test1: saving files to subdirectories

files_cells/notebooks/en/downloading_en.ipynb

@@ -67,11 +67,11 @@
         "    # Dictionary of additional libraries specific to certain environments\n",
         "    additional_libs = {\n",
         "        \"Google Colab\": {\n",
-        "            \"xformers\": \"pip install xformers==0.0.25 --no-deps\"\n",
+        "            \"xformers\": \"pip install xformers==0.0.26.post1 --no-deps\"\n",
         "        },\n",
         "        \"Kaggle\": {\n",
-        "            \"xformers\": \"pip install -q xformers==0.0.23.post1 triton==2.1.0\",\n",
-        "            \"torch\": \"pip install -q torch==2.1.2+cu121 torchvision==0.16.2+cu121 torchaudio==2.1.2 --extra-index-url https://download.pytorch.org/whl/cu121\"\n",
+        "            \"xformers\": \"pip install -q xformers==0.0.26.post1\",\n",
+        "            # \"torch\": \"pip install -q torch==2.1.2+cu121 torchvision==0.16.2+cu121 torchaudio==2.1.2 --extra-index-url https://download.pytorch.org/whl/cu121\"\n",
         "        }\n",
         "    }\n",
         "\n",
@@ -104,7 +104,7 @@
         "## dl special files\n",
         "with capture.capture_output() as cap:\n",
         "    !mkdir -p {root_path}/file_cell/special\n",
-        "    !wget https://huggingface.co/NagisaNao/test/resolve/main/files_cells/special/python/dl_display_results.py -O {root_path}/file_cell/special/dl_display_results.py\n",
+        "    !wget https://huggingface.co/NagisaNao/fast_repo/resolve/main/special/dl_display_results.py -O {root_path}/file_cell/special/dl_display_results.py\n",
         "del cap\n",
         "\n",
         "\n",
@@ -344,7 +344,8 @@
         "    \"adetailer\": adetailer_dir\n",
         "}\n",
         "\n",
-        "!mkdir -p {models_dir} {vaes_dir} {loras_dir} {embeddings_dir} {extensions_dir} {control_dir} {adetailer_dir}\n",
+        "directories = [value for key, value in prefixes.items()] # for unpucking zip files\n",
+        "!mkdir -p {\" \".join(directories)}\n",
         "\n",
         "url = \"\"\n",
         "hf_token = optional_huggingface_token if optional_huggingface_token else \"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\"\n",
@@ -355,22 +356,33 @@
         "def handle_manual(url):\n",
         "    original_url = url\n",
         "    url = url.split(':', 1)[1]\n",
+        "\n",
         "    file_name = re.search(r'\\[(.*?)\\]', url)\n",
-        "    file_name = file_name.group(1) if file_name else None\n",
+        "    file_name = file_name.group(1) if file_name else None # for [] in url - change file name\n",
+        "    dir_path = re.search(r'\\((.*?)\\)', url)\n",
+        "    dir_path = dir_path.group(1) if dir_path else None    # for () in url - create subdir\n",
+        "\n",
         "    if file_name:\n",
         "        url = re.sub(r'\\[.*?\\]', '', url)\n",
+        "    if dir_path:\n",
+        "        url = re.sub(r'\\(.*?\\)', '', url)\n",
         "\n",
         "    for prefix, dir in prefixes.items():\n",
         "        if original_url.startswith(f\"{prefix}:\"):\n",
         "            if prefix != \"extension\":\n",
-        "                manual_download(url, dir, file_name=file_name)\n",
+        "                manual_download(url, dir, file_name, dir_path)\n",
         "            else:\n",
         "                extension_repo.append((url, file_name))\n",
         "\n",
-        "def manual_download(url, dst_dir, file_name):\n",
+        "\n",
+        "def manual_download(url, dst_dir, file_name, dir_path=None):\n",
         "    basename = url.split(\"/\")[-1] if file_name is None else file_name\n",
         "    header_option = f\"--header={user_header}\"\n",
         "\n",
+        "    if dir_path:\n",
+        "        dst_dir = f\"{dst_dir}/{dir_path}\"\n",
+        "        !mkdir -p {dst_dir}\n",
+        "\n",
         "    print(\"\\033[32m---\"*45 + f\"\\n\\033[33mURL: \\033[34m{url}\\n\\033[33mSAVE DIR: \\033[34m{dst_dir}\\n\\033[33mFILE NAME: \\033[34m{file_name}\\033[32m\\n~~~\\033[0m\")\n",
         "    # print(url, dst_dir, file_name)\n",
         "\n",
@@ -388,7 +400,7 @@
         "               !gdown \"{url}\" -O {dst_dir}/{file_name} --fuzzy -c\n",
         "            else:\n",
         "               !gdown \"{url}\" -O {dst_dir} --fuzzy -c\n",
-        "    # -- Huggin Face --\n",
+        "    # -- Hugging Face --\n",
         "    elif 'huggingface' in url:\n",
         "        if '/blob/' in url:\n",
         "            url = url.replace('/blob/', '/resolve/')\n",
@@ -423,8 +435,7 @@
         "\n",
         "## unpucking zip files\n",
         "def unpucking_zip_files():\n",
-        "    directories = [models_dir, vaes_dir, embeddings_dir, loras_dir , extensions_dir, control_dir , adetailer_dir]\n",
-        "\n",
+        "    # directories = [models_dir, vaes_dir, embeddings_dir, loras_dir , extensions_dir, control_dir , adetailer_dir]\n",
         "    for directory in directories:\n",
         "        for root, dirs, files in os.walk(directory):\n",
         "            for file in files:\n",
@@ -439,33 +450,40 @@
         "\n",
         "submodels = []\n",
         "\n",
+        "def get_all_models(model_dict):\n",
+        "    all_models = []\n",
+        "    for models in model_dict.values():\n",
+        "        all_models.extend(models)\n",
+        "    return all_models\n",
+        "\n",
+        "def get_selected_models(model_dict, num_selection):\n",
+        "    selected_models = []\n",
+        "    selected_nums = map(int, num_selection.replace(',', '').split())\n",
+        "    for num in selected_nums:\n",
+        "        if 1 <= num <= len(model_dict):\n",
+        "            name = list(model_dict)[num - 1]\n",
+        "            selected_models.extend(model_dict[name])\n",
+        "    return selected_models\n",
+        "\n",
         "def add_submodels(selection, num_selection, model_dict, dst_dir):\n",
         "    if selection == \"none\":\n",
         "        return []\n",
-        "    if selection == \"ALL\":\n",
-        "        all_models = []\n",
-        "        for models in model_dict.values():\n",
-        "            all_models.extend(models)\n",
-        "        selected_models = all_models\n",
+        "    elif selection == \"ALL\":\n",
+        "        selected_models = get_all_models(model_dict)\n",
         "    else:\n",
-        "        selected_models = model_dict[selection]\n",
-        "        selected_nums = map(int, num_selection.replace(',', '').split())\n",
-        "\n",
-        "        for num in selected_nums:\n",
-        "            if 1 <= num <= len(model_dict):\n",
-        "                name = list(model_dict)[num - 1]\n",
-        "                selected_models.extend(model_dict[name])\n",
+        "        selected_models = model_dict.get(selection, [])\n",
+        "        if num_selection:\n",
+        "            selected_models.extend(get_selected_models(model_dict, num_selection))\n",
         "\n",
         "    unique_models = list({model['name']: model for model in selected_models}.values())\n",
-        "\n",
         "    for model in unique_models:\n",
         "        model['dst_dir'] = dst_dir\n",
         "\n",
         "    return unique_models\n",
         "\n",
-        "submodels += add_submodels(Model, Model_Num, model_list, models_dir)                                                   # model\n",
-        "submodels += add_submodels(Vae, Vae_Num, vae_list, vaes_dir)                                                           # vae\n",
-        "submodels += add_submodels(controlnet, \"\" if controlnet == \"ALL\" else controlnet_Num, controlnet_list, control_dir)    # controlnet\n",
+        "submodels += add_submodels(Model, Model_Num, model_list, models_dir)\n",
+        "submodels += add_submodels(Vae, Vae_Num, vae_list, vaes_dir)\n",
+        "submodels += add_submodels(controlnet, \"\" if controlnet == \"ALL\" else controlnet_Num, controlnet_list, control_dir)\n",
         "\n",
         "for submodel in submodels:\n",
         "    if not Inpainting_Model and \"inpainting\" in submodel['name']:\n",
@@ -491,12 +509,11 @@
         "    current_tag = None\n",
         "    for line in lines:\n",
         "        if any(f'# {tag}' in line.lower() for tag in prefixes):\n",
-        "            current_tag = next((tag for tag in prefixes if tag in line.lower()))\n",
+        "            current_tag = next((tag for tag in prefixes if tag in line.lower()), None)\n",
         "\n",
-        "        urls = [url.split('#')[0].strip() for url in line.split(',')]  # filter urls\n",
+        "        urls = [url.split('#')[0].strip() for url in line.split(',')] # filter urls\n",
         "        for url in urls:\n",
         "            if url.startswith(\"http\") and url not in unique_urls:\n",
-        "                # handle_manual(f\"{current_tag}:{url}\")\n",
         "                files_urls += f\"{current_tag}:{url}, \"\n",
         "                unique_urls.append(url)\n",
         "\n",
@@ -518,7 +535,7 @@
         "            pass\n",
         "\n",
         "# url prefixing\n",
-        "urls = [Model_url, Vae_url, LoRA_url, Embedding_url, Extensions_url]\n",
+        "urls = [Model_url, Vae_url, LoRA_url, Embedding_url, Extensions_url] # base url\n",
         "prefixed_urls = [f\"{prefix}:{url}\" for prefix, url in zip(prefixes.keys(), urls) if url for url in url.replace(',', '').split()]\n",
         "url += \", \".join(prefixed_urls) + \", \" + file_urls\n",
         "\n",
@@ -555,7 +572,7 @@
         "\n",
         "## List Models and stuff V2\n",
         "if detailed_download == \"off\":\n",
-        "    print(\"\\n\\n\\033[33mЕсли вы не видете каких-то скаченных файлов, включите в виджетах функцию 'Подробная Загрузка'.\")\n",
+        "    print(\"\\n\\n\\033[33mIf you don't see any downloaded files, enable the 'Detailed Downloads' feature in the widget.\")\n",
         "    get_ipython().run_line_magic('run', '{root_path}/file_cell/special/dl_display_results.py') # display widgets result\n",
         "\n",
         "else:\n",

files_cells/notebooks/ru/downloading_ru.ipynb

@@ -67,11 +67,11 @@
         "    # Dictionary of additional libraries specific to certain environments\n",
         "    additional_libs = {\n",
         "        \"Google Colab\": {\n",
-        "            \"xformers\": \"pip install xformers==0.0.25 --no-deps\"\n",
+        "            \"xformers\": \"pip install xformers==0.0.26.post1 --no-deps\"\n",
         "        },\n",
         "        \"Kaggle\": {\n",
-        "            \"xformers\": \"pip install -q xformers==0.0.23.post1 triton==2.1.0\",\n",
-        "            \"torch\": \"pip install -q torch==2.1.2+cu121 torchvision==0.16.2+cu121 torchaudio==2.1.2 --extra-index-url https://download.pytorch.org/whl/cu121\"\n",
+        "            \"xformers\": \"pip install -q xformers==0.0.26.post1\",\n",
+        "            # \"torch\": \"pip install -q torch==2.1.2+cu121 torchvision==0.16.2+cu121 torchaudio==2.1.2 --extra-index-url https://download.pytorch.org/whl/cu121\"\n",
         "        }\n",
         "    }\n",
         "\n",
@@ -104,7 +104,7 @@
         "## dl special files\n",
         "with capture.capture_output() as cap:\n",
         "    !mkdir -p {root_path}/file_cell/special\n",
-        "    !wget https://huggingface.co/NagisaNao/test/resolve/main/files_cells/special/python/dl_display_results.py -O {root_path}/file_cell/special/dl_display_results.py\n",
+        "    !wget https://huggingface.co/NagisaNao/fast_repo/resolve/main/special/dl_display_results.py -O {root_path}/file_cell/special/dl_display_results.py\n",
         "del cap\n",
         "\n",
         "\n",
@@ -344,7 +344,8 @@
         "    \"adetailer\": adetailer_dir\n",
         "}\n",
         "\n",
-        "!mkdir -p {models_dir} {vaes_dir} {loras_dir} {embeddings_dir} {extensions_dir} {control_dir} {adetailer_dir}\n",
+        "directories = [value for key, value in prefixes.items()] # for unpucking zip files\n",
+        "!mkdir -p {\" \".join(directories)}\n",
         "\n",
         "url = \"\"\n",
         "hf_token = optional_huggingface_token if optional_huggingface_token else \"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\"\n",
@@ -355,22 +356,33 @@
         "def handle_manual(url):\n",
         "    original_url = url\n",
         "    url = url.split(':', 1)[1]\n",
+        "\n",
         "    file_name = re.search(r'\\[(.*?)\\]', url)\n",
-        "    file_name = file_name.group(1) if file_name else None\n",
+        "    file_name = file_name.group(1) if file_name else None # for [] in url - change file name\n",
+        "    dir_path = re.search(r'\\((.*?)\\)', url)\n",
+        "    dir_path = dir_path.group(1) if dir_path else None    # for () in url - create subdir\n",
+        "\n",
         "    if file_name:\n",
         "        url = re.sub(r'\\[.*?\\]', '', url)\n",
+        "    if dir_path:\n",
+        "        url = re.sub(r'\\(.*?\\)', '', url)\n",
         "\n",
         "    for prefix, dir in prefixes.items():\n",
         "        if original_url.startswith(f\"{prefix}:\"):\n",
         "            if prefix != \"extension\":\n",
-        "                manual_download(url, dir, file_name=file_name)\n",
+        "                manual_download(url, dir, file_name, dir_path)\n",
         "            else:\n",
         "                extension_repo.append((url, file_name))\n",
         "\n",
-        "def manual_download(url, dst_dir, file_name):\n",
+        "\n",
+        "def manual_download(url, dst_dir, file_name, dir_path=None):\n",
         "    basename = url.split(\"/\")[-1] if file_name is None else file_name\n",
         "    header_option = f\"--header={user_header}\"\n",
         "\n",
+        "    if dir_path:\n",
+        "        dst_dir = f\"{dst_dir}/{dir_path}\"\n",
+        "        !mkdir -p {dst_dir}\n",
+        "\n",
         "    print(\"\\033[32m---\"*45 + f\"\\n\\033[33mURL: \\033[34m{url}\\n\\033[33mSAVE DIR: \\033[34m{dst_dir}\\n\\033[33mFILE NAME: \\033[34m{file_name}\\033[32m\\n~~~\\033[0m\")\n",
         "    # print(url, dst_dir, file_name)\n",
         "\n",
@@ -388,7 +400,7 @@
         "               !gdown \"{url}\" -O {dst_dir}/{file_name} --fuzzy -c\n",
         "            else:\n",
         "               !gdown \"{url}\" -O {dst_dir} --fuzzy -c\n",
-        "    # -- Huggin Face --\n",
+        "    # -- Hugging Face --\n",
         "    elif 'huggingface' in url:\n",
         "        if '/blob/' in url:\n",
         "            url = url.replace('/blob/', '/resolve/')\n",
@@ -423,8 +435,7 @@
         "\n",
         "## unpucking zip files\n",
         "def unpucking_zip_files():\n",
-        "    directories = [models_dir, vaes_dir, embeddings_dir, loras_dir , extensions_dir, control_dir , adetailer_dir]\n",
-        "\n",
+        "    # directories = [models_dir, vaes_dir, embeddings_dir, loras_dir , extensions_dir, control_dir , adetailer_dir]\n",
         "    for directory in directories:\n",
         "        for root, dirs, files in os.walk(directory):\n",
         "            for file in files:\n",
@@ -439,33 +450,40 @@
         "\n",
         "submodels = []\n",
         "\n",
+        "def get_all_models(model_dict):\n",
+        "    all_models = []\n",
+        "    for models in model_dict.values():\n",
+        "        all_models.extend(models)\n",
+        "    return all_models\n",
+        "\n",
+        "def get_selected_models(model_dict, num_selection):\n",
+        "    selected_models = []\n",
+        "    selected_nums = map(int, num_selection.replace(',', '').split())\n",
+        "    for num in selected_nums:\n",
+        "        if 1 <= num <= len(model_dict):\n",
+        "            name = list(model_dict)[num - 1]\n",
+        "            selected_models.extend(model_dict[name])\n",
+        "    return selected_models\n",
+        "\n",
         "def add_submodels(selection, num_selection, model_dict, dst_dir):\n",
         "    if selection == \"none\":\n",
         "        return []\n",
-        "    if selection == \"ALL\":\n",
-        "        all_models = []\n",
-        "        for models in model_dict.values():\n",
-        "            all_models.extend(models)\n",
-        "        selected_models = all_models\n",
+        "    elif selection == \"ALL\":\n",
+        "        selected_models = get_all_models(model_dict)\n",
         "    else:\n",
-        "        selected_models = model_dict[selection]\n",
-        "        selected_nums = map(int, num_selection.replace(',', '').split())\n",
-        "\n",
-        "        for num in selected_nums:\n",
-        "            if 1 <= num <= len(model_dict):\n",
-        "                name = list(model_dict)[num - 1]\n",
-        "                selected_models.extend(model_dict[name])\n",
+        "        selected_models = model_dict.get(selection, [])\n",
+        "        if num_selection:\n",
+        "            selected_models.extend(get_selected_models(model_dict, num_selection))\n",
         "\n",
         "    unique_models = list({model['name']: model for model in selected_models}.values())\n",
-        "\n",
         "    for model in unique_models:\n",
         "        model['dst_dir'] = dst_dir\n",
         "\n",
         "    return unique_models\n",
         "\n",
-        "submodels += add_submodels(Model, Model_Num, model_list, models_dir)                                                   # model\n",
-        "submodels += add_submodels(Vae, Vae_Num, vae_list, vaes_dir)                                                           # vae\n",
-        "submodels += add_submodels(controlnet, \"\" if controlnet == \"ALL\" else controlnet_Num, controlnet_list, control_dir)    # controlnet\n",
+        "submodels += add_submodels(Model, Model_Num, model_list, models_dir)\n",
+        "submodels += add_submodels(Vae, Vae_Num, vae_list, vaes_dir)\n",
+        "submodels += add_submodels(controlnet, \"\" if controlnet == \"ALL\" else controlnet_Num, controlnet_list, control_dir)\n",
         "\n",
         "for submodel in submodels:\n",
         "    if not Inpainting_Model and \"inpainting\" in submodel['name']:\n",
@@ -491,12 +509,11 @@
         "    current_tag = None\n",
         "    for line in lines:\n",
         "        if any(f'# {tag}' in line.lower() for tag in prefixes):\n",
-        "            current_tag = next((tag for tag in prefixes if tag in line.lower()))\n",
+        "            current_tag = next((tag for tag in prefixes if tag in line.lower()), None)\n",
         "\n",
-        "        urls = [url.split('#')[0].strip() for url in line.split(',')]  # filter urls\n",
+        "        urls = [url.split('#')[0].strip() for url in line.split(',')] # filter urls\n",
         "        for url in urls:\n",
         "            if url.startswith(\"http\") and url not in unique_urls:\n",
-        "                # handle_manual(f\"{current_tag}:{url}\")\n",
         "                files_urls += f\"{current_tag}:{url}, \"\n",
         "                unique_urls.append(url)\n",
         "\n",
@@ -518,7 +535,7 @@
         "            pass\n",
         "\n",
         "# url prefixing\n",
-        "urls = [Model_url, Vae_url, LoRA_url, Embedding_url, Extensions_url]\n",
+        "urls = [Model_url, Vae_url, LoRA_url, Embedding_url, Extensions_url] # base url\n",
         "prefixed_urls = [f\"{prefix}:{url}\" for prefix, url in zip(prefixes.keys(), urls) if url for url in url.replace(',', '').split()]\n",
         "url += \", \".join(prefixed_urls) + \", \" + file_urls\n",
         "\n",

files_cells/python/en/downloading_en.py

@@ -48,11 +48,11 @@ if not os.path.exists(flag_file):
     # Dictionary of additional libraries specific to certain environments
     additional_libs = {
         "Google Colab": {
-            "xformers": "pip install xformers==0.0.25 --no-deps"
+            "xformers": "pip install xformers==0.0.26.post1 --no-deps"
         },
         "Kaggle": {
-            "xformers": "pip install -q xformers==0.0.23.post1 triton==2.1.0",
-            "torch": "pip install -q torch==2.1.2+cu121 torchvision==0.16.2+cu121 torchaudio==2.1.2 --extra-index-url https://download.pytorch.org/whl/cu121"
+            "xformers": "pip install -q xformers==0.0.26.post1",
+            # "torch": "pip install -q torch==2.1.2+cu121 torchvision==0.16.2+cu121 torchaudio==2.1.2 --extra-index-url https://download.pytorch.org/whl/cu121"
         }
     }
 
@@ -85,7 +85,7 @@ if not os.path.exists(flag_file):
 ## dl special files
 with capture.capture_output() as cap:
     get_ipython().system('mkdir -p {root_path}/file_cell/special')
-    get_ipython().system('wget https://huggingface.co/NagisaNao/test/resolve/main/files_cells/special/python/dl_display_results.py -O {root_path}/file_cell/special/dl_display_results.py')
+    get_ipython().system('wget https://huggingface.co/NagisaNao/fast_repo/resolve/main/special/dl_display_results.py -O {root_path}/file_cell/special/dl_display_results.py')
 del cap
 
 
@@ -325,7 +325,8 @@ prefixes = {
     "adetailer": adetailer_dir
 }
 
-get_ipython().system('mkdir -p {models_dir} {vaes_dir} {loras_dir} {embeddings_dir} {extensions_dir} {control_dir} {adetailer_dir}')
+directories = [value for key, value in prefixes.items()] # for unpucking zip files
+get_ipython().system('mkdir -p {" ".join(directories)}')
 
 url = ""
 hf_token = optional_huggingface_token if optional_huggingface_token else "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"
@@ -336,22 +337,33 @@ user_header = f"\"Authorization: Bearer {hf_token}\""
 def handle_manual(url):
     original_url = url
     url = url.split(':', 1)[1]
+
     file_name = re.search(r'\[(.*?)\]', url)
-    file_name = file_name.group(1) if file_name else None
+    file_name = file_name.group(1) if file_name else None # for [] in url - change file name
+    dir_path = re.search(r'\((.*?)\)', url)
+    dir_path = dir_path.group(1) if dir_path else None    # for () in url - create subdir
+
     if file_name:
         url = re.sub(r'\[.*?\]', '', url)
+    if dir_path:
+        url = re.sub(r'\(.*?\)', '', url)
 
     for prefix, dir in prefixes.items():
         if original_url.startswith(f"{prefix}:"):
             if prefix != "extension":
-                manual_download(url, dir, file_name=file_name)
+                manual_download(url, dir, file_name, dir_path)
             else:
                 extension_repo.append((url, file_name))
 
-def manual_download(url, dst_dir, file_name):
+
+def manual_download(url, dst_dir, file_name, dir_path=None):
     basename = url.split("/")[-1] if file_name is None else file_name
     header_option = f"--header={user_header}"
 
+    if dir_path:
+        dst_dir = f"{dst_dir}/{dir_path}"
+        get_ipython().system('mkdir -p {dst_dir}')
+
     print("\033[32m---"*45 + f"\n\033[33mURL: \033[34m{url}\n\033[33mSAVE DIR: \033[34m{dst_dir}\n\033[33mFILE NAME: \033[34m{file_name}\033[32m\n~~~\033[0m")
     # print(url, dst_dir, file_name)
 
@@ -369,7 +381,7 @@ def manual_download(url, dst_dir, 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 --
+    # -- Hugging Face --
     elif 'huggingface' in url:
         if '/blob/' in url:
             url = url.replace('/blob/', '/resolve/')
@@ -404,8 +416,7 @@ def download(url):
 
 ## unpucking zip files
 def unpucking_zip_files():
-    directories = [models_dir, vaes_dir, embeddings_dir, loras_dir , extensions_dir, control_dir , adetailer_dir]
-
+    # directories = [models_dir, vaes_dir, embeddings_dir, loras_dir , extensions_dir, control_dir , adetailer_dir]
     for directory in directories:
         for root, dirs, files in os.walk(directory):
             for file in files:
@@ -420,33 +431,40 @@ def unpucking_zip_files():
 
 submodels = []
 
+def get_all_models(model_dict):
+    all_models = []
+    for models in model_dict.values():
+        all_models.extend(models)
+    return all_models
+
+def get_selected_models(model_dict, num_selection):
+    selected_models = []
+    selected_nums = map(int, num_selection.replace(',', '').split())
+    for num in selected_nums:
+        if 1 <= num <= len(model_dict):
+            name = list(model_dict)[num - 1]
+            selected_models.extend(model_dict[name])
+    return selected_models
+
 def add_submodels(selection, num_selection, model_dict, dst_dir):
     if selection == "none":
         return []
-    if selection == "ALL":
-        all_models = []
-        for models in model_dict.values():
-            all_models.extend(models)
-        selected_models = all_models
+    elif selection == "ALL":
+        selected_models = get_all_models(model_dict)
     else:
-        selected_models = model_dict[selection]
-        selected_nums = map(int, num_selection.replace(',', '').split())
-
-        for num in selected_nums:
-            if 1 <= num <= len(model_dict):
-                name = list(model_dict)[num - 1]
-                selected_models.extend(model_dict[name])
+        selected_models = model_dict.get(selection, [])
+        if num_selection:
+            selected_models.extend(get_selected_models(model_dict, num_selection))
 
     unique_models = list({model['name']: model for model in selected_models}.values())
-
     for model in unique_models:
         model['dst_dir'] = dst_dir
 
     return unique_models
 
-submodels += add_submodels(Model, Model_Num, model_list, models_dir)                                                   # model
-submodels += add_submodels(Vae, Vae_Num, vae_list, vaes_dir)                                                           # vae
-submodels += add_submodels(controlnet, "" if controlnet == "ALL" else controlnet_Num, controlnet_list, control_dir)    # controlnet
+submodels += add_submodels(Model, Model_Num, model_list, models_dir)
+submodels += add_submodels(Vae, Vae_Num, vae_list, vaes_dir)
+submodels += add_submodels(controlnet, "" if controlnet == "ALL" else controlnet_Num, controlnet_list, control_dir)
 
 for submodel in submodels:
     if not Inpainting_Model and "inpainting" in submodel['name']:
@@ -472,12 +490,11 @@ def process_file_download(file_url):
     current_tag = None
     for line in lines:
         if any(f'# {tag}' in line.lower() for tag in prefixes):
-            current_tag = next((tag for tag in prefixes if tag in line.lower()))
+            current_tag = next((tag for tag in prefixes if tag in line.lower()), None)
 
-        urls = [url.split('#')[0].strip() for url in line.split(',')]  # filter urls
+        urls = [url.split('#')[0].strip() for url in line.split(',')] # filter urls
         for url in urls:
             if url.startswith("http") and url not in unique_urls:
-                # handle_manual(f"{current_tag}:{url}")
                 files_urls += f"{current_tag}:{url}, "
                 unique_urls.append(url)
 
@@ -499,7 +516,7 @@ if custom_file_urls:
             pass
 
 # url prefixing
-urls = [Model_url, Vae_url, LoRA_url, Embedding_url, Extensions_url]
+urls = [Model_url, Vae_url, LoRA_url, Embedding_url, Extensions_url] # base url
 prefixed_urls = [f"{prefix}:{url}" for prefix, url in zip(prefixes.keys(), urls) if url for url in url.replace(',', '').split()]
 url += ", ".join(prefixed_urls) + ", " + file_urls
 
@@ -533,7 +550,7 @@ if len(extension_repo) > 0:
 
 ## List Models and stuff V2
 if detailed_download == "off":
-    print("\n\n\033[33mЕсли вы не видете каких-то скаченных файлов, включите в виджетах функцию 'Подробная Загрузка'.")
+    print("\n\n\033[33mIf you don't see any downloaded files, enable the 'Detailed Downloads' feature in the widget.")
     get_ipython().run_line_magic('run', '{root_path}/file_cell/special/dl_display_results.py') # display widgets result
 
 else:

files_cells/python/en/widgets_en.py

@@ -477,7 +477,7 @@ Vae_widget = widgets.Dropdown(options=vae_options, value='3.Blessed2.vae', descr
 Vae_Num_widget = widgets.Text(description='Vae Number:', placeholder='Enter the vae numbers to be downloaded using comma/space.', style=style, layout=layout)
 
 ''' Display Vae'''
-all_vae_box= widgets.VBox([vae_header, Vae_widget, Vae_Num_widget]).add_class("container").add_class("image_2")
+all_vae_box = widgets.VBox([vae_header, Vae_widget, Vae_Num_widget]).add_class("container").add_class("image_2")
 display(all_vae_box)
 
 # --- ADDITIONAL ---
@@ -519,26 +519,33 @@ display(all_additional_box)
 # --- CUSTOM DOWNLOAD ---
 custom_download_header_popup = widgets.HTML('''
 <style>
-/* Term Colors */
-.sample_label {color: #dbafff;}
-.braces {color: #ffff00;}
-.extension {color: #eb934b;}
-.file_name {color: #ffffd8;}
+/* Color */
+.sl {color: #DBAFFF;}   /* sample label */
+.br {color: #FFFF00;}   /* braces */
+.br2 {color: #C596F0;}  /* braces2 */
+.fn {color: #FFFFD8;}   /* file name */
+.ex {color: #EB934B;}   /* extension */
+.sd {color: #FF8CD7;}   /* subdirs */
+.wr {color: #FF9999;}   /* warning */
 </style>
 
 <div class="header" style="cursor: pointer;" onclick="toggleContainer()">Custom Download</div>
 <!-- PopUp Window -->
 <div class="info">INFO</div>
 <div class="popup">
-    Separate multiple URLs with a comma/space. For a <span class="file_name">custom name</span> file/extension, specify it with <span class="braces">[]</span>
+    Separate multiple URLs with a comma/space. For a <span class="fn">custom name</span> file/extension, specify it with <span class="br">[]</span>
     after the URL without spaces.
-    <span style="color: #ff9999">For files, be sure to specify</span> - <span class="extension">Filename Extension.</span>
+    <br>
+    <span>You can also specify the <span class="sd">subdirectory</span> to which the file will be saved, specify it with <span class="br2">()</span> after the URL without spaces.</span>\
+    <br>
+    <span class="wr">For files, be sure to specify</span> - <span class="ex">Filename Extension.</span>
+
     <div class="sample">
-        <span class="sample_label">Example for File:</span>
-        https://civitai.com/api/download/models/229782<span class="braces">[</span><span class="file_name">Detailer</span><span class="extension">.safetensors</span><span class="braces">]</span>
+        <span class="sl">Example for File:</span>
+        https://civitai.com/api/download/models/229782<span class="br">[</span><span class="fn">Detailer</span><span class="ex">.safetensors</span><span class="br">]</span><span class="br2">(</span><span class="sd">detailers</span><span class="br2">)</span>
         <br>
-        <span class="sample_label">Example for Extension:</span>
-        https://github.com/hako-mikan/sd-webui-regional-prompter<span class="braces">[</span><span class="file_name">Regional-Prompter</span><span class="braces">]</span>
+        <span class="sl">Example for Extension:</span>
+        https://github.com/hako-mikan/sd-webui-cd-tuner<span class="br">[</span><span class="fn">CD-Tuner</span><span class="br">]</span>
     </div>
 </div>
 ''')

files_cells/python/ru/downloading_ru.py

@@ -48,11 +48,11 @@ if not os.path.exists(flag_file):
     # Dictionary of additional libraries specific to certain environments
     additional_libs = {
         "Google Colab": {
-            "xformers": "pip install xformers==0.0.25 --no-deps"
+            "xformers": "pip install xformers==0.0.26.post1 --no-deps"
         },
         "Kaggle": {
-            "xformers": "pip install -q xformers==0.0.23.post1 triton==2.1.0",
-            "torch": "pip install -q torch==2.1.2+cu121 torchvision==0.16.2+cu121 torchaudio==2.1.2 --extra-index-url https://download.pytorch.org/whl/cu121"
+            "xformers": "pip install -q xformers==0.0.26.post1",
+            # "torch": "pip install -q torch==2.1.2+cu121 torchvision==0.16.2+cu121 torchaudio==2.1.2 --extra-index-url https://download.pytorch.org/whl/cu121"
         }
     }
 
@@ -85,7 +85,7 @@ if not os.path.exists(flag_file):
 ## dl special files
 with capture.capture_output() as cap:
     get_ipython().system('mkdir -p {root_path}/file_cell/special')
-    get_ipython().system('wget https://huggingface.co/NagisaNao/test/resolve/main/files_cells/special/python/dl_display_results.py -O {root_path}/file_cell/special/dl_display_results.py')
+    get_ipython().system('wget https://huggingface.co/NagisaNao/fast_repo/resolve/main/special/dl_display_results.py -O {root_path}/file_cell/special/dl_display_results.py')
 del cap
 
 
@@ -325,7 +325,8 @@ prefixes = {
     "adetailer": adetailer_dir
 }
 
-get_ipython().system('mkdir -p {models_dir} {vaes_dir} {loras_dir} {embeddings_dir} {extensions_dir} {control_dir} {adetailer_dir}')
+directories = [value for key, value in prefixes.items()] # for unpucking zip files
+get_ipython().system('mkdir -p {" ".join(directories)}')
 
 url = ""
 hf_token = optional_huggingface_token if optional_huggingface_token else "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"
@@ -336,22 +337,33 @@ user_header = f"\"Authorization: Bearer {hf_token}\""
 def handle_manual(url):
     original_url = url
     url = url.split(':', 1)[1]
+
     file_name = re.search(r'\[(.*?)\]', url)
-    file_name = file_name.group(1) if file_name else None
+    file_name = file_name.group(1) if file_name else None # for [] in url - change file name
+    dir_path = re.search(r'\((.*?)\)', url)
+    dir_path = dir_path.group(1) if dir_path else None    # for () in url - create subdir
+
     if file_name:
         url = re.sub(r'\[.*?\]', '', url)
+    if dir_path:
+        url = re.sub(r'\(.*?\)', '', url)
 
     for prefix, dir in prefixes.items():
         if original_url.startswith(f"{prefix}:"):
             if prefix != "extension":
-                manual_download(url, dir, file_name=file_name)
+                manual_download(url, dir, file_name, dir_path)
             else:
                 extension_repo.append((url, file_name))
 
-def manual_download(url, dst_dir, file_name):
+
+def manual_download(url, dst_dir, file_name, dir_path=None):
     basename = url.split("/")[-1] if file_name is None else file_name
     header_option = f"--header={user_header}"
 
+    if dir_path:
+        dst_dir = f"{dst_dir}/{dir_path}"
+        get_ipython().system('mkdir -p {dst_dir}')
+
     print("\033[32m---"*45 + f"\n\033[33mURL: \033[34m{url}\n\033[33mSAVE DIR: \033[34m{dst_dir}\n\033[33mFILE NAME: \033[34m{file_name}\033[32m\n~~~\033[0m")
     # print(url, dst_dir, file_name)
 
@@ -369,7 +381,7 @@ def manual_download(url, dst_dir, 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 --
+    # -- Hugging Face --
     elif 'huggingface' in url:
         if '/blob/' in url:
             url = url.replace('/blob/', '/resolve/')
@@ -404,8 +416,7 @@ def download(url):
 
 ## unpucking zip files
 def unpucking_zip_files():
-    directories = [models_dir, vaes_dir, embeddings_dir, loras_dir , extensions_dir, control_dir , adetailer_dir]
-
+    # directories = [models_dir, vaes_dir, embeddings_dir, loras_dir , extensions_dir, control_dir , adetailer_dir]
     for directory in directories:
         for root, dirs, files in os.walk(directory):
             for file in files:
@@ -420,33 +431,40 @@ def unpucking_zip_files():
 
 submodels = []
 
+def get_all_models(model_dict):
+    all_models = []
+    for models in model_dict.values():
+        all_models.extend(models)
+    return all_models
+
+def get_selected_models(model_dict, num_selection):
+    selected_models = []
+    selected_nums = map(int, num_selection.replace(',', '').split())
+    for num in selected_nums:
+        if 1 <= num <= len(model_dict):
+            name = list(model_dict)[num - 1]
+            selected_models.extend(model_dict[name])
+    return selected_models
+
 def add_submodels(selection, num_selection, model_dict, dst_dir):
     if selection == "none":
         return []
-    if selection == "ALL":
-        all_models = []
-        for models in model_dict.values():
-            all_models.extend(models)
-        selected_models = all_models
+    elif selection == "ALL":
+        selected_models = get_all_models(model_dict)
     else:
-        selected_models = model_dict[selection]
-        selected_nums = map(int, num_selection.replace(',', '').split())
-
-        for num in selected_nums:
-            if 1 <= num <= len(model_dict):
-                name = list(model_dict)[num - 1]
-                selected_models.extend(model_dict[name])
+        selected_models = model_dict.get(selection, [])
+        if num_selection:
+            selected_models.extend(get_selected_models(model_dict, num_selection))
 
     unique_models = list({model['name']: model for model in selected_models}.values())
-
     for model in unique_models:
         model['dst_dir'] = dst_dir
 
     return unique_models
 
-submodels += add_submodels(Model, Model_Num, model_list, models_dir)                                                   # model
-submodels += add_submodels(Vae, Vae_Num, vae_list, vaes_dir)                                                           # vae
-submodels += add_submodels(controlnet, "" if controlnet == "ALL" else controlnet_Num, controlnet_list, control_dir)    # controlnet
+submodels += add_submodels(Model, Model_Num, model_list, models_dir)
+submodels += add_submodels(Vae, Vae_Num, vae_list, vaes_dir)
+submodels += add_submodels(controlnet, "" if controlnet == "ALL" else controlnet_Num, controlnet_list, control_dir)
 
 for submodel in submodels:
     if not Inpainting_Model and "inpainting" in submodel['name']:
@@ -472,12 +490,11 @@ def process_file_download(file_url):
     current_tag = None
     for line in lines:
         if any(f'# {tag}' in line.lower() for tag in prefixes):
-            current_tag = next((tag for tag in prefixes if tag in line.lower()))
+            current_tag = next((tag for tag in prefixes if tag in line.lower()), None)
 
-        urls = [url.split('#')[0].strip() for url in line.split(',')]  # filter urls
+        urls = [url.split('#')[0].strip() for url in line.split(',')] # filter urls
         for url in urls:
             if url.startswith("http") and url not in unique_urls:
-                # handle_manual(f"{current_tag}:{url}")
                 files_urls += f"{current_tag}:{url}, "
                 unique_urls.append(url)
 
@@ -499,7 +516,7 @@ if custom_file_urls:
             pass
 
 # url prefixing
-urls = [Model_url, Vae_url, LoRA_url, Embedding_url, Extensions_url]
+urls = [Model_url, Vae_url, LoRA_url, Embedding_url, Extensions_url] # base url
 prefixed_urls = [f"{prefix}:{url}" for prefix, url in zip(prefixes.keys(), urls) if url for url in url.replace(',', '').split()]
 url += ", ".join(prefixed_urls) + ", " + file_urls
 

files_cells/python/ru/widgets_ru.py

@@ -477,7 +477,7 @@ Vae_widget = widgets.Dropdown(options=vae_options, value='3.Blessed2.vae', descr
 Vae_Num_widget = widgets.Text(description='Номер Vae:', placeholder='Введите номера vae для скачивания через запятую/пробел.', style=style, layout=layout)
 
 ''' Display Vae'''
-all_vae_box= widgets.VBox([vae_header, Vae_widget, Vae_Num_widget]).add_class("container").add_class("image_2")
+all_vae_box = widgets.VBox([vae_header, Vae_widget, Vae_Num_widget]).add_class("container").add_class("image_2")
 display(all_vae_box)
 
 # --- ADDITIONAL ---
@@ -501,7 +501,7 @@ optional_huggingface_token_widget = widgets.Text(description='Токен Hugging
 ngrok_token_widget = widgets.Text(description='Токен Ngrok:', style=style, layout=widgets.Layout(width='1047px'))
 ngrock_button = widgets.HTML('<a href="https://dashboard.ngrok.com/get-started/your-authtoken" target="_blank">Получить Ngrok Токен</a>').add_class("button_ngrok")
 ngrok_widget = widgets.HBox([ngrok_token_widget, ngrock_button], style=style, layout=layout)
-zrok_token_widget = widgets.Text(description='Zrok Token:', style=style, layout=widgets.Layout(width='1047px'))
+zrok_token_widget = widgets.Text(description='Токен Zrok:', style=style, layout=widgets.Layout(width='1047px'))
 zrok_button = widgets.HTML('<a href="https://colab.research.google.com/drive/1d2sjWDJi_GYBUavrHSuQyHTDuLy36WpU" target="_blank">Зарегать Zrok Токен</a>').add_class("button_ngrok")
 zrok_widget = widgets.HBox([zrok_token_widget, zrok_button], style=style, layout=layout)
 # ---
@@ -520,25 +520,32 @@ display(all_additional_box)
 custom_download_header_popup = widgets.HTML('''
 <style>
 /* Color */
-.sample_label {color: #dbafff;}
-.braces {color: #ffff00;}
-.extension {color: #eb934b;}
-.file_name {color: #ffffd8;}
+.sl {color: #DBAFFF;}   /* sample label */
+.br {color: #FFFF00;}   /* braces */
+.br2 {color: #C596F0;}  /* braces2 */
+.fn {color: #FFFFD8;}   /* file name */
+.ex {color: #EB934B;}   /* extension */
+.sd {color: #FF8CD7;}   /* subdirs */
+.wr {color: #FF9999;}   /* warning */
 </style>
 
 <div class="header" style="cursor: pointer;" onclick="toggleContainer()">Кастомная Загрузка</div>
 <!-- PopUp window -->
 <div class="info" id="info_dl">INFO</div>
 <div class="popup">
-    Разделите несколько URL-адресов запятой/пробелом. Для <span class="file_name">пользовательского имени</span> файла/расширения укажите его через <span class="braces">[]</span>
+    URLs: разделяются запятой/пробелом. Для <span class="fn">кастомного имени</span> файла/расширения укажите его через <span class="br">[]</span>
     после URL без пробелов.
-    <span style="color: #ff9999">Для файлов обязательно укажите</span> - <span class="extension">Расширение Файла.</span>
-    <div class="sample">
-        <span class="sample_label">Пример для Файла:</span>
-        https://civitai.com/api/download/models/229782<span class="braces">[</span><span class="file_name">Detailer</span><span class="extension">.safetensors</span><span class="braces">]</span>
+    <br>
+    <span>Вы также можете указать <span class="sd">субдиректорию</span>, в которую будет сохранен файл, указав её через <span class="br2">()</span> после URL без пробелов.</span>
+    <br>
+    <span class="wr">Для файла обязательно укажите</span> - <span class="ex">Расширение Файла.</span>
+
+    <div class="sample" >
+        <span class="sl">Пример для Файла:</span>
+        https://civitai.com/api/download/models/229782<span class="br">[</span><span class="fn">Detailer</span><span class="ex">.safetensors</span><span class="br">]</span><span class="br2">(</span><span class="sd">detailers</span><span class="br2">)</span>
         <br>
-        <span class="sample_label">Пример для Расширения:</span>
-        https://github.com/hako-mikan/sd-webui-regional-prompter<span class="braces">[</span><span class="file_name">Regional-Prompter</span><span class="braces">]</span>
+        <span class="sl">Пример для Расширения:</span>
+        https://github.com/hako-mikan/sd-webui-cd-tuner<span class="br">[</span><span class="fn">CD-Tuner</span><span class="br">]</span>
     </div>
 </div>
 ''')