👽️ Updated part of CivitAi API & ✨Added new 'config' tag to download your config files :3

files_cells/notebooks/en/downloading_en.ipynb

@@ -318,7 +318,8 @@
         "    \"embed\": embeddings_dir,\n",
         "    \"extension\": extensions_dir,\n",
         "    \"control\": control_dir,\n",
-        "    \"adetailer\": adetailer_dir\n",
+        "    \"adetailer\": adetailer_dir,\n",
+        "    \"config\": webui_path\n",
         "}\n",
         "\n",
         "extension_repo = []\n",
@@ -347,49 +348,136 @@
         "    print(f\"\\033[33mSAVE DIR: \\033[34m{dst_dir}\")\n",
         "    print(f\"\\033[33mFILE NAME: \\033[34m{file_name}\\033[0m\")\n",
         "\n",
-        "''' Get Image Preview | CivitAi '''\n",
-        "\n",
-        "def get_data_from_api(model_id):\n",
-        "    \"\"\"Fetch model data from the API\"\"\"\n",
-        "    endpoint_url = f\"https://civitai.com/api/v1/model-versions/{model_id}\"\n",
-        "    headers = {\"Content-Type\": \"application/json\"}\n",
-        "    try:\n",
-        "        response = requests.get(endpoint_url, headers=headers)\n",
-        "        response.raise_for_status()\n",
-        "        return response.json()\n",
-        "    except requests.exceptions.RequestException as e:\n",
-        "        print(f\"An error occurred: {e}\")\n",
-        "        return None\n",
-        "\n",
-        "def extract_model_info(data, url):\n",
-        "    \"\"\"Extract model information based on URL\"\"\"\n",
-        "    if 'type=' in url:\n",
+        "''' GET CivitAi API - DATA '''\n",
+        "\n",
+        "def strip_(url, file_name=None):\n",
+        "    if 'github.com' in url:\n",
+        "        if '/blob/' in url:\n",
+        "            url = url.replace('/blob/', '/raw/')\n",
+        "\n",
+        "    elif \"civitai.com\" in url:\n",
+        "        return CivitAi_API(url, file_name)\n",
+        "\n",
+        "    elif \"huggingface.co\" in url:\n",
+        "        if '/blob/' in url:\n",
+        "            url = url.replace('/blob/', '/resolve/')\n",
+        "        if '?' in url:\n",
+        "            url = url.split('?')[0]\n",
+        "\n",
+        "    return url\n",
+        "\n",
+        "def CivitAi_API(url, file_name=None):\n",
+        "    support_types = ('Checkpoint', 'Model', 'TextualInversion', 'LORA')\n",
+        "    civitai_token = \"62c0c5956b2f9defbd844d754000180b\"\n",
+        "\n",
+        "    if '?token=' in url:\n",
+        "        url = url.split('?token=')[0]\n",
+        "    if '?type=' in url:\n",
+        "        url = url.replace('?type=', f'?token={civitai_token}&type=')\n",
+        "    else:\n",
+        "        url = f\"{url}?token={civitai_token}\"\n",
+        "\n",
+        "    # Determine model or version id\n",
+        "    if \"civitai.com/models/\" in url:\n",
+        "        if '?modelVersionId=' in url:\n",
+        "            version_id = url.split('?modelVersionId=')[1]\n",
+        "            response = requests.get(f\"https://civitai.com/api/v1/model-versions/{version_id}\")\n",
+        "            # print(f\"end - https://civitai.com/api/v1/model-versions/{version_id}\")\n",
+        "        else:\n",
+        "            model_id = url.split('/models/')[1].split('/')[0]\n",
+        "            response = requests.get(f\"https://civitai.com/api/v1/models/{model_id}\")\n",
+        "            # print(f\"end - https://civitai.com/api/v1/models/{model_id}\")\n",
+        "    else:\n",
+        "        version_id = url.split('/models/')[1].split('/')[0]\n",
+        "        response = requests.get(f\"https://civitai.com/api/v1/model-versions/{version_id}\")\n",
+        "        # print(f\"end - https://civitai.com/api/v1/model-versions/{version_id}\")\n",
+        "\n",
+        "    data = response.json()\n",
+        "\n",
+        "    if response.status_code != 200:\n",
+        "        return None, None, None, None, None, None, None\n",
+        "\n",
+        "    # Define model type and name\n",
+        "    if \"civitai.com/models/\" in url:\n",
+        "        if '?modelVersionId=' in url:\n",
+        "            model_type = data['model']['type']\n",
+        "            model_name = data['files'][0]['name']\n",
+        "        else:\n",
+        "            model_type = data['type']\n",
+        "            model_name = data['modelVersions'][0]['files'][0]['name']\n",
+        "    elif 'type=' in url:\n",
         "        model_type = parse_qs(urlparse(url).query).get('type', [''])[0]\n",
-        "        model_name = data['files'][1]['name']\n",
+        "        if 'model' in model_type.lower():\n",
+        "            model_name = data['files'][0]['name']\n",
+        "        else:\n",
+        "            model_name = data['files'][1]['name']\n",
         "    else:\n",
         "        model_type = data['model']['type']\n",
         "        model_name = data['files'][0]['name']\n",
         "\n",
-        "    # Finding a safe image: less than level 4 | Kaggle\n",
-        "    if env == 'Kaggle':\n",
-        "        image_url = next((image['url'] for image in data['images'] if image['nsfwLevel'] < 4), None)\n",
+        "    model_name = file_name or model_name\n",
+        "\n",
+        "    # Determine DownloadUrl\n",
+        "    if \"civitai.com/models/\" in url:\n",
+        "        if '?modelVersionId=' in url:\n",
+        "            download_url = data.get('downloadUrl')\n",
+        "        else:\n",
+        "            download_url = data[\"modelVersions\"][0].get(\"downloadUrl\", \"\")\n",
+        "    elif 'type=' in url:\n",
+        "        if any(t.lower() in model_type.lower() for t in support_types):\n",
+        "            download_url = data['files'][0]['downloadUrl']\n",
+        "        else:\n",
+        "            download_url = data['files'][1]['downloadUrl']\n",
         "    else:\n",
-        "        image_url = data['images'][0]['url']\n",
+        "        download_url = data.get('downloadUrl')\n",
         "\n",
-        "    return model_type, model_name, image_url\n",
+        "    clean_url = re.sub(r'[?&]token=[^&]*', '', download_url) # hide token\n",
+        "\n",
+        "    # Find a safe image: level less than 4 | Kaggle\n",
+        "    image_url, image_name = None, None\n",
+        "    if any(t in model_type for t in support_types):\n",
+        "        try:\n",
+        "            images = data.get('images') or data['modelVersions'][0].get('images', [])\n",
+        "            if env == 'Kaggle':\n",
+        "                image_url = next((image['url'] for image in images if image['nsfwLevel'] < 4), None)\n",
+        "            else:\n",
+        "                image_url = images[0]['url'] if images else None\n",
+        "        except KeyError:\n",
+        "            pass\n",
+        "\n",
+        "        # Generate a name to save the image\n",
+        "        image_name = f\"{model_name.split('.')[0]}.preview.{image_url.split('.')[-1]}\" if image_url else None\n",
+        "\n",
+        "    return f\"{download_url}{'&' if '?' in download_url else '?'}token={civitai_token}\", clean_url, model_type, model_name, image_url, image_name, data\n",
+        "\n",
+        "''' Main Download Code '''\n",
+        "\n",
+        "def download(url):\n",
+        "    links_and_paths = [link_or_path.strip() for link_or_path in url.split(',') if link_or_path.strip()]\n",
+        "\n",
+        "    for link_or_path in links_and_paths:\n",
+        "        if any(link_or_path.lower().startswith(prefix) for prefix in prefixes):\n",
+        "            handle_manual(link_or_path)\n",
+        "        else:\n",
+        "            url, dst_dir, file_name = link_or_path.split()\n",
+        "            manual_download(url, dst_dir, file_name)\n",
         "\n",
-        "def gen_preview_filename(model_name, image_url):\n",
-        "    \"\"\"Generate a preview filename\"\"\"\n",
-        "    name = model_name.split('.')\n",
-        "    img_exts = image_url.split('.')\n",
-        "    return f\"{name[0]}.preview.{img_exts[-1]}\"\n",
+        "    unpack_zip_files()\n",
         "\n",
-        "''' main download code '''\n",
+        "def unpack_zip_files():\n",
+        "    for directory in directories:\n",
+        "        for root, _, 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",
         "def handle_manual(url):\n",
         "    url_parts = url.split(':', 1)\n",
-        "    prefix = url_parts[0]\n",
-        "    path = url_parts[1]\n",
+        "    prefix, path = url_parts[0], url_parts[1]\n",
         "\n",
         "    file_name_match = re.search(r'\\[(.*?)\\]', path)\n",
         "    file_name = file_name_match.group(1) if file_name_match else None\n",
@@ -411,40 +499,38 @@
         "    basename = url.split(\"/\")[-1] if file_name is None else file_name\n",
         "    header_option = f\"--header={user_header}\"\n",
         "\n",
-        "    # ==== CivitAi API+ ====\n",
-        "    support_types = ('Checkpoint', 'Model', 'TextualInversion', 'LORA') # for dl preview image\n",
-        "    civitai_token = \"62c0c5956b2f9defbd844d754000180b\"\n",
+        "    if 'github.com' in url:\n",
+        "        url = strip_(url)\n",
         "\n",
-        "    if 'civitai' in url:\n",
-        "        url = f\"{url}{'&' if '?' in url else '?'}token={civitai_token}\"\n",
-        "        model_id = url.split('/')[-1].split('?')[0]\n",
-        "        clean_url = re.sub(r'[?&]token=[^&]*', '', url) # hide token\n",
-        "\n",
-        "        data = get_data_from_api(model_id)\n",
-        "        if data:\n",
-        "            model_type, model_name, image_url = extract_model_info(data, url)\n",
-        "\n",
-        "            if any(t in model_type for t in support_types):\n",
-        "                if model_name and image_url:\n",
-        "                    image_file_name = gen_preview_filename(model_name if not file_name else file_name, image_url)\n",
-        "                    with capture.capture_output() as cap:\n",
-        "                        !aria2c {aria2_args} -d {dst_dir} -o {image_file_name} '{image_url}'\n",
-        "                    del cap\n",
-        "            file_name = file_name or model_name\n",
-        "    else:\n",
-        "        clean_url = url\n",
+        "    # -- CivitAi APi+ V2 --\n",
+        "    elif 'civitai' in url:\n",
+        "        url, clean_url, model_type, file_name, image_url, image_name, data = strip_(url, file_name)\n",
+        "\n",
+        "        if image_url and image_name:\n",
+        "            with capture.capture_output() as cap:\n",
+        "                !aria2c {aria2_args} -d {dst_dir} -o '{image_name}' '{image_url}'\n",
+        "            del cap\n",
+        "\n",
+        "    elif \"huggingface.co\" in url:\n",
+        "        clean_url = strip_(url)\n",
         "\n",
         "    \"\"\" Formatted info output \"\"\"\n",
         "    model_name_or_basename = file_name if not 'huggingface' in url else basename\n",
         "    format_output(clean_url or url, dst_dir, model_name_or_basename)\n",
         "\n",
-        "    print(\"\\033[31m[Data Info]:\\033[0m Failed to retrieve data from the API.\\n\") if 'civitai' in url and not data else None\n",
-        "    if 'civitai' in url and data and any(t in model_type for t in support_types) and (locals().get('image_file_name') or ''):\n",
-        "        print(f\"\\033[32m[Preview DL]:\\033[0m {image_file_name} - {image_url}\\n\")\n",
+        "    # ## -- for my tests --\n",
+        "    # print(url, dst_dir, model_name_or_basename)\n",
+        "    print(f\"\\033[31m[Data Info]:\\033[0m Failed to retrieve data from the API.\\n\") if 'civitai' in url and not data else None\n",
+        "    if 'civitai' in url and data and image_name:\n",
+        "        print(f\"\\033[32m[Preview DL]:\\033[0m {image_name} - {image_url}\\n\")\n",
         "    # =====================\n",
         "\n",
+        "    # # -- Git Hub --\n",
+        "    if 'github.com' in url or 'githubusercontent.com' in url:\n",
+        "        !aria2c {aria2_args} -d {dst_dir} -o '{basename}' '{url}'\n",
+        "\n",
         "    # -- GDrive --\n",
-        "    if 'drive.google' in url:\n",
+        "    elif 'drive.google' in url:\n",
         "        try:\n",
         "            have_drive_link\n",
         "        except:\n",
@@ -461,43 +547,13 @@
         "\n",
         "    # -- Hugging Face --\n",
         "    elif 'huggingface' in url:\n",
-        "        if '/blob/' in url:\n",
-        "            url = url.replace('/blob/', '/resolve/')\n",
-        "        !aria2c {header_option} {aria2_args} -d {dst_dir} -o {basename} '{url}'\n",
+        "        !aria2c {header_option} {aria2_args} -d {dst_dir} -o '{basename}' '{url}'\n",
         "\n",
         "    # -- Other --\n",
         "    elif 'http' in url:\n",
-        "        !aria2c {aria2_args} -d {dst_dir} {'-o' + file_name if file_name else ''} '{url}'\n",
-        "\n",
-        "def download(url):\n",
-        "    links_and_paths = url.split(',')\n",
-        "\n",
-        "    for link_or_path in links_and_paths:\n",
-        "        link_or_path = link_or_path.strip()\n",
-        "        if not link_or_path:\n",
-        "            continue\n",
-        "        if any(link_or_path.startswith(prefix.lower()) for prefix in prefixes):\n",
-        "            handle_manual(link_or_path)\n",
-        "            continue\n",
-        "\n",
-        "        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",
-        "    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",
+        "        !aria2c {aria2_args} -d {dst_dir} '{'-o' + file_name if file_name else ''}' '{url}'\n",
         "\n",
-        "''' submodels - added urls '''\n",
+        "''' SubModels - Added URLs '''\n",
         "\n",
         "def add_submodels(selection, num_selection, model_dict, dst_dir):\n",
         "    if selection == \"none\":\n",

files_cells/notebooks/ru/downloading_ru.ipynb

@@ -318,7 +318,8 @@
         "    \"embed\": embeddings_dir,\n",
         "    \"extension\": extensions_dir,\n",
         "    \"control\": control_dir,\n",
-        "    \"adetailer\": adetailer_dir\n",
+        "    \"adetailer\": adetailer_dir,\n",
+        "    \"config\": webui_path\n",
         "}\n",
         "\n",
         "extension_repo = []\n",
@@ -347,49 +348,136 @@
         "    print(f\"\\033[33mSAVE DIR: \\033[34m{dst_dir}\")\n",
         "    print(f\"\\033[33mFILE NAME: \\033[34m{file_name}\\033[0m\")\n",
         "\n",
-        "''' Get Image Preview | CivitAi '''\n",
-        "\n",
-        "def get_data_from_api(model_id):\n",
-        "    \"\"\"Fetch model data from the API\"\"\"\n",
-        "    endpoint_url = f\"https://civitai.com/api/v1/model-versions/{model_id}\"\n",
-        "    headers = {\"Content-Type\": \"application/json\"}\n",
-        "    try:\n",
-        "        response = requests.get(endpoint_url, headers=headers)\n",
-        "        response.raise_for_status()\n",
-        "        return response.json()\n",
-        "    except requests.exceptions.RequestException as e:\n",
-        "        print(f\"An error occurred: {e}\")\n",
-        "        return None\n",
-        "\n",
-        "def extract_model_info(data, url):\n",
-        "    \"\"\"Extract model information based on URL\"\"\"\n",
-        "    if 'type=' in url:\n",
+        "''' GET CivitAi API - DATA '''\n",
+        "\n",
+        "def strip_(url, file_name=None):\n",
+        "    if 'github.com' in url:\n",
+        "        if '/blob/' in url:\n",
+        "            url = url.replace('/blob/', '/raw/')\n",
+        "\n",
+        "    elif \"civitai.com\" in url:\n",
+        "        return CivitAi_API(url, file_name)\n",
+        "\n",
+        "    elif \"huggingface.co\" in url:\n",
+        "        if '/blob/' in url:\n",
+        "            url = url.replace('/blob/', '/resolve/')\n",
+        "        if '?' in url:\n",
+        "            url = url.split('?')[0]\n",
+        "\n",
+        "    return url\n",
+        "\n",
+        "def CivitAi_API(url, file_name=None):\n",
+        "    support_types = ('Checkpoint', 'Model', 'TextualInversion', 'LORA')\n",
+        "    civitai_token = \"62c0c5956b2f9defbd844d754000180b\"\n",
+        "\n",
+        "    if '?token=' in url:\n",
+        "        url = url.split('?token=')[0]\n",
+        "    if '?type=' in url:\n",
+        "        url = url.replace('?type=', f'?token={civitai_token}&type=')\n",
+        "    else:\n",
+        "        url = f\"{url}?token={civitai_token}\"\n",
+        "\n",
+        "    # Determine model or version id\n",
+        "    if \"civitai.com/models/\" in url:\n",
+        "        if '?modelVersionId=' in url:\n",
+        "            version_id = url.split('?modelVersionId=')[1]\n",
+        "            response = requests.get(f\"https://civitai.com/api/v1/model-versions/{version_id}\")\n",
+        "            # print(f\"end - https://civitai.com/api/v1/model-versions/{version_id}\")\n",
+        "        else:\n",
+        "            model_id = url.split('/models/')[1].split('/')[0]\n",
+        "            response = requests.get(f\"https://civitai.com/api/v1/models/{model_id}\")\n",
+        "            # print(f\"end - https://civitai.com/api/v1/models/{model_id}\")\n",
+        "    else:\n",
+        "        version_id = url.split('/models/')[1].split('/')[0]\n",
+        "        response = requests.get(f\"https://civitai.com/api/v1/model-versions/{version_id}\")\n",
+        "        # print(f\"end - https://civitai.com/api/v1/model-versions/{version_id}\")\n",
+        "\n",
+        "    data = response.json()\n",
+        "\n",
+        "    if response.status_code != 200:\n",
+        "        return None, None, None, None, None, None, None\n",
+        "\n",
+        "    # Define model type and name\n",
+        "    if \"civitai.com/models/\" in url:\n",
+        "        if '?modelVersionId=' in url:\n",
+        "            model_type = data['model']['type']\n",
+        "            model_name = data['files'][0]['name']\n",
+        "        else:\n",
+        "            model_type = data['type']\n",
+        "            model_name = data['modelVersions'][0]['files'][0]['name']\n",
+        "    elif 'type=' in url:\n",
         "        model_type = parse_qs(urlparse(url).query).get('type', [''])[0]\n",
-        "        model_name = data['files'][1]['name']\n",
+        "        if 'model' in model_type.lower():\n",
+        "            model_name = data['files'][0]['name']\n",
+        "        else:\n",
+        "            model_name = data['files'][1]['name']\n",
         "    else:\n",
         "        model_type = data['model']['type']\n",
         "        model_name = data['files'][0]['name']\n",
         "\n",
-        "    # Finding a safe image: less than level 4 | Kaggle\n",
-        "    if env == 'Kaggle':\n",
-        "        image_url = next((image['url'] for image in data['images'] if image['nsfwLevel'] < 4), None)\n",
+        "    model_name = file_name or model_name\n",
+        "\n",
+        "    # Determine DownloadUrl\n",
+        "    if \"civitai.com/models/\" in url:\n",
+        "        if '?modelVersionId=' in url:\n",
+        "            download_url = data.get('downloadUrl')\n",
+        "        else:\n",
+        "            download_url = data[\"modelVersions\"][0].get(\"downloadUrl\", \"\")\n",
+        "    elif 'type=' in url:\n",
+        "        if any(t.lower() in model_type.lower() for t in support_types):\n",
+        "            download_url = data['files'][0]['downloadUrl']\n",
+        "        else:\n",
+        "            download_url = data['files'][1]['downloadUrl']\n",
         "    else:\n",
-        "        image_url = data['images'][0]['url']\n",
+        "        download_url = data.get('downloadUrl')\n",
         "\n",
-        "    return model_type, model_name, image_url\n",
+        "    clean_url = re.sub(r'[?&]token=[^&]*', '', download_url) # hide token\n",
+        "\n",
+        "    # Find a safe image: level less than 4 | Kaggle\n",
+        "    image_url, image_name = None, None\n",
+        "    if any(t in model_type for t in support_types):\n",
+        "        try:\n",
+        "            images = data.get('images') or data['modelVersions'][0].get('images', [])\n",
+        "            if env == 'Kaggle':\n",
+        "                image_url = next((image['url'] for image in images if image['nsfwLevel'] < 4), None)\n",
+        "            else:\n",
+        "                image_url = images[0]['url'] if images else None\n",
+        "        except KeyError:\n",
+        "            pass\n",
+        "\n",
+        "        # Generate a name to save the image\n",
+        "        image_name = f\"{model_name.split('.')[0]}.preview.{image_url.split('.')[-1]}\" if image_url else None\n",
+        "\n",
+        "    return f\"{download_url}{'&' if '?' in download_url else '?'}token={civitai_token}\", clean_url, model_type, model_name, image_url, image_name, data\n",
+        "\n",
+        "''' Main Download Code '''\n",
+        "\n",
+        "def download(url):\n",
+        "    links_and_paths = [link_or_path.strip() for link_or_path in url.split(',') if link_or_path.strip()]\n",
+        "\n",
+        "    for link_or_path in links_and_paths:\n",
+        "        if any(link_or_path.lower().startswith(prefix) for prefix in prefixes):\n",
+        "            handle_manual(link_or_path)\n",
+        "        else:\n",
+        "            url, dst_dir, file_name = link_or_path.split()\n",
+        "            manual_download(url, dst_dir, file_name)\n",
         "\n",
-        "def gen_preview_filename(model_name, image_url):\n",
-        "    \"\"\"Generate a preview filename\"\"\"\n",
-        "    name = model_name.split('.')\n",
-        "    img_exts = image_url.split('.')\n",
-        "    return f\"{name[0]}.preview.{img_exts[-1]}\"\n",
+        "    unpack_zip_files()\n",
         "\n",
-        "''' main download code '''\n",
+        "def unpack_zip_files():\n",
+        "    for directory in directories:\n",
+        "        for root, _, 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",
         "def handle_manual(url):\n",
         "    url_parts = url.split(':', 1)\n",
-        "    prefix = url_parts[0]\n",
-        "    path = url_parts[1]\n",
+        "    prefix, path = url_parts[0], url_parts[1]\n",
         "\n",
         "    file_name_match = re.search(r'\\[(.*?)\\]', path)\n",
         "    file_name = file_name_match.group(1) if file_name_match else None\n",
@@ -411,40 +499,38 @@
         "    basename = url.split(\"/\")[-1] if file_name is None else file_name\n",
         "    header_option = f\"--header={user_header}\"\n",
         "\n",
-        "    # ==== CivitAi API+ ====\n",
-        "    support_types = ('Checkpoint', 'Model', 'TextualInversion', 'LORA') # for dl preview image\n",
-        "    civitai_token = \"62c0c5956b2f9defbd844d754000180b\"\n",
+        "    if 'github.com' in url:\n",
+        "        url = strip_(url)\n",
         "\n",
-        "    if 'civitai' in url:\n",
-        "        url = f\"{url}{'&' if '?' in url else '?'}token={civitai_token}\"\n",
-        "        model_id = url.split('/')[-1].split('?')[0]\n",
-        "        clean_url = re.sub(r'[?&]token=[^&]*', '', url) # hide token\n",
-        "\n",
-        "        data = get_data_from_api(model_id)\n",
-        "        if data:\n",
-        "            model_type, model_name, image_url = extract_model_info(data, url)\n",
-        "\n",
-        "            if any(t in model_type for t in support_types):\n",
-        "                if model_name and image_url:\n",
-        "                    image_file_name = gen_preview_filename(model_name if not file_name else file_name, image_url)\n",
-        "                    with capture.capture_output() as cap:\n",
-        "                        !aria2c {aria2_args} -d {dst_dir} -o {image_file_name} '{image_url}'\n",
-        "                    del cap\n",
-        "            file_name = file_name or model_name\n",
-        "    else:\n",
-        "        clean_url = url\n",
+        "    # -- CivitAi APi+ V2 --\n",
+        "    elif 'civitai' in url:\n",
+        "        url, clean_url, model_type, file_name, image_url, image_name, data = strip_(url, file_name)\n",
+        "\n",
+        "        if image_url and image_name:\n",
+        "            with capture.capture_output() as cap:\n",
+        "                !aria2c {aria2_args} -d {dst_dir} -o '{image_name}' '{image_url}'\n",
+        "            del cap\n",
+        "\n",
+        "    elif \"huggingface.co\" in url:\n",
+        "        clean_url = strip_(url)\n",
         "\n",
         "    \"\"\" Formatted info output \"\"\"\n",
         "    model_name_or_basename = file_name if not 'huggingface' in url else basename\n",
         "    format_output(clean_url or url, dst_dir, model_name_or_basename)\n",
         "\n",
-        "    print(\"\\033[31m[Data Info]:\\033[0m Failed to retrieve data from the API.\\n\") if 'civitai' in url and not data else None\n",
-        "    if 'civitai' in url and data and any(t in model_type for t in support_types) and (locals().get('image_file_name') or ''):\n",
-        "        print(f\"\\033[32m[Preview DL]:\\033[0m {image_file_name} - {image_url}\\n\")\n",
+        "    # ## -- for my tests --\n",
+        "    # print(url, dst_dir, model_name_or_basename)\n",
+        "    print(f\"\\033[31m[Data Info]:\\033[0m Failed to retrieve data from the API.\\n\") if 'civitai' in url and not data else None\n",
+        "    if 'civitai' in url and data and image_name:\n",
+        "        print(f\"\\033[32m[Preview DL]:\\033[0m {image_name} - {image_url}\\n\")\n",
         "    # =====================\n",
         "\n",
+        "    # # -- Git Hub --\n",
+        "    if 'github.com' in url or 'githubusercontent.com' in url:\n",
+        "        !aria2c {aria2_args} -d {dst_dir} -o '{basename}' '{url}'\n",
+        "\n",
         "    # -- GDrive --\n",
-        "    if 'drive.google' in url:\n",
+        "    elif 'drive.google' in url:\n",
         "        try:\n",
         "            have_drive_link\n",
         "        except:\n",
@@ -461,43 +547,13 @@
         "\n",
         "    # -- Hugging Face --\n",
         "    elif 'huggingface' in url:\n",
-        "        if '/blob/' in url:\n",
-        "            url = url.replace('/blob/', '/resolve/')\n",
-        "        !aria2c {header_option} {aria2_args} -d {dst_dir} -o {basename} '{url}'\n",
+        "        !aria2c {header_option} {aria2_args} -d {dst_dir} -o '{basename}' '{url}'\n",
         "\n",
         "    # -- Other --\n",
         "    elif 'http' in url:\n",
-        "        !aria2c {aria2_args} -d {dst_dir} {'-o' + file_name if file_name else ''} '{url}'\n",
-        "\n",
-        "def download(url):\n",
-        "    links_and_paths = url.split(',')\n",
-        "\n",
-        "    for link_or_path in links_and_paths:\n",
-        "        link_or_path = link_or_path.strip()\n",
-        "        if not link_or_path:\n",
-        "            continue\n",
-        "        if any(link_or_path.startswith(prefix.lower()) for prefix in prefixes):\n",
-        "            handle_manual(link_or_path)\n",
-        "            continue\n",
-        "\n",
-        "        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",
-        "    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",
+        "        !aria2c {aria2_args} -d {dst_dir} '{'-o' + file_name if file_name else ''}' '{url}'\n",
         "\n",
-        "''' submodels - added urls '''\n",
+        "''' SubModels - Added URLs '''\n",
         "\n",
         "def add_submodels(selection, num_selection, model_dict, dst_dir):\n",
         "    if selection == \"none\":\n",

files_cells/python/en/downloading_en.py

@@ -308,7 +308,8 @@ prefixes = {
     "embed": embeddings_dir,
     "extension": extensions_dir,
     "control": control_dir,
-    "adetailer": adetailer_dir
+    "adetailer": adetailer_dir,
+    "config": webui_path
 }
 
 extension_repo = []
@@ -337,49 +338,136 @@ def format_output(url, dst_dir, file_name):
     print(f"\033[33mSAVE DIR: \033[34m{dst_dir}")
     print(f"\033[33mFILE NAME: \033[34m{file_name}\033[0m")
 
-''' Get Image Preview | CivitAi '''
-
-def get_data_from_api(model_id):
-    """Fetch model data from the API"""
-    endpoint_url = f"https://civitai.com/api/v1/model-versions/{model_id}"
-    headers = {"Content-Type": "application/json"}
-    try:
-        response = requests.get(endpoint_url, headers=headers)
-        response.raise_for_status()
-        return response.json()
-    except requests.exceptions.RequestException as e:
-        print(f"An error occurred: {e}")
-        return None
-
-def extract_model_info(data, url):
-    """Extract model information based on URL"""
-    if 'type=' in url:
+''' GET CivitAi API - DATA '''
+
+def strip_(url, file_name=None):
+    if 'github.com' in url:
+        if '/blob/' in url:
+            url = url.replace('/blob/', '/raw/')
+
+    elif "civitai.com" in url:
+        return CivitAi_API(url, file_name)
+
+    elif "huggingface.co" in url:
+        if '/blob/' in url:
+            url = url.replace('/blob/', '/resolve/')
+        if '?' in url:
+            url = url.split('?')[0]
+
+    return url
+
+def CivitAi_API(url, file_name=None):
+    support_types = ('Checkpoint', 'Model', 'TextualInversion', 'LORA')
+    civitai_token = "62c0c5956b2f9defbd844d754000180b"
+
+    if '?token=' in url:
+        url = url.split('?token=')[0]
+    if '?type=' in url:
+        url = url.replace('?type=', f'?token={civitai_token}&type=')
+    else:
+        url = f"{url}?token={civitai_token}"
+
+    # Determine model or version id
+    if "civitai.com/models/" in url:
+        if '?modelVersionId=' in url:
+            version_id = url.split('?modelVersionId=')[1]
+            response = requests.get(f"https://civitai.com/api/v1/model-versions/{version_id}")
+            # print(f"end - https://civitai.com/api/v1/model-versions/{version_id}")
+        else:
+            model_id = url.split('/models/')[1].split('/')[0]
+            response = requests.get(f"https://civitai.com/api/v1/models/{model_id}")
+            # print(f"end - https://civitai.com/api/v1/models/{model_id}")
+    else:
+        version_id = url.split('/models/')[1].split('/')[0]
+        response = requests.get(f"https://civitai.com/api/v1/model-versions/{version_id}")
+        # print(f"end - https://civitai.com/api/v1/model-versions/{version_id}")
+
+    data = response.json()
+
+    if response.status_code != 200:
+        return None, None, None, None, None, None, None
+
+    # Define model type and name
+    if "civitai.com/models/" in url:
+        if '?modelVersionId=' in url:
+            model_type = data['model']['type']
+            model_name = data['files'][0]['name']
+        else:
+            model_type = data['type']
+            model_name = data['modelVersions'][0]['files'][0]['name']
+    elif 'type=' in url:
         model_type = parse_qs(urlparse(url).query).get('type', [''])[0]
-        model_name = data['files'][1]['name']
+        if 'model' in model_type.lower():
+            model_name = data['files'][0]['name']
+        else:
+            model_name = data['files'][1]['name']
     else:
         model_type = data['model']['type']
         model_name = data['files'][0]['name']
 
-    # Finding a safe image: less than level 4 | Kaggle
-    if env == 'Kaggle':
-        image_url = next((image['url'] for image in data['images'] if image['nsfwLevel'] < 4), None)
+    model_name = file_name or model_name
+
+    # Determine DownloadUrl
+    if "civitai.com/models/" in url:
+        if '?modelVersionId=' in url:
+            download_url = data.get('downloadUrl')
+        else:
+            download_url = data["modelVersions"][0].get("downloadUrl", "")
+    elif 'type=' in url:
+        if any(t.lower() in model_type.lower() for t in support_types):
+            download_url = data['files'][0]['downloadUrl']
+        else:
+            download_url = data['files'][1]['downloadUrl']
     else:
-        image_url = data['images'][0]['url']
+        download_url = data.get('downloadUrl')
 
-    return model_type, model_name, image_url
+    clean_url = re.sub(r'[?&]token=[^&]*', '', download_url) # hide token
+
+    # Find a safe image: level less than 4 | Kaggle
+    image_url, image_name = None, None
+    if any(t in model_type for t in support_types):
+        try:
+            images = data.get('images') or data['modelVersions'][0].get('images', [])
+            if env == 'Kaggle':
+                image_url = next((image['url'] for image in images if image['nsfwLevel'] < 4), None)
+            else:
+                image_url = images[0]['url'] if images else None
+        except KeyError:
+            pass
+
+        # Generate a name to save the image
+        image_name = f"{model_name.split('.')[0]}.preview.{image_url.split('.')[-1]}" if image_url else None
+
+    return f"{download_url}{'&' if '?' in download_url else '?'}token={civitai_token}", clean_url, model_type, model_name, image_url, image_name, data
+
+''' Main Download Code '''
+
+def download(url):
+    links_and_paths = [link_or_path.strip() for link_or_path in url.split(',') if link_or_path.strip()]
+
+    for link_or_path in links_and_paths:
+        if any(link_or_path.lower().startswith(prefix) for prefix in prefixes):
+            handle_manual(link_or_path)
+        else:
+            url, dst_dir, file_name = link_or_path.split()
+            manual_download(url, dst_dir, file_name)
 
-def gen_preview_filename(model_name, image_url):
-    """Generate a preview filename"""
-    name = model_name.split('.')
-    img_exts = image_url.split('.')
-    return f"{name[0]}.preview.{img_exts[-1]}"
+    unpack_zip_files()
 
-''' main download code '''
+def unpack_zip_files():
+    for directory in directories:
+        for root, _, 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)
 
 def handle_manual(url):
     url_parts = url.split(':', 1)
-    prefix = url_parts[0]
-    path = url_parts[1]
+    prefix, path = url_parts[0], url_parts[1]
 
     file_name_match = re.search(r'\[(.*?)\]', path)
     file_name = file_name_match.group(1) if file_name_match else None
@@ -401,40 +489,38 @@ 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}"
 
-    # ==== CivitAi API+ ====
-    support_types = ('Checkpoint', 'Model', 'TextualInversion', 'LORA') # for dl preview image
-    civitai_token = "62c0c5956b2f9defbd844d754000180b"
+    if 'github.com' in url:
+        url = strip_(url)
 
-    if 'civitai' in url:
-        url = f"{url}{'&' if '?' in url else '?'}token={civitai_token}"
-        model_id = url.split('/')[-1].split('?')[0]
-        clean_url = re.sub(r'[?&]token=[^&]*', '', url) # hide token
-
-        data = get_data_from_api(model_id)
-        if data:
-            model_type, model_name, image_url = extract_model_info(data, url)
-
-            if any(t in model_type for t in support_types):
-                if model_name and image_url:
-                    image_file_name = gen_preview_filename(model_name if not file_name else file_name, image_url)
-                    with capture.capture_output() as cap:
-                        get_ipython().system("aria2c {aria2_args} -d {dst_dir} -o {image_file_name} '{image_url}'")
-                    del cap
-            file_name = file_name or model_name
-    else:
-        clean_url = url
+    # -- CivitAi APi+ V2 --
+    elif 'civitai' in url:
+        url, clean_url, model_type, file_name, image_url, image_name, data = strip_(url, file_name)
+
+        if image_url and image_name:
+            with capture.capture_output() as cap:
+                get_ipython().system("aria2c {aria2_args} -d {dst_dir} -o '{image_name}' '{image_url}'")
+            del cap
+
+    elif "huggingface.co" in url:
+        clean_url = strip_(url)
 
     """ Formatted info output """
     model_name_or_basename = file_name if not 'huggingface' in url else basename
     format_output(clean_url or url, dst_dir, model_name_or_basename)
 
-    print("\033[31m[Data Info]:\033[0m Failed to retrieve data from the API.\n") if 'civitai' in url and not data else None
-    if 'civitai' in url and data and any(t in model_type for t in support_types) and (locals().get('image_file_name') or ''):
-        print(f"\033[32m[Preview DL]:\033[0m {image_file_name} - {image_url}\n")
+    # ## -- for my tests --
+    # print(url, dst_dir, model_name_or_basename)
+    print(f"\033[31m[Data Info]:\033[0m Failed to retrieve data from the API.\n") if 'civitai' in url and not data else None
+    if 'civitai' in url and data and image_name:
+        print(f"\033[32m[Preview DL]:\033[0m {image_name} - {image_url}\n")
     # =====================
 
+    # # -- Git Hub --
+    if 'github.com' in url or 'githubusercontent.com' in url:
+        get_ipython().system("aria2c {aria2_args} -d {dst_dir} -o '{basename}' '{url}'")
+
     # -- GDrive --
-    if 'drive.google' in url:
+    elif 'drive.google' in url:
         try:
             have_drive_link
         except:
@@ -451,43 +537,13 @@ def manual_download(url, dst_dir, file_name):
 
     # -- Hugging Face --
     elif 'huggingface' in url:
-        if '/blob/' in url:
-            url = url.replace('/blob/', '/resolve/')
-        get_ipython().system("aria2c {header_option} {aria2_args} -d {dst_dir} -o {basename} '{url}'")
+        get_ipython().system("aria2c {header_option} {aria2_args} -d {dst_dir} -o '{basename}' '{url}'")
 
     # -- Other --
     elif 'http' in url:
-        get_ipython().system("aria2c {aria2_args} -d {dst_dir} {'-o' + file_name if file_name else ''} '{url}'")
-
-def download(url):
-    links_and_paths = url.split(',')
-
-    for link_or_path in links_and_paths:
-        link_or_path = link_or_path.strip()
-        if not link_or_path:
-            continue
-        if any(link_or_path.startswith(prefix.lower()) for prefix in prefixes):
-            handle_manual(link_or_path)
-            continue
-
-        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():
-    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)
+        get_ipython().system("aria2c {aria2_args} -d {dst_dir} '{'-o' + file_name if file_name else ''}' '{url}'")
 
-''' submodels - added urls '''
+''' SubModels - Added URLs '''
 
 def add_submodels(selection, num_selection, model_dict, dst_dir):
     if selection == "none":

files_cells/python/ru/downloading_ru.py

@@ -308,7 +308,8 @@ prefixes = {
     "embed": embeddings_dir,
     "extension": extensions_dir,
     "control": control_dir,
-    "adetailer": adetailer_dir
+    "adetailer": adetailer_dir,
+    "config": webui_path
 }
 
 extension_repo = []
@@ -337,49 +338,136 @@ def format_output(url, dst_dir, file_name):
     print(f"\033[33mSAVE DIR: \033[34m{dst_dir}")
     print(f"\033[33mFILE NAME: \033[34m{file_name}\033[0m")
 
-''' Get Image Preview | CivitAi '''
-
-def get_data_from_api(model_id):
-    """Fetch model data from the API"""
-    endpoint_url = f"https://civitai.com/api/v1/model-versions/{model_id}"
-    headers = {"Content-Type": "application/json"}
-    try:
-        response = requests.get(endpoint_url, headers=headers)
-        response.raise_for_status()
-        return response.json()
-    except requests.exceptions.RequestException as e:
-        print(f"An error occurred: {e}")
-        return None
-
-def extract_model_info(data, url):
-    """Extract model information based on URL"""
-    if 'type=' in url:
+''' GET CivitAi API - DATA '''
+
+def strip_(url, file_name=None):
+    if 'github.com' in url:
+        if '/blob/' in url:
+            url = url.replace('/blob/', '/raw/')
+
+    elif "civitai.com" in url:
+        return CivitAi_API(url, file_name)
+
+    elif "huggingface.co" in url:
+        if '/blob/' in url:
+            url = url.replace('/blob/', '/resolve/')
+        if '?' in url:
+            url = url.split('?')[0]
+
+    return url
+
+def CivitAi_API(url, file_name=None):
+    support_types = ('Checkpoint', 'Model', 'TextualInversion', 'LORA')
+    civitai_token = "62c0c5956b2f9defbd844d754000180b"
+
+    if '?token=' in url:
+        url = url.split('?token=')[0]
+    if '?type=' in url:
+        url = url.replace('?type=', f'?token={civitai_token}&type=')
+    else:
+        url = f"{url}?token={civitai_token}"
+
+    # Determine model or version id
+    if "civitai.com/models/" in url:
+        if '?modelVersionId=' in url:
+            version_id = url.split('?modelVersionId=')[1]
+            response = requests.get(f"https://civitai.com/api/v1/model-versions/{version_id}")
+            # print(f"end - https://civitai.com/api/v1/model-versions/{version_id}")
+        else:
+            model_id = url.split('/models/')[1].split('/')[0]
+            response = requests.get(f"https://civitai.com/api/v1/models/{model_id}")
+            # print(f"end - https://civitai.com/api/v1/models/{model_id}")
+    else:
+        version_id = url.split('/models/')[1].split('/')[0]
+        response = requests.get(f"https://civitai.com/api/v1/model-versions/{version_id}")
+        # print(f"end - https://civitai.com/api/v1/model-versions/{version_id}")
+
+    data = response.json()
+
+    if response.status_code != 200:
+        return None, None, None, None, None, None, None
+
+    # Define model type and name
+    if "civitai.com/models/" in url:
+        if '?modelVersionId=' in url:
+            model_type = data['model']['type']
+            model_name = data['files'][0]['name']
+        else:
+            model_type = data['type']
+            model_name = data['modelVersions'][0]['files'][0]['name']
+    elif 'type=' in url:
         model_type = parse_qs(urlparse(url).query).get('type', [''])[0]
-        model_name = data['files'][1]['name']
+        if 'model' in model_type.lower():
+            model_name = data['files'][0]['name']
+        else:
+            model_name = data['files'][1]['name']
     else:
         model_type = data['model']['type']
         model_name = data['files'][0]['name']
 
-    # Finding a safe image: less than level 4 | Kaggle
-    if env == 'Kaggle':
-        image_url = next((image['url'] for image in data['images'] if image['nsfwLevel'] < 4), None)
+    model_name = file_name or model_name
+
+    # Determine DownloadUrl
+    if "civitai.com/models/" in url:
+        if '?modelVersionId=' in url:
+            download_url = data.get('downloadUrl')
+        else:
+            download_url = data["modelVersions"][0].get("downloadUrl", "")
+    elif 'type=' in url:
+        if any(t.lower() in model_type.lower() for t in support_types):
+            download_url = data['files'][0]['downloadUrl']
+        else:
+            download_url = data['files'][1]['downloadUrl']
     else:
-        image_url = data['images'][0]['url']
+        download_url = data.get('downloadUrl')
 
-    return model_type, model_name, image_url
+    clean_url = re.sub(r'[?&]token=[^&]*', '', download_url) # hide token
+
+    # Find a safe image: level less than 4 | Kaggle
+    image_url, image_name = None, None
+    if any(t in model_type for t in support_types):
+        try:
+            images = data.get('images') or data['modelVersions'][0].get('images', [])
+            if env == 'Kaggle':
+                image_url = next((image['url'] for image in images if image['nsfwLevel'] < 4), None)
+            else:
+                image_url = images[0]['url'] if images else None
+        except KeyError:
+            pass
+
+        # Generate a name to save the image
+        image_name = f"{model_name.split('.')[0]}.preview.{image_url.split('.')[-1]}" if image_url else None
+
+    return f"{download_url}{'&' if '?' in download_url else '?'}token={civitai_token}", clean_url, model_type, model_name, image_url, image_name, data
+
+''' Main Download Code '''
+
+def download(url):
+    links_and_paths = [link_or_path.strip() for link_or_path in url.split(',') if link_or_path.strip()]
+
+    for link_or_path in links_and_paths:
+        if any(link_or_path.lower().startswith(prefix) for prefix in prefixes):
+            handle_manual(link_or_path)
+        else:
+            url, dst_dir, file_name = link_or_path.split()
+            manual_download(url, dst_dir, file_name)
 
-def gen_preview_filename(model_name, image_url):
-    """Generate a preview filename"""
-    name = model_name.split('.')
-    img_exts = image_url.split('.')
-    return f"{name[0]}.preview.{img_exts[-1]}"
+    unpack_zip_files()
 
-''' main download code '''
+def unpack_zip_files():
+    for directory in directories:
+        for root, _, 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)
 
 def handle_manual(url):
     url_parts = url.split(':', 1)
-    prefix = url_parts[0]
-    path = url_parts[1]
+    prefix, path = url_parts[0], url_parts[1]
 
     file_name_match = re.search(r'\[(.*?)\]', path)
     file_name = file_name_match.group(1) if file_name_match else None
@@ -401,40 +489,38 @@ 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}"
 
-    # ==== CivitAi API+ ====
-    support_types = ('Checkpoint', 'Model', 'TextualInversion', 'LORA') # for dl preview image
-    civitai_token = "62c0c5956b2f9defbd844d754000180b"
+    if 'github.com' in url:
+        url = strip_(url)
 
-    if 'civitai' in url:
-        url = f"{url}{'&' if '?' in url else '?'}token={civitai_token}"
-        model_id = url.split('/')[-1].split('?')[0]
-        clean_url = re.sub(r'[?&]token=[^&]*', '', url) # hide token
-
-        data = get_data_from_api(model_id)
-        if data:
-            model_type, model_name, image_url = extract_model_info(data, url)
-
-            if any(t in model_type for t in support_types):
-                if model_name and image_url:
-                    image_file_name = gen_preview_filename(model_name if not file_name else file_name, image_url)
-                    with capture.capture_output() as cap:
-                        get_ipython().system("aria2c {aria2_args} -d {dst_dir} -o {image_file_name} '{image_url}'")
-                    del cap
-            file_name = file_name or model_name
-    else:
-        clean_url = url
+    # -- CivitAi APi+ V2 --
+    elif 'civitai' in url:
+        url, clean_url, model_type, file_name, image_url, image_name, data = strip_(url, file_name)
+
+        if image_url and image_name:
+            with capture.capture_output() as cap:
+                get_ipython().system("aria2c {aria2_args} -d {dst_dir} -o '{image_name}' '{image_url}'")
+            del cap
+
+    elif "huggingface.co" in url:
+        clean_url = strip_(url)
 
     """ Formatted info output """
     model_name_or_basename = file_name if not 'huggingface' in url else basename
     format_output(clean_url or url, dst_dir, model_name_or_basename)
 
-    print("\033[31m[Data Info]:\033[0m Failed to retrieve data from the API.\n") if 'civitai' in url and not data else None
-    if 'civitai' in url and data and any(t in model_type for t in support_types) and (locals().get('image_file_name') or ''):
-        print(f"\033[32m[Preview DL]:\033[0m {image_file_name} - {image_url}\n")
+    # ## -- for my tests --
+    # print(url, dst_dir, model_name_or_basename)
+    print(f"\033[31m[Data Info]:\033[0m Failed to retrieve data from the API.\n") if 'civitai' in url and not data else None
+    if 'civitai' in url and data and image_name:
+        print(f"\033[32m[Preview DL]:\033[0m {image_name} - {image_url}\n")
     # =====================
 
+    # # -- Git Hub --
+    if 'github.com' in url or 'githubusercontent.com' in url:
+        get_ipython().system("aria2c {aria2_args} -d {dst_dir} -o '{basename}' '{url}'")
+
     # -- GDrive --
-    if 'drive.google' in url:
+    elif 'drive.google' in url:
         try:
             have_drive_link
         except:
@@ -451,43 +537,13 @@ def manual_download(url, dst_dir, file_name):
 
     # -- Hugging Face --
     elif 'huggingface' in url:
-        if '/blob/' in url:
-            url = url.replace('/blob/', '/resolve/')
-        get_ipython().system("aria2c {header_option} {aria2_args} -d {dst_dir} -o {basename} '{url}'")
+        get_ipython().system("aria2c {header_option} {aria2_args} -d {dst_dir} -o '{basename}' '{url}'")
 
     # -- Other --
     elif 'http' in url:
-        get_ipython().system("aria2c {aria2_args} -d {dst_dir} {'-o' + file_name if file_name else ''} '{url}'")
-
-def download(url):
-    links_and_paths = url.split(',')
-
-    for link_or_path in links_and_paths:
-        link_or_path = link_or_path.strip()
-        if not link_or_path:
-            continue
-        if any(link_or_path.startswith(prefix.lower()) for prefix in prefixes):
-            handle_manual(link_or_path)
-            continue
-
-        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():
-    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)
+        get_ipython().system("aria2c {aria2_args} -d {dst_dir} '{'-o' + file_name if file_name else ''}' '{url}'")
 
-''' submodels - added urls '''
+''' SubModels - Added URLs '''
 
 def add_submodels(selection, num_selection, model_dict, dst_dir):
     if selection == "none":

special/dl_display_results.py

@@ -194,7 +194,7 @@ header_widget = widgets.HTML(value=f'''
 ''')
 
 # Models
-models_list = get_files_list(models_dir, '.safetensors')
+models_list = get_files_list(models_dir, ('.safetensors', '.ckpt'))
 models_widget = output_container_generator('Models', models_list)
 # Vaes
 vaes_list = get_files_list(vaes_dir, '.safetensors')