🐛

files_cells/notebooks/en/auto_cleaner_en.ipynb

@@ -55,7 +55,6 @@
         "\"\"\" functions \"\"\"\n",
         "def clean_directory(directory):\n",
         "    deleted_files = 0\n",
-        "    image_dir = directories['Images']\n",
         "\n",
         "    for root, dirs, files in os.walk(directory):\n",
         "        for file in files:\n",
@@ -63,7 +62,7 @@
         "\n",
         "            if file.endswith(\".txt\"):\n",
         "                continue\n",
-        "            if file.endswith((\".safetensors\", \".pt\")) or root == image_dir: # fix for image counter\n",
+        "            if file.endswith((\".safetensors\", \".pt\", \".png\", \".jpg\", \".jpeg\")):\n",
         "                deleted_files += 1\n",
         "\n",
         "            os.remove(file_path)\n",

files_cells/notebooks/en/downloading_en.ipynb

@@ -254,7 +254,7 @@
         "## Downloading model and stuff | oh~ Hey! If you're freaked out by that code too, don't worry, me too!\n",
         "print(\"📦 Downloading models and stuff...\", end='')\n",
         "\n",
-        "url = \"\"\n",
+        "extension_repo = []\n",
         "PREFIXES = {\n",
         "    \"model\": models_dir,\n",
         "    \"vae\": vaes_dir,\n",
@@ -265,33 +265,24 @@
         "    \"adetailer\": adetailer_dir,\n",
         "    \"config\": webui_path\n",
         "}\n",
-        "\n",
-        "extension_repo = []\n",
-        "directories = [value for key, value in PREFIXES.items()] # for unpucking zip files\n",
-        "!mkdir -p {\" \".join(directories)}\n",
-        "\n",
-        "hf_token = huggingface_token if huggingface_token else \"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\"\n",
-        "user_header = f\"\\\"Authorization: Bearer {hf_token}\\\"\"\n",
+        "!mkdir -p {\" \".join(PREFIXES.values())}\n",
         "\n",
         "''' Formatted Info Output '''\n",
         "\n",
-        "from math import floor\n",
-        "\n",
         "def center_text(text, terminal_width=45):\n",
         "    padding = (terminal_width - len(text)) // 2\n",
-        "    return f\"\\033[1m\\033[36m{' ' * padding}{text}{' ' * padding}\\033[0m\\033[32m\"\n",
+        "    return f\"{' ' * padding}{text}{' ' * padding}\"\n",
         "\n",
         "def format_output(url, dst_dir, file_name, image_name=None, image_url=None):\n",
         "    info = center_text(f\"[{file_name.split('.')[0]}]\")\n",
-        "    separation_line = '\\033[32m' + '---' * 20\n",
+        "    sep_line = '---' * 20\n",
         "\n",
-        "    print(f\"\\n{separation_line}{info}{separation_line}\")\n",
-        "    print(f\"\\033[33mURL: \\033[34m{url}\")\n",
+        "    print(f\"\\n\\033[32m{sep_line}\\033[36;1m{info}\\033[32m{sep_line}\\033[0m\")\n",
+        "    print(f\"\\033[33mURL: {url}\")\n",
         "    print(f\"\\033[33mSAVE DIR: \\033[34m{dst_dir}\")\n",
         "    print(f\"\\033[33mFILE NAME: \\033[34m{file_name}\\033[0m\")\n",
-        "\n",
         "    if 'civitai' in url and image_url:\n",
-        "        print(f\"\\033[32m[Preview IMG]:\\033[0m {image_name} - {image_url}\\n\")\n",
+        "        print(f\"\\033[32m[Preview DL]:\\033[0m {image_name} - {image_url}\\n\")\n",
         "\n",
         "''' GET CivitAi API - DATA '''\n",
         "\n",
@@ -325,7 +316,7 @@
         "        print(\"\\033[31m[Data Info]:\\033[0m Failed to retrieve data from the API.\\n\")\n",
         "        return 'None', None, None, None, None, None, None\n",
         "\n",
-        "    def extract_model_info(url, data):\n",
+        "    def get_model_info(url, data):\n",
         "        model_type = data['model']['type']\n",
         "        model_name = data['files'][0]['name']\n",
         "\n",
@@ -337,17 +328,12 @@
         "\n",
         "        return model_type, model_name\n",
         "\n",
-        "    model_type, model_name = extract_model_info(url, data)\n",
-        "    model_name = file_name or model_name\n",
-        "\n",
         "    def get_download_url(data, model_type):\n",
         "        if any(t.lower() in model_type.lower() for t in SUPPORT_TYPES):\n",
         "            return data['files'][0]['downloadUrl']\n",
         "\n",
         "        return data['files'][1]['downloadUrl'] if 'type' in url else data['files'][0]['downloadUrl']\n",
         "\n",
-        "    download_url = get_download_url(data, model_type)\n",
-        "\n",
         "    def get_image_info(data, model_type, model_name):\n",
         "        if not any(t in model_type for t in SUPPORT_TYPES):\n",
         "            return None, None\n",
@@ -359,9 +345,11 @@
         "            image_extension = image_url.split('.')[-1]\n",
         "            image_name = f\"{model_name.split('.')[0]}.preview.{image_extension}\" if image_url else None\n",
         "            return image_url, image_name\n",
-        "\n",
         "        return None, None\n",
         "\n",
+        "    model_type, model_name = get_model_info(url, data)\n",
+        "    model_name = file_name or model_name\n",
+        "    download_url = get_download_url(data, model_type)\n",
         "    image_url, image_name = get_image_info(data, model_type, model_name)\n",
         "\n",
         "    return f\"{download_url}{'&' if '?' in download_url else '?'}token={CIVITAI_TOKEN}\", download_url, model_type, model_name, image_url, image_name, data\n",
@@ -387,7 +375,7 @@
         "            manual_download(url, dst_dir, file_name)\n",
         "\n",
         "    # Unpuck ZIPs Files\n",
-        "    for directory in directories:\n",
+        "    for directory in PREFIXES.values():\n",
         "        for root, _, files in os.walk(directory):\n",
         "            for file in files:\n",
         "                if file.endswith(\".zip\"):\n",
@@ -417,7 +405,7 @@
         "            extension_repo.append((path, file_name))\n",
         "\n",
         "def manual_download(url, dst_dir, file_name, prefix=None):\n",
-        "    header_option = f\"--header={user_header}\"\n",
+        "    hf_header = f\"--header='Authorization: Bearer {huggingface_token}'\" if huggingface_token else \"\"\n",
         "    aria2c_header = \"--header='User-Agent: Mozilla/5.0' --allow-overwrite=true\"\n",
         "    aria2_args = \"--optimize-concurrent-downloads --console-log-level=error --summary-interval=10 --stderr=true -c -x16 -s16 -k1M -j5\"\n",
         "\n",
@@ -430,14 +418,13 @@
         "            subprocess.run(command, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)\n",
         "\n",
         "    elif 'github' in url or \"huggingface.co\" in url:\n",
-        "        basename = url.split(\"/\")[-1] if file_name is None else file_name\n",
+        "        file_name = clean_url.split(\"/\")[-1] if file_name is None else file_name\n",
         "\n",
         "    \"\"\" Formatted info output \"\"\"\n",
-        "    model_name_or_basename = file_name if file_name else basename\n",
         "    try:\n",
-        "        format_output(clean_url, dst_dir, model_name_or_basename, image_name, image_url)\n",
+        "        format_output(clean_url, dst_dir, file_name, image_name, image_url)\n",
         "    except UnboundLocalError:\n",
-        "        format_output(clean_url, dst_dir, model_name_or_basename, None, None)\n",
+        "        format_output(clean_url, dst_dir, file_name, None, None)\n",
         "\n",
         "    # =====================\n",
         "    def run_aria2c(url, dst_dir, file_name=None, args=\"\", header=\"\"):\n",
@@ -462,7 +449,7 @@
         "\n",
         "    # -- GitHub or Hugging Face --\n",
         "    elif 'github' in url or 'huggingface' in url:\n",
-        "        run_aria2c(clean_url, dst_dir, basename, aria2_args, header_option if 'huggingface' in url else '')\n",
+        "        run_aria2c(clean_url, dst_dir, file_name, aria2_args, hf_header if 'huggingface' in url else '')\n",
         "\n",
         "    # -- Other HTTP/Sources --\n",
         "    elif 'http' in url:\n",
@@ -521,15 +508,13 @@
         "\n",
         "def handle_submodels(selection, num_selection, model_dict, dst_dir, url):\n",
         "    submodels = add_submodels(selection, num_selection, model_dict, dst_dir)\n",
-        "    urls = []\n",
         "    for submodel in submodels:\n",
         "        if not inpainting_model and \"inpainting\" in submodel['name']:\n",
         "            continue\n",
-        "        urls.append(f\"{submodel['url']} {submodel['dst_dir']} {submodel['name']}\")\n",
-        "\n",
-        "    url += \", \".join(urls) + ', '\n",
+        "        url += f\"{submodel['url']} {submodel['dst_dir']} {submodel['name']}, \"\n",
         "    return url\n",
         "\n",
+        "url = \"\"\n",
         "url = handle_submodels(model, model_num, model_list, models_dir, url)\n",
         "url = handle_submodels(vae, vae_num, vae_list, vaes_dir, url)\n",
         "url = handle_submodels(controlnet, controlnet_num, controlnet_list, control_dir, url)\n",

files_cells/notebooks/ru/auto_cleaner_ru.ipynb

@@ -60,7 +60,6 @@
         "\"\"\" functions \"\"\"\n",
         "def clean_directory(directory):\n",
         "    deleted_files = 0\n",
-        "    image_dir = directories['Изображения']\n",
         "\n",
         "    for root, dirs, files in os.walk(directory):\n",
         "        for file in files:\n",
@@ -68,7 +67,7 @@
         "\n",
         "            if file.endswith(\".txt\"):\n",
         "                continue\n",
-        "            if file.endswith((\".safetensors\", \".pt\")) or root == image_dir: # fix for image counter\n",
+        "            if file.endswith((\".safetensors\", \".pt\", \".png\", \".jpg\", \".jpeg\")):\n",
         "                deleted_files += 1\n",
         "\n",
         "            os.remove(file_path)\n",

files_cells/notebooks/ru/downloading_ru.ipynb

@@ -254,7 +254,7 @@
         "## Downloading model and stuff | oh~ Hey! If you're freaked out by that code too, don't worry, me too!\n",
         "print(\"📦 Скачивание моделей и прочего...\", end='')\n",
         "\n",
-        "url = \"\"\n",
+        "extension_repo = []\n",
         "PREFIXES = {\n",
         "    \"model\": models_dir,\n",
         "    \"vae\": vaes_dir,\n",
@@ -265,33 +265,24 @@
         "    \"adetailer\": adetailer_dir,\n",
         "    \"config\": webui_path\n",
         "}\n",
-        "\n",
-        "extension_repo = []\n",
-        "directories = [value for key, value in PREFIXES.items()] # for unpucking zip files\n",
-        "!mkdir -p {\" \".join(directories)}\n",
-        "\n",
-        "hf_token = huggingface_token if huggingface_token else \"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\"\n",
-        "user_header = f\"\\\"Authorization: Bearer {hf_token}\\\"\"\n",
+        "!mkdir -p {\" \".join(PREFIXES.values())}\n",
         "\n",
         "''' Formatted Info Output '''\n",
         "\n",
-        "from math import floor\n",
-        "\n",
         "def center_text(text, terminal_width=45):\n",
         "    padding = (terminal_width - len(text)) // 2\n",
-        "    return f\"\\033[1m\\033[36m{' ' * padding}{text}{' ' * padding}\\033[0m\\033[32m\"\n",
+        "    return f\"{' ' * padding}{text}{' ' * padding}\"\n",
         "\n",
         "def format_output(url, dst_dir, file_name, image_name=None, image_url=None):\n",
         "    info = center_text(f\"[{file_name.split('.')[0]}]\")\n",
-        "    separation_line = '\\033[32m' + '---' * 20\n",
+        "    sep_line = '---' * 20\n",
         "\n",
-        "    print(f\"\\n{separation_line}{info}{separation_line}\")\n",
-        "    print(f\"\\033[33mURL: \\033[34m{url}\")\n",
+        "    print(f\"\\n\\033[32m{sep_line}\\033[36;1m{info}\\033[32m{sep_line}\\033[0m\")\n",
+        "    print(f\"\\033[33mURL: {url}\")\n",
         "    print(f\"\\033[33mSAVE DIR: \\033[34m{dst_dir}\")\n",
         "    print(f\"\\033[33mFILE NAME: \\033[34m{file_name}\\033[0m\")\n",
-        "\n",
         "    if 'civitai' in url and image_url:\n",
-        "        print(f\"\\033[32m[Preview IMG]:\\033[0m {image_name} - {image_url}\\n\")\n",
+        "        print(f\"\\033[32m[Preview DL]:\\033[0m {image_name} - {image_url}\\n\")\n",
         "\n",
         "''' GET CivitAi API - DATA '''\n",
         "\n",
@@ -325,7 +316,7 @@
         "        print(\"\\033[31m[Data Info]:\\033[0m Failed to retrieve data from the API.\\n\")\n",
         "        return 'None', None, None, None, None, None, None\n",
         "\n",
-        "    def extract_model_info(url, data):\n",
+        "    def get_model_info(url, data):\n",
         "        model_type = data['model']['type']\n",
         "        model_name = data['files'][0]['name']\n",
         "\n",
@@ -337,17 +328,12 @@
         "\n",
         "        return model_type, model_name\n",
         "\n",
-        "    model_type, model_name = extract_model_info(url, data)\n",
-        "    model_name = file_name or model_name\n",
-        "\n",
         "    def get_download_url(data, model_type):\n",
         "        if any(t.lower() in model_type.lower() for t in SUPPORT_TYPES):\n",
         "            return data['files'][0]['downloadUrl']\n",
         "\n",
         "        return data['files'][1]['downloadUrl'] if 'type' in url else data['files'][0]['downloadUrl']\n",
         "\n",
-        "    download_url = get_download_url(data, model_type)\n",
-        "\n",
         "    def get_image_info(data, model_type, model_name):\n",
         "        if not any(t in model_type for t in SUPPORT_TYPES):\n",
         "            return None, None\n",
@@ -359,9 +345,11 @@
         "            image_extension = image_url.split('.')[-1]\n",
         "            image_name = f\"{model_name.split('.')[0]}.preview.{image_extension}\" if image_url else None\n",
         "            return image_url, image_name\n",
-        "\n",
         "        return None, None\n",
         "\n",
+        "    model_type, model_name = get_model_info(url, data)\n",
+        "    model_name = file_name or model_name\n",
+        "    download_url = get_download_url(data, model_type)\n",
         "    image_url, image_name = get_image_info(data, model_type, model_name)\n",
         "\n",
         "    return f\"{download_url}{'&' if '?' in download_url else '?'}token={CIVITAI_TOKEN}\", download_url, model_type, model_name, image_url, image_name, data\n",
@@ -387,7 +375,7 @@
         "            manual_download(url, dst_dir, file_name)\n",
         "\n",
         "    # Unpuck ZIPs Files\n",
-        "    for directory in directories:\n",
+        "    for directory in PREFIXES.values():\n",
         "        for root, _, files in os.walk(directory):\n",
         "            for file in files:\n",
         "                if file.endswith(\".zip\"):\n",
@@ -417,7 +405,7 @@
         "            extension_repo.append((path, file_name))\n",
         "\n",
         "def manual_download(url, dst_dir, file_name, prefix=None):\n",
-        "    header_option = f\"--header={user_header}\"\n",
+        "    hf_header = f\"--header='Authorization: Bearer {huggingface_token}'\" if huggingface_token else \"\"\n",
         "    aria2c_header = \"--header='User-Agent: Mozilla/5.0' --allow-overwrite=true\"\n",
         "    aria2_args = \"--optimize-concurrent-downloads --console-log-level=error --summary-interval=10 --stderr=true -c -x16 -s16 -k1M -j5\"\n",
         "\n",
@@ -430,14 +418,13 @@
         "            subprocess.run(command, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)\n",
         "\n",
         "    elif 'github' in url or \"huggingface.co\" in url:\n",
-        "        basename = url.split(\"/\")[-1] if file_name is None else file_name\n",
+        "        file_name = clean_url.split(\"/\")[-1] if file_name is None else file_name\n",
         "\n",
         "    \"\"\" Formatted info output \"\"\"\n",
-        "    model_name_or_basename = file_name if file_name else basename\n",
         "    try:\n",
-        "        format_output(clean_url, dst_dir, model_name_or_basename, image_name, image_url)\n",
+        "        format_output(clean_url, dst_dir, file_name, image_name, image_url)\n",
         "    except UnboundLocalError:\n",
-        "        format_output(clean_url, dst_dir, model_name_or_basename, None, None)\n",
+        "        format_output(clean_url, dst_dir, file_name, None, None)\n",
         "\n",
         "    # =====================\n",
         "    def run_aria2c(url, dst_dir, file_name=None, args=\"\", header=\"\"):\n",
@@ -462,7 +449,7 @@
         "\n",
         "    # -- GitHub or Hugging Face --\n",
         "    elif 'github' in url or 'huggingface' in url:\n",
-        "        run_aria2c(clean_url, dst_dir, basename, aria2_args, header_option if 'huggingface' in url else '')\n",
+        "        run_aria2c(clean_url, dst_dir, file_name, aria2_args, hf_header if 'huggingface' in url else '')\n",
         "\n",
         "    # -- Other HTTP/Sources --\n",
         "    elif 'http' in url:\n",
@@ -472,50 +459,52 @@
         "\n",
         "# Separation of merged numbers\n",
         "def split_numbers(num_str, max_num):\n",
-        "    def helper(s):\n",
-        "        if not s:\n",
-        "            return []\n",
+        "    result = []\n",
+        "    i = 0\n",
+        "    while i < len(num_str):\n",
+        "        found = False\n",
         "        for length in range(2, 0, -1):\n",
-        "            if len(s) >= length:\n",
-        "                part = int(s[:length])\n",
+        "            if i + length <= len(num_str):\n",
+        "                part = int(num_str[i:i + length])\n",
         "                if part <= max_num:\n",
-        "                    result = helper(s[length:])\n",
-        "                    if result is not None:\n",
-        "                        return [part] + result\n",
-        "        return None\n",
-        "    return helper(num_str)\n",
+        "                    result.append(part)\n",
+        "                    i += length\n",
+        "                    found = True\n",
+        "                    break\n",
+        "        if not found:\n",
+        "            break\n",
+        "    return result\n",
         "\n",
         "def add_submodels(selection, num_selection, model_dict, dst_dir):\n",
-        "    selected_models = []\n",
         "    if selection == \"none\":\n",
-        "        return selected_models\n",
+        "        return []\n",
+        "    selected_models = []\n",
+        "\n",
         "    if selection == \"ALL\":\n",
-        "        for models in model_dict.values():\n",
-        "            selected_models.extend(models)\n",
+        "        selected_models = sum(model_dict.values(), [])\n",
         "    else:\n",
         "        if selection in model_dict:\n",
         "            selected_models.extend(model_dict[selection])\n",
+        "\n",
         "        nums = num_selection.replace(',', ' ').split()\n",
         "        max_num = len(model_dict)\n",
-        "        selected_nums = []\n",
+        "        unique_nums = set()\n",
         "\n",
         "        for num_part in nums:\n",
         "            split_nums = split_numbers(num_part, max_num)\n",
-        "            if split_nums:\n",
-        "                selected_nums.extend(split_nums)\n",
-        "\n",
-        "        unique_nums = list(set(selected_nums))\n",
+        "            unique_nums.update(split_nums)\n",
         "\n",
         "        for num in unique_nums:\n",
         "            if 1 <= num <= max_num:\n",
-        "                name = list(model_dict)[num - 1]\n",
+        "                name = list(model_dict.keys())[num - 1]\n",
         "                selected_models.extend(model_dict[name])\n",
         "\n",
-        "    unique_models = list({model['name']: model for model in selected_models}.values())\n",
+        "    unique_models = {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",
+        "    return list(unique_models)\n",
         "\n",
         "def handle_submodels(selection, num_selection, model_dict, dst_dir, url):\n",
         "    submodels = add_submodels(selection, num_selection, model_dict, dst_dir)\n",
@@ -525,6 +514,7 @@
         "        url += f\"{submodel['url']} {submodel['dst_dir']} {submodel['name']}, \"\n",
         "    return url\n",
         "\n",
+        "url = \"\"\n",
         "url = handle_submodels(model, model_num, model_list, models_dir, url)\n",
         "url = handle_submodels(vae, vae_num, vae_list, vaes_dir, url)\n",
         "url = handle_submodels(controlnet, controlnet_num, controlnet_list, control_dir, url)\n",

files_cells/python/en/auto_cleaner_en.py

@@ -36,7 +36,6 @@ directories = {
 """ functions """
 def clean_directory(directory):
     deleted_files = 0
-    image_dir = directories['Images']
 
     for root, dirs, files in os.walk(directory):
         for file in files:
@@ -44,7 +43,7 @@ def clean_directory(directory):
 
             if file.endswith(".txt"):
                 continue
-            if file.endswith((".safetensors", ".pt")) or root == image_dir: # fix for image counter
+            if file.endswith((".safetensors", ".pt", ".png", ".jpg", ".jpeg")):
                 deleted_files += 1
 
             os.remove(file_path)

files_cells/python/en/downloading_en.py

@@ -244,7 +244,7 @@ if commit_hash:
 ## Downloading model and stuff | oh~ Hey! If you're freaked out by that code too, don't worry, me too!
 print("📦 Downloading models and stuff...", end='')
 
-url = ""
+extension_repo = []
 PREFIXES = {
     "model": models_dir,
     "vae": vaes_dir,
@@ -255,33 +255,24 @@ PREFIXES = {
     "adetailer": adetailer_dir,
     "config": webui_path
 }
-
-extension_repo = []
-directories = [value for key, value in PREFIXES.items()] # for unpucking zip files
-get_ipython().system('mkdir -p {" ".join(directories)}')
-
-hf_token = huggingface_token if huggingface_token else "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"
-user_header = f"\"Authorization: Bearer {hf_token}\""
+get_ipython().system('mkdir -p {" ".join(PREFIXES.values())}')
 
 ''' Formatted Info Output '''
 
-from math import floor
-
 def center_text(text, terminal_width=45):
     padding = (terminal_width - len(text)) // 2
-    return f"\033[1m\033[36m{' ' * padding}{text}{' ' * padding}\033[0m\033[32m"
+    return f"{' ' * padding}{text}{' ' * padding}"
 
 def format_output(url, dst_dir, file_name, image_name=None, image_url=None):
     info = center_text(f"[{file_name.split('.')[0]}]")
-    separation_line = '\033[32m' + '---' * 20
+    sep_line = '---' * 20
 
-    print(f"\n{separation_line}{info}{separation_line}")
-    print(f"\033[33mURL: \033[34m{url}")
+    print(f"\n\033[32m{sep_line}\033[36;1m{info}\033[32m{sep_line}\033[0m")
+    print(f"\033[33mURL: {url}")
     print(f"\033[33mSAVE DIR: \033[34m{dst_dir}")
     print(f"\033[33mFILE NAME: \033[34m{file_name}\033[0m")
-
     if 'civitai' in url and image_url:
-        print(f"\033[32m[Preview IMG]:\033[0m {image_name} - {image_url}\n")
+        print(f"\033[32m[Preview DL]:\033[0m {image_name} - {image_url}\n")
 
 ''' GET CivitAi API - DATA '''
 
@@ -315,7 +306,7 @@ def CivitAi_API(url, file_name=None):
         print("\033[31m[Data Info]:\033[0m Failed to retrieve data from the API.\n")
         return 'None', None, None, None, None, None, None
 
-    def extract_model_info(url, data):
+    def get_model_info(url, data):
         model_type = data['model']['type']
         model_name = data['files'][0]['name']
 
@@ -327,17 +318,12 @@ def CivitAi_API(url, file_name=None):
 
         return model_type, model_name
 
-    model_type, model_name = extract_model_info(url, data)
-    model_name = file_name or model_name
-
     def get_download_url(data, model_type):
         if any(t.lower() in model_type.lower() for t in SUPPORT_TYPES):
             return data['files'][0]['downloadUrl']
 
         return data['files'][1]['downloadUrl'] if 'type' in url else data['files'][0]['downloadUrl']
 
-    download_url = get_download_url(data, model_type)
-
     def get_image_info(data, model_type, model_name):
         if not any(t in model_type for t in SUPPORT_TYPES):
             return None, None
@@ -349,9 +335,11 @@ def CivitAi_API(url, file_name=None):
             image_extension = image_url.split('.')[-1]
             image_name = f"{model_name.split('.')[0]}.preview.{image_extension}" if image_url else None
             return image_url, image_name
-
         return None, None
 
+    model_type, model_name = get_model_info(url, data)
+    model_name = file_name or model_name
+    download_url = get_download_url(data, model_type)
     image_url, image_name = get_image_info(data, model_type, model_name)
 
     return f"{download_url}{'&' if '?' in download_url else '?'}token={CIVITAI_TOKEN}", download_url, model_type, model_name, image_url, image_name, data
@@ -377,7 +365,7 @@ def download(url):
             manual_download(url, dst_dir, file_name)
 
     # Unpuck ZIPs Files
-    for directory in directories:
+    for directory in PREFIXES.values():
         for root, _, files in os.walk(directory):
             for file in files:
                 if file.endswith(".zip"):
@@ -407,7 +395,7 @@ def handle_manual(url):
             extension_repo.append((path, file_name))
 
 def manual_download(url, dst_dir, file_name, prefix=None):
-    header_option = f"--header={user_header}"
+    hf_header = f"--header='Authorization: Bearer {huggingface_token}'" if huggingface_token else ""
     aria2c_header = "--header='User-Agent: Mozilla/5.0' --allow-overwrite=true"
     aria2_args = "--optimize-concurrent-downloads --console-log-level=error --summary-interval=10 --stderr=true -c -x16 -s16 -k1M -j5"
 
@@ -420,14 +408,13 @@ def manual_download(url, dst_dir, file_name, prefix=None):
             subprocess.run(command, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
 
     elif 'github' in url or "huggingface.co" in url:
-        basename = url.split("/")[-1] if file_name is None else file_name
+        file_name = clean_url.split("/")[-1] if file_name is None else file_name
 
     """ Formatted info output """
-    model_name_or_basename = file_name if file_name else basename
     try:
-        format_output(clean_url, dst_dir, model_name_or_basename, image_name, image_url)
+        format_output(clean_url, dst_dir, file_name, image_name, image_url)
     except UnboundLocalError:
-        format_output(clean_url, dst_dir, model_name_or_basename, None, None)
+        format_output(clean_url, dst_dir, file_name, None, None)
 
     # =====================
     def run_aria2c(url, dst_dir, file_name=None, args="", header=""):
@@ -452,7 +439,7 @@ def manual_download(url, dst_dir, file_name, prefix=None):
 
     # -- GitHub or Hugging Face --
     elif 'github' in url or 'huggingface' in url:
-        run_aria2c(clean_url, dst_dir, basename, aria2_args, header_option if 'huggingface' in url else '')
+        run_aria2c(clean_url, dst_dir, file_name, aria2_args, hf_header if 'huggingface' in url else '')
 
     # -- Other HTTP/Sources --
     elif 'http' in url:
@@ -511,15 +498,13 @@ def add_submodels(selection, num_selection, model_dict, dst_dir):
 
 def handle_submodels(selection, num_selection, model_dict, dst_dir, url):
     submodels = add_submodels(selection, num_selection, model_dict, dst_dir)
-    urls = []
     for submodel in submodels:
         if not inpainting_model and "inpainting" in submodel['name']:
             continue
-        urls.append(f"{submodel['url']} {submodel['dst_dir']} {submodel['name']}")
-
-    url += ", ".join(urls) + ', '
+        url += f"{submodel['url']} {submodel['dst_dir']} {submodel['name']}, "
     return url
 
+url = ""
 url = handle_submodels(model, model_num, model_list, models_dir, url)
 url = handle_submodels(vae, vae_num, vae_list, vaes_dir, url)
 url = handle_submodels(controlnet, controlnet_num, controlnet_list, control_dir, url)

files_cells/python/ru/auto_cleaner_ru.py

@@ -36,7 +36,6 @@ directories = {
 """ functions """
 def clean_directory(directory):
     deleted_files = 0
-    image_dir = directories['Изображения']
 
     for root, dirs, files in os.walk(directory):
         for file in files:
@@ -44,7 +43,7 @@ def clean_directory(directory):
 
             if file.endswith(".txt"):
                 continue
-            if file.endswith((".safetensors", ".pt")) or root == image_dir: # fix for image counter
+            if file.endswith((".safetensors", ".pt", ".png", ".jpg", ".jpeg")):
                 deleted_files += 1
 
             os.remove(file_path)

files_cells/python/ru/downloading_ru.py

@@ -244,7 +244,7 @@ if commit_hash:
 ## Downloading model and stuff | oh~ Hey! If you're freaked out by that code too, don't worry, me too!
 print("📦 Скачивание моделей и прочего...", end='')
 
-url = ""
+extension_repo = []
 PREFIXES = {
     "model": models_dir,
     "vae": vaes_dir,
@@ -255,33 +255,24 @@ PREFIXES = {
     "adetailer": adetailer_dir,
     "config": webui_path
 }
-
-extension_repo = []
-directories = [value for key, value in PREFIXES.items()] # for unpucking zip files
-get_ipython().system('mkdir -p {" ".join(directories)}')
-
-hf_token = huggingface_token if huggingface_token else "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"
-user_header = f"\"Authorization: Bearer {hf_token}\""
+get_ipython().system('mkdir -p {" ".join(PREFIXES.values())}')
 
 ''' Formatted Info Output '''
 
-from math import floor
-
 def center_text(text, terminal_width=45):
     padding = (terminal_width - len(text)) // 2
-    return f"\033[1m\033[36m{' ' * padding}{text}{' ' * padding}\033[0m\033[32m"
+    return f"{' ' * padding}{text}{' ' * padding}"
 
 def format_output(url, dst_dir, file_name, image_name=None, image_url=None):
     info = center_text(f"[{file_name.split('.')[0]}]")
-    separation_line = '\033[32m' + '---' * 20
+    sep_line = '---' * 20
 
-    print(f"\n{separation_line}{info}{separation_line}")
-    print(f"\033[33mURL: \033[34m{url}")
+    print(f"\n\033[32m{sep_line}\033[36;1m{info}\033[32m{sep_line}\033[0m")
+    print(f"\033[33mURL: {url}")
     print(f"\033[33mSAVE DIR: \033[34m{dst_dir}")
     print(f"\033[33mFILE NAME: \033[34m{file_name}\033[0m")
-
     if 'civitai' in url and image_url:
-        print(f"\033[32m[Preview IMG]:\033[0m {image_name} - {image_url}\n")
+        print(f"\033[32m[Preview DL]:\033[0m {image_name} - {image_url}\n")
 
 ''' GET CivitAi API - DATA '''
 
@@ -315,7 +306,7 @@ def CivitAi_API(url, file_name=None):
         print("\033[31m[Data Info]:\033[0m Failed to retrieve data from the API.\n")
         return 'None', None, None, None, None, None, None
 
-    def extract_model_info(url, data):
+    def get_model_info(url, data):
         model_type = data['model']['type']
         model_name = data['files'][0]['name']
 
@@ -327,17 +318,12 @@ def CivitAi_API(url, file_name=None):
 
         return model_type, model_name
 
-    model_type, model_name = extract_model_info(url, data)
-    model_name = file_name or model_name
-
     def get_download_url(data, model_type):
         if any(t.lower() in model_type.lower() for t in SUPPORT_TYPES):
             return data['files'][0]['downloadUrl']
 
         return data['files'][1]['downloadUrl'] if 'type' in url else data['files'][0]['downloadUrl']
 
-    download_url = get_download_url(data, model_type)
-
     def get_image_info(data, model_type, model_name):
         if not any(t in model_type for t in SUPPORT_TYPES):
             return None, None
@@ -349,9 +335,11 @@ def CivitAi_API(url, file_name=None):
             image_extension = image_url.split('.')[-1]
             image_name = f"{model_name.split('.')[0]}.preview.{image_extension}" if image_url else None
             return image_url, image_name
-
         return None, None
 
+    model_type, model_name = get_model_info(url, data)
+    model_name = file_name or model_name
+    download_url = get_download_url(data, model_type)
     image_url, image_name = get_image_info(data, model_type, model_name)
 
     return f"{download_url}{'&' if '?' in download_url else '?'}token={CIVITAI_TOKEN}", download_url, model_type, model_name, image_url, image_name, data
@@ -377,7 +365,7 @@ def download(url):
             manual_download(url, dst_dir, file_name)
 
     # Unpuck ZIPs Files
-    for directory in directories:
+    for directory in PREFIXES.values():
         for root, _, files in os.walk(directory):
             for file in files:
                 if file.endswith(".zip"):
@@ -407,7 +395,7 @@ def handle_manual(url):
             extension_repo.append((path, file_name))
 
 def manual_download(url, dst_dir, file_name, prefix=None):
-    header_option = f"--header={user_header}"
+    hf_header = f"--header='Authorization: Bearer {huggingface_token}'" if huggingface_token else ""
     aria2c_header = "--header='User-Agent: Mozilla/5.0' --allow-overwrite=true"
     aria2_args = "--optimize-concurrent-downloads --console-log-level=error --summary-interval=10 --stderr=true -c -x16 -s16 -k1M -j5"
 
@@ -420,14 +408,13 @@ def manual_download(url, dst_dir, file_name, prefix=None):
             subprocess.run(command, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
 
     elif 'github' in url or "huggingface.co" in url:
-        basename = url.split("/")[-1] if file_name is None else file_name
+        file_name = clean_url.split("/")[-1] if file_name is None else file_name
 
     """ Formatted info output """
-    model_name_or_basename = file_name if file_name else basename
     try:
-        format_output(clean_url, dst_dir, model_name_or_basename, image_name, image_url)
+        format_output(clean_url, dst_dir, file_name, image_name, image_url)
     except UnboundLocalError:
-        format_output(clean_url, dst_dir, model_name_or_basename, None, None)
+        format_output(clean_url, dst_dir, file_name, None, None)
 
     # =====================
     def run_aria2c(url, dst_dir, file_name=None, args="", header=""):
@@ -452,7 +439,7 @@ def manual_download(url, dst_dir, file_name, prefix=None):
 
     # -- GitHub or Hugging Face --
     elif 'github' in url or 'huggingface' in url:
-        run_aria2c(clean_url, dst_dir, basename, aria2_args, header_option if 'huggingface' in url else '')
+        run_aria2c(clean_url, dst_dir, file_name, aria2_args, hf_header if 'huggingface' in url else '')
 
     # -- Other HTTP/Sources --
     elif 'http' in url:
@@ -462,50 +449,52 @@ def manual_download(url, dst_dir, file_name, prefix=None):
 
 # Separation of merged numbers
 def split_numbers(num_str, max_num):
-    def helper(s):
-        if not s:
-            return []
+    result = []
+    i = 0
+    while i < len(num_str):
+        found = False
         for length in range(2, 0, -1):
-            if len(s) >= length:
-                part = int(s[:length])
+            if i + length <= len(num_str):
+                part = int(num_str[i:i + length])
                 if part <= max_num:
-                    result = helper(s[length:])
-                    if result is not None:
-                        return [part] + result
-        return None
-    return helper(num_str)
+                    result.append(part)
+                    i += length
+                    found = True
+                    break
+        if not found:
+            break
+    return result
 
 def add_submodels(selection, num_selection, model_dict, dst_dir):
-    selected_models = []
     if selection == "none":
-        return selected_models
+        return []
+    selected_models = []
+
     if selection == "ALL":
-        for models in model_dict.values():
-            selected_models.extend(models)
+        selected_models = sum(model_dict.values(), [])
     else:
         if selection in model_dict:
             selected_models.extend(model_dict[selection])
+
         nums = num_selection.replace(',', ' ').split()
         max_num = len(model_dict)
-        selected_nums = []
+        unique_nums = set()
 
         for num_part in nums:
             split_nums = split_numbers(num_part, max_num)
-            if split_nums:
-                selected_nums.extend(split_nums)
-
-        unique_nums = list(set(selected_nums))
+            unique_nums.update(split_nums)
 
         for num in unique_nums:
             if 1 <= num <= max_num:
-                name = list(model_dict)[num - 1]
+                name = list(model_dict.keys())[num - 1]
                 selected_models.extend(model_dict[name])
 
-    unique_models = list({model['name']: model for model in selected_models}.values())
+    unique_models = {model['name']: model for model in selected_models}.values()
+
     for model in unique_models:
         model['dst_dir'] = dst_dir
 
-    return unique_models
+    return list(unique_models)
 
 def handle_submodels(selection, num_selection, model_dict, dst_dir, url):
     submodels = add_submodels(selection, num_selection, model_dict, dst_dir)
@@ -515,6 +504,7 @@ def handle_submodels(selection, num_selection, model_dict, dst_dir, url):
         url += f"{submodel['url']} {submodel['dst_dir']} {submodel['name']}, "
     return url
 
+url = ""
 url = handle_submodels(model, model_num, model_list, models_dir, url)
 url = handle_submodels(vae, vae_num, vae_list, vaes_dir, url)
 url = handle_submodels(controlnet, controlnet_num, controlnet_list, control_dir, url)