Add BYO aoai support (Azure#31815)

* Add BYO aoai support

* hide parameter

Author: ZhidaLiu

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

@@ -518,6 +518,13 @@
             "metadata": {
                 "description": "A flag to determine whether to set up feature store"
             }
+        },
+        "byo_open_ai_resource_id": {
+            "type": "string",
+            "defaultValue": "",
+            "metadata": {
+                "description": "Resource Id of BYO open ai resource."
+            }
         }
     },
     "variables": {
@@ -759,7 +766,10 @@
                 },
                 "enableDataIsolation": "[parameters('enable_data_isolation')]",
                 "workspaceHubConfig": "[parameters('workspace_hub_config')]",
-                "existingWorkspaces": "[parameters('existing_workspaces')]"
+                "existingWorkspaces": "[parameters('existing_workspaces')]",
+                "azureOpenAI": {
+                    "resourceId": "[parameters('byo_open_ai_resource_id')]"
+                }
             }
         },
         {

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

@@ -166,5 +166,8 @@
     },
     "set_up_feature_store": {
         "value": "false"
+    },
+    "byo_open_ai_resource_id": {
+        "value": ""
     }
 }

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

@@ -557,6 +557,13 @@
             "metadata": {
                 "description": "A flag to determine whether to set up feature store"
             }
+        },
+        "byo_open_ai_resource_id": {
+            "type": "string",
+            "defaultValue": "",
+            "metadata": {
+                "description": "Resource Id of BYO open ai resource."
+            }
         }
     },
     "variables": {
@@ -642,7 +649,10 @@
                 "description": "[parameters('description')]",
                 "applicationInsights": "[variables('applicationInsights')]",
                 "primaryUserAssignedIdentity": "[parameters('primaryUserAssignedIdentity')]",
-                "hubResourceId": "[parameters('workspace_hub')]"
+                "hubResourceId": "[parameters('workspace_hub')]",
+                "azureOpenAI": {
+                    "resourceId": "[parameters('byo_open_ai_resource_id')]"
+                }
             }
         }
     ]

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

@@ -173,7 +173,6 @@ def begin_create(
         :return: An instance of LROPoller that returns a Workspace.
         :rtype: ~azure.core.polling.LROPoller[~azure.ai.ml.entities.Workspace]
         """
-
         return super().begin_create(workspace, update_dependent_resources=update_dependent_resources, **kwargs)
 
     @monitor_with_activity(logger, "Workspace.BeginUpdate", ActivityType.PUBLICAPI)

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

@@ -80,6 +80,8 @@ def begin_create(
     ) -> LROPoller[Workspace]:
         existing_workspace = None
         resource_group = kwargs.get("resource_group") or workspace.resource_group or self._resource_group_name
+        byo_open_ai_resource_id = kwargs.get("byo_open_ai_resource_id") or ""
+
         try:
             existing_workspace = self.get(workspace.name, resource_group=resource_group)
         except Exception:  # pylint: disable=broad-except
@@ -112,7 +114,13 @@ def begin_create(
             workspace.tags["createdByToolkit"] = "sdk-v2-{}".format(VERSION)
 
         workspace.resource_group = resource_group
-        template, param, resources_being_deployed = self._populate_arm_paramaters(workspace, **kwargs)
+        (
+            template,
+            param,
+            resources_being_deployed,
+        ) = self._populate_arm_paramaters(  # pylint: disable=too-many-function-args
+            workspace, byo_open_ai_resource_id, **kwargs
+        )
         # check if create with workspace hub request is valid
         if workspace._kind == PROJECT_WORKSPACE_KIND:
             if not all(
@@ -377,6 +385,8 @@ def _populate_arm_paramaters(self, workspace: Workspace, **kwargs: Dict) -> Tupl
         param = get_template(resource_type=ArmConstants.WORKSPACE_PARAM)
         if workspace._kind == PROJECT_WORKSPACE_KIND:
             template = get_template(resource_type=ArmConstants.WORKSPACE_PROJECT)
+        byo_open_ai_resource_id = kwargs.get("byo_open_ai_resource_id") or ""
+        _set_val(param["byo_open_ai_resource_id"], byo_open_ai_resource_id)
         _set_val(param["workspaceName"], workspace.name)
         if not workspace.display_name:
             _set_val(param["friendlyName"], workspace.name)