less waiting :3

files_cells/notebooks/en/downloading_en.ipynb

@@ -34,8 +34,30 @@
         "webui_path = os.getenv('WEBUI_PATH')\n",
         "free_plan = os.getenv('FREE_PLAN')\n",
         "\n",
-        "OLD_UI = os.getenv('SDW_OLD_UI')\n",
         "UI = os.getenv('SDW_UI')\n",
+        "OLD_UI = os.getenv('SDW_OLD_UI')\n",
+        "\n",
+        "\n",
+        "# ============ loading settings V4 =============\n",
+        "def load_settings(path):\n",
+        "    if os.path.exists(path):\n",
+        "        with open(path, 'r') as file:\n",
+        "            return json.load(file)\n",
+        "    return {}\n",
+        "\n",
+        "settings = load_settings(f'{root_path}/settings.json')\n",
+        "\n",
+        "VARIABLES = [\n",
+        "    'model', 'model_num', 'inpainting_model',\n",
+        "    'vae', 'vae_num', 'latest_webui', 'latest_exstensions',\n",
+        "    'change_webui', 'detailed_download', 'controlnet',\n",
+        "    'controlnet_num', 'commit_hash', 'huggingface_token',\n",
+        "    'ngrok_token', 'zrok_token', 'commandline_arguments',\n",
+        "    'Model_url', 'Vae_url', 'LoRA_url', 'Embedding_url',\n",
+        "    'Extensions_url', 'custom_file_urls'\n",
+        "]\n",
+        "\n",
+        "locals().update({key: settings.get(key) for key in VARIABLES})\n",
         "\n",
         "\n",
         "# ================ LIBRARIES V2 ================\n",
@@ -45,11 +67,12 @@
         "    print(\"💿 Installing the libraries, it's going to take a while:\\n\")\n",
         "\n",
         "    install_lib = {\n",
-        "        \"aria2\": \"apt -y install aria2\",\n",
-        "        # \"aria2\": \"pip install aria2\",\n",
+        "        # \"aria2\": \"apt -y install aria2\",\n",
+        "        \"aria2\": \"pip install aria2\",\n",
         "        \"localtunnel\": \"npm install -g localtunnel\",\n",
-        "        \"insightface\": \"pip install insightface\"\n",
         "    }\n",
+        "    if controlnet != 'none':\n",
+        "        install_lib[\"insightface\"] = \"pip install insightface\"\n",
         "\n",
         "    additional_libs = {\n",
         "        \"Google Colab\": {\n",
@@ -61,7 +84,6 @@
         "            # \"aiohttp\": \"pip install trash-cli && trash-put /opt/conda/lib/python3.10/site-packages/aiohttp*\" # fix install req\n",
         "        }\n",
         "    }\n",
-        "\n",
         "    if env in additional_libs:\n",
         "        install_lib.update(additional_libs[env])\n",
         "\n",
@@ -88,28 +110,6 @@
         "    clear_output()\n",
         "\n",
         "\n",
-        "# ============ loading settings V4 =============\n",
-        "def load_settings(path):\n",
-        "    if os.path.exists(path):\n",
-        "        with open(path, 'r') as file:\n",
-        "            return json.load(file)\n",
-        "    return {}\n",
-        "\n",
-        "settings = load_settings(f'{root_path}/settings.json')\n",
-        "\n",
-        "VARIABLES = [\n",
-        "    'model', 'model_num', 'inpainting_model',\n",
-        "    'vae', 'vae_num', 'latest_webui', 'latest_exstensions',\n",
-        "    'change_webui', 'detailed_download', 'controlnet',\n",
-        "    'controlnet_num', 'commit_hash', 'huggingface_token',\n",
-        "    'ngrok_token', 'zrok_token', 'commandline_arguments',\n",
-        "    'Model_url', 'Vae_url', 'LoRA_url', 'Embedding_url',\n",
-        "    'Extensions_url', 'custom_file_urls'\n",
-        "]\n",
-        "\n",
-        "locals().update({key: settings.get(key) for key in VARIABLES})\n",
-        "\n",
-        "\n",
         "# =================== OTHER ====================\n",
         "# Setup Timer\n",
         "if \"START_COLAB\" in os.environ:\n",
@@ -413,13 +413,13 @@
         "        dir = PREFIXES[prefix]\n",
         "        if prefix != \"extension\":\n",
         "            try:\n",
-        "                manual_download(path, dir, file_name=file_name)\n",
+        "                manual_download(path, dir, file_name=file_name, prefix=prefix)\n",
         "            except Exception as e:\n",
         "                print(f\"Error downloading file: {e}\")\n",
         "        else:\n",
         "            extension_repo.append((path, file_name))\n",
         "\n",
-        "def manual_download(url, dst_dir, file_name):\n",
+        "def manual_download(url, dst_dir, file_name, prefix=None):\n",
         "    header_option = f\"--header={user_header}\"\n",
         "    aria2c_header = \"--header='User-Agent: Mozilla/5.0' --allow-overwrite=true\"\n",
         "    aria2_args = \"--optimize-concurrent-downloads --console-log-level=error --summary-interval=10 --stderr=true -c -x16 -s16 -k1M -j5\"\n",
@@ -444,6 +444,10 @@
         "\n",
         "    # =====================\n",
         "    def run_aria2c(url, dst_dir, file_name=None, args=\"\", header=\"\"):\n",
+        "        file_path = os.path.join(dst_dir, file_name) # replaces config files\n",
+        "        if os.path.exists(file_path) and prefix == 'config':\n",
+        "            os.remove(file_path)\n",
+        "\n",
         "        out = f\"-o '{file_name}'\" if file_name else \"\"\n",
         "        !aria2c {header} {args} -d {dst_dir} {out} '{url}'\n",
         "\n",

files_cells/notebooks/ru/downloading_ru.ipynb

@@ -38,6 +38,28 @@
         "OLD_UI = os.getenv('SDW_OLD_UI')\n",
         "\n",
         "\n",
+        "# ============ loading settings V4 =============\n",
+        "def load_settings(path):\n",
+        "    if os.path.exists(path):\n",
+        "        with open(path, 'r') as file:\n",
+        "            return json.load(file)\n",
+        "    return {}\n",
+        "\n",
+        "settings = load_settings(f'{root_path}/settings.json')\n",
+        "\n",
+        "VARIABLES = [\n",
+        "    'model', 'model_num', 'inpainting_model',\n",
+        "    'vae', 'vae_num', 'latest_webui', 'latest_exstensions',\n",
+        "    'change_webui', 'detailed_download', 'controlnet',\n",
+        "    'controlnet_num', 'commit_hash', 'huggingface_token',\n",
+        "    'ngrok_token', 'zrok_token', 'commandline_arguments',\n",
+        "    'Model_url', 'Vae_url', 'LoRA_url', 'Embedding_url',\n",
+        "    'Extensions_url', 'custom_file_urls'\n",
+        "]\n",
+        "\n",
+        "locals().update({key: settings.get(key) for key in VARIABLES})\n",
+        "\n",
+        "\n",
         "# ================ LIBRARIES V2 ================\n",
         "flag_file = f\"{root_path}/libraries_installed.txt\"\n",
         "\n",
@@ -45,11 +67,12 @@
         "    print(\"💿 Установка библиотек, это займет какое-то время:\\n\")\n",
         "\n",
         "    install_lib = {\n",
-        "        \"aria2\": \"apt -y install aria2\",\n",
-        "        # \"aria2\": \"pip install aria2\",\n",
+        "        # \"aria2\": \"apt -y install aria2\",\n",
+        "        \"aria2\": \"pip install aria2\",\n",
         "        \"localtunnel\": \"npm install -g localtunnel\",\n",
-        "        \"insightface\": \"pip install insightface\"\n",
         "    }\n",
+        "    if controlnet != 'none':\n",
+        "        install_lib[\"insightface\"] = \"pip install insightface\"\n",
         "\n",
         "    additional_libs = {\n",
         "        \"Google Colab\": {\n",
@@ -61,7 +84,6 @@
         "            # \"aiohttp\": \"pip install trash-cli && trash-put /opt/conda/lib/python3.10/site-packages/aiohttp*\" # fix install req\n",
         "        }\n",
         "    }\n",
-        "\n",
         "    if env in additional_libs:\n",
         "        install_lib.update(additional_libs[env])\n",
         "\n",
@@ -88,28 +110,6 @@
         "    clear_output()\n",
         "\n",
         "\n",
-        "# ============ loading settings V4 =============\n",
-        "def load_settings(path):\n",
-        "    if os.path.exists(path):\n",
-        "        with open(path, 'r') as file:\n",
-        "            return json.load(file)\n",
-        "    return {}\n",
-        "\n",
-        "settings = load_settings(f'{root_path}/settings.json')\n",
-        "\n",
-        "VARIABLES = [\n",
-        "    'model', 'model_num', 'inpainting_model',\n",
-        "    'vae', 'vae_num', 'latest_webui', 'latest_exstensions',\n",
-        "    'change_webui', 'detailed_download', 'controlnet',\n",
-        "    'controlnet_num', 'commit_hash', 'huggingface_token',\n",
-        "    'ngrok_token', 'zrok_token', 'commandline_arguments',\n",
-        "    'Model_url', 'Vae_url', 'LoRA_url', 'Embedding_url',\n",
-        "    'Extensions_url', 'custom_file_urls'\n",
-        "]\n",
-        "\n",
-        "locals().update({key: settings.get(key) for key in VARIABLES})\n",
-        "\n",
-        "\n",
         "# =================== OTHER ====================\n",
         "# Setup Timer\n",
         "if \"START_COLAB\" in os.environ:\n",
@@ -413,13 +413,13 @@
         "        dir = PREFIXES[prefix]\n",
         "        if prefix != \"extension\":\n",
         "            try:\n",
-        "                manual_download(path, dir, file_name=file_name)\n",
+        "                manual_download(path, dir, file_name=file_name, prefix=prefix)\n",
         "            except Exception as e:\n",
         "                print(f\"Error downloading file: {e}\")\n",
         "        else:\n",
         "            extension_repo.append((path, file_name))\n",
         "\n",
-        "def manual_download(url, dst_dir, file_name):\n",
+        "def manual_download(url, dst_dir, file_name, prefix=None):\n",
         "    header_option = f\"--header={user_header}\"\n",
         "    aria2c_header = \"--header='User-Agent: Mozilla/5.0' --allow-overwrite=true\"\n",
         "    aria2_args = \"--optimize-concurrent-downloads --console-log-level=error --summary-interval=10 --stderr=true -c -x16 -s16 -k1M -j5\"\n",
@@ -444,6 +444,10 @@
         "\n",
         "    # =====================\n",
         "    def run_aria2c(url, dst_dir, file_name=None, args=\"\", header=\"\"):\n",
+        "        file_path = os.path.join(dst_dir, file_name) # replaces config files\n",
+        "        if os.path.exists(file_path) and prefix == 'config':\n",
+        "            os.remove(file_path)\n",
+        "\n",
         "        out = f\"-o '{file_name}'\" if file_name else \"\"\n",
         "        !aria2c {header} {args} -d {dst_dir} {out} '{url}'\n",
         "\n",

files_cells/python/en/downloading_en.py

@@ -24,8 +24,30 @@ root_path = os.getenv('ROOT_PATH')
 webui_path = os.getenv('WEBUI_PATH')
 free_plan = os.getenv('FREE_PLAN')
 
-OLD_UI = os.getenv('SDW_OLD_UI')
 UI = os.getenv('SDW_UI')
+OLD_UI = os.getenv('SDW_OLD_UI')
+
+
+# ============ loading settings V4 =============
+def load_settings(path):
+    if os.path.exists(path):
+        with open(path, 'r') as file:
+            return json.load(file)
+    return {}
+
+settings = load_settings(f'{root_path}/settings.json')
+
+VARIABLES = [
+    'model', 'model_num', 'inpainting_model',
+    'vae', 'vae_num', 'latest_webui', 'latest_exstensions',
+    'change_webui', 'detailed_download', 'controlnet',
+    'controlnet_num', 'commit_hash', 'huggingface_token',
+    'ngrok_token', 'zrok_token', 'commandline_arguments',
+    'Model_url', 'Vae_url', 'LoRA_url', 'Embedding_url',
+    'Extensions_url', 'custom_file_urls'
+]
+
+locals().update({key: settings.get(key) for key in VARIABLES})
 
 
 # ================ LIBRARIES V2 ================
@@ -35,11 +57,12 @@ if not os.path.exists(flag_file):
     print("💿 Installing the libraries, it's going to take a while:\n")
 
     install_lib = {
-        "aria2": "apt -y install aria2",
-        # "aria2": "pip install aria2",
+        # "aria2": "apt -y install aria2",
+        "aria2": "pip install aria2",
         "localtunnel": "npm install -g localtunnel",
-        "insightface": "pip install insightface"
     }
+    if controlnet != 'none':
+        install_lib["insightface"] = "pip install insightface"
 
     additional_libs = {
         "Google Colab": {
@@ -51,7 +74,6 @@ if not os.path.exists(flag_file):
             # "aiohttp": "pip install trash-cli && trash-put /opt/conda/lib/python3.10/site-packages/aiohttp*" # fix install req
         }
     }
-
     if env in additional_libs:
         install_lib.update(additional_libs[env])
 
@@ -78,28 +100,6 @@ if not os.path.exists(flag_file):
     clear_output()
 
 
-# ============ loading settings V4 =============
-def load_settings(path):
-    if os.path.exists(path):
-        with open(path, 'r') as file:
-            return json.load(file)
-    return {}
-
-settings = load_settings(f'{root_path}/settings.json')
-
-VARIABLES = [
-    'model', 'model_num', 'inpainting_model',
-    'vae', 'vae_num', 'latest_webui', 'latest_exstensions',
-    'change_webui', 'detailed_download', 'controlnet',
-    'controlnet_num', 'commit_hash', 'huggingface_token',
-    'ngrok_token', 'zrok_token', 'commandline_arguments',
-    'Model_url', 'Vae_url', 'LoRA_url', 'Embedding_url',
-    'Extensions_url', 'custom_file_urls'
-]
-
-locals().update({key: settings.get(key) for key in VARIABLES})
-
-
 # =================== OTHER ====================
 # Setup Timer
 if "START_COLAB" in os.environ:
@@ -403,13 +403,13 @@ def handle_manual(url):
         dir = PREFIXES[prefix]
         if prefix != "extension":
             try:
-                manual_download(path, dir, file_name=file_name)
+                manual_download(path, dir, file_name=file_name, prefix=prefix)
             except Exception as e:
                 print(f"Error downloading file: {e}")
         else:
             extension_repo.append((path, file_name))
 
-def manual_download(url, dst_dir, file_name):
+def manual_download(url, dst_dir, file_name, prefix=None):
     header_option = f"--header={user_header}"
     aria2c_header = "--header='User-Agent: Mozilla/5.0' --allow-overwrite=true"
     aria2_args = "--optimize-concurrent-downloads --console-log-level=error --summary-interval=10 --stderr=true -c -x16 -s16 -k1M -j5"
@@ -434,6 +434,10 @@ def manual_download(url, dst_dir, file_name):
 
     # =====================
     def run_aria2c(url, dst_dir, file_name=None, args="", header=""):
+        file_path = os.path.join(dst_dir, file_name) # replaces config files
+        if os.path.exists(file_path) and prefix == 'config':
+            os.remove(file_path)
+
         out = f"-o '{file_name}'" if file_name else ""
         get_ipython().system("aria2c {header} {args} -d {dst_dir} {out} '{url}'")
 

files_cells/python/ru/downloading_ru.py

@@ -28,6 +28,28 @@ UI = os.getenv('SDW_UI')
 OLD_UI = os.getenv('SDW_OLD_UI')
 
 
+# ============ loading settings V4 =============
+def load_settings(path):
+    if os.path.exists(path):
+        with open(path, 'r') as file:
+            return json.load(file)
+    return {}
+
+settings = load_settings(f'{root_path}/settings.json')
+
+VARIABLES = [
+    'model', 'model_num', 'inpainting_model',
+    'vae', 'vae_num', 'latest_webui', 'latest_exstensions',
+    'change_webui', 'detailed_download', 'controlnet',
+    'controlnet_num', 'commit_hash', 'huggingface_token',
+    'ngrok_token', 'zrok_token', 'commandline_arguments',
+    'Model_url', 'Vae_url', 'LoRA_url', 'Embedding_url',
+    'Extensions_url', 'custom_file_urls'
+]
+
+locals().update({key: settings.get(key) for key in VARIABLES})
+
+
 # ================ LIBRARIES V2 ================
 flag_file = f"{root_path}/libraries_installed.txt"
 
@@ -35,11 +57,12 @@ if not os.path.exists(flag_file):
     print("💿 Установка библиотек, это займет какое-то время:\n")
 
     install_lib = {
-        "aria2": "apt -y install aria2",
-        # "aria2": "pip install aria2",
+        # "aria2": "apt -y install aria2",
+        "aria2": "pip install aria2",
         "localtunnel": "npm install -g localtunnel",
-        "insightface": "pip install insightface"
     }
+    if controlnet != 'none':
+        install_lib["insightface"] = "pip install insightface"
 
     additional_libs = {
         "Google Colab": {
@@ -51,7 +74,6 @@ if not os.path.exists(flag_file):
             # "aiohttp": "pip install trash-cli && trash-put /opt/conda/lib/python3.10/site-packages/aiohttp*" # fix install req
         }
     }
-
     if env in additional_libs:
         install_lib.update(additional_libs[env])
 
@@ -78,28 +100,6 @@ if not os.path.exists(flag_file):
     clear_output()
 
 
-# ============ loading settings V4 =============
-def load_settings(path):
-    if os.path.exists(path):
-        with open(path, 'r') as file:
-            return json.load(file)
-    return {}
-
-settings = load_settings(f'{root_path}/settings.json')
-
-VARIABLES = [
-    'model', 'model_num', 'inpainting_model',
-    'vae', 'vae_num', 'latest_webui', 'latest_exstensions',
-    'change_webui', 'detailed_download', 'controlnet',
-    'controlnet_num', 'commit_hash', 'huggingface_token',
-    'ngrok_token', 'zrok_token', 'commandline_arguments',
-    'Model_url', 'Vae_url', 'LoRA_url', 'Embedding_url',
-    'Extensions_url', 'custom_file_urls'
-]
-
-locals().update({key: settings.get(key) for key in VARIABLES})
-
-
 # =================== OTHER ====================
 # Setup Timer
 if "START_COLAB" in os.environ:
@@ -403,13 +403,13 @@ def handle_manual(url):
         dir = PREFIXES[prefix]
         if prefix != "extension":
             try:
-                manual_download(path, dir, file_name=file_name)
+                manual_download(path, dir, file_name=file_name, prefix=prefix)
             except Exception as e:
                 print(f"Error downloading file: {e}")
         else:
             extension_repo.append((path, file_name))
 
-def manual_download(url, dst_dir, file_name):
+def manual_download(url, dst_dir, file_name, prefix=None):
     header_option = f"--header={user_header}"
     aria2c_header = "--header='User-Agent: Mozilla/5.0' --allow-overwrite=true"
     aria2_args = "--optimize-concurrent-downloads --console-log-level=error --summary-interval=10 --stderr=true -c -x16 -s16 -k1M -j5"
@@ -434,6 +434,10 @@ def manual_download(url, dst_dir, file_name):
 
     # =====================
     def run_aria2c(url, dst_dir, file_name=None, args="", header=""):
+        file_path = os.path.join(dst_dir, file_name) # replaces config files
+        if os.path.exists(file_path) and prefix == 'config':
+            os.remove(file_path)
+
         out = f"-o '{file_name}'" if file_name else ""
         get_ipython().system("aria2c {header} {args} -d {dst_dir} {out} '{url}'")