dl prew img for models

files_cells/notebooks/en/downloading_en.ipynb

@@ -344,12 +344,42 @@
         "    \"adetailer\": adetailer_dir\n",
         "}\n",
         "\n",
-        "!mkdir -p {models_dir} {vaes_dir} {loras_dir} {embeddings_dir} {extensions_dir} {control_dir} {adetailer_dir}\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",
         "user_header = f\"\\\"Authorization: Bearer {hf_token}\\\"\"\n",
         "\n",
+        "''' Get Image Preview | CivitAi '''\n",
+        "\n",
+        "def get_data_from_api(model_id): # get model data\n",
+        "    base_url = f\"https://civitai.com/api/v1/model-versions/{model_id}\"\n",
+        "    headers = {\"Content-Type\": \"application/json\"}\n",
+        "    try:\n",
+        "        response = requests.get(base_url, headers=headers)\n",
+        "        if response.status_code == 200:\n",
+        "            return response.json()\n",
+        "        else:\n",
+        "            print(f\"Failed to retrieve data. Status code: {response.status_code}\")\n",
+        "            return None\n",
+        "    except requests.exceptions.RequestException as e:\n",
+        "        print(f\"An error occurred: {e}\")\n",
+        "        return None\n",
+        "\n",
+        "def extract_file_and_image_info(data):\n",
+        "    files = data.get('files', [{}])\n",
+        "    model_name = files[0].get('name', None) # get original file name\n",
+        "    images = data.get('images', [{}])\n",
+        "    image_url = images[0].get('url', None) # get preview: first image\n",
+        "    return model_name, image_url\n",
+        "\n",
+        "def generate_preview_filename(model_name, image_url):\n",
+        "    file_parts = model_name.split('.')\n",
+        "    image_format = image_url.split('.')[-1].split('?')[0]\n",
+        "    return f\"{file_parts[0]}.preview.{image_format}\" # assigning the original image format\n",
+        "\n",
         "''' main download code '''\n",
         "\n",
         "def handle_manual(url):\n",
@@ -368,17 +398,32 @@
         "                extension_repo.append((url, file_name))\n",
         "\n",
         "def manual_download(url, dst_dir, file_name):\n",
-        "    basename = url.split(\"/\")[-1] if file_name is None else file_name\n",
         "    header_option = f\"--header={user_header}\"\n",
+        "    basename = url.split(\"/\")[-1] if file_name is None else file_name\n",
+        "    aria2_args = '--optimize-concurrent-downloads --console-log-level=error --summary-interval=10 -j5 -x16 -s16 -k1M -c'\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",
-        "    # I do it at my own risk..... Fucking CivitAi >:(\n",
+        "    # === CivitAi API ===\n",
         "    civitai_token = \"62c0c5956b2f9defbd844d754000180b\"\n",
         "    if 'civitai' in url and civitai_token:\n",
+        "        model_id = url.split('/')[-1]\n",
+        "        data = get_data_from_api(model_id)\n",
         "        url = f\"{url}?token={civitai_token}\"\n",
         "\n",
+        "        if data:\n",
+        "            model_name, image_url = extract_file_and_image_info(data)\n",
+        "            if model_name and image_url:\n",
+        "                image_file_name = generate_preview_filename(model_name if not file_name else file_name, image_url)\n",
+        "                with capture.capture_output() as cap: # clear shit\n",
+        "                    !aria2c {aria2_args} -d {dst_dir} -o {image_file_name} {image_url}\n",
+        "                del cap\n",
+        "            else:\n",
+        "                print(\"File name or image URL missing.\")\n",
+        "        else:\n",
+        "            print(\"Failed to retrieve data from the API.\")\n",
+        "\n",
         "    # -- GDrive --\n",
         "    if 'drive.google' in url:\n",
         "        if 'folders' in url:\n",
@@ -388,22 +433,24 @@
         "               !gdown \"{url}\" -O {dst_dir}/{file_name} --fuzzy -c\n",
         "            else:\n",
         "               !gdown \"{url}\" -O {dst_dir} --fuzzy -c\n",
-        "    # -- Huggin Face --\n",
+        "\n",
+        "    # -- Hugging Face --\n",
         "    elif 'huggingface' in url:\n",
         "        if '/blob/' in url:\n",
         "            url = url.replace('/blob/', '/resolve/')\n",
         "        if file_name:\n",
-        "            !aria2c {header_option} --optimize-concurrent-downloads --console-log-level=error --summary-interval=10 -c -j5 -x16 -s16 -k1M -c -d {dst_dir} -o {basename} {url}\n",
+        "            !aria2c {header_option} {aria2_args} {dst_dir} -o {basename} {url}\n",
         "        else:\n",
         "            parsed_link = f'\\n{url}\\n\\tout={unquote(url.split(\"/\")[-1])}'\n",
-        "            !echo -e \"{parsed_link}\" | aria2c {header_option} --console-log-level=error --summary-interval=10 -i- -j5 -x16 -s16 -k1M -c -d \"{dst_dir}\" -o {basename}\n",
+        "            !echo -e \"{parsed_link}\" | aria2c {header_option} {aria2_args} -d \"{dst_dir}\" -o {basename}\n",
+        "\n",
         "    # -- Other --\n",
         "    elif 'http' in url or 'magnet' in url:\n",
         "        if file_name:\n",
-        "            !aria2c --optimize-concurrent-downloads --console-log-level=error --summary-interval=10 -j5 -x16 -s16 -k1M -c -d {dst_dir} -o {file_name} {url}\n",
+        "            !aria2c {aria2_args} -d {dst_dir} -o {file_name} {url}\n",
         "        else:\n",
         "            parsed_link = '\"{}\"'.format(url)\n",
-        "            !aria2c --optimize-concurrent-downloads --console-log-level=error --summary-interval=10 -j5 -x16 -s16 -k1M -c -d {dst_dir} -Z {parsed_link}\n",
+        "            !aria2c {aria2_args} -d {dst_dir} -Z {parsed_link}\n",
         "\n",
         "def download(url):\n",
         "    links_and_paths = url.split(',')\n",
@@ -423,8 +470,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",
@@ -561,21 +607,21 @@
         "else:\n",
         "    if any(not file.endswith('.txt') for file in os.listdir(models_dir)):\n",
         "        print(\"\\n\\033[33m➤ Models\\033[0m\")\n",
-        "        get_ipython().system(\"find {models_dir}/ -mindepth 1 ! -name '*.txt' -printf '%f\\\\n'\")\n",
+        "        !find {models_dir}/ -mindepth 1 -name '*.safetensors' -printf '%f\\n'\n",
         "    if any(not file.endswith('.txt') for file in os.listdir(vaes_dir)):\n",
         "        print(\"\\n\\033[33m➤ VAEs\\033[0m\")\n",
-        "        get_ipython().system(\"find {vaes_dir}/ -mindepth 1 ! -name '*.txt' -printf '%f\\\\n'\")\n",
+        "        !find {vaes_dir}/ -mindepth 1 -name '*.safetensors' -printf '%f\\n'\n",
         "    if any(not file.endswith('.txt') and not os.path.isdir(os.path.join(embeddings_dir, file)) for file in os.listdir(embeddings_dir)):\n",
         "        print(\"\\n\\033[33m➤ Embeddings\\033[0m\")\n",
-        "        get_ipython().system(\"find {embeddings_dir}/ -mindepth 1 -maxdepth 1 \\\\( -name '*.pt' -or -name '*.safetensors' \\\\) -printf '%f\\\\n'\")\n",
+        "        !find {embeddings_dir}/ -mindepth 1 -maxdepth 1 \\( -name '*.pt' -or -name '*.safetensors' \\) -printf '%f\\n'\n",
         "    if any(not file.endswith('.txt') for file in os.listdir(loras_dir)):\n",
         "        print(\"\\n\\033[33m➤ LoRAs\\033[0m\")\n",
-        "        get_ipython().system(\"find {loras_dir}/ -mindepth 1 ! -name '*.keep' -printf '%f\\\\n'\")\n",
+        "        !find {loras_dir}/ -mindepth 1 -name '*.safetensors' -printf '%f\\n'\n",
         "    print(f\"\\n\\033[33m➤ Extensions\\033[0m\")\n",
-        "    get_ipython().system(\"find {extensions_dir}/ -mindepth 1 -maxdepth 1 ! -name '*.txt' -printf '%f\\\\n'\")\n",
+        "    !find {extensions_dir}/ -mindepth 1 -maxdepth 1 ! -name '*.txt' -printf '%f\\n'\n",
         "    if any(not file.endswith(('.txt', '.yaml')) for file in os.listdir(control_dir)):\n",
         "        print(\"\\n\\033[33m➤ ControlNet\\033[0m\")\n",
-        "        get_ipython().system(\"find {control_dir}/ -mindepth 1 ! -name '*.yaml' -printf '%f\\\\n' | sed 's/^[^_]*_[^_]*_[^_]*_\\\\(.*\\\\)_fp16\\\\.safetensors$/\\\\1/'\")\n",
+        "        !find {control_dir}/ -mindepth 1 ! -name '*.yaml' -printf '%f\\n' | sed 's/^[^_]*_[^_]*_[^_]*_\\([^_]*\\)_fp16\\.safetensors$/\\1/'\n",
         "\n",
         "\n",
         "# === OTHER ===\n",

files_cells/notebooks/ru/downloading_ru.ipynb

@@ -344,12 +344,42 @@
         "    \"adetailer\": adetailer_dir\n",
         "}\n",
         "\n",
-        "!mkdir -p {models_dir} {vaes_dir} {loras_dir} {embeddings_dir} {extensions_dir} {control_dir} {adetailer_dir}\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",
         "user_header = f\"\\\"Authorization: Bearer {hf_token}\\\"\"\n",
         "\n",
+        "''' Get Image Preview | CivitAi '''\n",
+        "\n",
+        "def get_data_from_api(model_id): # get model data\n",
+        "    base_url = f\"https://civitai.com/api/v1/model-versions/{model_id}\"\n",
+        "    headers = {\"Content-Type\": \"application/json\"}\n",
+        "    try:\n",
+        "        response = requests.get(base_url, headers=headers)\n",
+        "        if response.status_code == 200:\n",
+        "            return response.json()\n",
+        "        else:\n",
+        "            print(f\"Failed to retrieve data. Status code: {response.status_code}\")\n",
+        "            return None\n",
+        "    except requests.exceptions.RequestException as e:\n",
+        "        print(f\"An error occurred: {e}\")\n",
+        "        return None\n",
+        "\n",
+        "def extract_file_and_image_info(data):\n",
+        "    files = data.get('files', [{}])\n",
+        "    model_name = files[0].get('name', None) # get original file name\n",
+        "    images = data.get('images', [{}])\n",
+        "    image_url = images[0].get('url', None) # get preview: first image\n",
+        "    return model_name, image_url\n",
+        "\n",
+        "def generate_preview_filename(model_name, image_url):\n",
+        "    file_parts = model_name.split('.')\n",
+        "    image_format = image_url.split('.')[-1].split('?')[0]\n",
+        "    return f\"{file_parts[0]}.preview.{image_format}\" # assigning the original image format\n",
+        "\n",
         "''' main download code '''\n",
         "\n",
         "def handle_manual(url):\n",
@@ -368,17 +398,32 @@
         "                extension_repo.append((url, file_name))\n",
         "\n",
         "def manual_download(url, dst_dir, file_name):\n",
-        "    basename = url.split(\"/\")[-1] if file_name is None else file_name\n",
         "    header_option = f\"--header={user_header}\"\n",
+        "    basename = url.split(\"/\")[-1] if file_name is None else file_name\n",
+        "    aria2_args = '--optimize-concurrent-downloads --console-log-level=error --summary-interval=10 -j5 -x16 -s16 -k1M -c'\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",
-        "    # I do it at my own risk..... Fucking CivitAi >:(\n",
+        "    # === CivitAi API ===\n",
         "    civitai_token = \"62c0c5956b2f9defbd844d754000180b\"\n",
         "    if 'civitai' in url and civitai_token:\n",
+        "        model_id = url.split('/')[-1]\n",
+        "        data = get_data_from_api(model_id)\n",
         "        url = f\"{url}?token={civitai_token}\"\n",
         "\n",
+        "        if data:\n",
+        "            model_name, image_url = extract_file_and_image_info(data)\n",
+        "            if model_name and image_url:\n",
+        "                image_file_name = generate_preview_filename(model_name if not file_name else file_name, image_url)\n",
+        "                with capture.capture_output() as cap: # clear shit\n",
+        "                    !aria2c {aria2_args} -d {dst_dir} -o {image_file_name} {image_url}\n",
+        "                del cap\n",
+        "            else:\n",
+        "                print(\"File name or image URL missing.\")\n",
+        "        else:\n",
+        "            print(\"Failed to retrieve data from the API.\")\n",
+        "\n",
         "    # -- GDrive --\n",
         "    if 'drive.google' in url:\n",
         "        if 'folders' in url:\n",
@@ -388,22 +433,24 @@
         "               !gdown \"{url}\" -O {dst_dir}/{file_name} --fuzzy -c\n",
         "            else:\n",
         "               !gdown \"{url}\" -O {dst_dir} --fuzzy -c\n",
-        "    # -- Huggin Face --\n",
+        "\n",
+        "    # -- Hugging Face --\n",
         "    elif 'huggingface' in url:\n",
         "        if '/blob/' in url:\n",
         "            url = url.replace('/blob/', '/resolve/')\n",
         "        if file_name:\n",
-        "            !aria2c {header_option} --optimize-concurrent-downloads --console-log-level=error --summary-interval=10 -c -j5 -x16 -s16 -k1M -c -d {dst_dir} -o {basename} {url}\n",
+        "            !aria2c {header_option} {aria2_args} {dst_dir} -o {basename} {url}\n",
         "        else:\n",
         "            parsed_link = f'\\n{url}\\n\\tout={unquote(url.split(\"/\")[-1])}'\n",
-        "            !echo -e \"{parsed_link}\" | aria2c {header_option} --console-log-level=error --summary-interval=10 -i- -j5 -x16 -s16 -k1M -c -d \"{dst_dir}\" -o {basename}\n",
+        "            !echo -e \"{parsed_link}\" | aria2c {header_option} {aria2_args} -d \"{dst_dir}\" -o {basename}\n",
+        "\n",
         "    # -- Other --\n",
         "    elif 'http' in url or 'magnet' in url:\n",
         "        if file_name:\n",
-        "            !aria2c --optimize-concurrent-downloads --console-log-level=error --summary-interval=10 -j5 -x16 -s16 -k1M -c -d {dst_dir} -o {file_name} {url}\n",
+        "            !aria2c {aria2_args} -d {dst_dir} -o {file_name} {url}\n",
         "        else:\n",
         "            parsed_link = '\"{}\"'.format(url)\n",
-        "            !aria2c --optimize-concurrent-downloads --console-log-level=error --summary-interval=10 -j5 -x16 -s16 -k1M -c -d {dst_dir} -Z {parsed_link}\n",
+        "            !aria2c {aria2_args} -d {dst_dir} -Z {parsed_link}\n",
         "\n",
         "def download(url):\n",
         "    links_and_paths = url.split(',')\n",
@@ -423,8 +470,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",
@@ -561,21 +607,21 @@
         "else:\n",
         "    if any(not file.endswith('.txt') for file in os.listdir(models_dir)):\n",
         "        print(\"\\n\\033[33m➤ Models\\033[0m\")\n",
-        "        get_ipython().system(\"find {models_dir}/ -mindepth 1 ! -name '*.txt' -printf '%f\\\\n'\")\n",
+        "        !find {models_dir}/ -mindepth 1 -name '*.safetensors' -printf '%f\\n'\n",
         "    if any(not file.endswith('.txt') for file in os.listdir(vaes_dir)):\n",
         "        print(\"\\n\\033[33m➤ VAEs\\033[0m\")\n",
-        "        get_ipython().system(\"find {vaes_dir}/ -mindepth 1 ! -name '*.txt' -printf '%f\\\\n'\")\n",
+        "        !find {vaes_dir}/ -mindepth 1 -name '*.safetensors' -printf '%f\\n'\n",
         "    if any(not file.endswith('.txt') and not os.path.isdir(os.path.join(embeddings_dir, file)) for file in os.listdir(embeddings_dir)):\n",
         "        print(\"\\n\\033[33m➤ Embeddings\\033[0m\")\n",
-        "        get_ipython().system(\"find {embeddings_dir}/ -mindepth 1 -maxdepth 1 \\\\( -name '*.pt' -or -name '*.safetensors' \\\\) -printf '%f\\\\n'\")\n",
+        "        !find {embeddings_dir}/ -mindepth 1 -maxdepth 1 \\( -name '*.pt' -or -name '*.safetensors' \\) -printf '%f\\n'\n",
         "    if any(not file.endswith('.txt') for file in os.listdir(loras_dir)):\n",
         "        print(\"\\n\\033[33m➤ LoRAs\\033[0m\")\n",
-        "        get_ipython().system(\"find {loras_dir}/ -mindepth 1 ! -name '*.keep' -printf '%f\\\\n'\")\n",
+        "        !find {loras_dir}/ -mindepth 1 -name '*.safetensors' -printf '%f\\n'\n",
         "    print(f\"\\n\\033[33m➤ Extensions\\033[0m\")\n",
-        "    get_ipython().system(\"find {extensions_dir}/ -mindepth 1 -maxdepth 1 ! -name '*.txt' -printf '%f\\\\n'\")\n",
+        "    !find {extensions_dir}/ -mindepth 1 -maxdepth 1 ! -name '*.txt' -printf '%f\\n'\n",
         "    if any(not file.endswith(('.txt', '.yaml')) for file in os.listdir(control_dir)):\n",
         "        print(\"\\n\\033[33m➤ ControlNet\\033[0m\")\n",
-        "        get_ipython().system(\"find {control_dir}/ -mindepth 1 ! -name '*.yaml' -printf '%f\\\\n' | sed 's/^[^_]*_[^_]*_[^_]*_\\\\(.*\\\\)_fp16\\\\.safetensors$/\\\\1/'\")\n",
+        "        !find {control_dir}/ -mindepth 1 ! -name '*.yaml' -printf '%f\\n' | sed 's/^[^_]*_[^_]*_[^_]*_\\([^_]*\\)_fp16\\.safetensors$/\\1/'\n",
         "\n",
         "\n",
         "# === OTHER ===\n",

files_cells/python/en/downloading_en.py

@@ -325,12 +325,42 @@ prefixes = {
     "adetailer": adetailer_dir
 }
 
-get_ipython().system('mkdir -p {models_dir} {vaes_dir} {loras_dir} {embeddings_dir} {extensions_dir} {control_dir} {adetailer_dir}')
+# !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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"
 user_header = f"\"Authorization: Bearer {hf_token}\""
 
+''' Get Image Preview | CivitAi '''
+
+def get_data_from_api(model_id): # get model data
+    base_url = f"https://civitai.com/api/v1/model-versions/{model_id}"
+    headers = {"Content-Type": "application/json"}
+    try:
+        response = requests.get(base_url, headers=headers)
+        if response.status_code == 200:
+            return response.json()
+        else:
+            print(f"Failed to retrieve data. Status code: {response.status_code}")
+            return None
+    except requests.exceptions.RequestException as e:
+        print(f"An error occurred: {e}")
+        return None
+
+def extract_file_and_image_info(data):
+    files = data.get('files', [{}])
+    model_name = files[0].get('name', None) # get original file name
+    images = data.get('images', [{}])
+    image_url = images[0].get('url', None) # get preview: first image
+    return model_name, image_url
+
+def generate_preview_filename(model_name, image_url):
+    file_parts = model_name.split('.')
+    image_format = image_url.split('.')[-1].split('?')[0]
+    return f"{file_parts[0]}.preview.{image_format}" # assigning the original image format
+
 ''' main download code '''
 
 def handle_manual(url):
@@ -349,17 +379,32 @@ def handle_manual(url):
                 extension_repo.append((url, file_name))
 
 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}"
+    basename = url.split("/")[-1] if file_name is None else file_name
+    aria2_args = '--optimize-concurrent-downloads --console-log-level=error --summary-interval=10 -j5 -x16 -s16 -k1M -c'
 
     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 API ===
     civitai_token = "62c0c5956b2f9defbd844d754000180b"
     if 'civitai' in url and civitai_token:
+        model_id = url.split('/')[-1]
+        data = get_data_from_api(model_id)
         url = f"{url}?token={civitai_token}"
 
+        if data:
+            model_name, image_url = extract_file_and_image_info(data)
+            if model_name and image_url:
+                image_file_name = generate_preview_filename(model_name if not file_name else file_name, image_url)
+                with capture.capture_output() as cap: # clear shit
+                    get_ipython().system('aria2c {aria2_args} -d {dst_dir} -o {image_file_name} {image_url}')
+                del cap
+            else:
+                print("File name or image URL missing.")
+        else:
+            print("Failed to retrieve data from the API.")
+
     # -- GDrive --
     if 'drive.google' in url:
         if 'folders' in url:
@@ -369,22 +414,24 @@ 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/')
         if file_name:
-            get_ipython().system('aria2c {header_option} --optimize-concurrent-downloads --console-log-level=error --summary-interval=10 -c -j5 -x16 -s16 -k1M -c -d {dst_dir} -o {basename} {url}')
+            get_ipython().system('aria2c {header_option} {aria2_args} {dst_dir} -o {basename} {url}')
         else:
             parsed_link = f'\n{url}\n\tout={unquote(url.split("/")[-1])}'
-            get_ipython().system('echo -e "{parsed_link}" | aria2c {header_option} --console-log-level=error --summary-interval=10 -i- -j5 -x16 -s16 -k1M -c -d "{dst_dir}" -o {basename}')
+            get_ipython().system('echo -e "{parsed_link}" | aria2c {header_option} {aria2_args} -d "{dst_dir}" -o {basename}')
+
     # -- Other --
     elif 'http' in url or 'magnet' in url:
         if file_name:
-            get_ipython().system('aria2c --optimize-concurrent-downloads --console-log-level=error --summary-interval=10 -j5 -x16 -s16 -k1M -c -d {dst_dir} -o {file_name} {url}')
+            get_ipython().system('aria2c {aria2_args} -d {dst_dir} -o {file_name} {url}')
         else:
             parsed_link = '"{}"'.format(url)
-            get_ipython().system('aria2c --optimize-concurrent-downloads --console-log-level=error --summary-interval=10 -j5 -x16 -s16 -k1M -c -d {dst_dir} -Z {parsed_link}')
+            get_ipython().system('aria2c {aria2_args} -d {dst_dir} -Z {parsed_link}')
 
 def download(url):
     links_and_paths = url.split(',')
@@ -404,8 +451,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:
@@ -539,21 +585,21 @@ if detailed_download == "off":
 else:
     if any(not file.endswith('.txt') for file in os.listdir(models_dir)):
         print("\n\033[33m➤ Models\033[0m")
-        get_ipython().system("find {models_dir}/ -mindepth 1 ! -name '*.txt' -printf '%f\\n'")
+        get_ipython().system("find {models_dir}/ -mindepth 1 -name '*.safetensors' -printf '%f\\n'")
     if any(not file.endswith('.txt') for file in os.listdir(vaes_dir)):
         print("\n\033[33m➤ VAEs\033[0m")
-        get_ipython().system("find {vaes_dir}/ -mindepth 1 ! -name '*.txt' -printf '%f\\n'")
+        get_ipython().system("find {vaes_dir}/ -mindepth 1 -name '*.safetensors' -printf '%f\\n'")
     if any(not file.endswith('.txt') and not os.path.isdir(os.path.join(embeddings_dir, file)) for file in os.listdir(embeddings_dir)):
         print("\n\033[33m➤ Embeddings\033[0m")
         get_ipython().system("find {embeddings_dir}/ -mindepth 1 -maxdepth 1 \\( -name '*.pt' -or -name '*.safetensors' \\) -printf '%f\\n'")
     if any(not file.endswith('.txt') for file in os.listdir(loras_dir)):
         print("\n\033[33m➤ LoRAs\033[0m")
-        get_ipython().system("find {loras_dir}/ -mindepth 1 ! -name '*.keep' -printf '%f\\n'")
+        get_ipython().system("find {loras_dir}/ -mindepth 1 -name '*.safetensors' -printf '%f\\n'")
     print(f"\n\033[33m➤ Extensions\033[0m")
     get_ipython().system("find {extensions_dir}/ -mindepth 1 -maxdepth 1 ! -name '*.txt' -printf '%f\\n'")
     if any(not file.endswith(('.txt', '.yaml')) for file in os.listdir(control_dir)):
         print("\n\033[33m➤ ControlNet\033[0m")
-        get_ipython().system("find {control_dir}/ -mindepth 1 ! -name '*.yaml' -printf '%f\\n' | sed 's/^[^_]*_[^_]*_[^_]*_\\(.*\\)_fp16\\.safetensors$/\\1/'")
+        get_ipython().system("find {control_dir}/ -mindepth 1 ! -name '*.yaml' -printf '%f\\n' | sed 's/^[^_]*_[^_]*_[^_]*_\\([^_]*\\)_fp16\\.safetensors$/\\1/'")
 
 
 # === OTHER ===

files_cells/python/ru/downloading_ru.py

@@ -325,12 +325,42 @@ prefixes = {
     "adetailer": adetailer_dir
 }
 
-get_ipython().system('mkdir -p {models_dir} {vaes_dir} {loras_dir} {embeddings_dir} {extensions_dir} {control_dir} {adetailer_dir}')
+# !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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"
 user_header = f"\"Authorization: Bearer {hf_token}\""
 
+''' Get Image Preview | CivitAi '''
+
+def get_data_from_api(model_id): # get model data
+    base_url = f"https://civitai.com/api/v1/model-versions/{model_id}"
+    headers = {"Content-Type": "application/json"}
+    try:
+        response = requests.get(base_url, headers=headers)
+        if response.status_code == 200:
+            return response.json()
+        else:
+            print(f"Failed to retrieve data. Status code: {response.status_code}")
+            return None
+    except requests.exceptions.RequestException as e:
+        print(f"An error occurred: {e}")
+        return None
+
+def extract_file_and_image_info(data):
+    files = data.get('files', [{}])
+    model_name = files[0].get('name', None) # get original file name
+    images = data.get('images', [{}])
+    image_url = images[0].get('url', None) # get preview: first image
+    return model_name, image_url
+
+def generate_preview_filename(model_name, image_url):
+    file_parts = model_name.split('.')
+    image_format = image_url.split('.')[-1].split('?')[0]
+    return f"{file_parts[0]}.preview.{image_format}" # assigning the original image format
+
 ''' main download code '''
 
 def handle_manual(url):
@@ -349,17 +379,32 @@ def handle_manual(url):
                 extension_repo.append((url, file_name))
 
 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}"
+    basename = url.split("/")[-1] if file_name is None else file_name
+    aria2_args = '--optimize-concurrent-downloads --console-log-level=error --summary-interval=10 -j5 -x16 -s16 -k1M -c'
 
     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 API ===
     civitai_token = "62c0c5956b2f9defbd844d754000180b"
     if 'civitai' in url and civitai_token:
+        model_id = url.split('/')[-1]
+        data = get_data_from_api(model_id)
         url = f"{url}?token={civitai_token}"
 
+        if data:
+            model_name, image_url = extract_file_and_image_info(data)
+            if model_name and image_url:
+                image_file_name = generate_preview_filename(model_name if not file_name else file_name, image_url)
+                with capture.capture_output() as cap: # clear shit
+                    get_ipython().system('aria2c {aria2_args} -d {dst_dir} -o {image_file_name} {image_url}')
+                del cap
+            else:
+                print("File name or image URL missing.")
+        else:
+            print("Failed to retrieve data from the API.")
+
     # -- GDrive --
     if 'drive.google' in url:
         if 'folders' in url:
@@ -369,22 +414,24 @@ 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/')
         if file_name:
-            get_ipython().system('aria2c {header_option} --optimize-concurrent-downloads --console-log-level=error --summary-interval=10 -c -j5 -x16 -s16 -k1M -c -d {dst_dir} -o {basename} {url}')
+            get_ipython().system('aria2c {header_option} {aria2_args} {dst_dir} -o {basename} {url}')
         else:
             parsed_link = f'\n{url}\n\tout={unquote(url.split("/")[-1])}'
-            get_ipython().system('echo -e "{parsed_link}" | aria2c {header_option} --console-log-level=error --summary-interval=10 -i- -j5 -x16 -s16 -k1M -c -d "{dst_dir}" -o {basename}')
+            get_ipython().system('echo -e "{parsed_link}" | aria2c {header_option} {aria2_args} -d "{dst_dir}" -o {basename}')
+
     # -- Other --
     elif 'http' in url or 'magnet' in url:
         if file_name:
-            get_ipython().system('aria2c --optimize-concurrent-downloads --console-log-level=error --summary-interval=10 -j5 -x16 -s16 -k1M -c -d {dst_dir} -o {file_name} {url}')
+            get_ipython().system('aria2c {aria2_args} -d {dst_dir} -o {file_name} {url}')
         else:
             parsed_link = '"{}"'.format(url)
-            get_ipython().system('aria2c --optimize-concurrent-downloads --console-log-level=error --summary-interval=10 -j5 -x16 -s16 -k1M -c -d {dst_dir} -Z {parsed_link}')
+            get_ipython().system('aria2c {aria2_args} -d {dst_dir} -Z {parsed_link}')
 
 def download(url):
     links_and_paths = url.split(',')
@@ -404,8 +451,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:
@@ -539,21 +585,21 @@ if detailed_download == "off":
 else:
     if any(not file.endswith('.txt') for file in os.listdir(models_dir)):
         print("\n\033[33m➤ Models\033[0m")
-        get_ipython().system("find {models_dir}/ -mindepth 1 ! -name '*.txt' -printf '%f\\n'")
+        get_ipython().system("find {models_dir}/ -mindepth 1 -name '*.safetensors' -printf '%f\\n'")
     if any(not file.endswith('.txt') for file in os.listdir(vaes_dir)):
         print("\n\033[33m➤ VAEs\033[0m")
-        get_ipython().system("find {vaes_dir}/ -mindepth 1 ! -name '*.txt' -printf '%f\\n'")
+        get_ipython().system("find {vaes_dir}/ -mindepth 1 -name '*.safetensors' -printf '%f\\n'")
     if any(not file.endswith('.txt') and not os.path.isdir(os.path.join(embeddings_dir, file)) for file in os.listdir(embeddings_dir)):
         print("\n\033[33m➤ Embeddings\033[0m")
         get_ipython().system("find {embeddings_dir}/ -mindepth 1 -maxdepth 1 \\( -name '*.pt' -or -name '*.safetensors' \\) -printf '%f\\n'")
     if any(not file.endswith('.txt') for file in os.listdir(loras_dir)):
         print("\n\033[33m➤ LoRAs\033[0m")
-        get_ipython().system("find {loras_dir}/ -mindepth 1 ! -name '*.keep' -printf '%f\\n'")
+        get_ipython().system("find {loras_dir}/ -mindepth 1 -name '*.safetensors' -printf '%f\\n'")
     print(f"\n\033[33m➤ Extensions\033[0m")
     get_ipython().system("find {extensions_dir}/ -mindepth 1 -maxdepth 1 ! -name '*.txt' -printf '%f\\n'")
     if any(not file.endswith(('.txt', '.yaml')) for file in os.listdir(control_dir)):
         print("\n\033[33m➤ ControlNet\033[0m")
-        get_ipython().system("find {control_dir}/ -mindepth 1 ! -name '*.yaml' -printf '%f\\n' | sed 's/^[^_]*_[^_]*_[^_]*_\\(.*\\)_fp16\\.safetensors$/\\1/'")
+        get_ipython().system("find {control_dir}/ -mindepth 1 ! -name '*.yaml' -printf '%f\\n' | sed 's/^[^_]*_[^_]*_[^_]*_\\([^_]*\\)_fp16\\.safetensors$/\\1/'")
 
 
 # === OTHER ===