updated download code & added zip support & added adetailer model download support

files_cells/notebooks/en/downloading_en.ipynb

@@ -23,6 +23,8 @@
         "import re\n",
         "import time\n",
         "import json\n",
+        "import shutil\n",
+        "import zipfile\n",
         "import requests\n",
         "import subprocess\n",
         "from datetime import timedelta\n",
@@ -134,6 +136,7 @@
         "loras_dir = f\"{webui_path}/models/Lora\"\n",
         "extensions_dir = f\"{webui_path}/extensions\"\n",
         "control_dir = f\"{webui_path}/models/ControlNet\"\n",
+        "adetailer_dir = f\"{webui_path}/models/adetailer/\"\n",
         "\n",
         "\n",
         "# ================= MAIN CODE =================\n",
@@ -326,19 +329,18 @@
         "\n",
         "extension_repo = []\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",
-        "    \"embed\": [embeddings_dir, \"Embedding_url\"],\n",
-        "    \"extension\": [extensions_dir, \"Extensions_url\"],\n",
-        "    \"control\": [control_dir, \"ControlNet_url\"]\n",
+        "    \"model\": models_dir,\n",
+        "    \"vae\": vaes_dir,\n",
+        "    \"lora\": loras_dir,\n",
+        "    \"embed\": embeddings_dir,\n",
+        "    \"extension\": extensions_dir,\n",
+        "    \"control\": control_dir,\n",
+        "    \"adetailer\": adetailer_dir\n",
         "}\n",
         "\n",
-        "!mkdir -p {models_dir} {vaes_dir} {loras_dir} {embeddings_dir} {extensions_dir} {control_dir}\n",
+        "!mkdir -p {models_dir} {vaes_dir} {loras_dir} {embeddings_dir} {extensions_dir} {control_dir} {adetailer_dir}\n",
         "\n",
         "url = \"\"\n",
-        "ControlNet_url = \"\"\n",
         "hf_token = optional_huggingface_token if optional_huggingface_token else \"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\"\n",
         "user_header = f\"\\\"Authorization: Bearer {hf_token}\\\"\"\n",
         "\n",
@@ -352,7 +354,7 @@
         "    if file_name:\n",
         "        url = re.sub(r'\\[.*?\\]', '', url)\n",
         "\n",
-        "    for prefix, (dir, _) in prefixes.items():\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",
@@ -363,7 +365,8 @@
         "    basename = url.split(\"/\")[-1] if file_name is None else file_name\n",
         "    header_option = f\"--header={user_header}\"\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(\"\\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",
         "    # I do it at my own risk..... Fucking CivitAi >:(\n",
         "    civitai_token = \"62c0c5956b2f9defbd844d754000180b\"\n",
@@ -410,6 +413,22 @@
         "        url, dst_dir, file_name = link_or_path.split()\n",
         "        manual_download(url, dst_dir, file_name)\n",
         "\n",
+        "    unpucking_zip_files()\n",
+        "\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",
+        "    for directory in directories:\n",
+        "        for root, dirs, files in os.walk(directory):\n",
+        "            for file in files:\n",
+        "                if file.endswith(\".zip\"):\n",
+        "                    zip_path = os.path.join(root, file)\n",
+        "                    extract_path = os.path.splitext(zip_path)[0]\n",
+        "                    with zipfile.ZipFile(zip_path, 'r') as zip_ref:\n",
+        "                        zip_ref.extractall(extract_path)\n",
+        "                    os.remove(zip_path)\n",
+        "\n",
         "''' submodels - added urls '''\n",
         "\n",
         "submodels = []\n",
@@ -452,6 +471,8 @@
         "unique_urls = []\n",
         "\n",
         "def process_file_download(file_url):\n",
+        "    files_urls = \"\"\n",
+        "\n",
         "    if file_url.startswith(\"http\"):\n",
         "        if \"blob\" in file_url:\n",
         "            file_url = file_url.replace(\"blob\", \"raw\")\n",
@@ -466,13 +487,17 @@
         "        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",
         "\n",
-        "        urls = [url.strip() for url in line.split(',')]\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",
-        "                globals()[prefixes[current_tag][1]] += \", \" + url\n",
+        "                # handle_manual(f\"{current_tag}:{url}\")\n",
+        "                files_urls += f\"{current_tag}:{url}, \"\n",
         "                unique_urls.append(url)\n",
         "\n",
+        "    return files_urls\n",
+        "\n",
         "# fix all possible errors/options and function call\n",
+        "file_urls = \"\"\n",
         "if custom_file_urls:\n",
         "    for custom_file_url in custom_file_urls.replace(',', '').split():\n",
         "        if not custom_file_url.endswith('.txt'):\n",
@@ -482,17 +507,14 @@
         "                custom_file_url = f'{root_path}/{custom_file_url}'\n",
         "\n",
         "        try:\n",
-        "            process_file_download(custom_file_url)\n",
+        "            file_urls += process_file_download(custom_file_url)\n",
         "        except FileNotFoundError:\n",
         "            pass\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}:{url}\" for url in urls[i].replace(',', '').split()]\n",
-        "        if prefixed_urls:\n",
-        "            url += \", \".join(prefixed_urls) + \", \"\n",
+        "urls = [Model_url, Vae_url, LoRA_url, Embedding_url, Extensions_url]\n",
+        "prefixed_urls = [f\"{prefix}:{url}\" for prefix, url in zip(prefixes.keys(), urls) if url]\n",
+        "url += \", \".join(prefixed_urls) + \", \" + file_urls\n",
         "\n",
         "if detailed_download == \"on\":\n",
         "    print(\"\\n\\n\\033[33m# ====== Detailed Download ====== #\\n\\033[0m\")\n",

files_cells/notebooks/en/launch_en.ipynb

@@ -92,6 +92,7 @@
         "# automatic fixing path V2\n",
         "!sed -i 's#\"tagger_hf_cache_dir\": \".*models/interrogators\"#\"tagger_hf_cache_dir\": \"{root_path}/sdw/models/interrogators\"#' {webui_path}/config.json\n",
         "!sed -i 's#\"additional_networks_extra_lora_path\": \".*models/Lora/\"#\"additional_networks_extra_lora_path\": \"{root_path}/sdw/models/Lora/\"#' {webui_path}/config.json\n",
+        "!sed -i \'s#"ad_extra_models_dir": "*"#"ad_extra_models_dir": "{root_path}/sdw/models/adetailer/"#\' {webui_path}/config.json\n",
         "# ---\n",
         "!sed -i 's/\"sd_checkpoint_hash\": \".*\"/\"sd_checkpoint_hash\": \"\"/g; s/\"sd_model_checkpoint\": \".*\"/\"sd_model_checkpoint\": \"\"/g; s/\"sd_vae\": \".*\"/\"sd_vae\": \"None\"/g' {webui_path}/config.json\n",
         "\n",

files_cells/notebooks/ru/downloading_ru.ipynb

@@ -23,6 +23,8 @@
         "import re\n",
         "import time\n",
         "import json\n",
+        "import shutil\n",
+        "import zipfile\n",
         "import requests\n",
         "import subprocess\n",
         "from datetime import timedelta\n",
@@ -134,6 +136,7 @@
         "loras_dir = f\"{webui_path}/models/Lora\"\n",
         "extensions_dir = f\"{webui_path}/extensions\"\n",
         "control_dir = f\"{webui_path}/models/ControlNet\"\n",
+        "adetailer_dir = f\"{webui_path}/models/adetailer/\"\n",
         "\n",
         "\n",
         "# ================= MAIN CODE =================\n",
@@ -326,19 +329,18 @@
         "\n",
         "extension_repo = []\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",
-        "    \"embed\": [embeddings_dir, \"Embedding_url\"],\n",
-        "    \"extension\": [extensions_dir, \"Extensions_url\"],\n",
-        "    \"control\": [control_dir, \"ControlNet_url\"]\n",
+        "    \"model\": models_dir,\n",
+        "    \"vae\": vaes_dir,\n",
+        "    \"lora\": loras_dir,\n",
+        "    \"embed\": embeddings_dir,\n",
+        "    \"extension\": extensions_dir,\n",
+        "    \"control\": control_dir,\n",
+        "    \"adetailer\": adetailer_dir\n",
         "}\n",
         "\n",
-        "!mkdir -p {models_dir} {vaes_dir} {loras_dir} {embeddings_dir} {extensions_dir} {control_dir}\n",
+        "!mkdir -p {models_dir} {vaes_dir} {loras_dir} {embeddings_dir} {extensions_dir} {control_dir} {adetailer_dir}\n",
         "\n",
         "url = \"\"\n",
-        "ControlNet_url = \"\"\n",
         "hf_token = optional_huggingface_token if optional_huggingface_token else \"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\"\n",
         "user_header = f\"\\\"Authorization: Bearer {hf_token}\\\"\"\n",
         "\n",
@@ -352,7 +354,7 @@
         "    if file_name:\n",
         "        url = re.sub(r'\\[.*?\\]', '', url)\n",
         "\n",
-        "    for prefix, (dir, _) in prefixes.items():\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",
@@ -363,7 +365,8 @@
         "    basename = url.split(\"/\")[-1] if file_name is None else file_name\n",
         "    header_option = f\"--header={user_header}\"\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(\"\\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",
         "    # I do it at my own risk..... Fucking CivitAi >:(\n",
         "    civitai_token = \"62c0c5956b2f9defbd844d754000180b\"\n",
@@ -410,6 +413,22 @@
         "        url, dst_dir, file_name = link_or_path.split()\n",
         "        manual_download(url, dst_dir, file_name)\n",
         "\n",
+        "    unpucking_zip_files()\n",
+        "\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",
+        "    for directory in directories:\n",
+        "        for root, dirs, files in os.walk(directory):\n",
+        "            for file in files:\n",
+        "                if file.endswith(\".zip\"):\n",
+        "                    zip_path = os.path.join(root, file)\n",
+        "                    extract_path = os.path.splitext(zip_path)[0]\n",
+        "                    with zipfile.ZipFile(zip_path, 'r') as zip_ref:\n",
+        "                        zip_ref.extractall(extract_path)\n",
+        "                    os.remove(zip_path)\n",
+        "\n",
         "''' submodels - added urls '''\n",
         "\n",
         "submodels = []\n",
@@ -452,6 +471,8 @@
         "unique_urls = []\n",
         "\n",
         "def process_file_download(file_url):\n",
+        "    files_urls = \"\"\n",
+        "\n",
         "    if file_url.startswith(\"http\"):\n",
         "        if \"blob\" in file_url:\n",
         "            file_url = file_url.replace(\"blob\", \"raw\")\n",
@@ -466,13 +487,17 @@
         "        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",
         "\n",
-        "        urls = [url.strip() for url in line.split(',')]\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",
-        "                globals()[prefixes[current_tag][1]] += \", \" + url\n",
+        "                # handle_manual(f\"{current_tag}:{url}\")\n",
+        "                files_urls += f\"{current_tag}:{url}, \"\n",
         "                unique_urls.append(url)\n",
         "\n",
+        "    return files_urls\n",
+        "\n",
         "# fix all possible errors/options and function call\n",
+        "file_urls = \"\"\n",
         "if custom_file_urls:\n",
         "    for custom_file_url in custom_file_urls.replace(',', '').split():\n",
         "        if not custom_file_url.endswith('.txt'):\n",
@@ -482,17 +507,14 @@
         "                custom_file_url = f'{root_path}/{custom_file_url}'\n",
         "\n",
         "        try:\n",
-        "            process_file_download(custom_file_url)\n",
+        "            file_urls += process_file_download(custom_file_url)\n",
         "        except FileNotFoundError:\n",
         "            pass\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}:{url}\" for url in urls[i].replace(',', '').split()]\n",
-        "        if prefixed_urls:\n",
-        "            url += \", \".join(prefixed_urls) + \", \"\n",
+        "urls = [Model_url, Vae_url, LoRA_url, Embedding_url, Extensions_url]\n",
+        "prefixed_urls = [f\"{prefix}:{url}\" for prefix, url in zip(prefixes.keys(), urls) if url]\n",
+        "url += \", \".join(prefixed_urls) + \", \" + file_urls\n",
         "\n",
         "if detailed_download == \"on\":\n",
         "    print(\"\\n\\n\\033[33m# ====== Подробная Загрузка ====== #\\n\\033[0m\")\n",

files_cells/notebooks/ru/launch_ru.ipynb

@@ -92,6 +92,7 @@
         "# automatic fixing path V2\n",
         "!sed -i 's#\"tagger_hf_cache_dir\": \".*models/interrogators\"#\"tagger_hf_cache_dir\": \"{root_path}/sdw/models/interrogators\"#' {webui_path}/config.json\n",
         "!sed -i 's#\"additional_networks_extra_lora_path\": \".*models/Lora/\"#\"additional_networks_extra_lora_path\": \"{root_path}/sdw/models/Lora/\"#' {webui_path}/config.json\n",
+        "!sed -i \'s#"ad_extra_models_dir": "*"#"ad_extra_models_dir": "{root_path}/sdw/models/adetailer/"#\' {webui_path}/config.json\n",
         "# ---\n",
         "!sed -i 's/\"sd_checkpoint_hash\": \".*\"/\"sd_checkpoint_hash\": \"\"/g; s/\"sd_model_checkpoint\": \".*\"/\"sd_model_checkpoint\": \"\"/g; s/\"sd_vae\": \".*\"/\"sd_vae\": \"None\"/g' {webui_path}/config.json\n",
         "\n",

files_cells/python/en/downloading_en.py

@@ -4,6 +4,8 @@ import os
 import re
 import time
 import json
+import shutil
+import zipfile
 import requests
 import subprocess
 from datetime import timedelta
@@ -115,6 +117,7 @@ embeddings_dir = f"{webui_path}/embeddings"
 loras_dir = f"{webui_path}/models/Lora"
 extensions_dir = f"{webui_path}/extensions"
 control_dir = f"{webui_path}/models/ControlNet"
+adetailer_dir = f"{webui_path}/models/adetailer/"
 
 
 # ================= MAIN CODE =================
@@ -307,19 +310,18 @@ controlnet_list = {
 
 extension_repo = []
 prefixes = {
-    # It's complicated, but supplementing has become easier
-    "model": [models_dir, "Model_url"],
-    "vae": [vaes_dir, "Vae_url"],
-    "lora": [loras_dir, "LoRA_url"],
-    "embed": [embeddings_dir, "Embedding_url"],
-    "extension": [extensions_dir, "Extensions_url"],
-    "control": [control_dir, "ControlNet_url"]
+    "model": models_dir,
+    "vae": vaes_dir,
+    "lora": loras_dir,
+    "embed": embeddings_dir,
+    "extension": extensions_dir,
+    "control": control_dir,
+    "adetailer": adetailer_dir
 }
 
-get_ipython().system('mkdir -p {models_dir} {vaes_dir} {loras_dir} {embeddings_dir} {extensions_dir} {control_dir}')
+get_ipython().system('mkdir -p {models_dir} {vaes_dir} {loras_dir} {embeddings_dir} {extensions_dir} {control_dir} {adetailer_dir}')
 
 url = ""
-ControlNet_url = ""
 hf_token = optional_huggingface_token if optional_huggingface_token else "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"
 user_header = f"\"Authorization: Bearer {hf_token}\""
 
@@ -333,7 +335,7 @@ def handle_manual(url):
     if file_name:
         url = re.sub(r'\[.*?\]', '', url)
 
-    for prefix, (dir, _) in prefixes.items():
+    for prefix, dir in prefixes.items():
         if original_url.startswith(f"{prefix}:"):
             if prefix != "extension":
                 manual_download(url, dir, file_name=file_name)
@@ -344,7 +346,8 @@ def manual_download(url, dst_dir, file_name):
     basename = url.split("/")[-1] if file_name is None else file_name
     header_option = f"--header={user_header}"
 
-    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("\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)
 
     # I do it at my own risk..... Fucking CivitAi >:(
     civitai_token = "62c0c5956b2f9defbd844d754000180b"
@@ -391,6 +394,22 @@ def download(url):
         url, dst_dir, file_name = link_or_path.split()
         manual_download(url, dst_dir, file_name)
 
+    unpucking_zip_files()
+
+## unpucking zip files
+def unpucking_zip_files():
+    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:
+                if file.endswith(".zip"):
+                    zip_path = os.path.join(root, file)
+                    extract_path = os.path.splitext(zip_path)[0]
+                    with zipfile.ZipFile(zip_path, 'r') as zip_ref:
+                        zip_ref.extractall(extract_path)
+                    os.remove(zip_path)
+
 ''' submodels - added urls '''
 
 submodels = []
@@ -433,6 +452,8 @@ for submodel in submodels:
 unique_urls = []
 
 def process_file_download(file_url):
+    files_urls = ""
+
     if file_url.startswith("http"):
         if "blob" in file_url:
             file_url = file_url.replace("blob", "raw")
@@ -447,13 +468,17 @@ def process_file_download(file_url):
         if any(f'# {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(',')]
+        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:
-                globals()[prefixes[current_tag][1]] += ", " + url
+                # handle_manual(f"{current_tag}:{url}")
+                files_urls += f"{current_tag}:{url}, "
                 unique_urls.append(url)
 
+    return files_urls
+
 # fix all possible errors/options and function call
+file_urls = ""
 if custom_file_urls:
     for custom_file_url in custom_file_urls.replace(',', '').split():
         if not custom_file_url.endswith('.txt'):
@@ -463,17 +488,14 @@ if custom_file_urls:
                 custom_file_url = f'{root_path}/{custom_file_url}'
 
         try:
-            process_file_download(custom_file_url)
+            file_urls += process_file_download(custom_file_url)
         except FileNotFoundError:
             pass
 
 # url prefixing
-urls = [globals()[urls[1]] for urls in prefixes.values()]
-for i, prefix in enumerate(prefixes):
-    if urls[i]:
-        prefixed_urls = [f"{prefix}:{url}" for url in urls[i].replace(',', '').split()]
-        if prefixed_urls:
-            url += ", ".join(prefixed_urls) + ", "
+urls = [Model_url, Vae_url, LoRA_url, Embedding_url, Extensions_url]
+prefixed_urls = [f"{prefix}:{url}" for prefix, url in zip(prefixes.keys(), urls) if url]
+url += ", ".join(prefixed_urls) + ", " + file_urls
 
 if detailed_download == "on":
     print("\n\n\033[33m# ====== Detailed Download ====== #\n\033[0m")

files_cells/python/en/launch_en.py

@@ -68,6 +68,7 @@ if zrok_token:
 # automatic fixing path V2
 get_ipython().system('sed -i \'s#"tagger_hf_cache_dir": ".*models/interrogators"#"tagger_hf_cache_dir": "{root_path}/sdw/models/interrogators"#\' {webui_path}/config.json')
 get_ipython().system('sed -i \'s#"additional_networks_extra_lora_path": ".*models/Lora/"#"additional_networks_extra_lora_path": "{root_path}/sdw/models/Lora/"#\' {webui_path}/config.json')
+get_ipython().system('sed -i \'s#"ad_extra_models_dir": "*"#"ad_extra_models_dir": "{root_path}/sdw/models/adetailer/"#\' {webui_path}/config.json')
 # ---
 get_ipython().system('sed -i \'s/"sd_checkpoint_hash": ".*"/"sd_checkpoint_hash": ""/g; s/"sd_model_checkpoint": ".*"/"sd_model_checkpoint": ""/g; s/"sd_vae": ".*"/"sd_vae": "None"/g\' {webui_path}/config.json')
 

files_cells/python/ru/downloading_ru.py

@@ -4,6 +4,8 @@ import os
 import re
 import time
 import json
+import shutil
+import zipfile
 import requests
 import subprocess
 from datetime import timedelta
@@ -115,6 +117,7 @@ embeddings_dir = f"{webui_path}/embeddings"
 loras_dir = f"{webui_path}/models/Lora"
 extensions_dir = f"{webui_path}/extensions"
 control_dir = f"{webui_path}/models/ControlNet"
+adetailer_dir = f"{webui_path}/models/adetailer/"
 
 
 # ================= MAIN CODE =================
@@ -307,19 +310,18 @@ controlnet_list = {
 
 extension_repo = []
 prefixes = {
-    # It's complicated, but supplementing has become easier
-    "model": [models_dir, "Model_url"],
-    "vae": [vaes_dir, "Vae_url"],
-    "lora": [loras_dir, "LoRA_url"],
-    "embed": [embeddings_dir, "Embedding_url"],
-    "extension": [extensions_dir, "Extensions_url"],
-    "control": [control_dir, "ControlNet_url"]
+    "model": models_dir,
+    "vae": vaes_dir,
+    "lora": loras_dir,
+    "embed": embeddings_dir,
+    "extension": extensions_dir,
+    "control": control_dir,
+    "adetailer": adetailer_dir
 }
 
-get_ipython().system('mkdir -p {models_dir} {vaes_dir} {loras_dir} {embeddings_dir} {extensions_dir} {control_dir}')
+get_ipython().system('mkdir -p {models_dir} {vaes_dir} {loras_dir} {embeddings_dir} {extensions_dir} {control_dir} {adetailer_dir}')
 
 url = ""
-ControlNet_url = ""
 hf_token = optional_huggingface_token if optional_huggingface_token else "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"
 user_header = f"\"Authorization: Bearer {hf_token}\""
 
@@ -333,7 +335,7 @@ def handle_manual(url):
     if file_name:
         url = re.sub(r'\[.*?\]', '', url)
 
-    for prefix, (dir, _) in prefixes.items():
+    for prefix, dir in prefixes.items():
         if original_url.startswith(f"{prefix}:"):
             if prefix != "extension":
                 manual_download(url, dir, file_name=file_name)
@@ -344,7 +346,8 @@ def manual_download(url, dst_dir, file_name):
     basename = url.split("/")[-1] if file_name is None else file_name
     header_option = f"--header={user_header}"
 
-    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("\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)
 
     # I do it at my own risk..... Fucking CivitAi >:(
     civitai_token = "62c0c5956b2f9defbd844d754000180b"
@@ -391,6 +394,22 @@ def download(url):
         url, dst_dir, file_name = link_or_path.split()
         manual_download(url, dst_dir, file_name)
 
+    unpucking_zip_files()
+
+## unpucking zip files
+def unpucking_zip_files():
+    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:
+                if file.endswith(".zip"):
+                    zip_path = os.path.join(root, file)
+                    extract_path = os.path.splitext(zip_path)[0]
+                    with zipfile.ZipFile(zip_path, 'r') as zip_ref:
+                        zip_ref.extractall(extract_path)
+                    os.remove(zip_path)
+
 ''' submodels - added urls '''
 
 submodels = []
@@ -433,6 +452,8 @@ for submodel in submodels:
 unique_urls = []
 
 def process_file_download(file_url):
+    files_urls = ""
+
     if file_url.startswith("http"):
         if "blob" in file_url:
             file_url = file_url.replace("blob", "raw")
@@ -447,13 +468,17 @@ def process_file_download(file_url):
         if any(f'# {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(',')]
+        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:
-                globals()[prefixes[current_tag][1]] += ", " + url
+                # handle_manual(f"{current_tag}:{url}")
+                files_urls += f"{current_tag}:{url}, "
                 unique_urls.append(url)
 
+    return files_urls
+
 # fix all possible errors/options and function call
+file_urls = ""
 if custom_file_urls:
     for custom_file_url in custom_file_urls.replace(',', '').split():
         if not custom_file_url.endswith('.txt'):
@@ -463,17 +488,14 @@ if custom_file_urls:
                 custom_file_url = f'{root_path}/{custom_file_url}'
 
         try:
-            process_file_download(custom_file_url)
+            file_urls += process_file_download(custom_file_url)
         except FileNotFoundError:
             pass
 
 # url prefixing
-urls = [globals()[urls[1]] for urls in prefixes.values()]
-for i, prefix in enumerate(prefixes):
-    if urls[i]:
-        prefixed_urls = [f"{prefix}:{url}" for url in urls[i].replace(',', '').split()]
-        if prefixed_urls:
-            url += ", ".join(prefixed_urls) + ", "
+urls = [Model_url, Vae_url, LoRA_url, Embedding_url, Extensions_url]
+prefixed_urls = [f"{prefix}:{url}" for prefix, url in zip(prefixes.keys(), urls) if url]
+url += ", ".join(prefixed_urls) + ", " + file_urls
 
 if detailed_download == "on":
     print("\n\n\033[33m# ====== Подробная Загрузка ====== #\n\033[0m")

files_cells/python/ru/launch_ru.py

@@ -68,6 +68,7 @@ if zrok_token:
 # automatic fixing path V2
 get_ipython().system('sed -i \'s#"tagger_hf_cache_dir": ".*models/interrogators"#"tagger_hf_cache_dir": "{root_path}/sdw/models/interrogators"#\' {webui_path}/config.json')
 get_ipython().system('sed -i \'s#"additional_networks_extra_lora_path": ".*models/Lora/"#"additional_networks_extra_lora_path": "{root_path}/sdw/models/Lora/"#\' {webui_path}/config.json')
+get_ipython().system('sed -i \'s#"ad_extra_models_dir": "*"#"ad_extra_models_dir": "{root_path}/sdw/models/adetailer/"#\' {webui_path}/config.json')
 # ---
 get_ipython().system('sed -i \'s/"sd_checkpoint_hash": ".*"/"sd_checkpoint_hash": ""/g; s/"sd_model_checkpoint": ".*"/"sd_model_checkpoint": ""/g; s/"sd_vae": ".*"/"sd_vae": "None"/g\' {webui_path}/config.json')