From 9e68c9d27b6f777d9c0f7fdf0e6a2eb32c149c40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Komnus=E4=B8=B6Q?= <40655746+quchuyuan@users.noreply.github.com> Date: Wed, 8 Mar 2023 11:31:54 -0800 Subject: [PATCH 01/20] delete registry after creation --- .github/workflows/sdk-resources-registry-registry-create.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/sdk-resources-registry-registry-create.yml b/.github/workflows/sdk-resources-registry-registry-create.yml index a5fa1a14b1..2112d3a4a8 100644 --- a/.github/workflows/sdk-resources-registry-registry-create.yml +++ b/.github/workflows/sdk-resources-registry-registry-create.yml @@ -67,6 +67,9 @@ jobs: [ -f "../../.azureml/config" ] && cat "../../.azureml/config"; papermill -k python registry-create.ipynb registry-create.output.ipynb working-directory: sdk/python/resources/registry + - name: delete created registry + run: | + az ml registry delete --name "DemoRegistryPython" - name: upload notebook's working folder as an artifact if: ${{ always() }} uses: actions/upload-artifact@v2 From 72af43eb4fe50189b3a99d31202a6c9208e68206 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Komnus=E4=B8=B6Q?= <40655746+quchuyuan@users.noreply.github.com> Date: Wed, 8 Mar 2023 11:40:03 -0800 Subject: [PATCH 02/20] always run deletion --- .github/workflows/sdk-resources-registry-registry-create.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/sdk-resources-registry-registry-create.yml b/.github/workflows/sdk-resources-registry-registry-create.yml index 2112d3a4a8..834692bb3a 100644 --- a/.github/workflows/sdk-resources-registry-registry-create.yml +++ b/.github/workflows/sdk-resources-registry-registry-create.yml @@ -68,8 +68,9 @@ jobs: papermill -k python registry-create.ipynb registry-create.output.ipynb working-directory: sdk/python/resources/registry - name: delete created registry + if: ${{ always() }} run: | - az ml registry delete --name "DemoRegistryPython" + az ml registry delete --name "DemoRegistryPython" --resource-group $RESOURCE_GROUP_NAME - name: upload notebook's working folder as an artifact if: ${{ always() }} uses: actions/upload-artifact@v2 From fc88bcf3c85855e7181b7447448794b39231650d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Komnus=E4=B8=B6Q?= <40655746+quchuyuan@users.noreply.github.com> Date: Wed, 8 Mar 2023 12:23:41 -0800 Subject: [PATCH 03/20] init env --- .github/workflows/sdk-resources-registry-registry-create.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/sdk-resources-registry-registry-create.yml b/.github/workflows/sdk-resources-registry-registry-create.yml index 834692bb3a..826de048ca 100644 --- a/.github/workflows/sdk-resources-registry-registry-create.yml +++ b/.github/workflows/sdk-resources-registry-registry-create.yml @@ -70,6 +70,8 @@ jobs: - name: delete created registry if: ${{ always() }} run: | + source "${{ github.workspace }}/infra/init_environment.sh"; + echo $RESOURCE_GROUP_NAME; az ml registry delete --name "DemoRegistryPython" --resource-group $RESOURCE_GROUP_NAME - name: upload notebook's working folder as an artifact if: ${{ always() }} From 70b01b11fff631b944eb6fff81b7f57c125626de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Komnus=E4=B8=B6Q?= <40655746+quchuyuan@users.noreply.github.com> Date: Wed, 8 Mar 2023 12:39:11 -0800 Subject: [PATCH 04/20] set working dir --- .github/workflows/sdk-resources-registry-registry-create.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/sdk-resources-registry-registry-create.yml b/.github/workflows/sdk-resources-registry-registry-create.yml index 826de048ca..cc3059da74 100644 --- a/.github/workflows/sdk-resources-registry-registry-create.yml +++ b/.github/workflows/sdk-resources-registry-registry-create.yml @@ -73,6 +73,7 @@ jobs: source "${{ github.workspace }}/infra/init_environment.sh"; echo $RESOURCE_GROUP_NAME; az ml registry delete --name "DemoRegistryPython" --resource-group $RESOURCE_GROUP_NAME + working-directory: sdk/python/resources/registry - name: upload notebook's working folder as an artifact if: ${{ always() }} uses: actions/upload-artifact@v2 From aec5b1cd80e94c3a71bbcf1c24f8ea4c53c78c96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Komnus=E4=B8=B6Q?= <40655746+quchuyuan@users.noreply.github.com> Date: Wed, 8 Mar 2023 12:54:38 -0800 Subject: [PATCH 05/20] add sdk_helper --- .github/workflows/sdk-resources-registry-registry-create.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/sdk-resources-registry-registry-create.yml b/.github/workflows/sdk-resources-registry-registry-create.yml index cc3059da74..2f98b24393 100644 --- a/.github/workflows/sdk-resources-registry-registry-create.yml +++ b/.github/workflows/sdk-resources-registry-registry-create.yml @@ -70,6 +70,7 @@ jobs: - name: delete created registry if: ${{ always() }} run: | + source "${{ github.workspace }}/infra/sdk_helpers.sh"; source "${{ github.workspace }}/infra/init_environment.sh"; echo $RESOURCE_GROUP_NAME; az ml registry delete --name "DemoRegistryPython" --resource-group $RESOURCE_GROUP_NAME From 5b4911b7684cb9427437b42532442ab62b4b9642 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Komnus=E4=B8=B6Q?= <40655746+quchuyuan@users.noreply.github.com> Date: Wed, 8 Mar 2023 13:13:24 -0800 Subject: [PATCH 06/20] add sub_id --- .github/workflows/sdk-resources-registry-registry-create.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sdk-resources-registry-registry-create.yml b/.github/workflows/sdk-resources-registry-registry-create.yml index 2f98b24393..a754815c38 100644 --- a/.github/workflows/sdk-resources-registry-registry-create.yml +++ b/.github/workflows/sdk-resources-registry-registry-create.yml @@ -73,7 +73,7 @@ jobs: source "${{ github.workspace }}/infra/sdk_helpers.sh"; source "${{ github.workspace }}/infra/init_environment.sh"; echo $RESOURCE_GROUP_NAME; - az ml registry delete --name "DemoRegistryPython" --resource-group $RESOURCE_GROUP_NAME + az ml registry delete --name "DemoRegistryPython" --resource-group $RESOURCE_GROUP_NAME --subscription $SUBSCRIPTION_ID working-directory: sdk/python/resources/registry - name: upload notebook's working folder as an artifact if: ${{ always() }} From b262fe6344bf26bca9e0ce0d57aede33c8ea0531 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Komnus=E4=B8=B6Q?= <40655746+quchuyuan@users.noreply.github.com> Date: Wed, 8 Mar 2023 16:36:30 -0800 Subject: [PATCH 07/20] edit for debugging --- .github/workflows/sdk-resources-registry-registry-create.yml | 1 + sdk/python/resources/registry/registry-create.ipynb | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/.github/workflows/sdk-resources-registry-registry-create.yml b/.github/workflows/sdk-resources-registry-registry-create.yml index a754815c38..8a3034cfb7 100644 --- a/.github/workflows/sdk-resources-registry-registry-create.yml +++ b/.github/workflows/sdk-resources-registry-registry-create.yml @@ -73,6 +73,7 @@ jobs: source "${{ github.workspace }}/infra/sdk_helpers.sh"; source "${{ github.workspace }}/infra/init_environment.sh"; echo $RESOURCE_GROUP_NAME; + az ml registry show --name "DemoRegistryPython"; az ml registry delete --name "DemoRegistryPython" --resource-group $RESOURCE_GROUP_NAME --subscription $SUBSCRIPTION_ID working-directory: sdk/python/resources/registry - name: upload notebook's working folder as an artifact diff --git a/sdk/python/resources/registry/registry-create.ipynb b/sdk/python/resources/registry/registry-create.ipynb index ee440457a3..678b50f29b 100644 --- a/sdk/python/resources/registry/registry-create.ipynb +++ b/sdk/python/resources/registry/registry-create.ipynb @@ -147,6 +147,10 @@ "# You can override the registry name if needed\n", "registry.name = \"DemoRegistryPython\"\n", "\n", + "reg_name = registry.name # defined within yaml file\n", + "my_registry = ml_client.registries.get(name=reg_name)\n", + "print(f\"printing registry info: {my_registry}\")\n", + "\n", "registry = ml_client.registries.begin_create(registry=registry).result(\n", " timeout=LROConfigurations.POLLING_TIMEOUT\n", ")" From 9e983eb611fbdf6ccb42f84bdc6fa48053639b39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Komnus=E4=B8=B6Q?= <40655746+quchuyuan@users.noreply.github.com> Date: Wed, 8 Mar 2023 16:54:36 -0800 Subject: [PATCH 08/20] try debugging --- sdk/python/resources/registry/registry-create.ipynb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sdk/python/resources/registry/registry-create.ipynb b/sdk/python/resources/registry/registry-create.ipynb index 678b50f29b..164c80cf60 100644 --- a/sdk/python/resources/registry/registry-create.ipynb +++ b/sdk/python/resources/registry/registry-create.ipynb @@ -147,9 +147,12 @@ "# You can override the registry name if needed\n", "registry.name = \"DemoRegistryPython\"\n", "\n", - "reg_name = registry.name # defined within yaml file\n", - "my_registry = ml_client.registries.get(name=reg_name)\n", - "print(f\"printing registry info: {my_registry}\")\n", + "try:\n", + " reg_name = registry.name # defined within yaml file\n", + " my_registry = ml_client.registries.get(name=reg_name)\n", + " print(f\"printing registry info: {my_registry}\")\n", + "except Exception as e:\n", + " print(e)\n", "\n", "registry = ml_client.registries.begin_create(registry=registry).result(\n", " timeout=LROConfigurations.POLLING_TIMEOUT\n", From 803756cdc09de67bff2d703863a40e160cac9b18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Komnus=E4=B8=B6Q?= <40655746+quchuyuan@users.noreply.github.com> Date: Wed, 8 Mar 2023 17:08:33 -0800 Subject: [PATCH 09/20] try deletion inside the notebook --- .../resources/registry/registry-create.ipynb | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/sdk/python/resources/registry/registry-create.ipynb b/sdk/python/resources/registry/registry-create.ipynb index 164c80cf60..91a94e6031 100644 --- a/sdk/python/resources/registry/registry-create.ipynb +++ b/sdk/python/resources/registry/registry-create.ipynb @@ -86,10 +86,12 @@ "outputs": [], "source": [ "# Create a client without specifying an existing registry or workspace\n", + "sub=\"\"\n", + "rg=\"\"\n", "ml_client = MLClient(\n", " credential=credential,\n", - " subscription_id=\"\",\n", - " resource_group_name=\"\",\n", + " subscription_id=sub,\n", + " resource_group_name=rg,\n", ")" ] }, @@ -145,14 +147,10 @@ "print(registry)\n", "\n", "# You can override the registry name if needed\n", - "registry.name = \"DemoRegistryPython\"\n", - "\n", - "try:\n", - " reg_name = registry.name # defined within yaml file\n", - " my_registry = ml_client.registries.get(name=reg_name)\n", - " print(f\"printing registry info: {my_registry}\")\n", - "except Exception as e:\n", - " print(e)\n", + "import datetime\n", + "ct = datetime.datetime.now()\n", + "ts = ct.timestamp()\n", + "registry.name = \"DemoRegistryPython\"+'-'+ts\n", "\n", "registry = ml_client.registries.begin_create(registry=registry).result(\n", " timeout=LROConfigurations.POLLING_TIMEOUT\n", @@ -213,7 +211,12 @@ "id": "5f2c0f69", "metadata": {}, "outputs": [], - "source": [] + "source": [ + "# delete registry after testing\n", + "from subprocess import run\n", + "\n", + "run(f\"az ml registry delete --name {reg_name} --resource-group {rg} --subscription {sub}\", shell=True)" + ] } ], "metadata": { From 5c84e6faafecc5d649c83d3603342665ce674e57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Komnus=E4=B8=B6Q?= <40655746+quchuyuan@users.noreply.github.com> Date: Thu, 9 Mar 2023 12:11:26 -0800 Subject: [PATCH 10/20] delete in the same step --- .../sdk-resources-registry-registry-create.yml | 11 ++--------- infra/sdk_helpers.sh | 1 + sdk/python/resources/registry/registry-create.ipynb | 8 +++----- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/.github/workflows/sdk-resources-registry-registry-create.yml b/.github/workflows/sdk-resources-registry-registry-create.yml index 8a3034cfb7..43ae02f59d 100644 --- a/.github/workflows/sdk-resources-registry-registry-create.yml +++ b/.github/workflows/sdk-resources-registry-registry-create.yml @@ -66,16 +66,9 @@ jobs: bash "${{ github.workspace }}/infra/sdk_helpers.sh" replace_template_values "registry-create.ipynb"; [ -f "../../.azureml/config" ] && cat "../../.azureml/config"; papermill -k python registry-create.ipynb registry-create.output.ipynb + az ml registry delete --name "DemoRegistryPython"-$timestamp --resource-group $RESOURCE_GROUP_NAME --subscription $SUBSCRIPTION_ID working-directory: sdk/python/resources/registry - - name: delete created registry - if: ${{ always() }} - run: | - source "${{ github.workspace }}/infra/sdk_helpers.sh"; - source "${{ github.workspace }}/infra/init_environment.sh"; - echo $RESOURCE_GROUP_NAME; - az ml registry show --name "DemoRegistryPython"; - az ml registry delete --name "DemoRegistryPython" --resource-group $RESOURCE_GROUP_NAME --subscription $SUBSCRIPTION_ID - working-directory: sdk/python/resources/registry + continue-on-error: true - name: upload notebook's working folder as an artifact if: ${{ always() }} uses: actions/upload-artifact@v2 diff --git a/infra/sdk_helpers.sh b/infra/sdk_helpers.sh index 310c46fe61..cfc3e6873a 100644 --- a/infra/sdk_helpers.sh +++ b/infra/sdk_helpers.sh @@ -813,6 +813,7 @@ function replace_template_values() { -e "s//$(echo "$REGISTRY_NAME")/g" \ -e "s//$(echo "$ARC_CLUSTER_NAME")/g" \ -e "s//$(echo "$ARC_COMPUTE_NAME")/g" \ + -e "s//$(echo "$timestamp")/g" \ -e "s/DefaultAzureCredential/AzureCliCredential/g" \ -e "s/InteractiveBrowserCredential/AzureCliCredential/g" \ -e "s/@pipeline(/&force_rerun=True,/g" \ diff --git a/sdk/python/resources/registry/registry-create.ipynb b/sdk/python/resources/registry/registry-create.ipynb index 91a94e6031..6b96cea2ae 100644 --- a/sdk/python/resources/registry/registry-create.ipynb +++ b/sdk/python/resources/registry/registry-create.ipynb @@ -147,9 +147,7 @@ "print(registry)\n", "\n", "# You can override the registry name if needed\n", - "import datetime\n", - "ct = datetime.datetime.now()\n", - "ts = ct.timestamp()\n", + "ts = \"\"\n", "registry.name = \"DemoRegistryPython\"+'-'+ts\n", "\n", "registry = ml_client.registries.begin_create(registry=registry).result(\n", @@ -213,9 +211,9 @@ "outputs": [], "source": [ "# delete registry after testing\n", - "from subprocess import run\n", + "# from subprocess import run\n", "\n", - "run(f\"az ml registry delete --name {reg_name} --resource-group {rg} --subscription {sub}\", shell=True)" + "# run(f\"az ml registry delete --name {reg_name} --resource-group {rg} --subscription {sub}\", shell=True)" ] } ], From 14938e69db597451f3383ed6f0dec0597d53f24f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Komnus=E4=B8=B6Q?= <40655746+quchuyuan@users.noreply.github.com> Date: Thu, 9 Mar 2023 14:37:15 -0800 Subject: [PATCH 11/20] print registry name for debugging --- .github/workflows/sdk-resources-registry-registry-create.yml | 2 +- sdk/python/resources/registry/registry-create.ipynb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/sdk-resources-registry-registry-create.yml b/.github/workflows/sdk-resources-registry-registry-create.yml index 43ae02f59d..6e09da3632 100644 --- a/.github/workflows/sdk-resources-registry-registry-create.yml +++ b/.github/workflows/sdk-resources-registry-registry-create.yml @@ -65,7 +65,7 @@ jobs: bash "${{ github.workspace }}/infra/sdk_helpers.sh" generate_workspace_config "../../.azureml/config.json"; bash "${{ github.workspace }}/infra/sdk_helpers.sh" replace_template_values "registry-create.ipynb"; [ -f "../../.azureml/config" ] && cat "../../.azureml/config"; - papermill -k python registry-create.ipynb registry-create.output.ipynb + papermill -k python registry-create.ipynb registry-create.output.ipynb; az ml registry delete --name "DemoRegistryPython"-$timestamp --resource-group $RESOURCE_GROUP_NAME --subscription $SUBSCRIPTION_ID working-directory: sdk/python/resources/registry continue-on-error: true diff --git a/sdk/python/resources/registry/registry-create.ipynb b/sdk/python/resources/registry/registry-create.ipynb index 6b96cea2ae..2932816c6b 100644 --- a/sdk/python/resources/registry/registry-create.ipynb +++ b/sdk/python/resources/registry/registry-create.ipynb @@ -149,6 +149,7 @@ "# You can override the registry name if needed\n", "ts = \"\"\n", "registry.name = \"DemoRegistryPython\"+'-'+ts\n", + "print(f\"the reigstry name: {registry.name}\")\n", "\n", "registry = ml_client.registries.begin_create(registry=registry).result(\n", " timeout=LROConfigurations.POLLING_TIMEOUT\n", From ea13795f38c7c417d2948bb21eb665c45d6d9581 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Komnus=E4=B8=B6Q?= <40655746+quchuyuan@users.noreply.github.com> Date: Thu, 9 Mar 2023 15:08:11 -0800 Subject: [PATCH 12/20] remove deletion for testing. --- .github/workflows/sdk-resources-registry-registry-create.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sdk-resources-registry-registry-create.yml b/.github/workflows/sdk-resources-registry-registry-create.yml index 6e09da3632..35fb0577ee 100644 --- a/.github/workflows/sdk-resources-registry-registry-create.yml +++ b/.github/workflows/sdk-resources-registry-registry-create.yml @@ -66,7 +66,7 @@ jobs: bash "${{ github.workspace }}/infra/sdk_helpers.sh" replace_template_values "registry-create.ipynb"; [ -f "../../.azureml/config" ] && cat "../../.azureml/config"; papermill -k python registry-create.ipynb registry-create.output.ipynb; - az ml registry delete --name "DemoRegistryPython"-$timestamp --resource-group $RESOURCE_GROUP_NAME --subscription $SUBSCRIPTION_ID + # az ml registry delete --name "DemoRegistryPython"-$timestamp --resource-group $RESOURCE_GROUP_NAME --subscription $SUBSCRIPTION_ID working-directory: sdk/python/resources/registry continue-on-error: true - name: upload notebook's working folder as an artifact From bd58c355c60fbc242b3d46cd12fdad990f1b68cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Komnus=E4=B8=B6Q?= <40655746+quchuyuan@users.noreply.github.com> Date: Thu, 9 Mar 2023 15:23:26 -0800 Subject: [PATCH 13/20] change everything back for final pr --- .../sdk-resources-registry-registry-create.yml | 2 +- .../resources/registry/registry-create.ipynb | 15 +-------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/.github/workflows/sdk-resources-registry-registry-create.yml b/.github/workflows/sdk-resources-registry-registry-create.yml index 35fb0577ee..6e09da3632 100644 --- a/.github/workflows/sdk-resources-registry-registry-create.yml +++ b/.github/workflows/sdk-resources-registry-registry-create.yml @@ -66,7 +66,7 @@ jobs: bash "${{ github.workspace }}/infra/sdk_helpers.sh" replace_template_values "registry-create.ipynb"; [ -f "../../.azureml/config" ] && cat "../../.azureml/config"; papermill -k python registry-create.ipynb registry-create.output.ipynb; - # az ml registry delete --name "DemoRegistryPython"-$timestamp --resource-group $RESOURCE_GROUP_NAME --subscription $SUBSCRIPTION_ID + az ml registry delete --name "DemoRegistryPython"-$timestamp --resource-group $RESOURCE_GROUP_NAME --subscription $SUBSCRIPTION_ID working-directory: sdk/python/resources/registry continue-on-error: true - name: upload notebook's working folder as an artifact diff --git a/sdk/python/resources/registry/registry-create.ipynb b/sdk/python/resources/registry/registry-create.ipynb index 2932816c6b..3ac266f6c8 100644 --- a/sdk/python/resources/registry/registry-create.ipynb +++ b/sdk/python/resources/registry/registry-create.ipynb @@ -149,7 +149,7 @@ "# You can override the registry name if needed\n", "ts = \"\"\n", "registry.name = \"DemoRegistryPython\"+'-'+ts\n", - "print(f\"the reigstry name: {registry.name}\")\n", + "print(f\"the registry name: {registry.name}\")\n", "\n", "registry = ml_client.registries.begin_create(registry=registry).result(\n", " timeout=LROConfigurations.POLLING_TIMEOUT\n", @@ -203,19 +203,6 @@ "for reg in ml_client.registries.list():\n", " print(reg.name)" ] - }, - { - "cell_type": "code", - "execution_count": null, - "id": "5f2c0f69", - "metadata": {}, - "outputs": [], - "source": [ - "# delete registry after testing\n", - "# from subprocess import run\n", - "\n", - "# run(f\"az ml registry delete --name {reg_name} --resource-group {rg} --subscription {sub}\", shell=True)" - ] } ], "metadata": { From ab8b74b5f5f92603949a19036a14d868b2e3c6e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Komnus=E4=B8=B6Q?= <40655746+quchuyuan@users.noreply.github.com> Date: Thu, 9 Mar 2023 16:30:21 -0800 Subject: [PATCH 14/20] modify format --- .../resources/registry/registry-create.ipynb | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/sdk/python/resources/registry/registry-create.ipynb b/sdk/python/resources/registry/registry-create.ipynb index 3ac266f6c8..610186ffdf 100644 --- a/sdk/python/resources/registry/registry-create.ipynb +++ b/sdk/python/resources/registry/registry-create.ipynb @@ -86,12 +86,10 @@ "outputs": [], "source": [ "# Create a client without specifying an existing registry or workspace\n", - "sub=\"\"\n", - "rg=\"\"\n", "ml_client = MLClient(\n", " credential=credential,\n", - " subscription_id=sub,\n", - " resource_group_name=rg,\n", + " subscription_id=\"\",\n", + " resource_group_name=\"\",\n", ")" ] }, @@ -203,6 +201,14 @@ "for reg in ml_client.registries.list():\n", " print(reg.name)" ] + }, + { + "cell_type": "code", + "execution_count": null, + "id": "118db0c9", + "metadata": {}, + "outputs": [], + "source": [] } ], "metadata": { From 2f43af7c269def503e3845eef12fef51bfe35a79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Komnus=E4=B8=B6Q?= <40655746+quchuyuan@users.noreply.github.com> Date: Thu, 16 Mar 2023 13:09:45 -0700 Subject: [PATCH 15/20] make deletion inside the ipnb --- ...sdk-resources-registry-registry-create.yml | 1 - .../resources/registry/registry-create.ipynb | 30 +++++++++++++++++-- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/.github/workflows/sdk-resources-registry-registry-create.yml b/.github/workflows/sdk-resources-registry-registry-create.yml index 6e09da3632..29b7e4d60d 100644 --- a/.github/workflows/sdk-resources-registry-registry-create.yml +++ b/.github/workflows/sdk-resources-registry-registry-create.yml @@ -66,7 +66,6 @@ jobs: bash "${{ github.workspace }}/infra/sdk_helpers.sh" replace_template_values "registry-create.ipynb"; [ -f "../../.azureml/config" ] && cat "../../.azureml/config"; papermill -k python registry-create.ipynb registry-create.output.ipynb; - az ml registry delete --name "DemoRegistryPython"-$timestamp --resource-group $RESOURCE_GROUP_NAME --subscription $SUBSCRIPTION_ID working-directory: sdk/python/resources/registry continue-on-error: true - name: upload notebook's working folder as an artifact diff --git a/sdk/python/resources/registry/registry-create.ipynb b/sdk/python/resources/registry/registry-create.ipynb index 610186ffdf..4822ddd6e7 100644 --- a/sdk/python/resources/registry/registry-create.ipynb +++ b/sdk/python/resources/registry/registry-create.ipynb @@ -90,7 +90,10 @@ " credential=credential,\n", " subscription_id=\"\",\n", " resource_group_name=\"\",\n", - ")" + ")\n", + "\n", + "subscription_id=\"\",\n", + "resource_group_name=\"\"" ] }, { @@ -182,11 +185,12 @@ ] }, { + "attachments": {}, "cell_type": "markdown", "id": "5468f90b", "metadata": {}, "source": [ - "### 2.1 List Registries\n", + "### 2.2 List Registries\n", "\n", "This will list all registries that exist under the resource group of your `MLClient`. " ] @@ -202,13 +206,33 @@ " print(reg.name)" ] }, + { + "attachments": {}, + "cell_type": "markdown", + "id": "011f0562", + "metadata": {}, + "source": [ + "### 2.3 Delete Registry\n", + "\n", + "This will delete the previously created registry." + ] + }, { "cell_type": "code", "execution_count": null, "id": "118db0c9", "metadata": {}, "outputs": [], - "source": [] + "source": [ + "from subprocess import run\n", + "\n", + "p = run(f\"az ml registry delete --name {reg_name} --resource-group {resource_group_name} --subscription {subscription_id}\", shell=True)\n", + "\n", + "if p.returncode == 0:\n", + " print(\"deleton succeeded\")\n", + "else:\n", + " print(\"deletion failed\")" + ] } ], "metadata": { From ba702b78e618356af87d2820c8f1af00a2329f83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Komnus=E4=B8=B6Q?= <40655746+quchuyuan@users.noreply.github.com> Date: Thu, 16 Mar 2023 15:15:30 -0700 Subject: [PATCH 16/20] try sdk deletion --- sdk/python/resources/registry/registry-create.ipynb | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/sdk/python/resources/registry/registry-create.ipynb b/sdk/python/resources/registry/registry-create.ipynb index 4822ddd6e7..300b0ad1b2 100644 --- a/sdk/python/resources/registry/registry-create.ipynb +++ b/sdk/python/resources/registry/registry-create.ipynb @@ -224,6 +224,7 @@ "metadata": {}, "outputs": [], "source": [ + "\"\"\"\n", "from subprocess import run\n", "\n", "p = run(f\"az ml registry delete --name {reg_name} --resource-group {resource_group_name} --subscription {subscription_id}\", shell=True)\n", @@ -231,7 +232,16 @@ "if p.returncode == 0:\n", " print(\"deleton succeeded\")\n", "else:\n", - " print(\"deletion failed\")" + " print(\"deletion failed\")\n", + "\"\"\"\n", + "\n", + "from azure.mgmt.containerregistry import ContainerRegistryManagementClient\n", + "from azure.identity import DefaultAzureCredential\n", + "\n", + "credential = DefaultAzureCredential()\n", + "client = ContainerRegistryManagementClient(credential, subscription_id)\n", + "\n", + "client.registries.delete(resource_group_name, reg_name)\n" ] } ], From 71e3909fe96d42c6f8bfaba73712423d0714a825 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Komnus=E4=B8=B6Q?= <40655746+quchuyuan@users.noreply.github.com> Date: Thu, 16 Mar 2023 15:36:54 -0700 Subject: [PATCH 17/20] try sdk --- sdk/python/resources/registry/registry-create.ipynb | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/sdk/python/resources/registry/registry-create.ipynb b/sdk/python/resources/registry/registry-create.ipynb index 300b0ad1b2..a788a593b6 100644 --- a/sdk/python/resources/registry/registry-create.ipynb +++ b/sdk/python/resources/registry/registry-create.ipynb @@ -235,13 +235,9 @@ " print(\"deletion failed\")\n", "\"\"\"\n", "\n", - "from azure.mgmt.containerregistry import ContainerRegistryManagementClient\n", - "from azure.identity import DefaultAzureCredential\n", - "\n", - "credential = DefaultAzureCredential()\n", - "client = ContainerRegistryManagementClient(credential, subscription_id)\n", - "\n", - "client.registries.delete(resource_group_name, reg_name)\n" + "ml_client.registries.delete(registry=registry).result(\n", + " timeout=LROConfigurations.POLLING_TIMEOUT\n", + ")\n" ] } ], From b585bb84eee2f47498051627aaec2030b80f3c68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Komnus=E4=B8=B6Q?= <40655746+quchuyuan@users.noreply.github.com> Date: Thu, 16 Mar 2023 15:58:13 -0700 Subject: [PATCH 18/20] use verified api. --- .../sdk-resources-registry-registry-create.yml | 3 +-- sdk/python/resources/registry/registry-create.ipynb | 11 +---------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/.github/workflows/sdk-resources-registry-registry-create.yml b/.github/workflows/sdk-resources-registry-registry-create.yml index 29b7e4d60d..a5fa1a14b1 100644 --- a/.github/workflows/sdk-resources-registry-registry-create.yml +++ b/.github/workflows/sdk-resources-registry-registry-create.yml @@ -65,9 +65,8 @@ jobs: bash "${{ github.workspace }}/infra/sdk_helpers.sh" generate_workspace_config "../../.azureml/config.json"; bash "${{ github.workspace }}/infra/sdk_helpers.sh" replace_template_values "registry-create.ipynb"; [ -f "../../.azureml/config" ] && cat "../../.azureml/config"; - papermill -k python registry-create.ipynb registry-create.output.ipynb; + papermill -k python registry-create.ipynb registry-create.output.ipynb working-directory: sdk/python/resources/registry - continue-on-error: true - name: upload notebook's working folder as an artifact if: ${{ always() }} uses: actions/upload-artifact@v2 diff --git a/sdk/python/resources/registry/registry-create.ipynb b/sdk/python/resources/registry/registry-create.ipynb index a788a593b6..55c054b138 100644 --- a/sdk/python/resources/registry/registry-create.ipynb +++ b/sdk/python/resources/registry/registry-create.ipynb @@ -224,18 +224,9 @@ "metadata": {}, "outputs": [], "source": [ - "\"\"\"\n", - "from subprocess import run\n", "\n", - "p = run(f\"az ml registry delete --name {reg_name} --resource-group {resource_group_name} --subscription {subscription_id}\", shell=True)\n", "\n", - "if p.returncode == 0:\n", - " print(\"deleton succeeded\")\n", - "else:\n", - " print(\"deletion failed\")\n", - "\"\"\"\n", - "\n", - "ml_client.registries.delete(registry=registry).result(\n", + "ml_client.registries.begin_delete(name = registry.name).result(\n", " timeout=LROConfigurations.POLLING_TIMEOUT\n", ")\n" ] From a8f120793a94268875734d83173a28befd83bf31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Komnus=E4=B8=B6Q?= <40655746+quchuyuan@users.noreply.github.com> Date: Mon, 20 Mar 2023 13:08:31 -0700 Subject: [PATCH 19/20] change format --- sdk/python/resources/registry/registry-create.ipynb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/python/resources/registry/registry-create.ipynb b/sdk/python/resources/registry/registry-create.ipynb index 55c054b138..839460609a 100644 --- a/sdk/python/resources/registry/registry-create.ipynb +++ b/sdk/python/resources/registry/registry-create.ipynb @@ -220,7 +220,7 @@ { "cell_type": "code", "execution_count": null, - "id": "118db0c9", + "id": "5f2c0f69", "metadata": {}, "outputs": [], "source": [ From 1568ab30850a43a60751ae816925d2dc7fd0cc0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Komnus=E4=B8=B6Q?= <40655746+quchuyuan@users.noreply.github.com> Date: Mon, 20 Mar 2023 13:16:30 -0700 Subject: [PATCH 20/20] Update registry-create.ipynb --- sdk/python/resources/registry/registry-create.ipynb | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/sdk/python/resources/registry/registry-create.ipynb b/sdk/python/resources/registry/registry-create.ipynb index 839460609a..55ec08cc07 100644 --- a/sdk/python/resources/registry/registry-create.ipynb +++ b/sdk/python/resources/registry/registry-create.ipynb @@ -92,8 +92,8 @@ " resource_group_name=\"\",\n", ")\n", "\n", - "subscription_id=\"\",\n", - "resource_group_name=\"\"" + "subscription_id = (\"\",)\n", + "resource_group_name = \"\"" ] }, { @@ -149,7 +149,7 @@ "\n", "# You can override the registry name if needed\n", "ts = \"\"\n", - "registry.name = \"DemoRegistryPython\"+'-'+ts\n", + "registry.name = \"DemoRegistryPython\" + \"-\" + ts\n", "print(f\"the registry name: {registry.name}\")\n", "\n", "registry = ml_client.registries.begin_create(registry=registry).result(\n", @@ -224,11 +224,9 @@ "metadata": {}, "outputs": [], "source": [ - "\n", - "\n", - "ml_client.registries.begin_delete(name = registry.name).result(\n", + "ml_client.registries.begin_delete(name=registry.name).result(\n", " timeout=LROConfigurations.POLLING_TIMEOUT\n", - ")\n" + ")" ] } ],