Hub arm updates may 2024 (Azure#35457)

* ai services create arg

* pylint and such

* run black again

* change connection kind name

* use new assets for connections

* fix project arm template

* remove ai_serives from workspace create

Author: MilesHolland

sdk/ml/azure-ai-ml/assets.json

@@ -2,5 +2,5 @@
   "AssetsRepo": "Azure/azure-sdk-assets",
   "AssetsRepoPrefixPath": "python",
   "TagPrefix": "python/ml/azure-ai-ml",
-  "Tag": "python/ml/azure-ai-ml_6ac7667166"
+  "Tag": "python/ml/azure-ai-ml_ea5ddd9a5f"
 }

sdk/ml/azure-ai-ml/azure/ai/ml/_arm_deployments/arm_templates/workspace_base.json

@@ -119,9 +119,9 @@
         },
         "applicationInsightsOption": {
             "type": "string",
-            "defaultValue": "new",
+            "defaultValue": "none",
             "allowedValues": [
-                "new",
+                "none",
                 "existing"
             ],
             "metadata": {
@@ -161,7 +161,6 @@
             "type": "string",
             "defaultValue": "none",
             "allowedValues": [
-                "new",
                 "existing",
                 "none"
             ],
@@ -778,52 +777,6 @@
                 "networkAcls": "[if(equals(parameters('keyVaultBehindVNet'), 'true'), variables('networkRuleSetBehindVNet'), json('null'))]"
             }
         },
-        {
-            "condition": "[and(variables('enablePE'), equals(parameters('containerRegistryOption'), 'new'))]",
-            "type": "Microsoft.ContainerRegistry/registries",
-            "apiVersion": "2019-05-01",
-            "tags": "[parameters('tagValues')]",
-            "name": "[parameters('containerRegistryName')]",
-            "dependsOn": [
-                "[resourceId('Microsoft.Network/virtualNetworks/subnets', parameters('vnetName'), parameters('subnetName'))]"
-            ],
-            "location": "[parameters('containerRegistryLocation')]",
-            "sku": {
-                "name": "[parameters('containerRegistrySku')]"
-            },
-            "properties": {
-                "adminUserEnabled": true,
-                "networkRuleSet": "[if(equals(parameters('containerRegistryBehindVNet'), 'true'), variables('networkRuleSetBehindVNet'), json('null'))]"
-            }
-        },
-        {
-            "condition": "[and(variables('enablePE'), equals(parameters('applicationInsightsOption'), 'new'))]",
-            "type": "Microsoft.OperationalInsights/workspaces",
-            "tags": "[parameters('tagValues')]",
-            "apiVersion": "2020-08-01",
-            "name": "[parameters('logAnalyticsName')]",
-            "location": "[if(or(equals(toLower(parameters('applicationInsightsLocation')),'westcentralus'), equals(toLower(parameters('applicationInsightsLocation')),'eastus2euap'), equals(toLower(parameters('applicationInsightsLocation')),'centraluseuap')),'southcentralus', parameters('applicationInsightsLocation'))]",
-            "kind": "web",
-            "properties": {
-                "Application_Type": "web"
-            }
-        },
-        {
-            "condition": "[and(variables('enablePE'), equals(parameters('applicationInsightsOption'), 'new'))]",
-            "type": "Microsoft.Insights/components",
-            "tags": "[parameters('tagValues')]",
-            "apiVersion": "2020-02-02-preview",
-            "name": "[parameters('applicationInsightsName')]",
-            "location": "[if(or(equals(toLower(parameters('applicationInsightsLocation')),'westcentralus'), equals(toLower(parameters('applicationInsightsLocation')),'eastus2euap'), equals(toLower(parameters('applicationInsightsLocation')),'centraluseuap')),'southcentralus', parameters('applicationInsightsLocation'))]",
-            "kind": "web",
-            "dependsOn": [
-                "[resourceId('Microsoft.OperationalInsights/workspaces', parameters('logAnalyticsName'))]"
-            ],
-            "properties": {
-                "Application_Type": "web",
-                "WorkspaceResourceId": "[parameters('logAnalyticsArmId')]"
-            }
-        },
         {
             "condition": "[variables('enablePE')]",
             "type": "Microsoft.MachineLearningServices/workspaces",
@@ -834,9 +787,7 @@
             "location": "[parameters('location')]",
             "dependsOn": [
                 "[resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccountName'))]",
-                "[resourceId('Microsoft.KeyVault/vaults', parameters('keyVaultName'))]",
-                "[resourceId('Microsoft.Insights/components', parameters('applicationInsightsName'))]",
-                "[resourceId('Microsoft.ContainerRegistry/registries', parameters('containerRegistryName'))]"
+                "[resourceId('Microsoft.KeyVault/vaults', parameters('keyVaultName'))]"
             ],
             "identity": "[parameters('identity')]",
             "properties": {
@@ -846,6 +797,7 @@
                 "keyVault": "[variables('keyVault')]",
                 "applicationInsights": "[variables('applicationInsights')]",
                 "containerRegistry": "[if(not(equals(parameters('containerRegistryOption'), 'none')), variables('containerRegistry'), json('null'))]",
+                "applicationInsights": "[if(not(equals(parameters('applicationInsightsOption'), 'none')), variables('containerRegistry'), json('null'))]",
                 "hbiWorkspace": "[parameters('confidential_data')]",
                 "imageBuildCompute": "[parameters('imageBuildCompute')]",
                 "publicNetworkAccess": "[parameters('publicNetworkAccess')]",
@@ -920,48 +872,6 @@
                             "resourceid": "[variables('materializationIdentity')]"
                         }
                     }
-                },
-                {
-                    "condition": "[and(equals(parameters('endpoint_option'), 'new'), variables('isWorkspaceHub'))]",
-                    "type": "endpoints",
-                    "apiVersion": "2023-08-01-preview",
-                    "name": "Azure.OpenAI",
-                    "properties": {
-                      "name": "Azure.OpenAI",
-                      "endpointType": "Azure.OpenAI",
-                      "associatedResourceId": "[if(equals(parameters('endpoint_resource_id'), 'null'), null(), parameters('endpoint_resource_id'))]"
-                    },
-                    "dependsOn": [
-                      "[parameters('workspaceName')]"
-                    ]
-                },
-                {
-                    "condition": "[and(equals(parameters('endpoint_kind'), 'AIServices'), equals(parameters('endpoint_option'), 'new'), variables('isWorkspaceHub'))]",
-                    "type": "endpoints",
-                    "apiVersion": "2023-08-01-preview",
-                    "name": "Azure.ContentSafety",
-                    "properties": {
-                        "name": "Azure.ContentSafety",
-                        "endpointType": "Azure.ContentSafety",
-                        "associatedResourceId": "[if(equals(parameters('endpoint_resource_id'), 'null'), null(), parameters('endpoint_resource_id'))]"
-                    },
-                    "dependsOn": [
-                        "[parameters('workspaceName')]"
-                    ]
-                },
-                {
-                    "condition": "[and(equals(parameters('endpoint_kind'), 'AIServices'), equals(parameters('endpoint_option'), 'new'), variables('isWorkspaceHub'))]",
-                    "type": "endpoints",
-                    "apiVersion": "2023-08-01-preview",
-                    "name": "Azure.Speech",
-                    "properties": {
-                        "name": "Azure.Speech",
-                        "endpointType": "Azure.Speech",
-                        "associatedResourceId": "[if(equals(parameters('endpoint_resource_id'), 'null'), null(), parameters('endpoint_resource_id'))]"
-                    },
-                    "dependsOn": [
-                        "[parameters('workspaceName')]"
-                    ]
                 }
             ]
         },

sdk/ml/azure-ai-ml/azure/ai/ml/_arm_deployments/arm_templates/workspace_param.json

@@ -39,7 +39,7 @@
         "value": ""
     },
     "applicationInsightsOption": {
-        "value": "new"
+        "value": "none"
     },
     "applicationInsightsName": {
         "value": ""

sdk/ml/azure-ai-ml/azure/ai/ml/_arm_deployments/arm_templates/workspace_project.json

@@ -119,9 +119,9 @@
         },
         "applicationInsightsOption": {
             "type": "string",
-            "defaultValue": "new",
+            "defaultValue": "none",
             "allowedValues": [
-                "new",
+                "none",
                 "existing"
             ],
             "metadata": {
@@ -161,7 +161,6 @@
             "type": "string",
             "defaultValue": "none",
             "allowedValues": [
-                "new",
                 "existing",
                 "none"
             ],

sdk/ml/azure-ai-ml/azure/ai/ml/constants/_common.py

@@ -841,10 +841,10 @@ class OneLakeArtifactTypes:
 
 
 class CognitiveServiceKinds:
-    """Subtypes for connections using the Cognitive serive type. These
+    """Subtypes for connections using the Cognitive service type. These
     values are plugged into the connection's metadata."""
 
-    CONTENT_SAFETY = "content_safety"
+    CONTENT_SAFETY = "Content Safety"
     SPEECH = "speech"
 
 

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

@@ -595,9 +595,9 @@ def _get_entity_class_from_rest_obj(cls, rest_obj: RestWorkspaceConnection) -> T
             and rest_obj.properties.metadata is not None
         ):
             kind = rest_obj.properties.metadata.get(CONNECTION_KIND_KEY, "").lower()
-            if kind == CognitiveServiceKinds.CONTENT_SAFETY:
+            if kind == CognitiveServiceKinds.CONTENT_SAFETY.lower():
                 return AzureContentSafetyConnection
-            if kind == CognitiveServiceKinds.SPEECH:
+            if kind == CognitiveServiceKinds.SPEECH.lower():
                 return AzureSpeechServicesConnection
             return Connection
 

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

@@ -518,8 +518,6 @@ class AzureContentSafetyConnection(ApiOrAadConnection):
     :type tags: dict
     """
 
-    # kinds AzureOpenAI", "ContentSafety", and "Speech"
-
     def __init__(
         self,
         **kwargs: Any,

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

@@ -740,13 +740,6 @@ def _populate_arm_parameters(self, workspace: Workspace, **kwargs: Any) -> Tuple
                 _set_val(param["endpoint_resource_id"], endpoint_resource_id)
                 _set_val(param["endpoint_kind"], endpoint_kind)
 
-            # Hubs must have an azure container registry on-provision. If none was provided, create one.
-            if not workspace.container_registry:
-                _set_val(param["containerRegistryOption"], "new")
-                container_registry = _generate_container_registry(workspace.name, resources_being_deployed)
-                _set_val(param["containerRegistryName"], container_registry)
-                _set_val(param["containerRegistryResourceGroupName"], self._resource_group_name)
-
         # Lean related param
         if (
             hasattr(workspace, "_kind")