revert connection name (#35578) (#35584)

* revert connection name (#35578)

* revert connection name

* rename files and schema class

* fake

* undo fake

* rename create field

* run black

* correct merge

Author: MilesHolland

sdk/ml/azure-ai-ml/CHANGELOG.md

@@ -31,7 +31,6 @@
 
 ### Breaking Changes
 
-- WorkspaceConnection and subclasses renamed to just Connection
 - Removed WorkspaceHubConfig entity, and renamed WorkspaceHub to Hub.
 - workspace_hub input of Workspace class hidden, renamed to hub_id, and re-surfaced in child class Project.
 - Removed Workspace Hub Operations from ML Client.

sdk/ml/azure-ai-ml/azure/ai/ml/_schema/workspace/connections/__init__.py

@@ -4,7 +4,7 @@
 
 __path__ = __import__("pkgutil").extend_path(__path__, __name__)  # type: ignore
 
-from .connection import ConnectionSchema
+from .workspace_connection import WorkspaceConnectionSchema
 from .connection_subtypes import (
     AzureBlobStoreConnectionSchema,
     MicrosoftOneLakeConnectionSchema,
@@ -21,7 +21,7 @@
 )
 
 __all__ = [
-    "ConnectionSchema",
+    "WorkspaceConnectionSchema",
     "AzureBlobStoreConnectionSchema",
     "MicrosoftOneLakeConnectionSchema",
     "AzureOpenAIConnectionSchema",

sdk/ml/azure-ai-ml/azure/ai/ml/_schema/workspace/connections/connection_subtypes.py

@@ -20,11 +20,11 @@
     AadCredentialConfigurationSchema,
 )
 from azure.ai.ml.entities import AadCredentialConfiguration
-from .connection import ConnectionSchema
+from .workspace_connection import WorkspaceConnectionSchema
 
 
 # pylint: disable-next=name-too-long
-class AzureBlobStoreConnectionSchema(ConnectionSchema):
+class AzureBlobStoreConnectionSchema(WorkspaceConnectionSchema):
     # type and credentials limited
     type = StringTransformedEnum(
         allowed_values=ConnectionCategory.AZURE_BLOB, casing_transform=camel_to_snake, required=True
@@ -52,7 +52,7 @@ def make(self, data, **kwargs):
 
 
 # pylint: disable-next=name-too-long
-class MicrosoftOneLakeConnectionSchema(ConnectionSchema):
+class MicrosoftOneLakeConnectionSchema(WorkspaceConnectionSchema):
     type = StringTransformedEnum(
         allowed_values=ConnectionCategory.AZURE_ONE_LAKE, casing_transform=camel_to_snake, required=True
     )
@@ -93,7 +93,7 @@ def make(self, data, **kwargs):
 
 
 # pylint: disable-next=name-too-long
-class AzureOpenAIConnectionSchema(ConnectionSchema):
+class AzureOpenAIConnectionSchema(WorkspaceConnectionSchema):
     # type and credentials limited
     type = StringTransformedEnum(
         allowed_values=ConnectionCategory.AZURE_OPEN_AI, casing_transform=camel_to_snake, required=True
@@ -112,7 +112,7 @@ def make(self, data, **kwargs):
 
 
 # pylint: disable-next=name-too-long
-class AzureAIServicesConnectionSchema(ConnectionSchema):
+class AzureAIServicesConnectionSchema(WorkspaceConnectionSchema):
     # type and credentials limited
     type = StringTransformedEnum(
         allowed_values=ConnectionTypes.AZURE_AI_SERVICES, casing_transform=camel_to_snake, required=True
@@ -129,7 +129,7 @@ def make(self, data, **kwargs):
 
 
 # pylint: disable-next=name-too-long
-class AzureAISearchConnectionSchema(ConnectionSchema):
+class AzureAISearchConnectionSchema(WorkspaceConnectionSchema):
     # type and credentials limited
     type = StringTransformedEnum(
         allowed_values=ConnectionTypes.AZURE_SEARCH, casing_transform=camel_to_snake, required=True
@@ -145,7 +145,7 @@ def make(self, data, **kwargs):
 
 
 # pylint: disable-next=name-too-long
-class AzureContentSafetyConnectionSchema(ConnectionSchema):
+class AzureContentSafetyConnectionSchema(WorkspaceConnectionSchema):
     # type and credentials limited
     type = StringTransformedEnum(
         allowed_values=ConnectionTypes.AZURE_CONTENT_SAFETY, casing_transform=camel_to_snake, required=True
@@ -161,7 +161,7 @@ def make(self, data, **kwargs):
 
 
 # pylint: disable-next=name-too-long
-class AzureSpeechServicesConnectionSchema(ConnectionSchema):
+class AzureSpeechServicesConnectionSchema(WorkspaceConnectionSchema):
     # type and credentials limited
     type = StringTransformedEnum(
         allowed_values=ConnectionTypes.AZURE_SPEECH_SERVICES, casing_transform=camel_to_snake, required=True
@@ -176,7 +176,7 @@ def make(self, data, **kwargs):
         return AzureSpeechServicesConnection(**data)
 
 
-class APIKeyConnectionSchema(ConnectionSchema):
+class APIKeyConnectionSchema(WorkspaceConnectionSchema):
     # type and credentials limited
     type = StringTransformedEnum(
         allowed_values=ConnectionCategory.API_KEY, casing_transform=camel_to_snake, required=True
@@ -192,7 +192,7 @@ def make(self, data, **kwargs):
 
 
 # pylint: disable-next=name-too-long
-class OpenAIConnectionSchema(ConnectionSchema):
+class OpenAIConnectionSchema(WorkspaceConnectionSchema):
     # type and credentials limited
     type = StringTransformedEnum(
         allowed_values=ConnectionCategory.OPEN_AI, casing_transform=camel_to_snake, required=True
@@ -207,7 +207,7 @@ def make(self, data, **kwargs):
 
 
 # pylint: disable-next=name-too-long
-class SerpConnectionSchema(ConnectionSchema):
+class SerpConnectionSchema(WorkspaceConnectionSchema):
     # type and credentials limited
     type = StringTransformedEnum(allowed_values=ConnectionCategory.SERP, casing_transform=camel_to_snake, required=True)
     api_key = fields.Str(required=True)
@@ -220,7 +220,7 @@ def make(self, data, **kwargs):
 
 
 # pylint: disable-next=name-too-long
-class ServerlessConnectionSchema(ConnectionSchema):
+class ServerlessConnectionSchema(WorkspaceConnectionSchema):
     # type and credentials limited
     type = StringTransformedEnum(
         allowed_values=ConnectionCategory.SERVERLESS, casing_transform=camel_to_snake, required=True

sdk/ml/azure-ai-ml/azure/ai/ml/_schema/workspace/connections/connection.py renamed to sdk/ml/azure-ai-ml/azure/ai/ml/_schema/workspace/connections/workspace_connection.py

@@ -27,7 +27,7 @@
 from azure.ai.ml.entities import NoneCredentialConfiguration, AadCredentialConfiguration
 
 
-class ConnectionSchema(ResourceSchema):
+class WorkspaceConnectionSchema(ResourceSchema):
     # Inherits name, id, tags, and description fields from ResourceSchema
     creation_context = NestedField(CreationContextSchema, dump_only=True)
     type = StringTransformedEnum(
@@ -73,7 +73,7 @@ class ConnectionSchema(ResourceSchema):
 
     @post_load
     def make(self, data, **kwargs):
-        from azure.ai.ml.entities import Connection
+        from azure.ai.ml.entities import WorkspaceConnection
 
         # Most non-subclassed connections default to a none credential if none
         # is provided. ALDS Gen 2 connections default to AAD with this code.
@@ -82,4 +82,4 @@ def make(self, data, **kwargs):
             and data.get("credentials", None) == NoneCredentialConfiguration()
         ):
             data["credentials"] = AadCredentialConfiguration()
-        return Connection(**data)
+        return WorkspaceConnection(**data)

sdk/ml/azure-ai-ml/azure/ai/ml/entities/__init__.py

@@ -255,7 +255,7 @@
 from ._system_data import SystemData
 from ._validation import ValidationResult
 from ._workspace.compute_runtime import ComputeRuntime
-from ._workspace.connections.connection import Connection
+from ._workspace.connections.workspace_connection import WorkspaceConnection
 from ._workspace.connections.connection_subtypes import (
     AzureBlobStoreConnection,
     MicrosoftOneLakeConnection,
@@ -352,7 +352,7 @@
     "ModelBatchDeploymentSettings",
     "Workspace",
     "WorkspaceKeys",
-    "Connection",
+    "WorkspaceConnection",
     "AzureBlobStoreConnection",
     "MicrosoftOneLakeConnection",
     "AzureOpenAIConnection",

sdk/ml/azure-ai-ml/azure/ai/ml/entities/_load_functions.py

@@ -44,7 +44,7 @@
 from azure.ai.ml.entities._resource import Resource
 from azure.ai.ml.entities._schedule.schedule import Schedule
 from azure.ai.ml.entities._validation import PathAwareSchemaValidatableMixin, ValidationResultBuilder
-from azure.ai.ml.entities._workspace.connections.connection import Connection
+from azure.ai.ml.entities._workspace.connections.workspace_connection import WorkspaceConnection
 from azure.ai.ml.entities._workspace.workspace import Workspace
 from azure.ai.ml.exceptions import ErrorCategory, ErrorTarget, ValidationErrorType, ValidationException
 
@@ -810,7 +810,7 @@ def load_connection(
     relative_origin: Optional[str] = None,
     params_override: Optional[List[Dict]] = None,
     **kwargs: Any,
-) -> Connection:
+) -> WorkspaceConnection:
     """Construct a connection object from yaml file.
 
     :param source: The local yaml source of a connection object. Must be either a
@@ -832,7 +832,9 @@ def load_connection(
     :rtype: Connection
 
     """
-    return cast(Connection, load_common(Connection, source, relative_origin, params_override, **kwargs))
+    return cast(
+        WorkspaceConnection, load_common(WorkspaceConnection, source, relative_origin, params_override, **kwargs)
+    )
 
 
 # Unlike other aspects of connections, this wasn't made experimental, and thus couldn't just be replaced
@@ -842,7 +844,7 @@ def load_workspace_connection(
     *,
     relative_origin: Optional[str] = None,
     **kwargs: Any,
-) -> Connection:
+) -> WorkspaceConnection:
     """Deprecated - use 'load_connection' instead. Construct a connection object from yaml file.
 
     :param source: The local yaml source of a connection object. Must be either a

sdk/ml/azure-ai-ml/azure/ai/ml/entities/_monitoring/signals.py

@@ -1016,7 +1016,7 @@ class CustomMonitoringSignal(RestTranslatableMixin):
         calculate the custom metrics.
     :paramtype component_id: str
     :keyword connection: Specify connection with environment variables and secret configs.
-    :paramtype connection: Optional[~azure.ai.ml.entities.Connection]
+    :paramtype connection: Optional[~azure.ai.ml.entities.WorkspaceConnection]
     :keyword alert_enabled: Whether or not to enable alerts for the signal. Defaults to True.
     :paramtype alert_enabled: bool
     :keyword properties: A dictionary of custom properties for the signal.

sdk/ml/azure-ai-ml/azure/ai/ml/entities/_workspace/connections/connection_subtypes.py

@@ -39,15 +39,15 @@
     ServerlessConnectionSchema,
 )
 from .one_lake_artifacts import OneLakeConnectionArtifact
-from .connection import Connection
+from .workspace_connection import WorkspaceConnection
 
 
 # Dev notes: Any new classes require modifying the elif chains in the following functions in the
 # WorkspaceConnection parent class: _from_rest_object, _get_entity_class_from_type, _get_schema_class_from_type
 
 
 @experimental
-class AzureBlobStoreConnection(Connection):
+class AzureBlobStoreConnection(WorkspaceConnection):
     """A connection to an Azure Blob Store.
 
     :param name: Name of the connection.
@@ -152,7 +152,7 @@ def account_name(self, value: str) -> None:
 # Due to this, we construct the target internally by composing more inputs
 # that are more user-accessible.
 @experimental
-class MicrosoftOneLakeConnection(Connection):
+class MicrosoftOneLakeConnection(WorkspaceConnection):
     """A connection to a Microsoft One Lake. Connections of this type
     are further specified by their artifact class type, although
     the number of artifact classes is currently limited.
@@ -236,7 +236,7 @@ def _construct_target(cls, endpoint: str, workspace: str, artifact: OneLakeConne
 
 # Not experimental since users should never see this,
 # No need to add an extra warning.
-class ApiOrAadConnection(Connection):
+class ApiOrAadConnection(WorkspaceConnection):
     """Internal parent class for all connections that accept either an api key or
     entra ID as credentials. Entra ID credentials are implicitly assumed if no api key is provided.
 

sdk/ml/azure-ai-ml/azure/ai/ml/entities/_workspace/connections/connection.py renamed to sdk/ml/azure-ai-ml/azure/ai/ml/entities/_workspace/connections/workspace_connection.py

@@ -19,7 +19,7 @@
     AADAuthTypeWorkspaceConnectionProperties,
 )
 
-from azure.ai.ml._schema.workspace.connections.connection import ConnectionSchema
+from azure.ai.ml._schema.workspace.connections.workspace_connection import WorkspaceConnectionSchema
 from azure.ai.ml._utils._experimental import experimental
 from azure.ai.ml._utils.utils import _snake_to_camel, camel_to_snake, dump_yaml_to_file
 from azure.ai.ml.constants._common import (
@@ -73,7 +73,7 @@
 # In the rest client enum defined at _azure_machine_learning_services_enums.ConnectionCategory.
 # We avoid directly referencing it in the docs to avoid restclient references.
 @experimental
-class Connection(Resource):
+class WorkspaceConnection(Resource):
     """Azure ML connection provides a secure way to store authentication and configuration information needed
     to connect and interact with the external resources.
 
@@ -138,8 +138,8 @@ def __init__(
         # The additional undocumented kwarg "strict_typing" turns the warning into a value error.
         from_child = kwargs.pop("from_child", False)
         strict_typing = kwargs.pop("strict_typing", False)
-        correct_class = Connection._get_entity_class_from_type(type)
-        if not from_child and correct_class != Connection:
+        correct_class = WorkspaceConnection._get_entity_class_from_type(type)
+        if not from_child and correct_class != WorkspaceConnection:
             if strict_typing:
                 raise ValueError(
                     f"Cannot instantiate a base Connection with a type of {type}. "
@@ -360,7 +360,7 @@ def _load(
         yaml_path: Optional[Union[PathLike, str]] = None,
         params_override: Optional[list] = None,
         **kwargs: Any,
-    ) -> "Connection":
+    ) -> "WorkspaceConnection":
         data = data or {}
         params_override = params_override or []
         context = {
@@ -370,23 +370,23 @@ def _load(
         return cls._load_from_dict(data=data, context=context, **kwargs)
 
     @classmethod
-    def _load_from_dict(cls, data: Dict, context: Dict, **kwargs: Any) -> "Connection":
+    def _load_from_dict(cls, data: Dict, context: Dict, **kwargs: Any) -> "WorkspaceConnection":
         conn_type = data["type"] if "type" in data else None
         schema_class = cls._get_schema_class_from_type(conn_type)
-        loaded_data: Connection = load_from_dict(schema_class, data, context, **kwargs)
+        loaded_data: WorkspaceConnection = load_from_dict(schema_class, data, context, **kwargs)
         return loaded_data
 
     def _to_dict(self) -> Dict:
         # pylint: disable=no-member
-        schema_class = Connection._get_schema_class_from_type(self.type)
+        schema_class = WorkspaceConnection._get_schema_class_from_type(self.type)
         # Not sure what this pylint complaint was about, probably due to the polymorphic
         # tricks at play. Disabling since testing indicates no issue.
         # pylint: disable-next=missing-kwoa
         res: dict = schema_class(context={BASE_PATH_CONTEXT_KEY: "./"}).dump(self)
         return res
 
     @classmethod
-    def _from_rest_object(cls, rest_obj: RestWorkspaceConnection) -> Optional["Connection"]:
+    def _from_rest_object(cls, rest_obj: RestWorkspaceConnection) -> Optional["WorkspaceConnection"]:
         if not rest_obj:
             return None
 
@@ -420,7 +420,7 @@ def _from_rest_object(cls, rest_obj: RestWorkspaceConnection) -> Optional["Conne
             # No default in pop, this should fail if we somehow don't get a resource ID
             rest_kwargs["ai_services_resource_id"] = rest_kwargs.pop(camel_to_snake(CONNECTION_RESOURCE_ID_KEY))
         connection = conn_class(**rest_kwargs)
-        return cast(Optional["Connection"], connection)
+        return cast(Optional["WorkspaceConnection"], connection)
 
     def _validate(self) -> str:
         return str(self.name)
@@ -544,7 +544,7 @@ def _get_entity_class_from_type(cls, type: str) -> Type:
 
         conn_type = _snake_to_camel(type).lower()
         if conn_type is None:
-            return Connection
+            return WorkspaceConnection
 
         # Connection categories don't perfectly follow perfect camel casing, so lower
         # case everything to avoid problems.
@@ -563,7 +563,7 @@ def _get_entity_class_from_type(cls, type: str) -> Type:
             _snake_to_camel(ConnectionTypes.AZURE_AI_SERVICES).lower(): AzureAIServicesConnection,
             ConnectionTypes.AI_SERVICES_REST_PLACEHOLDER.lower(): AzureAIServicesConnection,
         }
-        return CONNECTION_CATEGORY_TO_SUBCLASS_MAP.get(conn_type, Connection)
+        return CONNECTION_CATEGORY_TO_SUBCLASS_MAP.get(conn_type, WorkspaceConnection)
 
     @classmethod
     def _get_entity_class_from_rest_obj(cls, rest_obj: RestWorkspaceConnection) -> Type:
@@ -580,7 +580,7 @@ def _get_entity_class_from_rest_obj(cls, rest_obj: RestWorkspaceConnection) -> T
         conn_type = rest_obj.properties.category
         conn_type = _snake_to_camel(conn_type).lower()
         if conn_type is None:
-            return Connection
+            return WorkspaceConnection
 
         # Imports are done here to avoid circular imports on load.
         from .connection_subtypes import (
@@ -599,7 +599,7 @@ def _get_entity_class_from_rest_obj(cls, rest_obj: RestWorkspaceConnection) -> T
                 return AzureContentSafetyConnection
             if kind == CognitiveServiceKinds.SPEECH.lower():
                 return AzureSpeechServicesConnection
-            return Connection
+            return WorkspaceConnection
 
         return cls._get_entity_class_from_type(type=conn_type)
 
@@ -616,7 +616,7 @@ def _get_schema_class_from_type(cls, conn_type: Optional[str]) -> Type:
         :rtype: Type
         """
         if conn_type is None:
-            return ConnectionSchema
+            return WorkspaceConnectionSchema
         entity_class = cls._get_entity_class_from_type(conn_type)
         return entity_class._get_schema_class()
 
@@ -640,4 +640,4 @@ def _get_schema_class(cls) -> Type:
         :return: The appropriate schema class to use with this entity class.
         :rtype: Type
         """
-        return ConnectionSchema
+        return WorkspaceConnectionSchema