Santiagxf/packages patch (#2885)

* fix: updating deployments schemas * fix: xgboost==1.3.3 * fixes * cli * vllm * exec
Azure · Dec 6, 2023 · cf107d4 · cf107d4
1 parent 9965308
commit cf107d4
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 22 deletions.
diff --git a/cli/endpoints/online/deploy-with-packages/custom-model/deploy.sh b/cli/endpoints/online/deploy-with-packages/custom-model/deploy.sh
@@ -4,16 +4,20 @@ MODEL_PATH='model'
 az ml model create --name $MODEL_NAME --path $MODEL_PATH --type custom_model
 #</register_model>
 
+#<model_version>
+MODEL_VERSION=$(az ml model show --name $MODEL_NAME --label latest | jq -r .version)
+#</model_version>
+
 #<base_environment>
 az ml environment create -f environment/sklearn-regression-env.yml
 #</base_environment>
 
 #<build_package>
-az ml model package -n $MODEL_NAME -l latest --file package-moe.yml
+az ml model package -n $MODEL_NAME -v $MODEL_VERSION --file package-moe.yml
 #</build_package>
 
 #<endpoint_name>
-ENDPOINT_NAME = "sklearn-regression-online"
+ENDPOINT_NAME="sklearn-regression-online"
 #</endpoint_name>
 
 # The following code ensures the created deployment has a unique name
@@ -29,17 +33,17 @@ az ml online-deployment create -f deployment.yml
 #</create_deployment>
 
 #<test_deployment>
-az ml online-endpoint invoke -n $ENDPOINT_NAME -d with-package -f sample-request.json
+az ml online-endpoint invoke --name $ENDPOINT_NAME --deployment with-package -r sample-request.json
 #</test_deployment>
 
 #<create_deployment_with_package>
-az ml online-deployment create -f model-deployment.yml --with-package
+az ml online-deployment create --package-model --file model-deployment.yml
 #</create_deployment_with_package>
 
 #<delete_resources>
-az ml online-endpoint delete -n $ENDPOINT_NAME --yes
+az ml online-endpoint delete --name $ENDPOINT_NAME --yes
 #</delete_resources>
 
 #<build_package_copy>
-az ml model package -n $MODEL_NAME -l latest --file package-external.yml
+az ml model package --name $MODEL_NAME --version $MODEL_VERSION --file package-external.yml
 #</build_package_copy>
diff --git a/cli/endpoints/online/deploy-with-packages/custom-model/model-deployment.yml b/cli/endpoints/online/deploy-with-packages/custom-model/model-deployment.yml
@@ -1,5 +1,5 @@
 $schema: https://azuremlschemas.azureedge.net/latest/managedOnlineDeployment.schema.json
-name: with-package
+name: regular_deployment
 endpoint_name: hello-packages
 model: azureml:sklearn-regression@latest
 environment: azureml:sklearn-regression-env@latest

diff --git a/cli/endpoints/online/deploy-with-packages/custom-model/package-external.yml b/cli/endpoints/online/deploy-with-packages/custom-model/package-external.yml
@@ -1,12 +1,12 @@
 $schema: http://azureml/sdk-2-0/ModelVersionPackage.json
 base_environment_source:
     type: environment_asset
-    resource_id: azureml:sklearn-regression-env@latest
-target_environment_name: sklearn-regression-docker-pkg
+    resource_id: azureml:sklearn-regression-env:1
+target_environment: sklearn-regression-docker-pkg
 inferencing_server: 
     type: azureml_online
     code_configuration:
       code: src
-      entry_script: score.py
+      scoring_script: score.py
 model_configuration:
   mode: copy
diff --git a/cli/endpoints/online/deploy-with-packages/custom-model/package-moe.yml b/cli/endpoints/online/deploy-with-packages/custom-model/package-moe.yml
@@ -1,10 +1,11 @@
 $schema: http://azureml/sdk-2-0/ModelVersionPackage.json
 base_environment_source:
     type: environment_asset
-    resource_id: azureml:sklearn-regression-env@latest
-target_environment_name: sklearn-regression-online-pkg
+    resource_id: azureml:sklearn-regression-env:1
+target_environment:
+    name: sklearn-regression-online-pkg
 inferencing_server: 
     type: azureml_online
     code_configuration:
       code: src
-      entry_script: score.py
+      scoring_script: score.py
diff --git a/cli/endpoints/online/deploy-with-packages/mlflow-model/deploy.sh b/cli/endpoints/online/deploy-with-packages/mlflow-model/deploy.sh
@@ -4,12 +4,16 @@ MODEL_PATH='model'
 az ml model create --name $MODEL_NAME --path $MODEL_PATH --type mlflow_model
 #</register_model>
 
+#<model_version>
+MODEL_VERSION=$(az ml model show --name $MODEL_NAME --label latest | jq -r .version)
+#</model_version>
+
 #<build_package>
-az ml model package -n $MODEL_NAME -l latest --file package.yml
+az ml model package --name $MODEL_NAME --version $MODEL_VERSION --file package.yml
 #</build_package>
 
 #<endpoint_name>
-ENDPOINT_NAME = "heart-classifier"
+ENDPOINT_NAME="heart-classifier"
 #</endpoint_name>
 
 # The following code ensures the created deployment has a unique name
@@ -25,7 +29,7 @@ az ml online-deployment create -f deployment.yml -e $ENDPOINT_NAME
 #</create_deployment>
 
 #<test_deployment>
-az ml online-endpoint invoke -n $ENDPOINT_NAME -d with-package -f sample-request.json
+az ml online-endpoint invoke --name $ENDPOINT_NAME --deployment with-package -r sample-request.json
 #</test_deployment>
 
 #<create_deployment_inline>
@@ -37,5 +41,5 @@ az ml online-endpoint delete -n $ENDPOINT_NAME --yes
 #</delete_resources>
 
 #<build_package_copy>
-az ml model package -n $MODEL_NAME -l latest --file package-external.yml
+az ml model package --name $MODEL_NAME --version $MODEL_VERSION --file package-external.yml
 #</build_package_copy>
diff --git a/cli/endpoints/online/deploy-with-packages/mlflow-model/package-external.yml b/cli/endpoints/online/deploy-with-packages/mlflow-model/package-external.yml
@@ -1,5 +1,5 @@
 $schema: http://azureml/sdk-2-0/ModelVersionPackage.json
-target_environment_name: heart-classifier-mlflow-pkg
+target_environment: heart-classifier-mlflow-pkg
 inferencing_server: 
     type: azureml_online
 model_configuration:

diff --git a/cli/endpoints/online/deploy-with-packages/mlflow-model/package.yml b/cli/endpoints/online/deploy-with-packages/mlflow-model/package.yml
@@ -1,4 +1,4 @@
 $schema: http://azureml/sdk-2-0/ModelVersionPackage.json
-target_environment_name: heart-classifier-mlflow-pkg
+target_environment: heart-classifier-mlflow-pkg
 inferencing_server: 
     type: azureml_online
diff --git a/sdk/python/endpoints/online/deploy-with-packages/custom-model/sdk-deploy-and-test.ipynb b/sdk/python/endpoints/online/deploy-with-packages/custom-model/sdk-deploy-and-test.ipynb
@@ -329,7 +329,7 @@
    "outputs": [],
    "source": [
     "pakage_config = ModelPackage(\n",
-    "    target_environment_name=\"sklearn-regression-online-pkg\",\n",
+    "    target_environment=\"sklearn-regression-online-pkg\",\n",
     "    base_environment_source=BaseEnvironment(\n",
     "        type=\"asset\",\n",
     "        resource_id=f\"azureml:{base_environment.name}:{base_environment.version}\",\n",

diff --git a/sdk/python/endpoints/online/deploy-with-packages/mlflow-model/sdk-deploy-and-test.ipynb b/sdk/python/endpoints/online/deploy-with-packages/mlflow-model/sdk-deploy-and-test.ipynb
@@ -215,7 +215,7 @@
    "outputs": [],
    "source": [
     "pakage_config = ModelPackage(\n",
-    "    target_environment_name=\"heart-classifier-mlflow-pkg\",\n",
+    "    target_environment=\"heart-classifier-mlflow-pkg\",\n",
     "    inferencing_server=AzureMLOnlineInferencingServer(),\n",
     ")"
    ]

diff --git a/sdk/python/endpoints/online/deploy-with-packages/registry-model/sdk-deploy-and-test.ipynb b/sdk/python/endpoints/online/deploy-with-packages/registry-model/sdk-deploy-and-test.ipynb
@@ -242,7 +242,7 @@
     "model_package_version = str(int(time.time()))\n",
     "\n",
     "package_config = ModelPackage(\n",
-    "    target_environment_name=model_package_name,\n",
+    "    target_environment=model_package_name,\n",
     "    target_environment_version=model_package_version,\n",
     "    inferencing_server=AzureMLOnlineInferencingServer(),\n",
     ")"