more nits, and push flag to v2

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

@@ -4,8 +4,8 @@
 
 ### Features Added
 
-- Connections LIST operation now includes data connections.
-- Connections have read-only support for 3 new connection types: alds gen 2, data lake, and azure blob.
+- Connections LIST operation now supports returning data connections via new optional flag: include_data_connections.
+- Connections have read-only support for 3 new connection types: gen 2, data lake, and azure blob.
 
 ### Breaking Changes
 

sdk/ai/azure-ai-resources/azure/ai/resources/entities/base_connection.py

@@ -76,9 +76,22 @@ def _from_v2_workspace_connection(cls, workspace_connection: WorkspaceConnection
         :rtype: ~azure.ai.resources.entities.Connection
         """
         conn_class = cls._get_ai_connection_class_from_type(workspace_connection.type)
-        # It's simpler to create a placeholder connection, then overwrite it..
-        # We don't need to worry about the accidentally changing WC fields this way.
-        conn = conn_class(type="a", target="a", credentials=None, name="a", make_empty=True, api_version=None, api_type=None, kind=None)
+        # This slightly-cheeky initiliazation is just a placeholder that is immediately replaced
+        # with a directly-injected v2 connection object.
+        # Since all connection class initializers have kwargs, we can just throw a kitchen sink's
+        # worth of inputs to satisfy all possible subclass input requirements.
+        conn = conn_class(
+            type="a",
+            target="a",
+            credentials=None,
+            name="a",
+            make_empty=True,
+            api_version=None,
+            api_type=None,
+            kind=None,
+            account_name="a",
+            container_name="a",
+        )
         conn._workspace_connection = workspace_connection
         return conn
 
@@ -111,7 +124,7 @@ def _get_ai_connection_class_from_type(cls,  conn_type: str):
             ConnectionCategory.COGNITIVE_SEARCH.lower(): AzureAISearchConnection,
             ConnectionCategory.COGNITIVE_SERVICE.lower(): AzureAIServiceConnection,
             ConnectionCategory.GIT.lower(): GitHubConnection,
-            "azure_blob".lower(): AzureBlobStoreConnection,
+            "azureblob": AzureBlobStoreConnection,
             ConnectionCategory.CUSTOM_KEYS.lower(): CustomConnection, 
             WorkspaceConnectionTypes.CUSTOM.lower(): CustomConnection
         }

sdk/ai/azure-ai-resources/azure/ai/resources/entities/connection_subtypes.py

@@ -12,6 +12,8 @@
     CONNECTION_API_VERSION_KEY,
     CONNECTION_API_TYPE_KEY,
     CONNECTION_KIND_KEY,
+    CONNECTION_ACCOUNT_NAME_KEY,
+    CONNECTION_CONTAINER_NAME_KEY,
 )
 
 from .base_connection import BaseConnection
@@ -356,7 +358,8 @@ def container_name(self) -> str:
         :return: the container name of the connection.
         :rtype: str
         """
-        return self._workspace_connection.container_name
+        if self._workspace_connection.tags is not None and CONNECTION_CONTAINER_NAME_KEY in self._workspace_connection.tags:
+            return self._workspace_connection.tags[CONNECTION_CONTAINER_NAME_KEY]
 
     @container_name.setter
     def container_name(self, value: str) -> None:
@@ -365,7 +368,7 @@ def container_name(self, value: str) -> None:
         :param value: the new container name of the connection.
         :type value: str
         """
-        self._workspace_connection.container_name = value
+        self._workspace_connection.tags[CONNECTION_CONTAINER_NAME_KEY] = value
 
     @property
     def account_name(self) -> str:
@@ -374,7 +377,8 @@ def account_name(self) -> str:
         :return: the account name of the connection.
         :rtype: str
         """
-        return self._workspace_connection.account_name
+        if self._workspace_connection.tags is not None and CONNECTION_ACCOUNT_NAME_KEY in self._workspace_connection.tags:
+            return self._workspace_connection.tags[CONNECTION_ACCOUNT_NAME_KEY]
 
     @account_name.setter
     def account_name(self, value: str) -> None:
@@ -383,8 +387,7 @@ def account_name(self, value: str) -> None:
         :param value: the new account name of the connection.
         :type value: str
         """
-        self._workspace_connection.account_name = value
-
+        self._workspace_connection.tags[CONNECTION_ACCOUNT_NAME_KEY] = value
 class CustomConnection(BaseConnection):
     """A Connection to system that's not encapsulated by other connection types.
 

sdk/ai/azure-ai-resources/azure/ai/resources/operations/_connection_operations.py

@@ -34,7 +34,7 @@ def list(
         self,
         connection_type: Optional[str] = None,
         scope: str = OperationScope.AI_RESOURCE,
-        include_data_connection: bool = True,
+        include_data_connections: bool = False,
     ) -> Iterable[BaseConnection]:
         """List all connection assets in a project.
 
@@ -44,21 +44,18 @@ def list(
             that are available to the AI Client's AI Resource or just those available to the project.
             Defaults to AI resource-level scoping.
         :type scope: ~azure.ai.resources.constants.OperationScope
-        :param include_data_connection: If true, also return data connections. Defaults to True.
-        :type include_data_connection: bool
+        :param include_data_connections: If true, also return data connections. Defaults to False.
+        :type include_data_connections: bool
 
-        :return: An iterator like instance of connection objects
+        :return: An iterator of connection objects
         :rtype: Iterable[Connection]
         """
         client = self._resource_ml_client if scope == OperationScope.AI_RESOURCE else self._project_ml_client
 
-        if include_data_connection:
-            operation_result = client._workspace_connections.list(
-                connection_type=connection_type,
-                params={"includeAll": "true"}
-            )
-        else:
-            operation_result = client._workspace_connections.list(connection_type=connection_type)
+        operation_result = client._workspace_connections.list(
+            connection_type=connection_type,
+            include_data_connections=include_data_connections
+        )
 
         return [BaseConnection._from_v2_workspace_connection(conn) for conn in operation_result]
 

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

@@ -6,7 +6,7 @@
 - Remove `experimental` tag for  `ml_client.jobs.validate`.
 - Workspace Connection has new read-only subclass: AzureBlobStoreWorkspaceConnectionSchema.
 - Workspace Connection supports 2 new types under main class: gen 2 and azure_one_lake.
-- Workspace connection supports reading data connections.
+- Workspace Connection LIST operation can return data connections via new optional flag: include_data_connections.
 
 ### Bugs Fixed
 - Fix pipeline job `outputs` not load correctly when `component: <local-file>` exists in pipeline job yaml.

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

@@ -304,7 +304,7 @@ def _to_rest_object(self) -> RestWorkspaceConnection:
         if conn_type == WorkspaceConnectionTypes.CUSTOM:
             conn_type = ConnectionCategory.CUSTOM_KEYS
 
-        # No credential property bag uniquely has different inputs from ALL other propety bag classes.
+        # No credential property bag uniquely has different inputs from ALL other property bag classes.
         if workspace_connection_properties_class == NoneAuthTypeWorkspaceConnectionProperties:
             properties = workspace_connection_properties_class(
                 target=self.target,

sdk/ml/azure-ai-ml/azure/ai/ml/operations/_workspace_connections_operations.py

@@ -132,12 +132,15 @@ def delete(self, name: str) -> None:
     def list(
         self,
         connection_type: Optional[str] = None,
+        include_data_connections: bool = False,
         **kwargs: Any,
     ) -> Iterable[WorkspaceConnection]:
         """List all workspace connections for a workspace.
 
         :param connection_type: Type of workspace connection to list.
         :type connection_type: Optional[str]
+        :param include_data_connections: If true, also return data connections. Defaults to False.
+        :type include_data_connections: bool
         :return: An iterator like instance of workspace connection objects
         :rtype: Iterable[~azure.ai.ml.entities.WorkspaceConnection]
 
@@ -150,6 +153,13 @@ def list(
                 :dedent: 8
                 :caption: Lists all connections for a workspace for a certain type, in this case "git".
         """
+
+        if include_data_connections:
+            if "params" in kwargs:
+                kwargs["params"]["includeAll"] = "true"
+            else:
+                kwargs["params"] = {"includeAll": "true"}
+
         return cast(
             Iterable[WorkspaceConnection],
             self._operation.list(