update downlaoding logic code

files_cells/notebooks/en/auto-cleaner_en.ipynb

@@ -35,11 +35,8 @@
         "\n",
         "\n",
         "#  ================= DETECT ENV =================\n",
-        "def check_colab_subscription():\n",
-        "    return (os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES') / (1024. ** 3) <= 20)\n",
-        "free_plan = check_colab_subscription()\n",
-        "\n",
         "def detect_environment():\n",
+        "    free_plan = (os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES') / (1024. ** 3) <= 20)\n",
         "    environments = {\n",
         "        'COLAB_GPU': ('Google Colab', \"/root\" if free_plan else \"/content\"),\n",
         "        'KAGGLE_URL_BASE': ('Kaggle', \"/kaggle/working/content\"),\n",
@@ -48,9 +45,9 @@
         "\n",
         "    for env_var, (environment, path) in environments.items():\n",
         "        if env_var in os.environ:\n",
-        "            return environment, path\n",
+        "            return environment, path, free_plan\n",
         "\n",
-        "env, root_path = detect_environment()\n",
+        "env, root_path, free_plan = detect_environment()\n",
         "webui_path = f\"{root_path}/sdw\"\n",
         "#  ----------------------------------------------\n",
         "\n",

files_cells/notebooks/en/downloading_en.ipynb

@@ -33,11 +33,8 @@
         "\n",
         "\n",
         "#  ================= DETECT ENV =================\n",
-        "def check_colab_subscription():\n",
-        "    return (os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES') / (1024. ** 3) <= 20)\n",
-        "free_plan = check_colab_subscription()\n",
-        "\n",
         "def detect_environment():\n",
+        "    free_plan = (os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES') / (1024. ** 3) <= 20)\n",
         "    environments = {\n",
         "        'COLAB_GPU': ('Google Colab', \"/root\" if free_plan else \"/content\"),\n",
         "        'KAGGLE_URL_BASE': ('Kaggle', \"/kaggle/working/content\"),\n",
@@ -46,9 +43,9 @@
         "\n",
         "    for env_var, (environment, path) in environments.items():\n",
         "        if env_var in os.environ:\n",
-        "            return environment, path\n",
+        "            return environment, path, free_plan\n",
         "\n",
-        "env, root_path = detect_environment()\n",
+        "env, root_path, free_plan = detect_environment()\n",
         "webui_path = f\"{root_path}/sdw\"\n",
         "#  ----------------------------------------------\n",
         "\n",
@@ -73,6 +70,7 @@
         "\n",
         "    print(\"Installing the libraries, it's going to take a while....\", end='')\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",
@@ -91,8 +89,7 @@
         "        if env == \"Google Colab\":\n",
         "            !pip install -q pip install xformers==0.0.26.dev769 -U\n",
         "        else:\n",
-        "            if env != \"Kaggle\":\n",
-        "                !pip install -q {torch} -U\n",
+        "            !pip install -q {torch} -U\n",
         "            !pip install -q {xformers} -U\n",
         "\n",
         "        with open(flag_file, \"w\") as f:\n",
@@ -334,16 +331,17 @@
         "}\n",
         "\n",
         "extension_repo = []\n",
-        "prefixes = [\n",
-        "    \"model:\",\n",
-        "    \"vae:\",\n",
-        "    \"lora:\",\n",
-        "    \"embeddings:\",\n",
-        "    \"extensions:\",\n",
-        "    \"control:\"\n",
-        "]\n",
+        "prefixes = {\n",
+        "    # It's complicated, but supplementing has become easier\n",
+        "    \"model\": [models_dir, \"Model_url\"],\n",
+        "    \"vae\": [vaes_dir, \"Vae_url\"],\n",
+        "    \"lora\": [loras_dir, \"LoRA_url\"],\n",
+        "    \"embeddings\": [embeddings_dir, \"Embedding_url\"],\n",
+        "    \"extensions\": [extensions_dir, \"Extensions_url\"],\n",
+        "    \"control\": [control_dir, \"ControlNet_url\"]\n",
+        "}\n",
         "\n",
-        "!mkdir -p {models_dir} {vaes_dir} {embeddings_dir} {loras_dir} {control_dir}\n",
+        "!mkdir -p {models_dir} {vaes_dir} {loras_dir} {embeddings_dir} {extensions_dir} {control_dir}\n",
         "\n",
         "url = \"\"\n",
         "ControlNet_url = \"\"\n",
@@ -359,9 +357,7 @@
         "    if file_name:\n",
         "        url = re.sub(r'\\[.*?\\]', '', url)\n",
         "\n",
-        "    dir_mapping = {\"model\": models_dir, \"vae\": vaes_dir, \"lora\": loras_dir, \"embeddings\": embeddings_dir, \"extensions\": None, \"control\": control_dir}\n",
-        "\n",
-        "    for prefix, dir in dir_mapping.items():\n",
+        "    for prefix, (dir, _) in prefixes.items():\n",
         "        if original_url.startswith(f\"{prefix}:\"):\n",
         "            if prefix != \"extensions\":\n",
         "                manual_download(url, dir, file_name=file_name)\n",
@@ -384,7 +380,10 @@
         "        if 'folders' in url:\n",
         "            !gdown --folder \"{url}\" -O {dst_dir} --fuzzy -c\n",
         "        else:\n",
-        "            !gdown \"{url}\" -O {dst_dir} --fuzzy -c\n",
+        "            if file_name:\n",
+        "               !gdown \"{url}\" -O {dst_dir}/{file_name} --fuzzy -c\n",
+        "            else:\n",
+        "               !gdown \"{url}\" -O {dst_dir} --fuzzy -c\n",
         "    # -- Huggin Face --\n",
         "    elif 'huggingface' in url:\n",
         "        if '/blob/' in url:\n",
@@ -409,7 +408,6 @@
         "        link_or_path = link_or_path.strip()\n",
         "        if not link_or_path:\n",
         "            continue\n",
-        "\n",
         "        if any(link_or_path.startswith(prefix.lower()) for prefix in prefixes):\n",
         "            handle_manual(link_or_path)\n",
         "            continue\n",
@@ -450,20 +448,9 @@
         "for submodel in submodels:\n",
         "    if not Inpainting_Model and \"inpainting\" in submodel['name']:\n",
         "        continue\n",
-        "\n",
         "    url += f\"{submodel['url']} {submodel['dst_dir']} {submodel['name']}, \"\n",
         "\n",
         "def process_file_download(file_url):\n",
-        "    global Model_url, Vae_url, LoRA_url, Embedding_url, Extensions_url\n",
-        "    urls_dict = {\n",
-        "        'model': 'Model_url',\n",
-        "        'vae': 'Vae_url',\n",
-        "        'embed': 'Embedding_url',\n",
-        "        'lora': 'LoRA_url',\n",
-        "        'extension': 'Extensions_url',\n",
-        "        'control': 'ControlNet_url'\n",
-        "    }\n",
-        "\n",
         "    if file_url.startswith(\"http\"):\n",
         "        if \"blob\" in file_url:\n",
         "            file_url = file_url.replace(\"blob\", \"raw\")\n",
@@ -476,12 +463,13 @@
         "    current_tag = None\n",
         "    for line in lines:\n",
         "        if line.strip().startswith('#'):\n",
-        "            current_tag = next((tag for tag in urls_dict if tag in line.lower()), None)\n",
-        "        elif current_tag and line.strip():\n",
-        "            urls = [url.strip() for url in line.split()]\n",
-        "            for url in urls:\n",
-        "                if url.startswith(\"http\"):\n",
-        "                    globals()[urls_dict[current_tag]] += \", \" + url\n",
+        "            if any(tag in line.lower() for tag in prefixes):\n",
+        "                current_tag = next((tag for tag in prefixes if tag in line.lower()))\n",
+        "\n",
+        "        urls = [url.strip() for url in line.split()]\n",
+        "        for url in urls:\n",
+        "            if url.startswith(\"http\"):\n",
+        "                globals()[prefixes[current_tag][1]] += \", \" + url\n",
         "\n",
         "# fix all possible errors/options and function call\n",
         "if custom_file_urls:\n",
@@ -496,11 +484,11 @@
         "    except FileNotFoundError:\n",
         "        pass\n",
         "\n",
-        "urls = [Model_url, Vae_url, LoRA_url, Embedding_url, Extensions_url, ControlNet_url]\n",
-        "\n",
+        "# url prefixing\n",
+        "urls = [globals()[urls[1]] for urls in prefixes.values()]\n",
         "for i, prefix in enumerate(prefixes):\n",
         "    if urls[i]:\n",
-        "        prefixed_urls = [f\"{prefix}{u}\" for u in urls[i].replace(',', '').split()]\n",
+        "        prefixed_urls = [f\"{prefix}:{url}\" for url in urls[i].replace(',', '').split()]\n",
         "        if prefixed_urls:\n",
         "            url += \", \".join(prefixed_urls) + \", \"\n",
         "\n",

files_cells/notebooks/en/launch_en.ipynb

@@ -33,11 +33,8 @@
         "\n",
         "\n",
         "#  ================= DETECT ENV =================\n",
-        "def check_colab_subscription():\n",
-        "    return (os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES') / (1024. ** 3) <= 20)\n",
-        "free_plan = check_colab_subscription()\n",
-        "\n",
         "def detect_environment():\n",
+        "    free_plan = (os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES') / (1024. ** 3) <= 20)\n",
         "    environments = {\n",
         "        'COLAB_GPU': ('Google Colab', \"/root\" if free_plan else \"/content\"),\n",
         "        'KAGGLE_URL_BASE': ('Kaggle', \"/kaggle/working/content\"),\n",
@@ -46,9 +43,9 @@
         "\n",
         "    for env_var, (environment, path) in environments.items():\n",
         "        if env_var in os.environ:\n",
-        "            return environment, path\n",
+        "            return environment, path, free_plan\n",
         "\n",
-        "env, root_path = detect_environment()\n",
+        "env, root_path, free_plan = detect_environment()\n",
         "webui_path = f\"{root_path}/sdw\"\n",
         "#  ----------------------------------------------\n",
         "\n",

files_cells/notebooks/en/widgets_en.ipynb

@@ -27,11 +27,8 @@
         "\n",
         "\n",
         "#  ================= DETECT ENV =================\n",
-        "def check_colab_subscription():\n",
-        "    return (os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES') / (1024. ** 3) <= 20)\n",
-        "free_plan = check_colab_subscription()\n",
-        "\n",
         "def detect_environment():\n",
+        "    free_plan = (os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES') / (1024. ** 3) <= 20)\n",
         "    environments = {\n",
         "        'COLAB_GPU': ('Google Colab', \"/root\" if free_plan else \"/content\"),\n",
         "        'KAGGLE_URL_BASE': ('Kaggle', \"/kaggle/working/content\"),\n",
@@ -40,9 +37,9 @@
         "\n",
         "    for env_var, (environment, path) in environments.items():\n",
         "        if env_var in os.environ:\n",
-        "            return environment, path\n",
+        "            return environment, path, free_plan\n",
         "\n",
-        "env, root_path = detect_environment()\n",
+        "env, root_path, free_plan = detect_environment()\n",
         "webui_path = f\"{root_path}/sdw\"\n",
         "\n",
         "!mkdir -p {root_path}\n",
@@ -364,7 +361,7 @@
         "commandline_arguments_widget = widgets.Text(description='Arguments:', value=commandline_arguments_options, style=style, layout=layout)\n",
         "\n",
         "additional_widget_list = [additional_header, latest_changes_widget, HR, controlnet_widget, controlnet_Num_widget, commit_hash_widget, optional_huggingface_token_widget, ngrok_widget, HR, commandline_arguments_widget]\n",
-        "if free_plan:\n",
+        "if free_plan and env == \"Google Colab\":\n",
         "    additional_widget_list.remove(ngrok_widget)\n",
         "display(widgets.VBox(additional_widget_list).add_class(\"container\"))\n",
         "\n",

files_cells/notebooks/ru/auto-cleaner_ru.ipynb

@@ -35,11 +35,8 @@
         "\n",
         "\n",
         "#  ================= DETECT ENV =================\n",
-        "def check_colab_subscription():\n",
-        "    return (os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES') / (1024. ** 3) <= 20)\n",
-        "free_plan = check_colab_subscription()\n",
-        "\n",
         "def detect_environment():\n",
+        "    free_plan = (os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES') / (1024. ** 3) <= 20)\n",
         "    environments = {\n",
         "        'COLAB_GPU': ('Google Colab', \"/root\" if free_plan else \"/content\"),\n",
         "        'KAGGLE_URL_BASE': ('Kaggle', \"/kaggle/working/content\"),\n",
@@ -48,9 +45,9 @@
         "\n",
         "    for env_var, (environment, path) in environments.items():\n",
         "        if env_var in os.environ:\n",
-        "            return environment, path\n",
+        "            return environment, path, free_plan\n",
         "\n",
-        "env, root_path = detect_environment()\n",
+        "env, root_path, free_plan = detect_environment()\n",
         "webui_path = f\"{root_path}/sdw\"\n",
         "#  ----------------------------------------------\n",
         "\n",

files_cells/notebooks/ru/downloading_ru.ipynb

@@ -33,11 +33,8 @@
         "\n",
         "\n",
         "#  ================= DETECT ENV =================\n",
-        "def check_colab_subscription():\n",
-        "    return (os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES') / (1024. ** 3) <= 20)\n",
-        "free_plan = check_colab_subscription()\n",
-        "\n",
         "def detect_environment():\n",
+        "    free_plan = (os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES') / (1024. ** 3) <= 20)\n",
         "    environments = {\n",
         "        'COLAB_GPU': ('Google Colab', \"/root\" if free_plan else \"/content\"),\n",
         "        'KAGGLE_URL_BASE': ('Kaggle', \"/kaggle/working/content\"),\n",
@@ -46,9 +43,9 @@
         "\n",
         "    for env_var, (environment, path) in environments.items():\n",
         "        if env_var in os.environ:\n",
-        "            return environment, path\n",
+        "            return environment, path, free_plan\n",
         "\n",
-        "env, root_path = detect_environment()\n",
+        "env, root_path, free_plan = detect_environment()\n",
         "webui_path = f\"{root_path}/sdw\"\n",
         "#  ----------------------------------------------\n",
         "\n",
@@ -73,6 +70,7 @@
         "\n",
         "    print(\"Установка библиотек, это займет какое-то время...\", end='')\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",
@@ -333,16 +331,17 @@
         "}\n",
         "\n",
         "extension_repo = []\n",
-        "prefixes = [\n",
-        "    \"model:\",\n",
-        "    \"vae:\",\n",
-        "    \"lora:\",\n",
-        "    \"embeddings:\",\n",
-        "    \"extensions:\",\n",
-        "    \"control:\"\n",
-        "]\n",
+        "prefixes = {\n",
+        "    # It's complicated, but supplementing has become easier\n",
+        "    \"model\": [models_dir, \"Model_url\"],\n",
+        "    \"vae\": [vaes_dir, \"Vae_url\"],\n",
+        "    \"lora\": [loras_dir, \"LoRA_url\"],\n",
+        "    \"embeddings\": [embeddings_dir, \"Embedding_url\"],\n",
+        "    \"extensions\": [extensions_dir, \"Extensions_url\"],\n",
+        "    \"control\": [control_dir, \"ControlNet_url\"]\n",
+        "}\n",
         "\n",
-        "!mkdir -p {models_dir} {vaes_dir} {embeddings_dir} {loras_dir} {control_dir}\n",
+        "!mkdir -p {models_dir} {vaes_dir} {loras_dir} {embeddings_dir} {extensions_dir} {control_dir}\n",
         "\n",
         "url = \"\"\n",
         "ControlNet_url = \"\"\n",
@@ -358,9 +357,7 @@
         "    if file_name:\n",
         "        url = re.sub(r'\\[.*?\\]', '', url)\n",
         "\n",
-        "    dir_mapping = {\"model\": models_dir, \"vae\": vaes_dir, \"lora\": loras_dir, \"embeddings\": embeddings_dir, \"extensions\": None, \"control\": control_dir}\n",
-        "\n",
-        "    for prefix, dir in dir_mapping.items():\n",
+        "    for prefix, (dir, _) in prefixes.items():\n",
         "        if original_url.startswith(f\"{prefix}:\"):\n",
         "            if prefix != \"extensions\":\n",
         "                manual_download(url, dir, file_name=file_name)\n",
@@ -383,7 +380,10 @@
         "        if 'folders' in url:\n",
         "            !gdown --folder \"{url}\" -O {dst_dir} --fuzzy -c\n",
         "        else:\n",
-        "            !gdown \"{url}\" -O {dst_dir} --fuzzy -c\n",
+        "            if file_name:\n",
+        "               !gdown \"{url}\" -O {dst_dir}/{file_name} --fuzzy -c\n",
+        "            else:\n",
+        "               !gdown \"{url}\" -O {dst_dir} --fuzzy -c\n",
         "    # -- Huggin Face --\n",
         "    elif 'huggingface' in url:\n",
         "        if '/blob/' in url:\n",
@@ -408,7 +408,6 @@
         "        link_or_path = link_or_path.strip()\n",
         "        if not link_or_path:\n",
         "            continue\n",
-        "\n",
         "        if any(link_or_path.startswith(prefix.lower()) for prefix in prefixes):\n",
         "            handle_manual(link_or_path)\n",
         "            continue\n",
@@ -449,20 +448,9 @@
         "for submodel in submodels:\n",
         "    if not Inpainting_Model and \"inpainting\" in submodel['name']:\n",
         "        continue\n",
-        "\n",
         "    url += f\"{submodel['url']} {submodel['dst_dir']} {submodel['name']}, \"\n",
         "\n",
         "def process_file_download(file_url):\n",
-        "    global Model_url, Vae_url, LoRA_url, Embedding_url, Extensions_url, ControlNet_url\n",
-        "    urls_dict = {\n",
-        "        'model': 'Model_url',\n",
-        "        'vae': 'Vae_url',\n",
-        "        'embed': 'Embedding_url',\n",
-        "        'lora': 'LoRA_url',\n",
-        "        'extension': 'Extensions_url',\n",
-        "        'control': 'ControlNet_url'\n",
-        "    }\n",
-        "\n",
         "    if file_url.startswith(\"http\"):\n",
         "        if \"blob\" in file_url:\n",
         "            file_url = file_url.replace(\"blob\", \"raw\")\n",
@@ -475,12 +463,13 @@
         "    current_tag = None\n",
         "    for line in lines:\n",
         "        if line.strip().startswith('#'):\n",
-        "            current_tag = next((tag for tag in urls_dict if tag in line.lower()), None)\n",
-        "        elif current_tag and line.strip():\n",
-        "            urls = [url.strip() for url in line.split()]\n",
-        "            for url in urls:\n",
-        "                if url.startswith(\"http\"):\n",
-        "                    globals()[urls_dict[current_tag]] += \", \" + url\n",
+        "            if any(tag in line.lower() for tag in prefixes):\n",
+        "                current_tag = next((tag for tag in prefixes if tag in line.lower()))\n",
+        "\n",
+        "        urls = [url.strip() for url in line.split()]\n",
+        "        for url in urls:\n",
+        "            if url.startswith(\"http\"):\n",
+        "                globals()[prefixes[current_tag][1]] += \", \" + url\n",
         "\n",
         "# fix all possible errors/options and function call\n",
         "if custom_file_urls:\n",
@@ -495,11 +484,11 @@
         "    except FileNotFoundError:\n",
         "        pass\n",
         "\n",
-        "urls = [Model_url, Vae_url, LoRA_url, Embedding_url, Extensions_url, ControlNet_url]\n",
-        "\n",
+        "# url prefixing\n",
+        "urls = [globals()[urls[1]] for urls in prefixes.values()]\n",
         "for i, prefix in enumerate(prefixes):\n",
         "    if urls[i]:\n",
-        "        prefixed_urls = [f\"{prefix}{u}\" for u in urls[i].replace(',', '').split()]\n",
+        "        prefixed_urls = [f\"{prefix}:{url}\" for url in urls[i].replace(',', '').split()]\n",
         "        if prefixed_urls:\n",
         "            url += \", \".join(prefixed_urls) + \", \"\n",
         "\n",

files_cells/notebooks/ru/launch_ru.ipynb

@@ -33,11 +33,8 @@
         "\n",
         "\n",
         "#  ================= DETECT ENV =================\n",
-        "def check_colab_subscription():\n",
-        "    return (os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES') / (1024. ** 3) <= 20)\n",
-        "free_plan = check_colab_subscription()\n",
-        "\n",
         "def detect_environment():\n",
+        "    free_plan = (os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES') / (1024. ** 3) <= 20)\n",
         "    environments = {\n",
         "        'COLAB_GPU': ('Google Colab', \"/root\" if free_plan else \"/content\"),\n",
         "        'KAGGLE_URL_BASE': ('Kaggle', \"/kaggle/working/content\"),\n",
@@ -46,9 +43,9 @@
         "\n",
         "    for env_var, (environment, path) in environments.items():\n",
         "        if env_var in os.environ:\n",
-        "            return environment, path\n",
+        "            return environment, path, free_plan\n",
         "\n",
-        "env, root_path = detect_environment()\n",
+        "env, root_path, free_plan = detect_environment()\n",
         "webui_path = f\"{root_path}/sdw\"\n",
         "#  ----------------------------------------------\n",
         "\n",

files_cells/notebooks/ru/widgets_ru.ipynb

@@ -27,11 +27,8 @@
         "\n",
         "\n",
         "#  ================= DETECT ENV =================\n",
-        "def check_colab_subscription():\n",
-        "    return (os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES') / (1024. ** 3) <= 20)\n",
-        "free_plan = check_colab_subscription()\n",
-        "\n",
         "def detect_environment():\n",
+        "    free_plan = (os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES') / (1024. ** 3) <= 20)\n",
         "    environments = {\n",
         "        'COLAB_GPU': ('Google Colab', \"/root\" if free_plan else \"/content\"),\n",
         "        'KAGGLE_URL_BASE': ('Kaggle', \"/kaggle/working/content\"),\n",
@@ -40,9 +37,9 @@
         "\n",
         "    for env_var, (environment, path) in environments.items():\n",
         "        if env_var in os.environ:\n",
-        "            return environment, path\n",
+        "            return environment, path, free_plan\n",
         "\n",
-        "env, root_path = detect_environment()\n",
+        "env, root_path, free_plan = detect_environment()\n",
         "webui_path = f\"{root_path}/sdw\"\n",
         "\n",
         "!mkdir -p {root_path}\n",
@@ -364,7 +361,7 @@
         "commandline_arguments_widget = widgets.Text(description='Аргументы:', value=commandline_arguments_options, style=style, layout=layout)\n",
         "\n",
         "additional_widget_list = [additional_header, latest_changes_widget, HR, controlnet_widget, controlnet_Num_widget, commit_hash_widget, optional_huggingface_token_widget, ngrok_widget, HR, commandline_arguments_widget]\n",
-        "if free_plan:\n",
+        "if free_plan and env == \"Google Colab\":\n",
         "    additional_widget_list.remove(ngrok_widget)\n",
         "display(widgets.VBox(additional_widget_list).add_class(\"container\"))\n",
         "\n",

files_cells/python/en/auto-cleaner_en.py

@@ -16,11 +16,8 @@ from IPython.display import display, HTML, Javascript
 
 
 #  ================= DETECT ENV =================
-def check_colab_subscription():
-    return (os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES') / (1024. ** 3) <= 20)
-free_plan = check_colab_subscription()
-
 def detect_environment():
+    free_plan = (os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES') / (1024. ** 3) <= 20)
     environments = {
         'COLAB_GPU': ('Google Colab', "/root" if free_plan else "/content"),
         'KAGGLE_URL_BASE': ('Kaggle', "/kaggle/working/content"),
@@ -29,9 +26,9 @@ def detect_environment():
 
     for env_var, (environment, path) in environments.items():
         if env_var in os.environ:
-            return environment, path
+            return environment, path, free_plan
 
-env, root_path = detect_environment()
+env, root_path, free_plan = detect_environment()
 webui_path = f"{root_path}/sdw"
 #  ----------------------------------------------
 

files_cells/python/en/downloading_en.py

@@ -14,11 +14,8 @@ from IPython.display import clear_output
 
 
 #  ================= DETECT ENV =================
-def check_colab_subscription():
-    return (os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES') / (1024. ** 3) <= 20)
-free_plan = check_colab_subscription()
-
 def detect_environment():
+    free_plan = (os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES') / (1024. ** 3) <= 20)
     environments = {
         'COLAB_GPU': ('Google Colab', "/root" if free_plan else "/content"),
         'KAGGLE_URL_BASE': ('Kaggle', "/kaggle/working/content"),
@@ -27,9 +24,9 @@ def detect_environment():
 
     for env_var, (environment, path) in environments.items():
         if env_var in os.environ:
-            return environment, path
+            return environment, path, free_plan
 
-env, root_path = detect_environment()
+env, root_path, free_plan = detect_environment()
 webui_path = f"{root_path}/sdw"
 #  ----------------------------------------------
 
@@ -54,6 +51,7 @@ if not os.path.exists(flag_file):
 
     print("Installing the libraries, it's going to take a while....", end='')
     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}')
@@ -72,8 +70,7 @@ if not os.path.exists(flag_file):
         if env == "Google Colab":
             get_ipython().system('pip install -q pip install xformers==0.0.26.dev769 -U')
         else:
-            if env != "Kaggle":
-                get_ipython().system('pip install -q {torch} -U')
+            get_ipython().system('pip install -q {torch} -U')
             get_ipython().system('pip install -q {xformers} -U')
 
         with open(flag_file, "w") as f:
@@ -315,16 +312,17 @@ controlnet_list = {
 }
 
 extension_repo = []
-prefixes = [
-    "model:",
-    "vae:",
-    "lora:",
-    "embeddings:",
-    "extensions:",
-    "control:"
-]
+prefixes = {
+    # It's complicated, but supplementing has become easier
+    "model": [models_dir, "Model_url"],
+    "vae": [vaes_dir, "Vae_url"],
+    "lora": [loras_dir, "LoRA_url"],
+    "embeddings": [embeddings_dir, "Embedding_url"],
+    "extensions": [extensions_dir, "Extensions_url"],
+    "control": [control_dir, "ControlNet_url"]
+}
 
-get_ipython().system('mkdir -p {models_dir} {vaes_dir} {embeddings_dir} {loras_dir} {control_dir}')
+get_ipython().system('mkdir -p {models_dir} {vaes_dir} {loras_dir} {embeddings_dir} {extensions_dir} {control_dir}')
 
 url = ""
 ControlNet_url = ""
@@ -340,9 +338,7 @@ def handle_manual(url):
     if file_name:
         url = re.sub(r'\[.*?\]', '', url)
 
-    dir_mapping = {"model": models_dir, "vae": vaes_dir, "lora": loras_dir, "embeddings": embeddings_dir, "extensions": None, "control": control_dir}
-
-    for prefix, dir in dir_mapping.items():
+    for prefix, (dir, _) in prefixes.items():
         if original_url.startswith(f"{prefix}:"):
             if prefix != "extensions":
                 manual_download(url, dir, file_name=file_name)
@@ -365,7 +361,10 @@ def manual_download(url, dst_dir, file_name):
         if 'folders' in url:
             get_ipython().system('gdown --folder "{url}" -O {dst_dir} --fuzzy -c')
         else:
-            get_ipython().system('gdown "{url}" -O {dst_dir} --fuzzy -c')
+            if file_name:
+               get_ipython().system('gdown "{url}" -O {dst_dir}/{file_name} --fuzzy -c')
+            else:
+               get_ipython().system('gdown "{url}" -O {dst_dir} --fuzzy -c')
     # -- Huggin Face --
     elif 'huggingface' in url:
         if '/blob/' in url:
@@ -390,7 +389,6 @@ def download(url):
         link_or_path = link_or_path.strip()
         if not link_or_path:
             continue
-
         if any(link_or_path.startswith(prefix.lower()) for prefix in prefixes):
             handle_manual(link_or_path)
             continue
@@ -431,20 +429,9 @@ submodels += add_submodels(controlnet, "" if controlnet == "ALL" else controlnet
 for submodel in submodels:
     if not Inpainting_Model and "inpainting" in submodel['name']:
         continue
-
     url += f"{submodel['url']} {submodel['dst_dir']} {submodel['name']}, "
 
 def process_file_download(file_url):
-    global Model_url, Vae_url, LoRA_url, Embedding_url, Extensions_url
-    urls_dict = {
-        'model': 'Model_url',
-        'vae': 'Vae_url',
-        'embed': 'Embedding_url',
-        'lora': 'LoRA_url',
-        'extension': 'Extensions_url',
-        'control': 'ControlNet_url'
-    }
-
     if file_url.startswith("http"):
         if "blob" in file_url:
             file_url = file_url.replace("blob", "raw")
@@ -457,12 +444,13 @@ def process_file_download(file_url):
     current_tag = None
     for line in lines:
         if line.strip().startswith('#'):
-            current_tag = next((tag for tag in urls_dict if tag in line.lower()), None)
-        elif current_tag and line.strip():
-            urls = [url.strip() for url in line.split()]
-            for url in urls:
-                if url.startswith("http"):
-                    globals()[urls_dict[current_tag]] += ", " + url
+            if any(tag in line.lower() for tag in prefixes):
+                current_tag = next((tag for tag in prefixes if tag in line.lower()))
+
+        urls = [url.strip() for url in line.split()]
+        for url in urls:
+            if url.startswith("http"):
+                globals()[prefixes[current_tag][1]] += ", " + url
 
 # fix all possible errors/options and function call
 if custom_file_urls:
@@ -477,11 +465,11 @@ if custom_file_urls:
     except FileNotFoundError:
         pass
 
-urls = [Model_url, Vae_url, LoRA_url, Embedding_url, Extensions_url, ControlNet_url]
-
+# url prefixing
+urls = [globals()[urls[1]] for urls in prefixes.values()]
 for i, prefix in enumerate(prefixes):
     if urls[i]:
-        prefixed_urls = [f"{prefix}{u}" for u in urls[i].replace(',', '').split()]
+        prefixed_urls = [f"{prefix}:{url}" for url in urls[i].replace(',', '').split()]
         if prefixed_urls:
             url += ", ".join(prefixed_urls) + ", "
 

files_cells/python/en/launch_en.py

@@ -9,11 +9,8 @@ from datetime import timedelta
 
 
 #  ================= DETECT ENV =================
-def check_colab_subscription():
-    return (os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES') / (1024. ** 3) <= 20)
-free_plan = check_colab_subscription()
-
 def detect_environment():
+    free_plan = (os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES') / (1024. ** 3) <= 20)
     environments = {
         'COLAB_GPU': ('Google Colab', "/root" if free_plan else "/content"),
         'KAGGLE_URL_BASE': ('Kaggle', "/kaggle/working/content"),
@@ -22,9 +19,9 @@ def detect_environment():
 
     for env_var, (environment, path) in environments.items():
         if env_var in os.environ:
-            return environment, path
+            return environment, path, free_plan
 
-env, root_path = detect_environment()
+env, root_path, free_plan = detect_environment()
 webui_path = f"{root_path}/sdw"
 #  ----------------------------------------------
 

files_cells/python/en/widgets_en.py

@@ -8,11 +8,8 @@ from IPython.display import display, HTML, Javascript, clear_output
 
 
 #  ================= DETECT ENV =================
-def check_colab_subscription():
-    return (os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES') / (1024. ** 3) <= 20)
-free_plan = check_colab_subscription()
-
 def detect_environment():
+    free_plan = (os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES') / (1024. ** 3) <= 20)
     environments = {
         'COLAB_GPU': ('Google Colab', "/root" if free_plan else "/content"),
         'KAGGLE_URL_BASE': ('Kaggle', "/kaggle/working/content"),
@@ -21,9 +18,9 @@ def detect_environment():
 
     for env_var, (environment, path) in environments.items():
         if env_var in os.environ:
-            return environment, path
+            return environment, path, free_plan
 
-env, root_path = detect_environment()
+env, root_path, free_plan = detect_environment()
 webui_path = f"{root_path}/sdw"
 
 get_ipython().system('mkdir -p {root_path}')
@@ -345,7 +342,7 @@ commandline_arguments_options = "--listen --enable-insecure-extension-access --t
 commandline_arguments_widget = widgets.Text(description='Arguments:', value=commandline_arguments_options, style=style, layout=layout)
 
 additional_widget_list = [additional_header, latest_changes_widget, HR, controlnet_widget, controlnet_Num_widget, commit_hash_widget, optional_huggingface_token_widget, ngrok_widget, HR, commandline_arguments_widget]
-if free_plan:
+if free_plan and env == "Google Colab":
     additional_widget_list.remove(ngrok_widget)
 display(widgets.VBox(additional_widget_list).add_class("container"))
 

files_cells/python/ru/auto-cleaner_ru.py

@@ -16,11 +16,8 @@ from IPython.display import display, HTML
 
 
 #  ================= DETECT ENV =================
-def check_colab_subscription():
-    return (os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES') / (1024. ** 3) <= 20)
-free_plan = check_colab_subscription()
-
 def detect_environment():
+    free_plan = (os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES') / (1024. ** 3) <= 20)
     environments = {
         'COLAB_GPU': ('Google Colab', "/root" if free_plan else "/content"),
         'KAGGLE_URL_BASE': ('Kaggle', "/kaggle/working/content"),
@@ -29,9 +26,9 @@ def detect_environment():
 
     for env_var, (environment, path) in environments.items():
         if env_var in os.environ:
-            return environment, path
+            return environment, path, free_plan
 
-env, root_path = detect_environment()
+env, root_path, free_plan = detect_environment()
 webui_path = f"{root_path}/sdw"
 #  ----------------------------------------------
 

files_cells/python/ru/downloading_ru.py

@@ -14,11 +14,8 @@ from IPython.display import clear_output
 
 
 #  ================= DETECT ENV =================
-def check_colab_subscription():
-    return (os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES') / (1024. ** 3) <= 20)
-free_plan = check_colab_subscription()
-
 def detect_environment():
+    free_plan = (os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES') / (1024. ** 3) <= 20)
     environments = {
         'COLAB_GPU': ('Google Colab', "/root" if free_plan else "/content"),
         'KAGGLE_URL_BASE': ('Kaggle', "/kaggle/working/content"),
@@ -27,9 +24,9 @@ def detect_environment():
 
     for env_var, (environment, path) in environments.items():
         if env_var in os.environ:
-            return environment, path
+            return environment, path, free_plan
 
-env, root_path = detect_environment()
+env, root_path, free_plan = detect_environment()
 webui_path = f"{root_path}/sdw"
 #  ----------------------------------------------
 
@@ -54,6 +51,7 @@ if not os.path.exists(flag_file):
 
     print("Установка библиотек, это займет какое-то время...", end='')
     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}')
@@ -314,16 +312,17 @@ controlnet_list = {
 }
 
 extension_repo = []
-prefixes = [
-    "model:",
-    "vae:",
-    "lora:",
-    "embeddings:",
-    "extensions:",
-    "control:"
-]
+prefixes = {
+    # It's complicated, but supplementing has become easier
+    "model": [models_dir, "Model_url"],
+    "vae": [vaes_dir, "Vae_url"],
+    "lora": [loras_dir, "LoRA_url"],
+    "embeddings": [embeddings_dir, "Embedding_url"],
+    "extensions": [extensions_dir, "Extensions_url"],
+    "control": [control_dir, "ControlNet_url"]
+}
 
-get_ipython().system('mkdir -p {models_dir} {vaes_dir} {embeddings_dir} {loras_dir} {control_dir}')
+get_ipython().system('mkdir -p {models_dir} {vaes_dir} {loras_dir} {embeddings_dir} {extensions_dir} {control_dir}')
 
 url = ""
 ControlNet_url = ""
@@ -339,9 +338,7 @@ def handle_manual(url):
     if file_name:
         url = re.sub(r'\[.*?\]', '', url)
 
-    dir_mapping = {"model": models_dir, "vae": vaes_dir, "lora": loras_dir, "embeddings": embeddings_dir, "extensions": None, "control": control_dir}
-
-    for prefix, dir in dir_mapping.items():
+    for prefix, (dir, _) in prefixes.items():
         if original_url.startswith(f"{prefix}:"):
             if prefix != "extensions":
                 manual_download(url, dir, file_name=file_name)
@@ -364,7 +361,10 @@ def manual_download(url, dst_dir, file_name):
         if 'folders' in url:
             get_ipython().system('gdown --folder "{url}" -O {dst_dir} --fuzzy -c')
         else:
-            get_ipython().system('gdown "{url}" -O {dst_dir} --fuzzy -c')
+            if file_name:
+               get_ipython().system('gdown "{url}" -O {dst_dir}/{file_name} --fuzzy -c')
+            else:
+               get_ipython().system('gdown "{url}" -O {dst_dir} --fuzzy -c')
     # -- Huggin Face --
     elif 'huggingface' in url:
         if '/blob/' in url:
@@ -389,7 +389,6 @@ def download(url):
         link_or_path = link_or_path.strip()
         if not link_or_path:
             continue
-
         if any(link_or_path.startswith(prefix.lower()) for prefix in prefixes):
             handle_manual(link_or_path)
             continue
@@ -430,20 +429,9 @@ submodels += add_submodels(controlnet, "" if controlnet == "ALL" else controlnet
 for submodel in submodels:
     if not Inpainting_Model and "inpainting" in submodel['name']:
         continue
-
     url += f"{submodel['url']} {submodel['dst_dir']} {submodel['name']}, "
 
 def process_file_download(file_url):
-    global Model_url, Vae_url, LoRA_url, Embedding_url, Extensions_url, ControlNet_url
-    urls_dict = {
-        'model': 'Model_url',
-        'vae': 'Vae_url',
-        'embed': 'Embedding_url',
-        'lora': 'LoRA_url',
-        'extension': 'Extensions_url',
-        'control': 'ControlNet_url'
-    }
-
     if file_url.startswith("http"):
         if "blob" in file_url:
             file_url = file_url.replace("blob", "raw")
@@ -456,12 +444,13 @@ def process_file_download(file_url):
     current_tag = None
     for line in lines:
         if line.strip().startswith('#'):
-            current_tag = next((tag for tag in urls_dict if tag in line.lower()), None)
-        elif current_tag and line.strip():
-            urls = [url.strip() for url in line.split()]
-            for url in urls:
-                if url.startswith("http"):
-                    globals()[urls_dict[current_tag]] += ", " + url
+            if any(tag in line.lower() for tag in prefixes):
+                current_tag = next((tag for tag in prefixes if tag in line.lower()))
+
+        urls = [url.strip() for url in line.split()]
+        for url in urls:
+            if url.startswith("http"):
+                globals()[prefixes[current_tag][1]] += ", " + url
 
 # fix all possible errors/options and function call
 if custom_file_urls:
@@ -476,11 +465,11 @@ if custom_file_urls:
     except FileNotFoundError:
         pass
 
-urls = [Model_url, Vae_url, LoRA_url, Embedding_url, Extensions_url, ControlNet_url]
-
+# url prefixing
+urls = [globals()[urls[1]] for urls in prefixes.values()]
 for i, prefix in enumerate(prefixes):
     if urls[i]:
-        prefixed_urls = [f"{prefix}{u}" for u in urls[i].replace(',', '').split()]
+        prefixed_urls = [f"{prefix}:{url}" for url in urls[i].replace(',', '').split()]
         if prefixed_urls:
             url += ", ".join(prefixed_urls) + ", "
 

files_cells/python/ru/launch_ru.py

@@ -9,11 +9,8 @@ from datetime import timedelta
 
 
 #  ================= DETECT ENV =================
-def check_colab_subscription():
-    return (os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES') / (1024. ** 3) <= 20)
-free_plan = check_colab_subscription()
-
 def detect_environment():
+    free_plan = (os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES') / (1024. ** 3) <= 20)
     environments = {
         'COLAB_GPU': ('Google Colab', "/root" if free_plan else "/content"),
         'KAGGLE_URL_BASE': ('Kaggle', "/kaggle/working/content"),
@@ -22,9 +19,9 @@ def detect_environment():
 
     for env_var, (environment, path) in environments.items():
         if env_var in os.environ:
-            return environment, path
+            return environment, path, free_plan
 
-env, root_path = detect_environment()
+env, root_path, free_plan = detect_environment()
 webui_path = f"{root_path}/sdw"
 #  ----------------------------------------------
 

files_cells/python/ru/widgets_ru.py

@@ -8,11 +8,8 @@ from IPython.display import display, HTML, Javascript, clear_output
 
 
 #  ================= DETECT ENV =================
-def check_colab_subscription():
-    return (os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES') / (1024. ** 3) <= 20)
-free_plan = check_colab_subscription()
-
 def detect_environment():
+    free_plan = (os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES') / (1024. ** 3) <= 20)
     environments = {
         'COLAB_GPU': ('Google Colab', "/root" if free_plan else "/content"),
         'KAGGLE_URL_BASE': ('Kaggle', "/kaggle/working/content"),
@@ -21,9 +18,9 @@ def detect_environment():
 
     for env_var, (environment, path) in environments.items():
         if env_var in os.environ:
-            return environment, path
+            return environment, path, free_plan
 
-env, root_path = detect_environment()
+env, root_path, free_plan = detect_environment()
 webui_path = f"{root_path}/sdw"
 
 get_ipython().system('mkdir -p {root_path}')
@@ -345,7 +342,7 @@ commandline_arguments_options = "--listen --enable-insecure-extension-access --t
 commandline_arguments_widget = widgets.Text(description='Аргументы:', value=commandline_arguments_options, style=style, layout=layout)
 
 additional_widget_list = [additional_header, latest_changes_widget, HR, controlnet_widget, controlnet_Num_widget, commit_hash_widget, optional_huggingface_token_widget, ngrok_widget, HR, commandline_arguments_widget]
-if free_plan:
+if free_plan and env == "Google Colab":
     additional_widget_list.remove(ngrok_widget)
 display(widgets.VBox(additional_widget_list).add_class("container"))