fix lingering files to use new Connections (#32742)

* fix configs.py file to use new connection

* fix connections.py

Author: MilesHolland

sdk/ai/azure-ai-generative/azure/ai/generative/entities/configs.py

@@ -3,7 +3,7 @@
 # ---------------------------------------------------------
 from dataclasses import dataclass
 from typing import Any, Dict
-from azure.ai.generative.entities.connection import Connection
+from azure.ai.generative.entities import AzureOpenAIConnection
 from azure.ai.ml._utils.utils import camel_to_snake
 
 
@@ -19,9 +19,9 @@ class AzureOpenAIModelConfiguration:
 
     @staticmethod
     def from_connection(
-        connection: Connection, model_name: str, deployment_name: str, **model_kwargs
+        connection: AzureOpenAIConnection, model_name: str, deployment_name: str, **model_kwargs
     ) -> 'AzureOpenAIModelConfiguration':
-        if not isinstance(connection, Connection) or camel_to_snake(connection.type) != "azure_open_ai":
+        if not isinstance(connection, AzureOpenAIConnection) or camel_to_snake(connection.type) != "azure_open_ai":
             raise TypeError(
                 "Only AzureOpenAI connection objects are supported."
             )
@@ -31,8 +31,8 @@ def from_connection(
 
         return AzureOpenAIModelConfiguration(
             api_base=connection.target,
-            api_key=connection.credentials.get("key"),
-            api_version=connection.metadata.get("ApiVersion"),
+            api_key=connection.credentials.key,
+            api_version=connection.api_version,
             model_name=model_name,
             deployment_name=deployment_name,
             model_kwargs=model_kwargs,

sdk/ai/azure-ai-generative/azure/ai/generative/index/_utils/connections.py

@@ -12,10 +12,10 @@
 
 try:
     from azure.ai.generative import AIClient
-    from azure.ai.generative.entities import Connection
+    from azure.ai.generative.entities import BaseConnection
 except Exception:
     AIClient = None
-    Connection = None
+    BaseConnection = None
 try:
     from azure.ai.ml import MLClient
     from azure.ai.ml.entities import WorkspaceConnection
@@ -84,12 +84,12 @@ def get_connection_credential(config, credential: Optional[TokenCredential] = No
     return connection_credential
 
 
-def workspace_connection_to_credential(connection: Union[dict, Connection, WorkspaceConnection]):
+def workspace_connection_to_credential(connection: Union[dict, BaseConnection, WorkspaceConnection]):
     """Get a credential for a workspace connection."""
     return connection_to_credential(connection)
 
 
-def connection_to_credential(connection: Union[dict, Connection, WorkspaceConnection]):
+def connection_to_credential(connection: Union[dict, BaseConnection, WorkspaceConnection]):
     """Get a credential for a workspace connection."""
     if isinstance(connection, dict):
         props = connection["properties"]
@@ -145,7 +145,7 @@ def connection_to_credential(connection: Union[dict, Connection, WorkspaceConnec
             raise ValueError(f"Unknown auth type '{connection.credentials.type}' for connection '{connection.name}'")
 
 
-def get_connection_by_id_v2(connection_id: str, credential: TokenCredential = None, client: str = "sdk") -> Union[dict, WorkspaceConnection, Connection]:
+def get_connection_by_id_v2(connection_id: str, credential: TokenCredential = None, client: str = "sdk") -> Union[dict, WorkspaceConnection, BaseConnection]:
     """
     Get a connection by id using azure.ai.ml or azure.ai.generative.
 
@@ -204,37 +204,37 @@ def get_connection_by_id_v2(connection_id: str, credential: TokenCredential = No
     return connection
 
 
-def get_id_from_connection(connection: Union[dict, WorkspaceConnection, Connection]) -> str:
+def get_id_from_connection(connection: Union[dict, WorkspaceConnection, BaseConnection]) -> str:
     """Get a connection id from a connection."""
     if isinstance(connection, dict):
         return connection["id"]
     elif isinstance(connection, WorkspaceConnection):
         return connection.id
-    elif isinstance(connection, Connection):
+    elif isinstance(connection, BaseConnection):
         return connection.id
     else:
         raise ValueError(f"Unknown connection type: {type(connection)}")
 
 
-def get_target_from_connection(connection: Union[dict, WorkspaceConnection, Connection]) -> str:
+def get_target_from_connection(connection: Union[dict, WorkspaceConnection, BaseConnection]) -> str:
     """Get a connection target from a connection."""
     if isinstance(connection, dict):
         return connection["properties"]["target"]
     elif isinstance(connection, WorkspaceConnection):
         return connection.target
-    elif isinstance(connection, Connection):
+    elif isinstance(connection, BaseConnection):
         return connection.target
     else:
         raise ValueError(f"Unknown connection type: {type(connection)}")
 
 
-def get_metadata_from_connection(connection: Union[dict, WorkspaceConnection, Connection]) -> dict:
+def get_metadata_from_connection(connection: Union[dict, WorkspaceConnection, BaseConnection]) -> dict:
     """Get a connection metadata from a connection."""
     if isinstance(connection, dict):
         return connection["properties"]["metadata"]
     elif isinstance(connection, WorkspaceConnection):
         return connection.metadata
-    elif isinstance(connection, Connection):
+    elif isinstance(connection, BaseConnection):
         return connection.metadata
     else:
         raise ValueError(f"Unknown connection type: {type(connection)}")