fix 2

files_cells/notebooks/en/downloading_en.ipynb

@@ -64,39 +64,60 @@
         "flag_file = f\"{root_path}/libraries_installed.txt\"\n",
         "\n",
         "if not os.path.exists(flag_file):\n",
-        "    # automatic1111 update webui to 1.8.0\n",
-        "    xformers = \"xformers==0.0.23.post1 triton==2.1.0\"\n",
-        "    torch = \"torch==2.1.2+cu121 torchvision==0.16.2+cu121 torchaudio==2.1.2 --extra-index-url https://download.pytorch.org/whl/cu121\"\n",
+        "    print(\"💿 Installing the libraries, it's going to take a while...\\n\")\n",
         "\n",
-        "    print(\"💿 Installing the libraries, it's going to take a while...\", end='')\n",
+        "    install_lib = {\n",
+        "        \"gdown\": \"pip install -U gdown\",\n",
+        "        \"aria2\": \"apt-get update && apt -y install aria2\",\n",
+        "        \"localtunnel\": \"npm install -g localtunnel &> /dev/null\",\n",
+        "        \"insightface\": \"pip install insightface\",\n",
+        "    }\n",
+        "\n",
+        "    # Dictionary of additional libraries specific to certain environments\n",
+        "    additional_libs = {\n",
+        "        \"Google Colab\": {\n",
+        "            \"xformers\": \"pip install xformers==0.0.25 --no-deps\"\n",
+        "        },\n",
+        "        \"Kaggle\": {\n",
+        "            \"xformers\": \"pip install -q xformers==0.0.23.post1 triton==2.1.0\",\n",
+        "            \"torch\": \"pip install -q torch==2.1.2+cu121 torchvision==0.16.2+cu121 torchaudio==2.1.2 --extra-index-url https://download.pytorch.org/whl/cu121\"\n",
+        "        },\n",
+        "        \"SageMaker Studio Lab\": {\n",
+        "            \"opencv\": \"pip install -q opencv-python-headless\",\n",
+        "            \"huggingface\": \"pip install -q huggingface-hub\",\n",
+        "            \"conda_update\": \"conda update -q -n base conda\",\n",
+        "            \"conda_aria2\": \"conda install -q -y aria2\",\n",
+        "            \"conda_glib\": \"conda install -q -y glib\",\n",
+        "            \"tensorflow\": \"pip install tensorflow\",\n",
+        "            \"xformers\": \"pip install -q xformers==0.0.23.post1 triton==2.1.0\",\n",
+        "            \"torch\": \"pip install -q torch==2.1.2+cu121 torchvision==0.16.2+cu121 torchaudio==2.1.2 --extra-index-url https://download.pytorch.org/whl/cu121\"\n",
+        "        }\n",
+        "    }\n",
+        "\n",
+        "    # If the current environment has additional libraries, update the install_lib dictionary\n",
+        "    if env in additional_libs:\n",
+        "        install_lib.update(additional_libs[env])\n",
+        "\n",
+        "    # Loop through libraries and execute install commands\n",
+        "    for index, (package, install_cmd) in enumerate(install_lib.items(), start=1):\n",
+        "        print(f\"\\r[{index}/{len(install_lib)}] \\033[32m>>\\033[0m Installing \\033[33m{package}\\033[0m...\" + \" \"*35, end='')\n",
+        "        subprocess.run(install_cmd, shell=True, capture_output=True)\n",
+        "\n",
+        "    # Additional manual installation steps for specific packages\n",
         "    with capture.capture_output() as cap:\n",
-        "        !pip install -U gdown\n",
-        "        !apt-get update && apt -y install aria2\n",
-        "        !npm install -g localtunnel &> /dev/null\n",
         "        !curl -s -OL https://github.com/DEX-1101/sd-webui-notebook/raw/main/res/new_tunnel --output-dir {root_path}\n",
         "        !curl -s -Lo /usr/bin/cl https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-amd64 && chmod +x /usr/bin/cl\n",
-        "        !pip install insightface\n",
         "        !curl -sLO https://github.com/openziti/zrok/releases/download/v0.4.23/zrok_0.4.23_linux_amd64.tar.gz && tar -xzf zrok_0.4.23_linux_amd64.tar.gz -C /usr/bin && rm -f zrok_0.4.23_linux_amd64.tar.gz\n",
+        "        !wget -P /home/studio-lab-user https://huggingface.co/NagisaNao/fast_repo/resolve/main/sagemaker/FULL_DELETED_NOTEBOOK.ipynb\n",
+        "    del cap\n",
         "\n",
-        "        if env == \"SageMaker Studio Lab\":\n",
-        "            %pip install -q opencv-python-headless huggingface-hub\n",
-        "            %conda update -q -n base conda\n",
-        "            %conda install -q -y aria2\n",
-        "            %conda install -q -y glib\n",
-        "            !pip install tensorflow\n",
+        "    clear_output()\n",
         "\n",
-        "            !wget -P /home/studio-lab-user https://huggingface.co/NagisaNao/fast_repo/resolve/main/sagemaker/FULL_DELETED_NOTEBOOK.ipynb\n",
+        "    # Save file install lib\n",
+        "    with open(flag_file, \"w\") as f:\n",
+        "        f.write(\">W<'\")\n",
         "\n",
-        "        if env == \"Google Colab\":\n",
-        "            !pip install xformers==0.0.25 --no-deps\n",
-        "        else:\n",
-        "            !pip install -q {torch} -U\n",
-        "            !pip install -q {xformers} -U\n",
-        "\n",
-        "        with open(flag_file, \"w\") as f:\n",
-        "            f.write(\"hey ;3\")\n",
-        "    del cap\n",
-        "    print(\"\\r🍪 Libraries are installed!\" + \" \"*35)\n",
+        "    print(\"🍪 Libraries are installed!\" + \" \"*35)\n",
         "    time.sleep(2)\n",
         "    clear_output()\n",
         "\n",

files_cells/notebooks/ru/downloading_ru.ipynb

@@ -100,7 +100,7 @@
         "\n",
         "    # Loop through libraries and execute install commands\n",
         "    for index, (package, install_cmd) in enumerate(install_lib.items(), start=1):\n",
-        "        print(f\"\\r[{index}/{len(install_lib)}] \\033[32m>>\\033[0m Installing \\033[33m{package}\\033[96m...\\033[0m\", end='')\n",
+        "        print(f\"\\r[{index}/{len(install_lib)}] \\033[32m>>\\033[0m Installing \\033[33m{package}\\033[0m...\" + \" \"*35, end='')\n",
         "        subprocess.run(install_cmd, shell=True, capture_output=True)\n",
         "\n",
         "    # Additional manual installation steps for specific packages\n",

files_cells/python/en/downloading_en.py

@@ -45,39 +45,60 @@ if env == "SageMaker Studio Lab":
 flag_file = f"{root_path}/libraries_installed.txt"
 
 if not os.path.exists(flag_file):
-    # automatic1111 update webui to 1.8.0
-    xformers = "xformers==0.0.23.post1 triton==2.1.0"
-    torch = "torch==2.1.2+cu121 torchvision==0.16.2+cu121 torchaudio==2.1.2 --extra-index-url https://download.pytorch.org/whl/cu121"
+    print("💿 Installing the libraries, it's going to take a while...\n")
 
-    print("💿 Installing the libraries, it's going to take a while...", end='')
+    install_lib = {
+        "gdown": "pip install -U gdown",
+        "aria2": "apt-get update && apt -y install aria2",
+        "localtunnel": "npm install -g localtunnel &> /dev/null",
+        "insightface": "pip install insightface",
+    }
+
+    # Dictionary of additional libraries specific to certain environments
+    additional_libs = {
+        "Google Colab": {
+            "xformers": "pip install xformers==0.0.25 --no-deps"
+        },
+        "Kaggle": {
+            "xformers": "pip install -q xformers==0.0.23.post1 triton==2.1.0",
+            "torch": "pip install -q torch==2.1.2+cu121 torchvision==0.16.2+cu121 torchaudio==2.1.2 --extra-index-url https://download.pytorch.org/whl/cu121"
+        },
+        "SageMaker Studio Lab": {
+            "opencv": "pip install -q opencv-python-headless",
+            "huggingface": "pip install -q huggingface-hub",
+            "conda_update": "conda update -q -n base conda",
+            "conda_aria2": "conda install -q -y aria2",
+            "conda_glib": "conda install -q -y glib",
+            "tensorflow": "pip install tensorflow",
+            "xformers": "pip install -q xformers==0.0.23.post1 triton==2.1.0",
+            "torch": "pip install -q torch==2.1.2+cu121 torchvision==0.16.2+cu121 torchaudio==2.1.2 --extra-index-url https://download.pytorch.org/whl/cu121"
+        }
+    }
+
+    # If the current environment has additional libraries, update the install_lib dictionary
+    if env in additional_libs:
+        install_lib.update(additional_libs[env])
+
+    # Loop through libraries and execute install commands
+    for index, (package, install_cmd) in enumerate(install_lib.items(), start=1):
+        print(f"\r[{index}/{len(install_lib)}] \033[32m>>\033[0m Installing \033[33m{package}\033[0m..." + " "*35, end='')
+        subprocess.run(install_cmd, shell=True, capture_output=True)
+
+    # Additional manual installation steps for specific packages
     with capture.capture_output() as cap:
-        get_ipython().system('pip install -U gdown')
-        get_ipython().system('apt-get update && apt -y install aria2')
-        get_ipython().system('npm install -g localtunnel &> /dev/null')
         get_ipython().system('curl -s -OL https://github.com/DEX-1101/sd-webui-notebook/raw/main/res/new_tunnel --output-dir {root_path}')
         get_ipython().system('curl -s -Lo /usr/bin/cl https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-amd64 && chmod +x /usr/bin/cl')
-        get_ipython().system('pip install insightface')
         get_ipython().system('curl -sLO https://github.com/openziti/zrok/releases/download/v0.4.23/zrok_0.4.23_linux_amd64.tar.gz && tar -xzf zrok_0.4.23_linux_amd64.tar.gz -C /usr/bin && rm -f zrok_0.4.23_linux_amd64.tar.gz')
+        get_ipython().system('wget -P /home/studio-lab-user https://huggingface.co/NagisaNao/fast_repo/resolve/main/sagemaker/FULL_DELETED_NOTEBOOK.ipynb')
+    del cap
 
-        if env == "SageMaker Studio Lab":
-            get_ipython().run_line_magic('pip', 'install -q opencv-python-headless huggingface-hub')
-            get_ipython().run_line_magic('conda', 'update -q -n base conda')
-            get_ipython().run_line_magic('conda', 'install -q -y aria2')
-            get_ipython().run_line_magic('conda', 'install -q -y glib')
-            get_ipython().system('pip install tensorflow')
+    clear_output()
 
-            get_ipython().system('wget -P /home/studio-lab-user https://huggingface.co/NagisaNao/fast_repo/resolve/main/sagemaker/FULL_DELETED_NOTEBOOK.ipynb')
+    # Save file install lib
+    with open(flag_file, "w") as f:
+        f.write(">W<'")
 
-        if env == "Google Colab":
-            get_ipython().system('pip install xformers==0.0.25 --no-deps')
-        else:
-            get_ipython().system('pip install -q {torch} -U')
-            get_ipython().system('pip install -q {xformers} -U')
-
-        with open(flag_file, "w") as f:
-            f.write("hey ;3")
-    del cap
-    print("\r🍪 Libraries are installed!" + " "*35)
+    print("🍪 Libraries are installed!" + " "*35)
     time.sleep(2)
     clear_output()
 

files_cells/python/ru/downloading_ru.py

@@ -81,7 +81,7 @@ if not os.path.exists(flag_file):
 
     # Loop through libraries and execute install commands
     for index, (package, install_cmd) in enumerate(install_lib.items(), start=1):
-        print(f"\r[{index}/{len(install_lib)}] \033[32m>>\033[0m Installing \033[33m{package}\033[96m...\033[0m", end='')
+        print(f"\r[{index}/{len(install_lib)}] \033[32m>>\033[0m Installing \033[33m{package}\033[0m..." + " "*35, end='')
         subprocess.run(install_cmd, shell=True, capture_output=True)
 
     # Additional manual installation steps for specific packages