Merge pull request #90 from Azure-Samples/clean-up-branch

vieiraae · web-flow · commit 81501cb96003 · 2025-01-14T23:44:07.000Z
update the clean up resources files to use the same utils function
diff --git a/labs/GPT-4o-inferencing/clean-up-resources.ipynb b/labs/GPT-4o-inferencing/clean-up-resources.ipynb
@@ -15,13 +15,12 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import os\n",
-    "import sys\n",
+    "import os, sys\n",
     "sys.path.insert(1, '../../shared')  # add the shared directory to the Python path\n",
-    "from functions import cleanUpResources\n",
+    "import utils\n",
     "\n",
     "deployment_name = os.path.basename(os.path.dirname(globals()['__vsc_ipynb_file__']))\n",
-    "cleanUpResources(deployment_name)"
+    "utils.cleanup_resources(deployment_name)"
    ]
   }
  ],
@@ -41,7 +40,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.13.1"
+   "version": "3.12.8"
   }
  },
  "nbformat": 4,
diff --git a/labs/access-controlling/clean-up-resources.ipynb b/labs/access-controlling/clean-up-resources.ipynb
@@ -15,13 +15,12 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import os\n",
-    "import sys\n",
+    "import os, sys\n",
     "sys.path.insert(1, '../../shared')  # add the shared directory to the Python path\n",
-    "from functions import cleanUpResources\n",
+    "import utils\n",
     "\n",
     "deployment_name = os.path.basename(os.path.dirname(globals()['__vsc_ipynb_file__']))\n",
-    "cleanUpResources(deployment_name)"
+    "utils.cleanup_resources(deployment_name)"
    ]
   },
   {
@@ -69,7 +68,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.13.1"
+   "version": "3.12.8"
   }
  },
  "nbformat": 4,
diff --git a/labs/ai-foundry-sdk/clean-up-resources.ipynb b/labs/ai-foundry-sdk/clean-up-resources.ipynb
@@ -15,13 +15,12 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import os\n",
-    "import sys\n",
+    "import os, sys\n",
     "sys.path.insert(1, '../../shared')  # add the shared directory to the Python path\n",
-    "from functions import cleanUpResources\n",
+    "import utils\n",
     "\n",
     "deployment_name = os.path.basename(os.path.dirname(globals()['__vsc_ipynb_file__']))\n",
-    "cleanUpResources(deployment_name)"
+    "utils.cleanup_resources(deployment_name)"
    ]
   }
  ],
@@ -41,7 +40,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.13.1"
+   "version": "3.12.8"
   }
  },
  "nbformat": 4,
diff --git a/labs/built-in-logging/clean-up-resources.ipynb b/labs/built-in-logging/clean-up-resources.ipynb
@@ -15,17 +15,12 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "# type: ignore\n",
-    "\n",
-    "import os\n",
-    "import sys\n",
+    "import os, sys\n",
     "sys.path.insert(1, '../../shared')  # add the shared directory to the Python path\n",
-    "from functions import cleanUpResources\n",
+    "import utils\n",
     "\n",
     "deployment_name = os.path.basename(os.path.dirname(globals()['__vsc_ipynb_file__']))\n",
-    "resource_group_name = f\"lab-{deployment_name}\"\n",
-    "\n",
-    "cleanUpResources(deployment_name, resource_group_name)"
+    "utils.cleanup_resources(deployment_name)"
    ]
   }
  ],
@@ -45,7 +40,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.13.1"
+   "version": "3.12.8"
   }
  },
  "nbformat": 4,
diff --git a/labs/content-filtering/clean-up-resources.ipynb b/labs/content-filtering/clean-up-resources.ipynb
@@ -15,13 +15,12 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import os\n",
-    "import sys\n",
+    "import os, sys\n",
     "sys.path.insert(1, '../../shared')  # add the shared directory to the Python path\n",
-    "from functions import cleanUpResources\n",
+    "import utils\n",
     "\n",
     "deployment_name = os.path.basename(os.path.dirname(globals()['__vsc_ipynb_file__']))\n",
-    "cleanUpResources(deployment_name)"
+    "utils.cleanup_resources(deployment_name)"
    ]
   }
  ],
@@ -41,7 +40,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.13.1"
+   "version": "3.12.8"
   }
  },
  "nbformat": 4,
diff --git a/labs/function-calling/clean-up-resources.ipynb b/labs/function-calling/clean-up-resources.ipynb
@@ -15,13 +15,12 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import os\n",
-    "import sys\n",
+    "import os, sys\n",
     "sys.path.insert(1, '../../shared')  # add the shared directory to the Python path\n",
-    "from functions import cleanUpResources\n",
+    "import utils\n",
     "\n",
     "deployment_name = os.path.basename(os.path.dirname(globals()['__vsc_ipynb_file__']))\n",
-    "cleanUpResources(deployment_name)"
+    "utils.cleanup_resources(deployment_name)"
    ]
   }
  ],
@@ -41,7 +40,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.13.1"
+   "version": "3.12.8"
   }
  },
  "nbformat": 4,
diff --git a/labs/message-storing/clean-up-resources.ipynb b/labs/message-storing/clean-up-resources.ipynb
@@ -15,13 +15,12 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import os\n",
-    "import sys\n",
+    "import os, sys\n",
     "sys.path.insert(1, '../../shared')  # add the shared directory to the Python path\n",
-    "from functions import cleanUpResources\n",
+    "import utils\n",
     "\n",
     "deployment_name = os.path.basename(os.path.dirname(globals()['__vsc_ipynb_file__']))\n",
-    "cleanUpResources(deployment_name)"
+    "utils.cleanup_resources(deployment_name)"
    ]
   }
  ],
@@ -41,7 +40,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.13.1"
+   "version": "3.12.8"
   }
  },
  "nbformat": 4,
diff --git a/labs/model-routing/clean-up-resources.ipynb b/labs/model-routing/clean-up-resources.ipynb
@@ -15,13 +15,12 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import os\n",
-    "import sys\n",
+    "import os, sys\n",
     "sys.path.insert(1, '../../shared')  # add the shared directory to the Python path\n",
-    "from functions import cleanUpResources\n",
+    "import utils\n",
     "\n",
     "deployment_name = os.path.basename(os.path.dirname(globals()['__vsc_ipynb_file__']))\n",
-    "cleanUpResources(deployment_name)"
+    "utils.cleanup_resources(deployment_name)"
    ]
   }
  ],
@@ -41,7 +40,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.13.1"
+   "version": "3.12.8"
   }
  },
  "nbformat": 4,
diff --git a/labs/prompt-flow/clean-up-resources.ipynb b/labs/prompt-flow/clean-up-resources.ipynb
@@ -15,13 +15,12 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import os\n",
-    "import sys\n",
+    "import os, sys\n",
     "sys.path.insert(1, '../../shared')  # add the shared directory to the Python path\n",
-    "from functions import cleanUpResources\n",
+    "import utils\n",
     "\n",
     "deployment_name = os.path.basename(os.path.dirname(globals()['__vsc_ipynb_file__']))\n",
-    "cleanUpResources(deployment_name)"
+    "utils.cleanup_resources(deployment_name)"
    ]
   }
  ],
@@ -41,7 +40,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.13.1"
+   "version": "3.12.8"
   }
  },
  "nbformat": 4,
diff --git a/labs/response-streaming/clean-up-resources.ipynb b/labs/response-streaming/clean-up-resources.ipynb
@@ -15,13 +15,12 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import os\n",
-    "import sys\n",
+    "import os, sys\n",
     "sys.path.insert(1, '../../shared')  # add the shared directory to the Python path\n",
-    "from functions import cleanUpResources\n",
+    "import utils\n",
     "\n",
     "deployment_name = os.path.basename(os.path.dirname(globals()['__vsc_ipynb_file__']))\n",
-    "cleanUpResources(deployment_name)"
+    "utils.cleanup_resources(deployment_name)"
    ]
   }
  ],
@@ -41,7 +40,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.13.1"
+   "version": "3.12.8"
   }
  },
  "nbformat": 4,
diff --git a/labs/semantic-caching/clean-up-resources.ipynb b/labs/semantic-caching/clean-up-resources.ipynb
@@ -15,13 +15,12 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import os\n",
-    "import sys\n",
+    "import os, sys\n",
     "sys.path.insert(1, '../../shared')  # add the shared directory to the Python path\n",
-    "from functions import cleanUpResources\n",
+    "import utils\n",
     "\n",
     "deployment_name = os.path.basename(os.path.dirname(globals()['__vsc_ipynb_file__']))\n",
-    "cleanUpResources(deployment_name)"
+    "utils.cleanup_resources(deployment_name)"
    ]
   }
  ],
@@ -41,7 +40,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.13.1"
+   "version": "3.12.8"
   }
  },
  "nbformat": 4,
diff --git a/labs/slm-self-hosting/clean-up-resources.ipynb b/labs/slm-self-hosting/clean-up-resources.ipynb
@@ -15,13 +15,12 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import os\n",
-    "import sys\n",
+    "import os, sys\n",
     "sys.path.insert(1, '../../shared')  # add the shared directory to the Python path\n",
-    "from functions import cleanUpResources\n",
+    "import utils\n",
     "\n",
     "deployment_name = os.path.basename(os.path.dirname(globals()['__vsc_ipynb_file__']))\n",
-    "cleanUpResources(deployment_name)"
+    "utils.cleanup_resources(deployment_name)"
    ]
   }
  ],
diff --git a/labs/token-metrics-emitting/clean-up-resources.ipynb b/labs/token-metrics-emitting/clean-up-resources.ipynb
@@ -15,13 +15,12 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import os\n",
-    "import sys\n",
+    "import os, sys\n",
     "sys.path.insert(1, '../../shared')  # add the shared directory to the Python path\n",
-    "from functions import cleanUpResources\n",
+    "import utils\n",
     "\n",
     "deployment_name = os.path.basename(os.path.dirname(globals()['__vsc_ipynb_file__']))\n",
-    "cleanUpResources(deployment_name)"
+    "utils.cleanup_resources(deployment_name)"
    ]
   }
  ],
@@ -41,7 +40,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.13.1"
+   "version": "3.12.8"
   }
  },
  "nbformat": 4,
diff --git a/labs/token-rate-limiting/clean-up-resources.ipynb b/labs/token-rate-limiting/clean-up-resources.ipynb
@@ -15,13 +15,12 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import os\n",
-    "import sys\n",
+    "import os, sys\n",
     "sys.path.insert(1, '../../shared')  # add the shared directory to the Python path\n",
-    "from functions import cleanUpResources\n",
+    "import utils\n",
     "\n",
     "deployment_name = os.path.basename(os.path.dirname(globals()['__vsc_ipynb_file__']))\n",
-    "cleanUpResources(deployment_name)"
+    "utils.cleanup_resources(deployment_name)"
    ]
   }
  ],
@@ -41,7 +40,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.13.1"
+   "version": "3.12.8"
   }
  },
  "nbformat": 4,
diff --git a/labs/vector-searching/clean-up-resources.ipynb b/labs/vector-searching/clean-up-resources.ipynb
@@ -15,13 +15,12 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import os\n",
-    "import sys\n",
+    "import os, sys\n",
     "sys.path.insert(1, '../../shared')  # add the shared directory to the Python path\n",
-    "from functions import cleanUpResources\n",
+    "import utils\n",
     "\n",
     "deployment_name = os.path.basename(os.path.dirname(globals()['__vsc_ipynb_file__']))\n",
-    "cleanUpResources(deployment_name)"
+    "utils.cleanup_resources(deployment_name)"
    ]
   }
  ],
@@ -41,7 +40,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.13.1"
+   "version": "3.12.8"
   }
  },
  "nbformat": 4,
