🐛 fixes+improvements

files_cells/notebooks/en/downloading_en.ipynb

@@ -112,10 +112,7 @@
         "\n",
         "# =================== OTHER ====================\n",
         "# Setup Timer\n",
-        "try:\n",
-        "    start_colab\n",
-        "except:\n",
-        "    start_colab = int(time.time())-5\n",
+        "start_colab = globals().get('start_colab', int(time.time()) - 5)\n",
         "\n",
         "# Save files temporarily\n",
         "temporarily_dir = f'{root_path}/temp_dir'\n",
@@ -128,68 +125,84 @@
         "        'models/Lora'\n",
         "    ]\n",
         "\n",
-        "    print(\"- There's a file move in progress... (This can take a minute or more)\", end='')\n",
+        "    print(\"Moving files...\", end='')\n",
+        "    time.sleep(1)\n",
         "    for item in items_to_copy:\n",
         "        src = os.path.join(src_base, item)\n",
         "        dst = os.path.join(dst_base, item)\n",
         "\n",
-        "        if os.path.isdir(src):\n",
+        "        if os.path.exists(src):\n",
         "            if os.path.exists(dst):\n",
         "                shutil.rmtree(dst)\n",
+        "            os.makedirs(os.path.dirname(dst), exist_ok=True)\n",
         "            shutil.move(src, dst)\n",
-        "        elif os.path.isfile(src):\n",
-        "            dst_dir = os.path.dirname(dst)\n",
-        "            os.makedirs(dst_dir, exist_ok=True)\n",
-        "            shutil.move(src, dst)\n",
-        "    print(\"\\r🔥 The files have been moved!\")\n",
+        "    print(\"\\r🔥 Files moved!\" + \" \"*15)\n",
+        "\n",
+        "def configure_environment():\n",
+        "    os.chdir(root_path)\n",
+        "    os.environ.update({\n",
+        "        \"SAFETENSORS_FAST_GPU\": '1',\n",
+        "        \"CUDA_MODULE_LOADING\": \"LAZY\",\n",
+        "        \"TF_CPP_MIN_LOG_LEVEL\": \"3\",\n",
+        "        \"PYTHONWARNINGS\": \"ignore\"\n",
+        "    })\n",
+        "\n",
+        "def download_and_unpack(url, dest_path):\n",
+        "    aria2_args = \"--optimize-concurrent-downloads --console-log-level=error --summary-interval=10 --stderr=true -c -x16 -s16 -k1M -j5\"\n",
+        "    get_ipython().system(f\"aria2c {aria2_args} '{url}' -o repo.zip\")\n",
+        "    get_ipython().system(f'unzip -q -o repo.zip -d {dest_path}')\n",
+        "    get_ipython().system('rm -rf repo.zip')\n",
+        "\n",
+        "def handle_colab_timer(webui_path, timer_colab):\n",
+        "    timer_file_path = os.path.join(webui_path, 'static', 'colabTimer.txt')\n",
+        "    if not os.path.exists(timer_file_path):\n",
+        "        with open(timer_file_path, 'w') as timer_file:\n",
+        "            timer_file.write(str(timer_colab))\n",
+        "    else:\n",
+        "        with open(timer_file_path, 'r') as timer_file:\n",
+        "            timer_colab = float(timer_file.read())\n",
+        "    return timer_colab\n",
+        "\n",
+        "def unpack_webui():\n",
+        "    start_install = time.time()\n",
+        "    print(f\"⌚ Unpacking Stable Diffusion{' (Forge)' if UI == 'Forge' else ''}...\", end='')\n",
+        "\n",
+        "    with capture.capture_output() as cap:\n",
+        "        download_url = \"https://huggingface.co/NagisaNao/fast_repo/resolve/main/FULL_REPO.zip\"\n",
+        "        if UI == 'Forge':\n",
+        "            download_url = \"https://huggingface.co/NagisaNao/fast_repo/resolve/main/FULL_REPO_forge.zip\"\n",
+        "\n",
+        "        download_and_unpack(download_url, webui_path)\n",
+        "        configure_environment()\n",
         "\n",
+        "        get_ipython().system(f'echo -n {start_colab} > {webui_path}/static/colabTimer.txt')\n",
+        "    del cap\n",
+        "\n",
+        "    install_time = time.time() - start_install\n",
+        "    minutes, seconds = divmod(int(install_time), 60)\n",
+        "    print(f\"\\r🚀 Unpacking complete! For {minutes:02}:{seconds:02} ⚡\", flush=True)\n",
+        "\n",
+        "    if os.path.exists(temporarily_dir):\n",
+        "        copy_items_with_replace(temporarily_dir, webui_path)\n",
+        "        shutil.rmtree(temporarily_dir)\n",
         "\n",
         "# ================= MAIN CODE ==================\n",
-        "# WebUI switch\n",
         "if os.path.exists(webui_path):\n",
         "    if UI != OLD_UI:\n",
         "        print(f'Switching the WebUI from \\033[33m{OLD_UI}\\033[0m to \\033[33m{UI}\\033[0m:\\n', end='')\n",
         "        copy_items_with_replace(webui_path, temporarily_dir)\n",
         "        shutil.rmtree(webui_path)\n",
-        "\n",
-        "        # Updating the environment variable after a change\n",
         "        os.environ['SDW_OLD_UI'] = UI\n",
         "        time.sleep(2)\n",
         "        clear_output()\n",
         "\n",
-        "# Unpacking the WebUI\n",
         "if not os.path.exists(webui_path):\n",
-        "    start_install = int(time.time())\n",
-        "    print(\"⌚ Unpacking Stable Diffusion...\" if UI != 'Forge' else \"⌚ Unpacking Stable Diffusion (Forge)...\", end='')\n",
-        "    with capture.capture_output() as cap:\n",
-        "        aria2_command = \"aria2c --console-log-level=error -c -x 16 -s 16 -k 1M\"\n",
-        "        url = \"https://huggingface.co/NagisaNao/fast_repo/resolve/main/FULL_REPO.zip\" if UI != 'Forge' else \"https://huggingface.co/NagisaNao/fast_repo/resolve/main/FULL_REPO_forge.zip\"\n",
-        "        !{aria2_command} {url} -o repo.zip\n",
-        "\n",
-        "        !unzip -q -o repo.zip -d {webui_path}\n",
-        "        !rm -rf repo.zip\n",
-        "\n",
-        "        # other\n",
-        "        %cd {root_path}\n",
-        "        os.environ[\"SAFETENSORS_FAST_GPU\"]='1'\n",
-        "        os.environ[\"CUDA_MODULE_LOADING\"]=\"LAZY\"\n",
-        "        os.environ[\"TF_CPP_MIN_LOG_LEVEL\"] = \"3\"\n",
-        "        os.environ[\"PYTHONWARNINGS\"] = \"ignore\"\n",
-        "\n",
-        "        !echo -n {start_colab} > {webui_path}/static/colabTimer.txt\n",
-        "    del cap\n",
-        "    install_time = timedelta(seconds=time.time()-start_install)\n",
-        "    print(\"\\r🚀 Unpacking is complete! For\",\"%02d:%02d:%02d ⚡\\n\" % (install_time.seconds / 3600, (install_time.seconds / 60) % 60, install_time.seconds % 60), end='', flush=True)\n",
-        "\n",
-        "    # Move temporary files\n",
-        "    if os.path.exists(temporarily_dir):\n",
-        "        copy_items_with_replace(temporarily_dir, webui_path)\n",
-        "        shutil.rmtree(temporarily_dir)\n",
+        "    unpack_webui()\n",
         "else:\n",
         "    print(\"🚀 All unpacked... Skip. ⚡\")\n",
-        "    start_colab = float(open(f'{webui_path}/static/colabTimer.txt', 'r').read())\n",
-        "    time_since_start = str(timedelta(seconds=time.time()-start_colab)).split('.')[0]\n",
-        "    print(f\"⌚️ You have been conducting this session for - \\033[33m{time_since_start}\\033[0m\")\n",
+        "    timer_colab = handle_colab_timer(webui_path, start_colab)\n",
+        "    elapsed_time = str(timedelta(seconds=time.time() - timer_colab)).split('.')[0]\n",
+        "    print(f\"⌚️ You have been conducting this session for - \\033[33m{elapsed_time}\\033[0m\")\n",
         "\n",
         "\n",
         "## Changes extensions and WebUi\n",
@@ -332,8 +345,8 @@
         "    def get_download_url(data, model_type):\n",
         "        if any(t.lower() in model_type.lower() for t in SUPPORT_TYPES):\n",
         "            return data['files'][0]['downloadUrl']\n",
-        "        else:\n",
-        "            return data['files'][1]['downloadUrl']\n",
+        "\n",
+        "        return data['files'][1]['downloadUrl'] if 'type' in url else data['files'][0]['downloadUrl']\n",
         "\n",
         "    download_url = get_download_url(data, model_type)\n",
         "\n",

files_cells/notebooks/ru/downloading_ru.ipynb

@@ -112,10 +112,7 @@
         "\n",
         "# =================== OTHER ====================\n",
         "# Setup Timer\n",
-        "try:\n",
-        "    start_colab\n",
-        "except:\n",
-        "    start_colab = int(time.time())-5\n",
+        "start_colab = globals().get('start_colab', int(time.time()) - 5)\n",
         "\n",
         "# Save files temporarily\n",
         "temporarily_dir = f'{root_path}/temp_dir'\n",
@@ -128,74 +125,90 @@
         "        'models/Lora'\n",
         "    ]\n",
         "\n",
-        "    print(\"- Идет перемещение файлов... (Это может занять минуту или больше)\", end='')\n",
+        "    print(\"Перемещение файлов...\", end='')\n",
+        "    time.sleep(1)\n",
         "    for item in items_to_copy:\n",
         "        src = os.path.join(src_base, item)\n",
         "        dst = os.path.join(dst_base, item)\n",
         "\n",
-        "        if os.path.isdir(src):\n",
+        "        if os.path.exists(src):\n",
         "            if os.path.exists(dst):\n",
         "                shutil.rmtree(dst)\n",
+        "            os.makedirs(os.path.dirname(dst), exist_ok=True)\n",
         "            shutil.move(src, dst)\n",
-        "        elif os.path.isfile(src):\n",
-        "            dst_dir = os.path.dirname(dst)\n",
-        "            os.makedirs(dst_dir, exist_ok=True)\n",
-        "            shutil.move(src, dst)\n",
-        "    print(\"\\r🔥 Файлы были перемещены!\")\n",
+        "    print(\"\\r🔥 Файлы перемещены!\" + \" \"*15)\n",
+        "\n",
+        "def configure_environment():\n",
+        "    os.chdir(root_path)\n",
+        "    os.environ.update({\n",
+        "        \"SAFETENSORS_FAST_GPU\": '1',\n",
+        "        \"CUDA_MODULE_LOADING\": \"LAZY\",\n",
+        "        \"TF_CPP_MIN_LOG_LEVEL\": \"3\",\n",
+        "        \"PYTHONWARNINGS\": \"ignore\"\n",
+        "    })\n",
+        "\n",
+        "def download_and_unpack(url, dest_path):\n",
+        "    aria2_args = \"--optimize-concurrent-downloads --console-log-level=error --summary-interval=10 --stderr=true -c -x16 -s16 -k1M -j5\"\n",
+        "    get_ipython().system(f\"aria2c {aria2_args} '{url}' -o repo.zip\")\n",
+        "    get_ipython().system(f'unzip -q -o repo.zip -d {dest_path}')\n",
+        "    get_ipython().system('rm -rf repo.zip')\n",
+        "\n",
+        "def handle_colab_timer(webui_path, timer_colab):\n",
+        "    timer_file_path = os.path.join(webui_path, 'static', 'colabTimer.txt')\n",
+        "    if not os.path.exists(timer_file_path):\n",
+        "        with open(timer_file_path, 'w') as timer_file:\n",
+        "            timer_file.write(str(timer_colab))\n",
+        "    else:\n",
+        "        with open(timer_file_path, 'r') as timer_file:\n",
+        "            timer_colab = float(timer_file.read())\n",
+        "    return timer_colab\n",
+        "\n",
+        "def unpack_webui():\n",
+        "    start_install = time.time()\n",
+        "    print(f\"⌚ Распаковка Stable Diffusion{' (Forge)' if UI == 'Forge' else ''}...\", end='')\n",
+        "\n",
+        "    with capture.capture_output() as cap:\n",
+        "        download_url = \"https://huggingface.co/NagisaNao/fast_repo/resolve/main/FULL_REPO.zip\"\n",
+        "        if UI == 'Forge':\n",
+        "            download_url = \"https://huggingface.co/NagisaNao/fast_repo/resolve/main/FULL_REPO_forge.zip\"\n",
+        "\n",
+        "        download_and_unpack(download_url, webui_path)\n",
+        "        configure_environment()\n",
         "\n",
+        "        get_ipython().system(f'echo -n {start_colab} > {webui_path}/static/colabTimer.txt')\n",
+        "    del cap\n",
+        "\n",
+        "    install_time = time.time() - start_install\n",
+        "    minutes, seconds = divmod(int(install_time), 60)\n",
+        "    print(f\"\\r🚀 Распаковка Завершена! За {minutes:02}:{seconds:02} ⚡\", flush=True)\n",
+        "\n",
+        "    if os.path.exists(temporarily_dir):\n",
+        "        copy_items_with_replace(temporarily_dir, webui_path)\n",
+        "        shutil.rmtree(temporarily_dir)\n",
         "\n",
         "# ================= MAIN CODE ==================\n",
-        "# WebUI switch\n",
         "if os.path.exists(webui_path):\n",
         "    if UI != OLD_UI:\n",
         "        print(f'Переключение веб-интерфейса с \\033[33m{OLD_UI}\\033[0m на \\033[33m{UI}\\033[0m:\\n', end='')\n",
         "        copy_items_with_replace(webui_path, temporarily_dir)\n",
         "        shutil.rmtree(webui_path)\n",
-        "\n",
-        "        # Updating the environment variable after a change\n",
         "        os.environ['SDW_OLD_UI'] = UI\n",
         "        time.sleep(2)\n",
         "        clear_output()\n",
         "\n",
-        "# Unpacking the WebUI\n",
         "if not os.path.exists(webui_path):\n",
-        "    start_install = int(time.time())\n",
-        "    print(\"⌚ Распаковка Stable Diffusion...\" if UI != 'Forge' else \"⌚ Распаковка Stable Diffusion (Forge)...\", end='')\n",
-        "    with capture.capture_output() as cap:\n",
-        "        aria2_command = \"aria2c --console-log-level=error -c -x 16 -s 16 -k 1M\"\n",
-        "        url = \"https://huggingface.co/NagisaNao/fast_repo/resolve/main/FULL_REPO.zip\" if UI != 'Forge' else \"https://huggingface.co/NagisaNao/fast_repo/resolve/main/FULL_REPO_forge.zip\"\n",
-        "        !{aria2_command} {url} -o repo.zip\n",
-        "\n",
-        "        !unzip -q -o repo.zip -d {webui_path}\n",
-        "        !rm -rf repo.zip\n",
-        "\n",
-        "        # other\n",
-        "        get_ipython().run_line_magic('cd', '{root_path}')\n",
-        "        os.environ[\"SAFETENSORS_FAST_GPU\"]='1'\n",
-        "        os.environ[\"CUDA_MODULE_LOADING\"]=\"LAZY\"\n",
-        "        os.environ[\"TF_CPP_MIN_LOG_LEVEL\"] = \"3\"\n",
-        "        os.environ[\"PYTHONWARNINGS\"] = \"ignore\"\n",
-        "\n",
-        "        !echo -n {start_colab} > {webui_path}/static/colabTimer.txt\n",
-        "    del cap\n",
-        "    install_time = timedelta(seconds=time.time()-start_install)\n",
-        "    print(\"\\r🚀 Распаковка Завершена! За\",\"%02d:%02d:%02d ⚡\\n\" % (install_time.seconds / 3600, (install_time.seconds / 60) % 60, install_time.seconds % 60), end='', flush=True)\n",
-        "\n",
-        "    # Move temporary files\n",
-        "    if os.path.exists(temporarily_dir):\n",
-        "        copy_items_with_replace(temporarily_dir, webui_path)\n",
-        "        shutil.rmtree(temporarily_dir)\n",
+        "    unpack_webui()\n",
         "else:\n",
-        "    print(\"🚀 Все распакованно... Пропуск. ⚡\")\n",
-        "    start_colab = float(open(f'{webui_path}/static/colabTimer.txt', 'r').read())\n",
-        "    time_since_start = str(timedelta(seconds=time.time()-start_colab)).split('.')[0]\n",
-        "    print(f\"⌚️ Вы проводите эту сессию в течение - \\033[33m{time_since_start}\\033[0m\")\n",
+        "    print(\"🚀 Все распакованно... Пропуск.  ⚡\")\n",
+        "    timer_colab = handle_colab_timer(webui_path, start_colab)\n",
+        "    elapsed_time = str(timedelta(seconds=time.time() - timer_colab)).split('.')[0]\n",
+        "    print(f\"⌚️ Вы проводите эту сессию в течение - \\033[33m{elapsed_time}\\033[0m\")\n",
         "\n",
         "\n",
         "## Changes extensions and WebUi\n",
         "if latest_webui or latest_exstensions:\n",
-        "    action = \"Обновление WebUI и Расширений\" if latest_webui and latest_exstensions else (\"Обновление WebUI\" if latest_webui else \"Обновление Расширений\")\n",
-        "    print(f\"⌚️ {action}...\", end='', flush=True)\n",
+        "    action = \"WebUI и Расширений\" if latest_webui and latest_exstensions else (\"WebUI\" if latest_webui else \"Расширений\")\n",
+        "    print(f\"⌚️ Обновление {action}...\", end='', flush=True)\n",
         "    with capture.capture_output() as cap:\n",
         "        !git config --global user.email \"you@example.com\"\n",
         "        !git config --global user.name \"Your Name\"\n",
@@ -210,7 +223,7 @@
         "        if latest_exstensions:\n",
         "            !{'for dir in ' + webui_path + '/extensions/*/; do cd \\\"$dir\\\" && git reset --hard && git pull; done'}\n",
         "    del cap\n",
-        "    print(f\"\\r✨ {action} Завершено!\")\n",
+        "    print(f\"\\r✨ Обновление {action} Завершено!\")\n",
         "\n",
         "\n",
         "# === FIXING EXTENSIONS ===\n",
@@ -332,8 +345,8 @@
         "    def get_download_url(data, model_type):\n",
         "        if any(t.lower() in model_type.lower() for t in SUPPORT_TYPES):\n",
         "            return data['files'][0]['downloadUrl']\n",
-        "        else:\n",
-        "            return data['files'][1]['downloadUrl']\n",
+        "\n",
+        "        return data['files'][1]['downloadUrl'] if 'type' in url else data['files'][0]['downloadUrl']\n",
         "\n",
         "    download_url = get_download_url(data, model_type)\n",
         "\n",

files_cells/python/en/downloading_en.py

@@ -102,10 +102,7 @@ locals().update({key: settings.get(key) for key in VARIABLES})
 
 # =================== OTHER ====================
 # Setup Timer
-try:
-    start_colab
-except:
-    start_colab = int(time.time())-5
+start_colab = globals().get('start_colab', int(time.time()) - 5)
 
 # Save files temporarily
 temporarily_dir = f'{root_path}/temp_dir'
@@ -118,68 +115,84 @@ def copy_items_with_replace(src_base, dst_base):
         'models/Lora'
     ]
 
-    print("- There's a file move in progress... (This can take a minute or more)", end='')
+    print("Moving files...", end='')
+    time.sleep(1)
     for item in items_to_copy:
         src = os.path.join(src_base, item)
         dst = os.path.join(dst_base, item)
 
-        if os.path.isdir(src):
+        if os.path.exists(src):
             if os.path.exists(dst):
                 shutil.rmtree(dst)
+            os.makedirs(os.path.dirname(dst), exist_ok=True)
             shutil.move(src, dst)
-        elif os.path.isfile(src):
-            dst_dir = os.path.dirname(dst)
-            os.makedirs(dst_dir, exist_ok=True)
-            shutil.move(src, dst)
-    print("\r🔥 The files have been moved!")
+    print("\r🔥 Files moved!" + " "*15)
+
+def configure_environment():
+    os.chdir(root_path)
+    os.environ.update({
+        "SAFETENSORS_FAST_GPU": '1',
+        "CUDA_MODULE_LOADING": "LAZY",
+        "TF_CPP_MIN_LOG_LEVEL": "3",
+        "PYTHONWARNINGS": "ignore"
+    })
+
+def download_and_unpack(url, dest_path):
+    aria2_args = "--optimize-concurrent-downloads --console-log-level=error --summary-interval=10 --stderr=true -c -x16 -s16 -k1M -j5"
+    get_ipython().system(f"aria2c {aria2_args} '{url}' -o repo.zip")
+    get_ipython().system(f'unzip -q -o repo.zip -d {dest_path}')
+    get_ipython().system('rm -rf repo.zip')
+
+def handle_colab_timer(webui_path, timer_colab):
+    timer_file_path = os.path.join(webui_path, 'static', 'colabTimer.txt')
+    if not os.path.exists(timer_file_path):
+        with open(timer_file_path, 'w') as timer_file:
+            timer_file.write(str(timer_colab))
+    else:
+        with open(timer_file_path, 'r') as timer_file:
+            timer_colab = float(timer_file.read())
+    return timer_colab
+
+def unpack_webui():
+    start_install = time.time()
+    print(f"⌚ Unpacking Stable Diffusion{' (Forge)' if UI == 'Forge' else ''}...", end='')
+
+    with capture.capture_output() as cap:
+        download_url = "https://huggingface.co/NagisaNao/fast_repo/resolve/main/FULL_REPO.zip"
+        if UI == 'Forge':
+            download_url = "https://huggingface.co/NagisaNao/fast_repo/resolve/main/FULL_REPO_forge.zip"
+
+        download_and_unpack(download_url, webui_path)
+        configure_environment()
 
+        get_ipython().system(f'echo -n {start_colab} > {webui_path}/static/colabTimer.txt')
+    del cap
+
+    install_time = time.time() - start_install
+    minutes, seconds = divmod(int(install_time), 60)
+    print(f"\r🚀 Unpacking complete! For {minutes:02}:{seconds:02} ⚡", flush=True)
+
+    if os.path.exists(temporarily_dir):
+        copy_items_with_replace(temporarily_dir, webui_path)
+        shutil.rmtree(temporarily_dir)
 
 # ================= MAIN CODE ==================
-# WebUI switch
 if os.path.exists(webui_path):
     if UI != OLD_UI:
         print(f'Switching the WebUI from \033[33m{OLD_UI}\033[0m to \033[33m{UI}\033[0m:\n', end='')
         copy_items_with_replace(webui_path, temporarily_dir)
         shutil.rmtree(webui_path)
-
-        # Updating the environment variable after a change
         os.environ['SDW_OLD_UI'] = UI
         time.sleep(2)
         clear_output()
 
-# Unpacking the WebUI
 if not os.path.exists(webui_path):
-    start_install = int(time.time())
-    print("⌚ Unpacking Stable Diffusion..." if UI != 'Forge' else "⌚ Unpacking Stable Diffusion (Forge)...", end='')
-    with capture.capture_output() as cap:
-        aria2_command = "aria2c --console-log-level=error -c -x 16 -s 16 -k 1M"
-        url = "https://huggingface.co/NagisaNao/fast_repo/resolve/main/FULL_REPO.zip" if UI != 'Forge' else "https://huggingface.co/NagisaNao/fast_repo/resolve/main/FULL_REPO_forge.zip"
-        get_ipython().system('{aria2_command} {url} -o repo.zip')
-
-        get_ipython().system('unzip -q -o repo.zip -d {webui_path}')
-        get_ipython().system('rm -rf repo.zip')
-
-        # other
-        get_ipython().run_line_magic('cd', '{root_path}')
-        os.environ["SAFETENSORS_FAST_GPU"]='1'
-        os.environ["CUDA_MODULE_LOADING"]="LAZY"
-        os.environ["TF_CPP_MIN_LOG_LEVEL"] = "3"
-        os.environ["PYTHONWARNINGS"] = "ignore"
-
-        get_ipython().system('echo -n {start_colab} > {webui_path}/static/colabTimer.txt')
-    del cap
-    install_time = timedelta(seconds=time.time()-start_install)
-    print("\r🚀 Unpacking is complete! For","%02d:%02d:%02d ⚡\n" % (install_time.seconds / 3600, (install_time.seconds / 60) % 60, install_time.seconds % 60), end='', flush=True)
-
-    # Move temporary files
-    if os.path.exists(temporarily_dir):
-        copy_items_with_replace(temporarily_dir, webui_path)
-        shutil.rmtree(temporarily_dir)
+    unpack_webui()
 else:
     print("🚀 All unpacked... Skip. ⚡")
-    start_colab = float(open(f'{webui_path}/static/colabTimer.txt', 'r').read())
-    time_since_start = str(timedelta(seconds=time.time()-start_colab)).split('.')[0]
-    print(f"⌚️ You have been conducting this session for - \033[33m{time_since_start}\033[0m")
+    timer_colab = handle_colab_timer(webui_path, start_colab)
+    elapsed_time = str(timedelta(seconds=time.time() - timer_colab)).split('.')[0]
+    print(f"⌚️ You have been conducting this session for - \033[33m{elapsed_time}\033[0m")
 
 
 ## Changes extensions and WebUi
@@ -322,8 +335,8 @@ def CivitAi_API(url, file_name=None):
     def get_download_url(data, model_type):
         if any(t.lower() in model_type.lower() for t in SUPPORT_TYPES):
             return data['files'][0]['downloadUrl']
-        else:
-            return data['files'][1]['downloadUrl']
+
+        return data['files'][1]['downloadUrl'] if 'type' in url else data['files'][0]['downloadUrl']
 
     download_url = get_download_url(data, model_type)
 

files_cells/python/ru/downloading_ru.py

@@ -102,10 +102,7 @@ locals().update({key: settings.get(key) for key in VARIABLES})
 
 # =================== OTHER ====================
 # Setup Timer
-try:
-    start_colab
-except:
-    start_colab = int(time.time())-5
+start_colab = globals().get('start_colab', int(time.time()) - 5)
 
 # Save files temporarily
 temporarily_dir = f'{root_path}/temp_dir'
@@ -118,74 +115,90 @@ def copy_items_with_replace(src_base, dst_base):
         'models/Lora'
     ]
 
-    print("- Идет перемещение файлов... (Это может занять минуту или больше)", end='')
+    print("Перемещение файлов...", end='')
+    time.sleep(1)
     for item in items_to_copy:
         src = os.path.join(src_base, item)
         dst = os.path.join(dst_base, item)
 
-        if os.path.isdir(src):
+        if os.path.exists(src):
             if os.path.exists(dst):
                 shutil.rmtree(dst)
+            os.makedirs(os.path.dirname(dst), exist_ok=True)
             shutil.move(src, dst)
-        elif os.path.isfile(src):
-            dst_dir = os.path.dirname(dst)
-            os.makedirs(dst_dir, exist_ok=True)
-            shutil.move(src, dst)
-    print("\r🔥 Файлы были перемещены!")
+    print("\r🔥 Файлы перемещены!" + " "*15)
+
+def configure_environment():
+    os.chdir(root_path)
+    os.environ.update({
+        "SAFETENSORS_FAST_GPU": '1',
+        "CUDA_MODULE_LOADING": "LAZY",
+        "TF_CPP_MIN_LOG_LEVEL": "3",
+        "PYTHONWARNINGS": "ignore"
+    })
+
+def download_and_unpack(url, dest_path):
+    aria2_args = "--optimize-concurrent-downloads --console-log-level=error --summary-interval=10 --stderr=true -c -x16 -s16 -k1M -j5"
+    get_ipython().system(f"aria2c {aria2_args} '{url}' -o repo.zip")
+    get_ipython().system(f'unzip -q -o repo.zip -d {dest_path}')
+    get_ipython().system('rm -rf repo.zip')
+
+def handle_colab_timer(webui_path, timer_colab):
+    timer_file_path = os.path.join(webui_path, 'static', 'colabTimer.txt')
+    if not os.path.exists(timer_file_path):
+        with open(timer_file_path, 'w') as timer_file:
+            timer_file.write(str(timer_colab))
+    else:
+        with open(timer_file_path, 'r') as timer_file:
+            timer_colab = float(timer_file.read())
+    return timer_colab
+
+def unpack_webui():
+    start_install = time.time()
+    print(f"⌚ Распаковка Stable Diffusion{' (Forge)' if UI == 'Forge' else ''}...", end='')
+
+    with capture.capture_output() as cap:
+        download_url = "https://huggingface.co/NagisaNao/fast_repo/resolve/main/FULL_REPO.zip"
+        if UI == 'Forge':
+            download_url = "https://huggingface.co/NagisaNao/fast_repo/resolve/main/FULL_REPO_forge.zip"
+
+        download_and_unpack(download_url, webui_path)
+        configure_environment()
 
+        get_ipython().system(f'echo -n {start_colab} > {webui_path}/static/colabTimer.txt')
+    del cap
+
+    install_time = time.time() - start_install
+    minutes, seconds = divmod(int(install_time), 60)
+    print(f"\r🚀 Распаковка Завершена! За {minutes:02}:{seconds:02} ⚡", flush=True)
+
+    if os.path.exists(temporarily_dir):
+        copy_items_with_replace(temporarily_dir, webui_path)
+        shutil.rmtree(temporarily_dir)
 
 # ================= MAIN CODE ==================
-# WebUI switch
 if os.path.exists(webui_path):
     if UI != OLD_UI:
         print(f'Переключение веб-интерфейса с \033[33m{OLD_UI}\033[0m на \033[33m{UI}\033[0m:\n', end='')
         copy_items_with_replace(webui_path, temporarily_dir)
         shutil.rmtree(webui_path)
-
-        # Updating the environment variable after a change
         os.environ['SDW_OLD_UI'] = UI
         time.sleep(2)
         clear_output()
 
-# Unpacking the WebUI
 if not os.path.exists(webui_path):
-    start_install = int(time.time())
-    print("⌚ Распаковка Stable Diffusion..." if UI != 'Forge' else "⌚ Распаковка Stable Diffusion (Forge)...", end='')
-    with capture.capture_output() as cap:
-        aria2_command = "aria2c --console-log-level=error -c -x 16 -s 16 -k 1M"
-        url = "https://huggingface.co/NagisaNao/fast_repo/resolve/main/FULL_REPO.zip" if UI != 'Forge' else "https://huggingface.co/NagisaNao/fast_repo/resolve/main/FULL_REPO_forge.zip"
-        get_ipython().system('{aria2_command} {url} -o repo.zip')
-
-        get_ipython().system('unzip -q -o repo.zip -d {webui_path}')
-        get_ipython().system('rm -rf repo.zip')
-
-        # other
-        get_ipython().run_line_magic('cd', '{root_path}')
-        os.environ["SAFETENSORS_FAST_GPU"]='1'
-        os.environ["CUDA_MODULE_LOADING"]="LAZY"
-        os.environ["TF_CPP_MIN_LOG_LEVEL"] = "3"
-        os.environ["PYTHONWARNINGS"] = "ignore"
-
-        get_ipython().system('echo -n {start_colab} > {webui_path}/static/colabTimer.txt')
-    del cap
-    install_time = timedelta(seconds=time.time()-start_install)
-    print("\r🚀 Распаковка Завершена! За","%02d:%02d:%02d ⚡\n" % (install_time.seconds / 3600, (install_time.seconds / 60) % 60, install_time.seconds % 60), end='', flush=True)
-
-    # Move temporary files
-    if os.path.exists(temporarily_dir):
-        copy_items_with_replace(temporarily_dir, webui_path)
-        shutil.rmtree(temporarily_dir)
+    unpack_webui()
 else:
-    print("🚀 Все распакованно... Пропуск. ⚡")
-    start_colab = float(open(f'{webui_path}/static/colabTimer.txt', 'r').read())
-    time_since_start = str(timedelta(seconds=time.time()-start_colab)).split('.')[0]
-    print(f"⌚️ Вы проводите эту сессию в течение - \033[33m{time_since_start}\033[0m")
+    print("🚀 Все распакованно... Пропуск.  ⚡")
+    timer_colab = handle_colab_timer(webui_path, start_colab)
+    elapsed_time = str(timedelta(seconds=time.time() - timer_colab)).split('.')[0]
+    print(f"⌚️ Вы проводите эту сессию в течение - \033[33m{elapsed_time}\033[0m")
 
 
 ## Changes extensions and WebUi
 if latest_webui or latest_exstensions:
-    action = "Обновление WebUI и Расширений" if latest_webui and latest_exstensions else ("Обновление WebUI" if latest_webui else "Обновление Расширений")
-    print(f"⌚️ {action}...", end='', flush=True)
+    action = "WebUI и Расширений" if latest_webui and latest_exstensions else ("WebUI" if latest_webui else "Расширений")
+    print(f"⌚️ Обновление {action}...", end='', flush=True)
     with capture.capture_output() as cap:
         get_ipython().system('git config --global user.email "you@example.com"')
         get_ipython().system('git config --global user.name "Your Name"')
@@ -200,7 +213,7 @@ if latest_webui or latest_exstensions:
         if latest_exstensions:
             get_ipython().system('{\'for dir in \' + webui_path + \'/extensions/*/; do cd \\"$dir\\" && git reset --hard && git pull; done\'}')
     del cap
-    print(f"\r✨ {action} Завершено!")
+    print(f"\r✨ Обновление {action} Завершено!")
 
 
 # === FIXING EXTENSIONS ===
@@ -322,8 +335,8 @@ def CivitAi_API(url, file_name=None):
     def get_download_url(data, model_type):
         if any(t.lower() in model_type.lower() for t in SUPPORT_TYPES):
             return data['files'][0]['downloadUrl']
-        else:
-            return data['files'][1]['downloadUrl']
+
+        return data['files'][1]['downloadUrl'] if 'type' in url else data['files'][0]['downloadUrl']
 
     download_url = get_download_url(data, model_type)