edits to the download code

files_cells/notebooks/en/auto-cleaner_en.ipynb

@@ -242,7 +242,7 @@
         "\n",
         "# ================ AutoCleaner function ================\n",
         "directories = {\n",
-        "    \"Images\": f\"{webui_path}/outputs\",\n",
+        "    \"Images\": f\"{webui_path}/output\",\n",
         "    \"Models\": f\"{webui_path}/models/Stable-diffusion/\",\n",
         "    \"Vae\": f\"{webui_path}/models/VAE/\",\n",
         "    \"LoRa\": f\"{webui_path}/models/Lora/\",\n",

files_cells/notebooks/en/downloading_en.ipynb

@@ -137,10 +137,10 @@
         "# ================= MAIN CODE =================\n",
         "if not os.path.exists(webui_path):\n",
         "    start_install = int(time.time())\n",
-        "    print(\"⌚ Unpacking Stable Diffusion...\", end='')\n",
+        "    print(\"⌚ Unpacking Stable Diffusion...\" if change_webui != 'Forge' else \"⌚ Unpacking Stable Diffusion (Forge)...\", end='')\n",
         "    with capture.capture_output() as cap:\n",
         "        aria2_command = \"aria2c --console-log-level=error -c -x 16 -s 16 -k 1M\"\n",
-        "        url = \"https://huggingface.co/NagisaNao/fast_repo/resolve/main/FULL_REPO.zip\" if change_webui != 'Forge' else \"https://huggingface.co/NagisaNao/test/resolve/main/FULL_REPO_forge.zip\"\n",
+        "        url = \"https://huggingface.co/NagisaNao/fast_repo/resolve/main/FULL_REPO.zip\" if change_webui != 'Forge' else \"https://huggingface.co/NagisaNao/fast_repo/resolve/main/FULL_REPO_forge.zip\"\n",
         "        !{aria2_command} {url} -o repo.zip\n",
         "\n",
         "        !unzip -q -o repo.zip -d {webui_path}\n",
@@ -253,13 +253,19 @@
         "\n",
         "# 1-4 (fp16/cleaned)\n",
         "vae_list = {\n",
-        "    \"1.Anime.vae\": [\n",
-        "        {\"url\": \"https://civitai.com/api/download/models/131654\", \"name\": \"Anime.vae.safetensors\"},\n",
-        "        {\"url\": \"https://civitai.com/api/download/models/131658\", \"name\": \"vae-ft-mse.vae.safetensors\"}\n",
-        "    ],\n",
-        "    \"2.Anything.vae\": [{\"url\": \"https://civitai.com/api/download/models/131656\", \"name\": \"Anything.vae.safetensors\"}],\n",
-        "    \"3.Blessed2.vae\": [{\"url\": \"https://civitai.com/api/download/models/142467\", \"name\": \"Blessed2.vae.safetensors\"}],\n",
-        "    \"4.ClearVae.vae\": [{\"url\": \"https://civitai.com/api/download/models/133362\", \"name\": \"ClearVae_23.vae.safetensors\"}],\n",
+        "    ## vae broke - the author's an asshole\n",
+        "    # \"1.Anime.vae\": [\n",
+        "    #     {\"url\": \"https://civitai.com/api/download/models/131654\", \"name\": \"Anime.vae.safetensors\"},\n",
+        "    #     {\"url\": \"https://civitai.com/api/download/models/131658\", \"name\": \"vae-ft-mse.vae.safetensors\"}\n",
+        "    # ],\n",
+        "    # \"2.Anything.vae\": [{\"url\": \"https://civitai.com/api/download/models/131656\", \"name\": \"Anything.vae.safetensors\"}],\n",
+        "    # \"3.Blessed2.vae\": [{\"url\": \"https://civitai.com/api/download/models/142467\", \"name\": \"Blessed2.vae.safetensors\"}],\n",
+        "    # \"4.ClearVae.vae\": [{\"url\": \"https://civitai.com/api/download/models/133362\", \"name\": \"ClearVae_23.vae.safetensors\"}],\n",
+        "\n",
+        "    \"1.Anime.vae\": [{\"url\": \"https://civitai.com/api/download/models/311162\", \"name\": \"vae-ft-mse-840000-ema-pruned.vae.safetensors\"}],\n",
+        "    \"2.Anything.vae\": [{\"url\": \"https://civitai.com/api/download/models/119279\", \"name\": \"Anything.vae.safetensors\"}],\n",
+        "    \"3.Blessed2.vae\": [{\"url\": \"https://huggingface.co/NoCrypt/blessed_vae/resolve/main/blessed2.vae.pt\", \"name\": \"Blessed2.vae.safetensors\"}],\n",
+        "    \"4.ClearVae.vae\": [{\"url\": \"https://civitai.com/api/download/models/88156\", \"name\": \"ClearVae_23.vae.safetensors\"}],\n",
         "    \"5.WD.vae\": [{\"url\": \"https://huggingface.co/NoCrypt/resources/resolve/main/VAE/wd.vae.safetensors\", \"name\": \"WD.vae.safetensors\"}]\n",
         "}\n",
         "\n",
@@ -333,26 +339,47 @@
         "}\n",
         "\n",
         "extension_repo = []\n",
-        "directories = (value for key, value in prefixes.items()) # for unpucking zip files\n",
+        "directories = [value for key, value in prefixes.items()] # for unpucking zip files\n",
         "!mkdir -p {\" \".join(directories)}\n",
         "\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",
+        "''' Formatted Info Output '''\n",
+        "\n",
+        "from math import floor\n",
+        "\n",
+        "def center_text(text, terminal_width=45):\n",
+        "    text_length = len(text)\n",
+        "    left_padding = floor((terminal_width - text_length) / 2)\n",
+        "    right_padding = terminal_width - text_length - left_padding\n",
+        "    return f\"\\033[1m\\033[36m{' ' * left_padding}{text}{' ' * right_padding}\\033[0m\\033[32m\"\n",
+        "\n",
+        "def format_output(url, dst_dir, file_name):\n",
+        "    info = f\"[{file_name.split('.')[0]}]\"\n",
+        "    info = center_text(info)\n",
+        "\n",
+        "    print(f\"\\n\\033[32m{'---'*20}]{info}[{'---'*20}\")\n",
+        "    print(f\"\\033[33mURL: \\033[34m{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",
         "''' Get Image Preview | CivitAi '''\n",
         "\n",
-        "def get_data_from_api(model_id): # get model data\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",
-        "        if response.status_code == 200:\n",
-        "            return response.json()\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",
         "        model_type = parse_qs(urlparse(url).query).get('type', [''])[0]\n",
         "        model_name = data['files'][1]['name']\n",
@@ -369,59 +396,69 @@
         "    return model_type, model_name, image_url\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]}\" # assigning the original image format\n",
+        "    return f\"{name[0]}.preview.{img_exts[-1]}\"\n",
         "\n",
         "''' main download code '''\n",
         "\n",
         "def handle_manual(url):\n",
-        "    original_url = url\n",
-        "    url = url.split(':', 1)[1]\n",
-        "    file_name = re.search(r'\\[(.*?)\\]', url)\n",
-        "    file_name = file_name.group(1) if file_name else None\n",
-        "    if file_name:\n",
-        "        url = re.sub(r'\\[.*?\\]', '', url)\n",
+        "    url_parts = url.split(':', 1)\n",
+        "    prefix = url_parts[0]\n",
+        "    path = url_parts[1]\n",
         "\n",
-        "    for prefix, dir in prefixes.items():\n",
-        "        if original_url.startswith(f\"{prefix}:\"):\n",
-        "            if prefix != \"extension\":\n",
-        "                manual_download(url, dir, file_name=file_name)\n",
-        "            else:\n",
-        "                extension_repo.append((url, file_name))\n",
+        "    file_name_match = re.search(r'\\[(.*?)\\]', path)\n",
+        "    file_name = file_name_match.group(1) if file_name_match else None\n",
+        "    if file_name:\n",
+        "        path = re.sub(r'\\[.*?\\]', '', path)\n",
+        "\n",
+        "    if prefix in prefixes:\n",
+        "        dir = prefixes[prefix]\n",
+        "        if prefix != \"extension\":\n",
+        "            try:\n",
+        "                manual_download(path, dir, file_name=file_name)\n",
+        "            except Exception as e:\n",
+        "                print(f\"Error downloading file: {e}\")\n",
+        "        else:\n",
+        "            extension_repo.append((path, file_name))\n",
         "\n",
         "def manual_download(url, dst_dir, file_name):\n",
         "    aria2_args = '--optimize-concurrent-downloads --console-log-level=error --summary-interval=10 -j5 -x16 -s16 -k1M -c'\n",
         "    basename = url.split(\"/\")[-1] if file_name is None else file_name\n",
         "    header_option = f\"--header={user_header}\"\n",
         "\n",
-        "    # === CivitAi API ===\n",
+        "    # ==== CivitAi API+ ====\n",
         "    support_types = ('Checkpoint', 'Model', 'TextualInversion', 'LORA') # for dl preview image\n",
         "    civitai_token = \"62c0c5956b2f9defbd844d754000180b\"\n",
         "\n",
         "    if 'civitai' in url:\n",
-        "        url = f\"{url}{'&' if '?' in url else '?'}token={civitai_token}\" # some authors are pussies and they need API token...\n",
-        "        model_id = url.split('/')[-1]\n",
-        "        clean_url = url.split('?')[0]\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",
-        "            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",
-        "                if any(types in model_type for types in support_types):\n",
-        "                    with capture.capture_output() as cap: # clear shit\n",
-        "                        !aria2c {aria2_args} -d {dst_dir} -o {image_file_name} {image_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 # assigns the original file name if not specified initially\n",
+        "            file_name = file_name or model_name\n",
+        "    else:\n",
+        "        clean_url = 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",
-        "    \"\"\" information output \"\"\"\n",
-        "    # -- wrold's best print info --\n",
-        "    print(f\"\\n\\033[32m{'---'*45}\\n\\033[33mURL: \\033[34m{clean_url if 'civitai' in url else url}\\n\\033[33mSAVE DIR: \\033[34m{dst_dir}\\n\\033[33mFILE NAME: \\033[34m{file_name if not 'huggingface' in url else basename}\\033[0m\")\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(types in model_type for types in support_types) and (locals().get('image_file_name') or ''):\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",
-        "    # ===================\n",
+        "    # =====================\n",
         "\n",
         "    # -- GDrive --\n",
         "    if 'drive.google' in url:\n",
@@ -465,9 +502,8 @@
         "\n",
         "    unpucking_zip_files()\n",
         "\n",
-        "## unpucking zip files\n",
+        "# unpucking zip files\n",
         "def unpucking_zip_files():\n",
-        "    # directories - above\n",
         "    for directory in directories:\n",
         "        for root, dirs, files in os.walk(directory):\n",
         "            for file in files:\n",
@@ -480,8 +516,6 @@
         "\n",
         "''' submodels - added urls '''\n",
         "\n",
-        "submodels = []\n",
-        "\n",
         "def add_submodels(selection, num_selection, model_dict, dst_dir):\n",
         "    if selection == \"none\":\n",
         "        return []\n",
@@ -493,33 +527,32 @@
         "    else:\n",
         "        selected_models = model_dict[selection]\n",
         "        selected_nums = map(int, num_selection.replace(',', '').split())\n",
-        "\n",
         "        for num in selected_nums:\n",
         "            if 1 <= num <= len(model_dict):\n",
         "                name = list(model_dict)[num - 1]\n",
         "                selected_models.extend(model_dict[name])\n",
         "\n",
         "    unique_models = list({model['name']: model for model in selected_models}.values())\n",
-        "\n",
         "    for model in unique_models:\n",
         "        model['dst_dir'] = dst_dir\n",
         "\n",
         "    return unique_models\n",
         "\n",
-        "submodels += add_submodels(Model, Model_Num, model_list, models_dir)                                                   # model\n",
-        "submodels += add_submodels(Vae, Vae_Num, vae_list, vaes_dir)                                                           # vae\n",
-        "submodels += add_submodels(controlnet, controlnet_Num, controlnet_list, control_dir)    # controlnet\n",
+        "def handle_submodels(selection, num_selection, model_dict, dst_dir, url):\n",
+        "    submodels = add_submodels(selection, num_selection, model_dict, dst_dir)\n",
+        "    for submodel in submodels:\n",
+        "        if not Inpainting_Model and \"inpainting\" in submodel['name']:\n",
+        "            continue\n",
+        "        url += f\"{submodel['url']} {submodel['dst_dir']} {submodel['name']}, \"\n",
+        "    return url\n",
         "\n",
-        "for submodel in submodels:\n",
-        "    if not Inpainting_Model and \"inpainting\" in submodel['name']:\n",
-        "        continue\n",
-        "    url += f\"{submodel['url']} {submodel['dst_dir']} {submodel['name']}, \"\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",
         "\n",
         "''' file.txt - added urls '''\n",
         "\n",
-        "unique_urls = []\n",
-        "\n",
-        "def process_file_download(file_url):\n",
+        "def process_file_download(file_url, prefixes, unique_urls):\n",
         "    files_urls = \"\"\n",
         "\n",
         "    if file_url.startswith(\"http\"):\n",
@@ -533,19 +566,23 @@
         "\n",
         "    current_tag = None\n",
         "    for line in lines:\n",
+        "        line = line.strip()\n",
         "        if any(f'# {tag}' in line.lower() for tag in prefixes):\n",
         "            current_tag = next((tag for tag in prefixes if tag in line.lower()))\n",
         "\n",
         "        urls = [url.split('#')[0].strip() for url in line.split(',')]  # filter urls\n",
         "        for url in urls:\n",
-        "            if url.startswith(\"http\") and url not in unique_urls:\n",
+        "            filter_url = url.split('[')[0] # same url filter\n",
+        "\n",
+        "            if url.startswith(\"http\") and filter_url not in unique_urls:\n",
         "                files_urls += f\"{current_tag}:{url}, \"\n",
-        "                unique_urls.append(url)\n",
+        "                unique_urls.add(filter_url)\n",
         "\n",
         "    return files_urls\n",
         "\n",
-        "# fix all possible errors/options and function call\n",
         "file_urls = \"\"\n",
+        "unique_urls = set()\n",
+        "\n",
         "if custom_file_urls:\n",
         "    for custom_file_url in custom_file_urls.replace(',', '').split():\n",
         "        if not custom_file_url.endswith('.txt'):\n",
@@ -555,7 +592,7 @@
         "                custom_file_url = f'{root_path}/{custom_file_url}'\n",
         "\n",
         "        try:\n",
-        "            file_urls += process_file_download(custom_file_url)\n",
+        "            file_urls += process_file_download(custom_file_url, prefixes, unique_urls)\n",
         "        except FileNotFoundError:\n",
         "            pass\n",
         "\n",

files_cells/notebooks/en/launch_en.ipynb

@@ -61,9 +61,10 @@
         "ngrok_token = settings['ngrok_token']\n",
         "zrok_token = settings['zrok_token']\n",
         "commandline_arguments = settings['commandline_arguments']\n",
+        "change_webui = settings['change_webui']\n",
         "\n",
         "\n",
-        "# ======================== TUNNEL ========================\n",
+        "# ======================== TUNNEL V2 ========================\n",
         "print('Please Wait...')\n",
         "\n",
         "def get_public_ip(version='ipv4'):\n",
@@ -76,10 +77,17 @@
         "    except Exception as e:\n",
         "        print(f\"Error getting public {version} address:\", e)\n",
         "\n",
-        "public_ipv4 = get_public_ip(version='ipv4')\n",
+        "# Check if public IP is already saved, if not then get it\n",
+        "try:\n",
+        "    with open(f\"{root_path}/public_ip.txt\", \"r\") as file:\n",
+        "        public_ipv4 = file.read().strip()\n",
+        "except FileNotFoundError:\n",
+        "    public_ipv4 = get_public_ip(version='ipv4')\n",
+        "    with open(f\"{root_path}/public_ip.txt\", \"w\") as file:\n",
+        "        file.write(public_ipv4)\n",
         "\n",
         "tunnel_class = pickle.load(open(f\"{root_path}/new_tunnel\", \"rb\"), encoding=\"utf-8\")\n",
-        "tunnel_port= 1734\n",
+        "tunnel_port = 1734\n",
         "tunnel = tunnel_class(tunnel_port)\n",
         "tunnel.add_tunnel(command=\"cl tunnel --url localhost:{port}\", name=\"cl\", pattern=re.compile(r\"[\\w-]+\\.trycloudflare\\.com\"))\n",
         "tunnel.add_tunnel(command=\"lt --port {port}\", name=\"lt\", pattern=re.compile(r\"[\\w-]+\\.loca\\.lt\"), note=\"Password : \" + \"\\033[32m\" + public_ipv4 + \"\\033[0m\" + \" rerun cell if 404 error.\")\n",
@@ -90,17 +98,32 @@
         "    tunnel.add_tunnel(command=\"zrok share public http://localhost:{port}/ --headless\", name=\"zrok\", pattern=re.compile(r\"[\\w-]+\\.share\\.zrok\\.io\"))\n",
         "\n",
         "clear_output()\n",
-        "# ======================== TUNNEL ========================\n",
         "\n",
         "\n",
-        " # automatic fixing path V2\n",
-        "!sed -i 's|\"tagger_hf_cache_dir\": \".*\"|\"tagger_hf_cache_dir\": \"{webui_path}/models/interrogators/\"|' {webui_path}/config.json\n",
-        "!sed -i 's|\"additional_networks_extra_lora_path\": \".*\"|\"additional_networks_extra_lora_path\": \"{webui_path}/models/Lora/\"|' {webui_path}/config.json\n",
-        "!sed -i 's|\"ad_extra_models_dir\": \".*\"|\"ad_extra_models_dir\": \"{webui_path}/models/adetailer/\"|' {webui_path}/config.json\n",
-        "!sed -i 's/\"sd_checkpoint_hash\": \".*\"/\"sd_checkpoint_hash\": \"\"/g; s/\"sd_model_checkpoint\": \".*\"/\"sd_model_checkpoint\": \"\"/g; s/\"sd_vae\": \".*\"/\"sd_vae\": \"None\"/g' {webui_path}/config.json\n",
-        "# for kaggle\n",
+        "# =============== Automatic Fixing Path V3 ===============\n",
+        "paths_to_check = [\n",
+        "    (\"tagger_hf_cache_dir\", f\"{webui_path}/models/interrogators/\"),\n",
+        "    (\"additional_networks_extra_lora_path\", f\"{webui_path}/models/Lora/\"),\n",
+        "    (\"ad_extra_models_dir\", f\"{webui_path}/models/adetailer/\"),\n",
+        "    (\"sd_checkpoint_hash\", \"\"),\n",
+        "    (\"sd_model_checkpoint\", \"\"),\n",
+        "    (\"sd_vae\", \"None\")\n",
+        "]\n",
+        "\n",
+        "config_path = f'{webui_path}/ui-config.json'\n",
+        "\n",
+        "with open(config_path, 'r') as file:\n",
+        "    config_data = json.load(file)\n",
+        "\n",
+        "for key, value in paths_to_check:\n",
+        "    if key in config_data and config_data[key] != value:\n",
+        "        sed_command = f\"sed -i 's|\\\"{key}\\\": \\\".*\\\"|\\\"{key}\\\": \\\"{value}\\\"|' {config_path}\"\n",
+        "        os.system(sed_command)\n",
+        "\n",
+        "# Additional check for Kaggle\n",
         "if env == 'Kaggle':\n",
-        "   !sed -i 's/\"civitai_interface\\/NSFW content\\/value\":.*/\"civitai_interface\\/NSFW content\\/value\": false/g' {webui_path}/ui-config.json\n",
+        "   get_ipython().system('sed -i \\'s/\"civitai_interface\\\\/NSFW content\\\\/value\":.*/\"civitai_interface\\\\/NSFW content\\\\/value\": false/g\\' {webui_path}/ui-config.json')\n",
+        "#  -------------------------------------------------------\n",
         "\n",
         "\n",
         "with tunnel:\n",
@@ -112,6 +135,10 @@
         "    if env != \"Google Colab\":\n",
         "        commandline_arguments += f' --encrypt-pass={tunnel_port} --api'\n",
         "\n",
+        "    # -- FORGE --\n",
+        "    if change_webui == 'Forge':\n",
+        "        commandline_arguments += ' --cuda-stream --pin-shared-memory'\n",
+        "\n",
         "    !COMMANDLINE_ARGS=\"{commandline_arguments}\" python launch.py\n",
         "\n",
         "\n",

files_cells/notebooks/ru/auto-cleaner_ru.ipynb

@@ -242,7 +242,7 @@
         "\n",
         "# ================ AutoCleaner function ================\n",
         "directories = {\n",
-        "    \"Изображения\": f\"{webui_path}/outputs\",\n",
+        "    \"Изображения\": f\"{webui_path}/output\",\n",
         "    \"Модели\": f\"{webui_path}/models/Stable-diffusion/\",\n",
         "    \"Vae\": f\"{webui_path}/models/VAE/\",\n",
         "    \"LoRa\": f\"{webui_path}/models/Lora/\",\n",

files_cells/notebooks/ru/downloading_ru.ipynb

@@ -140,7 +140,7 @@
         "    print(\"⌚ Распаковка Stable Diffusion...\" if change_webui != 'Forge' else \"⌚ Распаковка Stable Diffusion (Forge)...\", end='')\n",
         "    with capture.capture_output() as cap:\n",
         "        aria2_command = \"aria2c --console-log-level=error -c -x 16 -s 16 -k 1M\"\n",
-        "        url = \"https://huggingface.co/NagisaNao/fast_repo/resolve/main/FULL_REPO.zip\" if change_webui != 'Forge' else \"https://huggingface.co/NagisaNao/test/resolve/main/FULL_REPO_forge.zip\"\n",
+        "        url = \"https://huggingface.co/NagisaNao/fast_repo/resolve/main/FULL_REPO.zip\" if change_webui != 'Forge' else \"https://huggingface.co/NagisaNao/fast_repo/resolve/main/FULL_REPO_forge.zip\"\n",
         "        !{aria2_command} {url} -o repo.zip\n",
         "\n",
         "        !unzip -q -o repo.zip -d {webui_path}\n",
@@ -253,13 +253,19 @@
         "\n",
         "# 1-4 (fp16/cleaned)\n",
         "vae_list = {\n",
-        "    \"1.Anime.vae\": [\n",
-        "        {\"url\": \"https://civitai.com/api/download/models/131654\", \"name\": \"Anime.vae.safetensors\"},\n",
-        "        {\"url\": \"https://civitai.com/api/download/models/131658\", \"name\": \"vae-ft-mse.vae.safetensors\"}\n",
-        "    ],\n",
-        "    \"2.Anything.vae\": [{\"url\": \"https://civitai.com/api/download/models/131656\", \"name\": \"Anything.vae.safetensors\"}],\n",
-        "    \"3.Blessed2.vae\": [{\"url\": \"https://civitai.com/api/download/models/142467\", \"name\": \"Blessed2.vae.safetensors\"}],\n",
-        "    \"4.ClearVae.vae\": [{\"url\": \"https://civitai.com/api/download/models/133362\", \"name\": \"ClearVae_23.vae.safetensors\"}],\n",
+        "    ## vae broke - the author's an asshole\n",
+        "    # \"1.Anime.vae\": [\n",
+        "    #     {\"url\": \"https://civitai.com/api/download/models/131654\", \"name\": \"Anime.vae.safetensors\"},\n",
+        "    #     {\"url\": \"https://civitai.com/api/download/models/131658\", \"name\": \"vae-ft-mse.vae.safetensors\"}\n",
+        "    # ],\n",
+        "    # \"2.Anything.vae\": [{\"url\": \"https://civitai.com/api/download/models/131656\", \"name\": \"Anything.vae.safetensors\"}],\n",
+        "    # \"3.Blessed2.vae\": [{\"url\": \"https://civitai.com/api/download/models/142467\", \"name\": \"Blessed2.vae.safetensors\"}],\n",
+        "    # \"4.ClearVae.vae\": [{\"url\": \"https://civitai.com/api/download/models/133362\", \"name\": \"ClearVae_23.vae.safetensors\"}],\n",
+        "\n",
+        "    \"1.Anime.vae\": [{\"url\": \"https://civitai.com/api/download/models/311162\", \"name\": \"vae-ft-mse-840000-ema-pruned.vae.safetensors\"}],\n",
+        "    \"2.Anything.vae\": [{\"url\": \"https://civitai.com/api/download/models/119279\", \"name\": \"Anything.vae.safetensors\"}],\n",
+        "    \"3.Blessed2.vae\": [{\"url\": \"https://huggingface.co/NoCrypt/blessed_vae/resolve/main/blessed2.vae.pt\", \"name\": \"Blessed2.vae.safetensors\"}],\n",
+        "    \"4.ClearVae.vae\": [{\"url\": \"https://civitai.com/api/download/models/88156\", \"name\": \"ClearVae_23.vae.safetensors\"}],\n",
         "    \"5.WD.vae\": [{\"url\": \"https://huggingface.co/NoCrypt/resources/resolve/main/VAE/wd.vae.safetensors\", \"name\": \"WD.vae.safetensors\"}]\n",
         "}\n",
         "\n",
@@ -333,26 +339,47 @@
         "}\n",
         "\n",
         "extension_repo = []\n",
-        "directories = (value for key, value in prefixes.items()) # for unpucking zip files\n",
+        "directories = [value for key, value in prefixes.items()] # for unpucking zip files\n",
         "!mkdir -p {\" \".join(directories)}\n",
         "\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",
+        "''' Formatted Info Output '''\n",
+        "\n",
+        "from math import floor\n",
+        "\n",
+        "def center_text(text, terminal_width=45):\n",
+        "    text_length = len(text)\n",
+        "    left_padding = floor((terminal_width - text_length) / 2)\n",
+        "    right_padding = terminal_width - text_length - left_padding\n",
+        "    return f\"\\033[1m\\033[36m{' ' * left_padding}{text}{' ' * right_padding}\\033[0m\\033[32m\"\n",
+        "\n",
+        "def format_output(url, dst_dir, file_name):\n",
+        "    info = f\"[{file_name.split('.')[0]}]\"\n",
+        "    info = center_text(info)\n",
+        "\n",
+        "    print(f\"\\n\\033[32m{'---'*20}]{info}[{'---'*20}\")\n",
+        "    print(f\"\\033[33mURL: \\033[34m{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",
         "''' Get Image Preview | CivitAi '''\n",
         "\n",
-        "def get_data_from_api(model_id): # get model data\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",
-        "        if response.status_code == 200:\n",
-        "            return response.json()\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",
         "        model_type = parse_qs(urlparse(url).query).get('type', [''])[0]\n",
         "        model_name = data['files'][1]['name']\n",
@@ -369,59 +396,69 @@
         "    return model_type, model_name, image_url\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]}\" # assigning the original image format\n",
+        "    return f\"{name[0]}.preview.{img_exts[-1]}\"\n",
         "\n",
         "''' main download code '''\n",
         "\n",
         "def handle_manual(url):\n",
-        "    original_url = url\n",
-        "    url = url.split(':', 1)[1]\n",
-        "    file_name = re.search(r'\\[(.*?)\\]', url)\n",
-        "    file_name = file_name.group(1) if file_name else None\n",
-        "    if file_name:\n",
-        "        url = re.sub(r'\\[.*?\\]', '', url)\n",
+        "    url_parts = url.split(':', 1)\n",
+        "    prefix = url_parts[0]\n",
+        "    path = url_parts[1]\n",
         "\n",
-        "    for prefix, dir in prefixes.items():\n",
-        "        if original_url.startswith(f\"{prefix}:\"):\n",
-        "            if prefix != \"extension\":\n",
-        "                manual_download(url, dir, file_name=file_name)\n",
-        "            else:\n",
-        "                extension_repo.append((url, file_name))\n",
+        "    file_name_match = re.search(r'\\[(.*?)\\]', path)\n",
+        "    file_name = file_name_match.group(1) if file_name_match else None\n",
+        "    if file_name:\n",
+        "        path = re.sub(r'\\[.*?\\]', '', path)\n",
+        "\n",
+        "    if prefix in prefixes:\n",
+        "        dir = prefixes[prefix]\n",
+        "        if prefix != \"extension\":\n",
+        "            try:\n",
+        "                manual_download(path, dir, file_name=file_name)\n",
+        "            except Exception as e:\n",
+        "                print(f\"Error downloading file: {e}\")\n",
+        "        else:\n",
+        "            extension_repo.append((path, file_name))\n",
         "\n",
         "def manual_download(url, dst_dir, file_name):\n",
         "    aria2_args = '--optimize-concurrent-downloads --console-log-level=error --summary-interval=10 -j5 -x16 -s16 -k1M -c'\n",
         "    basename = url.split(\"/\")[-1] if file_name is None else file_name\n",
         "    header_option = f\"--header={user_header}\"\n",
         "\n",
-        "    # === CivitAi API ===\n",
+        "    # ==== CivitAi API+ ====\n",
         "    support_types = ('Checkpoint', 'Model', 'TextualInversion', 'LORA') # for dl preview image\n",
         "    civitai_token = \"62c0c5956b2f9defbd844d754000180b\"\n",
         "\n",
         "    if 'civitai' in url:\n",
-        "        url = f\"{url}{'&' if '?' in url else '?'}token={civitai_token}\" # some authors are pussies and they need API token...\n",
-        "        model_id = url.split('/')[-1]\n",
-        "        clean_url = url.split('?')[0]\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",
-        "            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",
-        "                if any(types in model_type for types in support_types):\n",
-        "                    with capture.capture_output() as cap: # clear shit\n",
-        "                        !aria2c {aria2_args} -d {dst_dir} -o {image_file_name} {image_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 # assigns the original file name if not specified initially\n",
+        "            file_name = file_name or model_name\n",
+        "    else:\n",
+        "        clean_url = 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",
-        "    \"\"\" information output \"\"\"\n",
-        "    # -- wrold's best print info --\n",
-        "    print(f\"\\n\\033[32m{'---'*45}\\n\\033[33mURL: \\033[34m{clean_url if 'civitai' in url else url}\\n\\033[33mSAVE DIR: \\033[34m{dst_dir}\\n\\033[33mFILE NAME: \\033[34m{file_name if not 'huggingface' in url else basename}\\033[0m\")\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(types in model_type for types in support_types) and (locals().get('image_file_name') or ''):\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",
-        "    # ===================\n",
+        "    # =====================\n",
         "\n",
         "    # -- GDrive --\n",
         "    if 'drive.google' in url:\n",
@@ -465,9 +502,8 @@
         "\n",
         "    unpucking_zip_files()\n",
         "\n",
-        "## unpucking zip files\n",
+        "# unpucking zip files\n",
         "def unpucking_zip_files():\n",
-        "    # directories - above\n",
         "    for directory in directories:\n",
         "        for root, dirs, files in os.walk(directory):\n",
         "            for file in files:\n",
@@ -480,8 +516,6 @@
         "\n",
         "''' submodels - added urls '''\n",
         "\n",
-        "submodels = []\n",
-        "\n",
         "def add_submodels(selection, num_selection, model_dict, dst_dir):\n",
         "    if selection == \"none\":\n",
         "        return []\n",
@@ -493,33 +527,32 @@
         "    else:\n",
         "        selected_models = model_dict[selection]\n",
         "        selected_nums = map(int, num_selection.replace(',', '').split())\n",
-        "\n",
         "        for num in selected_nums:\n",
         "            if 1 <= num <= len(model_dict):\n",
         "                name = list(model_dict)[num - 1]\n",
         "                selected_models.extend(model_dict[name])\n",
         "\n",
         "    unique_models = list({model['name']: model for model in selected_models}.values())\n",
-        "\n",
         "    for model in unique_models:\n",
         "        model['dst_dir'] = dst_dir\n",
         "\n",
         "    return unique_models\n",
         "\n",
-        "submodels += add_submodels(Model, Model_Num, model_list, models_dir)                                                   # model\n",
-        "submodels += add_submodels(Vae, Vae_Num, vae_list, vaes_dir)                                                           # vae\n",
-        "submodels += add_submodels(controlnet, controlnet_Num, controlnet_list, control_dir)    # controlnet\n",
+        "def handle_submodels(selection, num_selection, model_dict, dst_dir, url):\n",
+        "    submodels = add_submodels(selection, num_selection, model_dict, dst_dir)\n",
+        "    for submodel in submodels:\n",
+        "        if not Inpainting_Model and \"inpainting\" in submodel['name']:\n",
+        "            continue\n",
+        "        url += f\"{submodel['url']} {submodel['dst_dir']} {submodel['name']}, \"\n",
+        "    return url\n",
         "\n",
-        "for submodel in submodels:\n",
-        "    if not Inpainting_Model and \"inpainting\" in submodel['name']:\n",
-        "        continue\n",
-        "    url += f\"{submodel['url']} {submodel['dst_dir']} {submodel['name']}, \"\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",
         "\n",
         "''' file.txt - added urls '''\n",
         "\n",
-        "unique_urls = []\n",
-        "\n",
-        "def process_file_download(file_url):\n",
+        "def process_file_download(file_url, prefixes, unique_urls):\n",
         "    files_urls = \"\"\n",
         "\n",
         "    if file_url.startswith(\"http\"):\n",
@@ -533,19 +566,23 @@
         "\n",
         "    current_tag = None\n",
         "    for line in lines:\n",
+        "        line = line.strip()\n",
         "        if any(f'# {tag}' in line.lower() for tag in prefixes):\n",
         "            current_tag = next((tag for tag in prefixes if tag in line.lower()))\n",
         "\n",
         "        urls = [url.split('#')[0].strip() for url in line.split(',')]  # filter urls\n",
         "        for url in urls:\n",
-        "            if url.startswith(\"http\") and url not in unique_urls:\n",
+        "            filter_url = url.split('[')[0] # same url filter\n",
+        "\n",
+        "            if url.startswith(\"http\") and filter_url not in unique_urls:\n",
         "                files_urls += f\"{current_tag}:{url}, \"\n",
-        "                unique_urls.append(url)\n",
+        "                unique_urls.add(filter_url)\n",
         "\n",
         "    return files_urls\n",
         "\n",
-        "# fix all possible errors/options and function call\n",
         "file_urls = \"\"\n",
+        "unique_urls = set()\n",
+        "\n",
         "if custom_file_urls:\n",
         "    for custom_file_url in custom_file_urls.replace(',', '').split():\n",
         "        if not custom_file_url.endswith('.txt'):\n",
@@ -555,7 +592,7 @@
         "                custom_file_url = f'{root_path}/{custom_file_url}'\n",
         "\n",
         "        try:\n",
-        "            file_urls += process_file_download(custom_file_url)\n",
+        "            file_urls += process_file_download(custom_file_url, prefixes, unique_urls)\n",
         "        except FileNotFoundError:\n",
         "            pass\n",
         "\n",

files_cells/notebooks/ru/launch_ru.ipynb

@@ -61,9 +61,10 @@
         "ngrok_token = settings['ngrok_token']\n",
         "zrok_token = settings['zrok_token']\n",
         "commandline_arguments = settings['commandline_arguments']\n",
+        "change_webui = settings['change_webui']\n",
         "\n",
         "\n",
-        "# ======================== TUNNEL ========================\n",
+        "# ======================== TUNNEL V2 ========================\n",
         "print('Please Wait...')\n",
         "\n",
         "def get_public_ip(version='ipv4'):\n",
@@ -76,10 +77,17 @@
         "    except Exception as e:\n",
         "        print(f\"Error getting public {version} address:\", e)\n",
         "\n",
-        "public_ipv4 = get_public_ip(version='ipv4')\n",
+        "# Check if public IP is already saved, if not then get it\n",
+        "try:\n",
+        "    with open(f\"{root_path}/public_ip.txt\", \"r\") as file:\n",
+        "        public_ipv4 = file.read().strip()\n",
+        "except FileNotFoundError:\n",
+        "    public_ipv4 = get_public_ip(version='ipv4')\n",
+        "    with open(f\"{root_path}/public_ip.txt\", \"w\") as file:\n",
+        "        file.write(public_ipv4)\n",
         "\n",
         "tunnel_class = pickle.load(open(f\"{root_path}/new_tunnel\", \"rb\"), encoding=\"utf-8\")\n",
-        "tunnel_port= 1734\n",
+        "tunnel_port = 1734\n",
         "tunnel = tunnel_class(tunnel_port)\n",
         "tunnel.add_tunnel(command=\"cl tunnel --url localhost:{port}\", name=\"cl\", pattern=re.compile(r\"[\\w-]+\\.trycloudflare\\.com\"))\n",
         "tunnel.add_tunnel(command=\"lt --port {port}\", name=\"lt\", pattern=re.compile(r\"[\\w-]+\\.loca\\.lt\"), note=\"Password : \" + \"\\033[32m\" + public_ipv4 + \"\\033[0m\" + \" rerun cell if 404 error.\")\n",
@@ -90,17 +98,33 @@
         "    tunnel.add_tunnel(command=\"zrok share public http://localhost:{port}/ --headless\", name=\"zrok\", pattern=re.compile(r\"[\\w-]+\\.share\\.zrok\\.io\"))\n",
         "\n",
         "clear_output()\n",
-        "# ======================== TUNNEL ========================\n",
         "\n",
         "\n",
-        "# automatic fixing path V2\n",
-        "!sed -i 's|\"tagger_hf_cache_dir\": \".*\"|\"tagger_hf_cache_dir\": \"{webui_path}/models/interrogators/\"|' {webui_path}/config.json\n",
-        "!sed -i 's|\"additional_networks_extra_lora_path\": \".*\"|\"additional_networks_extra_lora_path\": \"{webui_path}/models/Lora/\"|' {webui_path}/config.json\n",
-        "!sed -i 's|\"ad_extra_models_dir\": \".*\"|\"ad_extra_models_dir\": \"{webui_path}/models/adetailer/\"|' {webui_path}/config.json\n",
-        "!sed -i 's/\"sd_checkpoint_hash\": \".*\"/\"sd_checkpoint_hash\": \"\"/g; s/\"sd_model_checkpoint\": \".*\"/\"sd_model_checkpoint\": \"\"/g; s/\"sd_vae\": \".*\"/\"sd_vae\": \"None\"/g' {webui_path}/config.json\n",
-        "# for kaggle\n",
+        "# =============== Automatic Fixing Path V3 ===============\n",
+        "paths_to_check = [\n",
+        "    (\"tagger_hf_cache_dir\", f\"{webui_path}/models/interrogators/\"),\n",
+        "    (\"additional_networks_extra_lora_path\", f\"{webui_path}/models/Lora/\"),\n",
+        "    (\"ad_extra_models_dir\", f\"{webui_path}/models/adetailer/\"),\n",
+        "    (\"sd_checkpoint_hash\", \"\"),\n",
+        "    (\"sd_model_checkpoint\", \"\"),\n",
+        "    (\"sd_vae\", \"None\")\n",
+        "]\n",
+        "\n",
+        "config_path = f'{webui_path}/ui-config.json'\n",
+        "\n",
+        "with open(config_path, 'r') as file:\n",
+        "    config_data = json.load(file)\n",
+        "\n",
+        "for key, value in paths_to_check:\n",
+        "    if key in config_data and config_data[key] != value:\n",
+        "        sed_command = f\"sed -i 's|\\\"{key}\\\": \\\".*\\\"|\\\"{key}\\\": \\\"{value}\\\"|' {config_path}\"\n",
+        "        os.system(sed_command)\n",
+        "\n",
+        "# Additional check for Kaggle\n",
         "if env == 'Kaggle':\n",
-        "   !sed -i 's/\"civitai_interface\\/NSFW content\\/value\":.*/\"civitai_interface\\/NSFW content\\/value\": false/g' {webui_path}/ui-config.json\n",
+        "   get_ipython().system('sed -i \\'s/\"civitai_interface\\\\/NSFW content\\\\/value\":.*/\"civitai_interface\\\\/NSFW content\\\\/value\": false/g\\' {webui_path}/ui-config.json')\n",
+        "#  -------------------------------------------------------\n",
+        "\n",
         "\n",
         "with tunnel:\n",
         "    %cd {webui_path}\n",
@@ -111,6 +135,10 @@
         "    if env != \"Google Colab\":\n",
         "        commandline_arguments += f' --encrypt-pass={tunnel_port} --api'\n",
         "\n",
+        "    # -- FORGE --\n",
+        "    if change_webui == 'Forge':\n",
+        "        commandline_arguments += ' --cuda-stream --pin-shared-memory'\n",
+        "\n",
         "    !COMMANDLINE_ARGS=\"{commandline_arguments}\" python launch.py\n",
         "\n",
         "\n",

files_cells/python/en/auto-cleaner_en.py

@@ -223,7 +223,7 @@ display(HTML(CSS))
 
 # ================ AutoCleaner function ================
 directories = {
-    "Images": f"{webui_path}/outputs",
+    "Images": f"{webui_path}/output",
     "Models": f"{webui_path}/models/Stable-diffusion/",
     "Vae": f"{webui_path}/models/VAE/",
     "LoRa": f"{webui_path}/models/Lora/",

files_cells/python/en/downloading_en.py

@@ -127,10 +127,10 @@ adetailer_dir = f"{webui_path}/models/adetailer"
 # ================= MAIN CODE =================
 if not os.path.exists(webui_path):
     start_install = int(time.time())
-    print("⌚ Unpacking Stable Diffusion...", end='')
+    print("⌚ Unpacking Stable Diffusion..." if change_webui != 'Forge' else "⌚ Unpacking Stable Diffusion (Forge)...", end='')
     with capture.capture_output() as cap:
         aria2_command = "aria2c --console-log-level=error -c -x 16 -s 16 -k 1M"
-        url = "https://huggingface.co/NagisaNao/fast_repo/resolve/main/FULL_REPO.zip" if change_webui != 'Forge' else "https://huggingface.co/NagisaNao/test/resolve/main/FULL_REPO_forge.zip"
+        url = "https://huggingface.co/NagisaNao/fast_repo/resolve/main/FULL_REPO.zip" if change_webui != 'Forge' else "https://huggingface.co/NagisaNao/fast_repo/resolve/main/FULL_REPO_forge.zip"
         get_ipython().system('{aria2_command} {url} -o repo.zip')
 
         get_ipython().system('unzip -q -o repo.zip -d {webui_path}')
@@ -243,13 +243,19 @@ model_list = {
 
 # 1-4 (fp16/cleaned)
 vae_list = {
-    "1.Anime.vae": [
-        {"url": "https://civitai.com/api/download/models/131654", "name": "Anime.vae.safetensors"},
-        {"url": "https://civitai.com/api/download/models/131658", "name": "vae-ft-mse.vae.safetensors"}
-    ],
-    "2.Anything.vae": [{"url": "https://civitai.com/api/download/models/131656", "name": "Anything.vae.safetensors"}],
-    "3.Blessed2.vae": [{"url": "https://civitai.com/api/download/models/142467", "name": "Blessed2.vae.safetensors"}],
-    "4.ClearVae.vae": [{"url": "https://civitai.com/api/download/models/133362", "name": "ClearVae_23.vae.safetensors"}],
+    ## vae broke - the author's an asshole
+    # "1.Anime.vae": [
+    #     {"url": "https://civitai.com/api/download/models/131654", "name": "Anime.vae.safetensors"},
+    #     {"url": "https://civitai.com/api/download/models/131658", "name": "vae-ft-mse.vae.safetensors"}
+    # ],
+    # "2.Anything.vae": [{"url": "https://civitai.com/api/download/models/131656", "name": "Anything.vae.safetensors"}],
+    # "3.Blessed2.vae": [{"url": "https://civitai.com/api/download/models/142467", "name": "Blessed2.vae.safetensors"}],
+    # "4.ClearVae.vae": [{"url": "https://civitai.com/api/download/models/133362", "name": "ClearVae_23.vae.safetensors"}],
+
+    "1.Anime.vae": [{"url": "https://civitai.com/api/download/models/311162", "name": "vae-ft-mse-840000-ema-pruned.vae.safetensors"}],
+    "2.Anything.vae": [{"url": "https://civitai.com/api/download/models/119279", "name": "Anything.vae.safetensors"}],
+    "3.Blessed2.vae": [{"url": "https://huggingface.co/NoCrypt/blessed_vae/resolve/main/blessed2.vae.pt", "name": "Blessed2.vae.safetensors"}],
+    "4.ClearVae.vae": [{"url": "https://civitai.com/api/download/models/88156", "name": "ClearVae_23.vae.safetensors"}],
     "5.WD.vae": [{"url": "https://huggingface.co/NoCrypt/resources/resolve/main/VAE/wd.vae.safetensors", "name": "WD.vae.safetensors"}]
 }
 
@@ -323,26 +329,47 @@ prefixes = {
 }
 
 extension_repo = []
-directories = (value for key, value in prefixes.items()) # for unpucking zip files
+directories = [value for key, value in prefixes.items()] # for unpucking zip files
 get_ipython().system('mkdir -p {" ".join(directories)}')
 
 hf_token = optional_huggingface_token if optional_huggingface_token else "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"
 user_header = f"\"Authorization: Bearer {hf_token}\""
 
+''' Formatted Info Output '''
+
+from math import floor
+
+def center_text(text, terminal_width=45):
+    text_length = len(text)
+    left_padding = floor((terminal_width - text_length) / 2)
+    right_padding = terminal_width - text_length - left_padding
+    return f"\033[1m\033[36m{' ' * left_padding}{text}{' ' * right_padding}\033[0m\033[32m"
+
+def format_output(url, dst_dir, file_name):
+    info = f"[{file_name.split('.')[0]}]"
+    info = center_text(info)
+
+    print(f"\n\033[32m{'---'*20}]{info}[{'---'*20}")
+    print(f"\033[33mURL: \033[34m{url}")
+    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): # get model data
+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)
-        if response.status_code == 200:
-            return response.json()
+        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:
         model_type = parse_qs(urlparse(url).query).get('type', [''])[0]
         model_name = data['files'][1]['name']
@@ -359,59 +386,69 @@ def extract_model_info(data, url):
     return model_type, model_name, image_url
 
 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]}" # assigning the original image format
+    return f"{name[0]}.preview.{img_exts[-1]}"
 
 ''' main download code '''
 
 def handle_manual(url):
-    original_url = url
-    url = url.split(':', 1)[1]
-    file_name = re.search(r'\[(.*?)\]', url)
-    file_name = file_name.group(1) if file_name else None
-    if file_name:
-        url = re.sub(r'\[.*?\]', '', url)
+    url_parts = url.split(':', 1)
+    prefix = url_parts[0]
+    path = url_parts[1]
 
-    for prefix, dir in prefixes.items():
-        if original_url.startswith(f"{prefix}:"):
-            if prefix != "extension":
-                manual_download(url, dir, file_name=file_name)
-            else:
-                extension_repo.append((url, file_name))
+    file_name_match = re.search(r'\[(.*?)\]', path)
+    file_name = file_name_match.group(1) if file_name_match else None
+    if file_name:
+        path = re.sub(r'\[.*?\]', '', path)
+
+    if prefix in prefixes:
+        dir = prefixes[prefix]
+        if prefix != "extension":
+            try:
+                manual_download(path, dir, file_name=file_name)
+            except Exception as e:
+                print(f"Error downloading file: {e}")
+        else:
+            extension_repo.append((path, file_name))
 
 def manual_download(url, dst_dir, file_name):
     aria2_args = '--optimize-concurrent-downloads --console-log-level=error --summary-interval=10 -j5 -x16 -s16 -k1M -c'
     basename = url.split("/")[-1] if file_name is None else file_name
     header_option = f"--header={user_header}"
 
-    # === CivitAi API ===
+    # ==== CivitAi API+ ====
     support_types = ('Checkpoint', 'Model', 'TextualInversion', 'LORA') # for dl preview image
     civitai_token = "62c0c5956b2f9defbd844d754000180b"
 
     if 'civitai' in url:
-        url = f"{url}{'&' if '?' in url else '?'}token={civitai_token}" # some authors are pussies and they need API token...
-        model_id = url.split('/')[-1]
-        clean_url = url.split('?')[0]
+        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 model_name and image_url:
-                image_file_name = gen_preview_filename(model_name if not file_name else file_name, image_url)
-                if any(types in model_type for types in support_types):
-                    with capture.capture_output() as cap: # clear shit
-                        get_ipython().system('aria2c {aria2_args} -d {dst_dir} -o {image_file_name} {image_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 # assigns the original file name if not specified initially
+            file_name = file_name or model_name
+    else:
+        clean_url = 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)
 
-    """ information output """
-    # -- wrold's best print info --
-    print(f"\n\033[32m{'---'*45}\n\033[33mURL: \033[34m{clean_url if 'civitai' in url else url}\n\033[33mSAVE DIR: \033[34m{dst_dir}\n\033[33mFILE NAME: \033[34m{file_name if not 'huggingface' in url else basename}\033[0m")
     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(types in model_type for types in support_types) and (locals().get('image_file_name') or ''):
+    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")
-    # ===================
+    # =====================
 
     # -- GDrive --
     if 'drive.google' in url:
@@ -455,9 +492,8 @@ def download(url):
 
     unpucking_zip_files()
 
-## unpucking zip files
+# unpucking zip files
 def unpucking_zip_files():
-    # directories - above
     for directory in directories:
         for root, dirs, files in os.walk(directory):
             for file in files:
@@ -470,8 +506,6 @@ def unpucking_zip_files():
 
 ''' submodels - added urls '''
 
-submodels = []
-
 def add_submodels(selection, num_selection, model_dict, dst_dir):
     if selection == "none":
         return []
@@ -483,33 +517,32 @@ def add_submodels(selection, num_selection, model_dict, dst_dir):
     else:
         selected_models = model_dict[selection]
         selected_nums = map(int, num_selection.replace(',', '').split())
-
         for num in selected_nums:
             if 1 <= num <= len(model_dict):
                 name = list(model_dict)[num - 1]
                 selected_models.extend(model_dict[name])
 
     unique_models = list({model['name']: model for model in selected_models}.values())
-
     for model in unique_models:
         model['dst_dir'] = dst_dir
 
     return unique_models
 
-submodels += add_submodels(Model, Model_Num, model_list, models_dir)                                                   # model
-submodels += add_submodels(Vae, Vae_Num, vae_list, vaes_dir)                                                           # vae
-submodels += add_submodels(controlnet, controlnet_Num, controlnet_list, control_dir)    # controlnet
+def handle_submodels(selection, num_selection, model_dict, dst_dir, url):
+    submodels = add_submodels(selection, num_selection, model_dict, dst_dir)
+    for submodel in submodels:
+        if not Inpainting_Model and "inpainting" in submodel['name']:
+            continue
+        url += f"{submodel['url']} {submodel['dst_dir']} {submodel['name']}, "
+    return url
 
-for submodel in submodels:
-    if not Inpainting_Model and "inpainting" in submodel['name']:
-        continue
-    url += f"{submodel['url']} {submodel['dst_dir']} {submodel['name']}, "
+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)
 
 ''' file.txt - added urls '''
 
-unique_urls = []
-
-def process_file_download(file_url):
+def process_file_download(file_url, prefixes, unique_urls):
     files_urls = ""
 
     if file_url.startswith("http"):
@@ -523,19 +556,23 @@ def process_file_download(file_url):
 
     current_tag = None
     for line in lines:
+        line = line.strip()
         if any(f'# {tag}' in line.lower() for tag in prefixes):
             current_tag = next((tag for tag in prefixes if tag in line.lower()))
 
         urls = [url.split('#')[0].strip() for url in line.split(',')]  # filter urls
         for url in urls:
-            if url.startswith("http") and url not in unique_urls:
+            filter_url = url.split('[')[0] # same url filter
+
+            if url.startswith("http") and filter_url not in unique_urls:
                 files_urls += f"{current_tag}:{url}, "
-                unique_urls.append(url)
+                unique_urls.add(filter_url)
 
     return files_urls
 
-# fix all possible errors/options and function call
 file_urls = ""
+unique_urls = set()
+
 if custom_file_urls:
     for custom_file_url in custom_file_urls.replace(',', '').split():
         if not custom_file_url.endswith('.txt'):
@@ -545,7 +582,7 @@ if custom_file_urls:
                 custom_file_url = f'{root_path}/{custom_file_url}'
 
         try:
-            file_urls += process_file_download(custom_file_url)
+            file_urls += process_file_download(custom_file_url, prefixes, unique_urls)
         except FileNotFoundError:
             pass
 

files_cells/python/en/launch_en.py

@@ -12,7 +12,7 @@ from IPython.display import clear_output
 
 #  ================= DETECT ENV =================
 def detect_environment():
-    free_plan = (os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES') / (1024. ** 3) <= 20)
+    free_plan = (os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES') / (1024 ** 3) <= 20)
     environments = {
         'COLAB_GPU': ('Google Colab', "/root" if free_plan else "/content"),
         'KAGGLE_URL_BASE': ('Kaggle', "/kaggle/working/content")
@@ -37,9 +37,10 @@ settings = load_settings()
 ngrok_token = settings['ngrok_token']
 zrok_token = settings['zrok_token']
 commandline_arguments = settings['commandline_arguments']
+change_webui = settings['change_webui']
 
 
-# ======================== TUNNEL ========================
+# ======================== TUNNEL V2 ========================
 print('Please Wait...')
 
 def get_public_ip(version='ipv4'):
@@ -52,10 +53,17 @@ def get_public_ip(version='ipv4'):
     except Exception as e:
         print(f"Error getting public {version} address:", e)
 
-public_ipv4 = get_public_ip(version='ipv4')
+# Check if public IP is already saved, if not then get it
+try:
+    with open(f"{root_path}/public_ip.txt", "r") as file:
+        public_ipv4 = file.read().strip()
+except FileNotFoundError:
+    public_ipv4 = get_public_ip(version='ipv4')
+    with open(f"{root_path}/public_ip.txt", "w") as file:
+        file.write(public_ipv4)
 
 tunnel_class = pickle.load(open(f"{root_path}/new_tunnel", "rb"), encoding="utf-8")
-tunnel_port= 1734
+tunnel_port = 1734
 tunnel = tunnel_class(tunnel_port)
 tunnel.add_tunnel(command="cl tunnel --url localhost:{port}", name="cl", pattern=re.compile(r"[\w-]+\.trycloudflare\.com"))
 tunnel.add_tunnel(command="lt --port {port}", name="lt", pattern=re.compile(r"[\w-]+\.loca\.lt"), note="Password : " + "\033[32m" + public_ipv4 + "\033[0m" + " rerun cell if 404 error.")
@@ -66,17 +74,32 @@ if zrok_token:
     tunnel.add_tunnel(command="zrok share public http://localhost:{port}/ --headless", name="zrok", pattern=re.compile(r"[\w-]+\.share\.zrok\.io"))
 
 clear_output()
-# ======================== TUNNEL ========================
 
 
- # automatic fixing path V2
-get_ipython().system('sed -i \'s|"tagger_hf_cache_dir": ".*"|"tagger_hf_cache_dir": "{webui_path}/models/interrogators/"|\' {webui_path}/config.json')
-get_ipython().system('sed -i \'s|"additional_networks_extra_lora_path": ".*"|"additional_networks_extra_lora_path": "{webui_path}/models/Lora/"|\' {webui_path}/config.json')
-get_ipython().system('sed -i \'s|"ad_extra_models_dir": ".*"|"ad_extra_models_dir": "{webui_path}/models/adetailer/"|\' {webui_path}/config.json')
-get_ipython().system('sed -i \'s/"sd_checkpoint_hash": ".*"/"sd_checkpoint_hash": ""/g; s/"sd_model_checkpoint": ".*"/"sd_model_checkpoint": ""/g; s/"sd_vae": ".*"/"sd_vae": "None"/g\' {webui_path}/config.json')
-# for kaggle
+# =============== Automatic Fixing Path V3 ===============
+paths_to_check = [
+    ("tagger_hf_cache_dir", f"{webui_path}/models/interrogators/"),
+    ("additional_networks_extra_lora_path", f"{webui_path}/models/Lora/"),
+    ("ad_extra_models_dir", f"{webui_path}/models/adetailer/"),
+    ("sd_checkpoint_hash", ""),
+    ("sd_model_checkpoint", ""),
+    ("sd_vae", "None")
+]
+
+config_path = f'{webui_path}/ui-config.json'
+
+with open(config_path, 'r') as file:
+    config_data = json.load(file)
+
+for key, value in paths_to_check:
+    if key in config_data and config_data[key] != value:
+        sed_command = f"sed -i 's|\"{key}\": \".*\"|\"{key}\": \"{value}\"|' {config_path}"
+        os.system(sed_command)
+
+# Additional check for Kaggle
 if env == 'Kaggle':
    get_ipython().system('sed -i \'s/"civitai_interface\\/NSFW content\\/value":.*/"civitai_interface\\/NSFW content\\/value": false/g\' {webui_path}/ui-config.json')
+#  -------------------------------------------------------
 
 
 with tunnel:
@@ -88,6 +111,10 @@ with tunnel:
     if env != "Google Colab":
         commandline_arguments += f' --encrypt-pass={tunnel_port} --api'
 
+    # -- FORGE --
+    if change_webui == 'Forge':
+        commandline_arguments += ' --cuda-stream --pin-shared-memory'
+
     get_ipython().system('COMMANDLINE_ARGS="{commandline_arguments}" python launch.py')
 
 

files_cells/python/ru/auto-cleaner_ru.py

@@ -223,7 +223,7 @@ display(HTML(CSS_AC))
 
 # ================ AutoCleaner function ================
 directories = {
-    "Изображения": f"{webui_path}/outputs",
+    "Изображения": f"{webui_path}/output",
     "Модели": f"{webui_path}/models/Stable-diffusion/",
     "Vae": f"{webui_path}/models/VAE/",
     "LoRa": f"{webui_path}/models/Lora/",

files_cells/python/ru/downloading_ru.py

@@ -130,7 +130,7 @@ if not os.path.exists(webui_path):
     print("⌚ Распаковка Stable Diffusion..." if change_webui != 'Forge' else "⌚ Распаковка Stable Diffusion (Forge)...", end='')
     with capture.capture_output() as cap:
         aria2_command = "aria2c --console-log-level=error -c -x 16 -s 16 -k 1M"
-        url = "https://huggingface.co/NagisaNao/fast_repo/resolve/main/FULL_REPO.zip" if change_webui != 'Forge' else "https://huggingface.co/NagisaNao/test/resolve/main/FULL_REPO_forge.zip"
+        url = "https://huggingface.co/NagisaNao/fast_repo/resolve/main/FULL_REPO.zip" if change_webui != 'Forge' else "https://huggingface.co/NagisaNao/fast_repo/resolve/main/FULL_REPO_forge.zip"
         get_ipython().system('{aria2_command} {url} -o repo.zip')
 
         get_ipython().system('unzip -q -o repo.zip -d {webui_path}')
@@ -243,13 +243,19 @@ model_list = {
 
 # 1-4 (fp16/cleaned)
 vae_list = {
-    "1.Anime.vae": [
-        {"url": "https://civitai.com/api/download/models/131654", "name": "Anime.vae.safetensors"},
-        {"url": "https://civitai.com/api/download/models/131658", "name": "vae-ft-mse.vae.safetensors"}
-    ],
-    "2.Anything.vae": [{"url": "https://civitai.com/api/download/models/131656", "name": "Anything.vae.safetensors"}],
-    "3.Blessed2.vae": [{"url": "https://civitai.com/api/download/models/142467", "name": "Blessed2.vae.safetensors"}],
-    "4.ClearVae.vae": [{"url": "https://civitai.com/api/download/models/133362", "name": "ClearVae_23.vae.safetensors"}],
+    ## vae broke - the author's an asshole
+    # "1.Anime.vae": [
+    #     {"url": "https://civitai.com/api/download/models/131654", "name": "Anime.vae.safetensors"},
+    #     {"url": "https://civitai.com/api/download/models/131658", "name": "vae-ft-mse.vae.safetensors"}
+    # ],
+    # "2.Anything.vae": [{"url": "https://civitai.com/api/download/models/131656", "name": "Anything.vae.safetensors"}],
+    # "3.Blessed2.vae": [{"url": "https://civitai.com/api/download/models/142467", "name": "Blessed2.vae.safetensors"}],
+    # "4.ClearVae.vae": [{"url": "https://civitai.com/api/download/models/133362", "name": "ClearVae_23.vae.safetensors"}],
+
+    "1.Anime.vae": [{"url": "https://civitai.com/api/download/models/311162", "name": "vae-ft-mse-840000-ema-pruned.vae.safetensors"}],
+    "2.Anything.vae": [{"url": "https://civitai.com/api/download/models/119279", "name": "Anything.vae.safetensors"}],
+    "3.Blessed2.vae": [{"url": "https://huggingface.co/NoCrypt/blessed_vae/resolve/main/blessed2.vae.pt", "name": "Blessed2.vae.safetensors"}],
+    "4.ClearVae.vae": [{"url": "https://civitai.com/api/download/models/88156", "name": "ClearVae_23.vae.safetensors"}],
     "5.WD.vae": [{"url": "https://huggingface.co/NoCrypt/resources/resolve/main/VAE/wd.vae.safetensors", "name": "WD.vae.safetensors"}]
 }
 
@@ -323,26 +329,47 @@ prefixes = {
 }
 
 extension_repo = []
-directories = (value for key, value in prefixes.items()) # for unpucking zip files
+directories = [value for key, value in prefixes.items()] # for unpucking zip files
 get_ipython().system('mkdir -p {" ".join(directories)}')
 
 hf_token = optional_huggingface_token if optional_huggingface_token else "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"
 user_header = f"\"Authorization: Bearer {hf_token}\""
 
+''' Formatted Info Output '''
+
+from math import floor
+
+def center_text(text, terminal_width=45):
+    text_length = len(text)
+    left_padding = floor((terminal_width - text_length) / 2)
+    right_padding = terminal_width - text_length - left_padding
+    return f"\033[1m\033[36m{' ' * left_padding}{text}{' ' * right_padding}\033[0m\033[32m"
+
+def format_output(url, dst_dir, file_name):
+    info = f"[{file_name.split('.')[0]}]"
+    info = center_text(info)
+
+    print(f"\n\033[32m{'---'*20}]{info}[{'---'*20}")
+    print(f"\033[33mURL: \033[34m{url}")
+    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): # get model data
+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)
-        if response.status_code == 200:
-            return response.json()
+        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:
         model_type = parse_qs(urlparse(url).query).get('type', [''])[0]
         model_name = data['files'][1]['name']
@@ -359,59 +386,69 @@ def extract_model_info(data, url):
     return model_type, model_name, image_url
 
 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]}" # assigning the original image format
+    return f"{name[0]}.preview.{img_exts[-1]}"
 
 ''' main download code '''
 
 def handle_manual(url):
-    original_url = url
-    url = url.split(':', 1)[1]
-    file_name = re.search(r'\[(.*?)\]', url)
-    file_name = file_name.group(1) if file_name else None
-    if file_name:
-        url = re.sub(r'\[.*?\]', '', url)
+    url_parts = url.split(':', 1)
+    prefix = url_parts[0]
+    path = url_parts[1]
 
-    for prefix, dir in prefixes.items():
-        if original_url.startswith(f"{prefix}:"):
-            if prefix != "extension":
-                manual_download(url, dir, file_name=file_name)
-            else:
-                extension_repo.append((url, file_name))
+    file_name_match = re.search(r'\[(.*?)\]', path)
+    file_name = file_name_match.group(1) if file_name_match else None
+    if file_name:
+        path = re.sub(r'\[.*?\]', '', path)
+
+    if prefix in prefixes:
+        dir = prefixes[prefix]
+        if prefix != "extension":
+            try:
+                manual_download(path, dir, file_name=file_name)
+            except Exception as e:
+                print(f"Error downloading file: {e}")
+        else:
+            extension_repo.append((path, file_name))
 
 def manual_download(url, dst_dir, file_name):
     aria2_args = '--optimize-concurrent-downloads --console-log-level=error --summary-interval=10 -j5 -x16 -s16 -k1M -c'
     basename = url.split("/")[-1] if file_name is None else file_name
     header_option = f"--header={user_header}"
 
-    # === CivitAi API ===
+    # ==== CivitAi API+ ====
     support_types = ('Checkpoint', 'Model', 'TextualInversion', 'LORA') # for dl preview image
     civitai_token = "62c0c5956b2f9defbd844d754000180b"
 
     if 'civitai' in url:
-        url = f"{url}{'&' if '?' in url else '?'}token={civitai_token}" # some authors are pussies and they need API token...
-        model_id = url.split('/')[-1]
-        clean_url = url.split('?')[0]
+        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 model_name and image_url:
-                image_file_name = gen_preview_filename(model_name if not file_name else file_name, image_url)
-                if any(types in model_type for types in support_types):
-                    with capture.capture_output() as cap: # clear shit
-                        get_ipython().system('aria2c {aria2_args} -d {dst_dir} -o {image_file_name} {image_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 # assigns the original file name if not specified initially
+            file_name = file_name or model_name
+    else:
+        clean_url = 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)
 
-    """ information output """
-    # -- wrold's best print info --
-    print(f"\n\033[32m{'---'*45}\n\033[33mURL: \033[34m{clean_url if 'civitai' in url else url}\n\033[33mSAVE DIR: \033[34m{dst_dir}\n\033[33mFILE NAME: \033[34m{file_name if not 'huggingface' in url else basename}\033[0m")
     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(types in model_type for types in support_types) and (locals().get('image_file_name') or ''):
+    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")
-    # ===================
+    # =====================
 
     # -- GDrive --
     if 'drive.google' in url:
@@ -455,9 +492,8 @@ def download(url):
 
     unpucking_zip_files()
 
-## unpucking zip files
+# unpucking zip files
 def unpucking_zip_files():
-    # directories - above
     for directory in directories:
         for root, dirs, files in os.walk(directory):
             for file in files:
@@ -470,8 +506,6 @@ def unpucking_zip_files():
 
 ''' submodels - added urls '''
 
-submodels = []
-
 def add_submodels(selection, num_selection, model_dict, dst_dir):
     if selection == "none":
         return []
@@ -483,33 +517,32 @@ def add_submodels(selection, num_selection, model_dict, dst_dir):
     else:
         selected_models = model_dict[selection]
         selected_nums = map(int, num_selection.replace(',', '').split())
-
         for num in selected_nums:
             if 1 <= num <= len(model_dict):
                 name = list(model_dict)[num - 1]
                 selected_models.extend(model_dict[name])
 
     unique_models = list({model['name']: model for model in selected_models}.values())
-
     for model in unique_models:
         model['dst_dir'] = dst_dir
 
     return unique_models
 
-submodels += add_submodels(Model, Model_Num, model_list, models_dir)                                                   # model
-submodels += add_submodels(Vae, Vae_Num, vae_list, vaes_dir)                                                           # vae
-submodels += add_submodels(controlnet, controlnet_Num, controlnet_list, control_dir)    # controlnet
+def handle_submodels(selection, num_selection, model_dict, dst_dir, url):
+    submodels = add_submodels(selection, num_selection, model_dict, dst_dir)
+    for submodel in submodels:
+        if not Inpainting_Model and "inpainting" in submodel['name']:
+            continue
+        url += f"{submodel['url']} {submodel['dst_dir']} {submodel['name']}, "
+    return url
 
-for submodel in submodels:
-    if not Inpainting_Model and "inpainting" in submodel['name']:
-        continue
-    url += f"{submodel['url']} {submodel['dst_dir']} {submodel['name']}, "
+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)
 
 ''' file.txt - added urls '''
 
-unique_urls = []
-
-def process_file_download(file_url):
+def process_file_download(file_url, prefixes, unique_urls):
     files_urls = ""
 
     if file_url.startswith("http"):
@@ -523,19 +556,23 @@ def process_file_download(file_url):
 
     current_tag = None
     for line in lines:
+        line = line.strip()
         if any(f'# {tag}' in line.lower() for tag in prefixes):
             current_tag = next((tag for tag in prefixes if tag in line.lower()))
 
         urls = [url.split('#')[0].strip() for url in line.split(',')]  # filter urls
         for url in urls:
-            if url.startswith("http") and url not in unique_urls:
+            filter_url = url.split('[')[0] # same url filter
+
+            if url.startswith("http") and filter_url not in unique_urls:
                 files_urls += f"{current_tag}:{url}, "
-                unique_urls.append(url)
+                unique_urls.add(filter_url)
 
     return files_urls
 
-# fix all possible errors/options and function call
 file_urls = ""
+unique_urls = set()
+
 if custom_file_urls:
     for custom_file_url in custom_file_urls.replace(',', '').split():
         if not custom_file_url.endswith('.txt'):
@@ -545,7 +582,7 @@ if custom_file_urls:
                 custom_file_url = f'{root_path}/{custom_file_url}'
 
         try:
-            file_urls += process_file_download(custom_file_url)
+            file_urls += process_file_download(custom_file_url, prefixes, unique_urls)
         except FileNotFoundError:
             pass
 

files_cells/python/ru/launch_ru.py

@@ -12,7 +12,7 @@ from IPython.display import clear_output
 
 #  ================= DETECT ENV =================
 def detect_environment():
-    free_plan = (os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES') / (1024. ** 3) <= 20)
+    free_plan = (os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES') / (1024 ** 3) <= 20)
     environments = {
         'COLAB_GPU': ('Google Colab', "/root" if free_plan else "/content"),
         'KAGGLE_URL_BASE': ('Kaggle', "/kaggle/working/content")
@@ -37,9 +37,10 @@ settings = load_settings()
 ngrok_token = settings['ngrok_token']
 zrok_token = settings['zrok_token']
 commandline_arguments = settings['commandline_arguments']
+change_webui = settings['change_webui']
 
 
-# ======================== TUNNEL ========================
+# ======================== TUNNEL V2 ========================
 print('Please Wait...')
 
 def get_public_ip(version='ipv4'):
@@ -52,10 +53,17 @@ def get_public_ip(version='ipv4'):
     except Exception as e:
         print(f"Error getting public {version} address:", e)
 
-public_ipv4 = get_public_ip(version='ipv4')
+# Check if public IP is already saved, if not then get it
+try:
+    with open(f"{root_path}/public_ip.txt", "r") as file:
+        public_ipv4 = file.read().strip()
+except FileNotFoundError:
+    public_ipv4 = get_public_ip(version='ipv4')
+    with open(f"{root_path}/public_ip.txt", "w") as file:
+        file.write(public_ipv4)
 
 tunnel_class = pickle.load(open(f"{root_path}/new_tunnel", "rb"), encoding="utf-8")
-tunnel_port= 1734
+tunnel_port = 1734
 tunnel = tunnel_class(tunnel_port)
 tunnel.add_tunnel(command="cl tunnel --url localhost:{port}", name="cl", pattern=re.compile(r"[\w-]+\.trycloudflare\.com"))
 tunnel.add_tunnel(command="lt --port {port}", name="lt", pattern=re.compile(r"[\w-]+\.loca\.lt"), note="Password : " + "\033[32m" + public_ipv4 + "\033[0m" + " rerun cell if 404 error.")
@@ -66,17 +74,33 @@ if zrok_token:
     tunnel.add_tunnel(command="zrok share public http://localhost:{port}/ --headless", name="zrok", pattern=re.compile(r"[\w-]+\.share\.zrok\.io"))
 
 clear_output()
-# ======================== TUNNEL ========================
 
 
-# automatic fixing path V2
-get_ipython().system('sed -i \'s|"tagger_hf_cache_dir": ".*"|"tagger_hf_cache_dir": "{webui_path}/models/interrogators/"|\' {webui_path}/config.json')
-get_ipython().system('sed -i \'s|"additional_networks_extra_lora_path": ".*"|"additional_networks_extra_lora_path": "{webui_path}/models/Lora/"|\' {webui_path}/config.json')
-get_ipython().system('sed -i \'s|"ad_extra_models_dir": ".*"|"ad_extra_models_dir": "{webui_path}/models/adetailer/"|\' {webui_path}/config.json')
-get_ipython().system('sed -i \'s/"sd_checkpoint_hash": ".*"/"sd_checkpoint_hash": ""/g; s/"sd_model_checkpoint": ".*"/"sd_model_checkpoint": ""/g; s/"sd_vae": ".*"/"sd_vae": "None"/g\' {webui_path}/config.json')
-# for kaggle
+# =============== Automatic Fixing Path V3 ===============
+paths_to_check = [
+    ("tagger_hf_cache_dir", f"{webui_path}/models/interrogators/"),
+    ("additional_networks_extra_lora_path", f"{webui_path}/models/Lora/"),
+    ("ad_extra_models_dir", f"{webui_path}/models/adetailer/"),
+    ("sd_checkpoint_hash", ""),
+    ("sd_model_checkpoint", ""),
+    ("sd_vae", "None")
+]
+
+config_path = f'{webui_path}/ui-config.json'
+
+with open(config_path, 'r') as file:
+    config_data = json.load(file)
+
+for key, value in paths_to_check:
+    if key in config_data and config_data[key] != value:
+        sed_command = f"sed -i 's|\"{key}\": \".*\"|\"{key}\": \"{value}\"|' {config_path}"
+        os.system(sed_command)
+
+# Additional check for Kaggle
 if env == 'Kaggle':
    get_ipython().system('sed -i \'s/"civitai_interface\\/NSFW content\\/value":.*/"civitai_interface\\/NSFW content\\/value": false/g\' {webui_path}/ui-config.json')
+#  -------------------------------------------------------
+
 
 with tunnel:
     get_ipython().run_line_magic('cd', '{webui_path}')
@@ -87,6 +111,10 @@ with tunnel:
     if env != "Google Colab":
         commandline_arguments += f' --encrypt-pass={tunnel_port} --api'
 
+    # -- FORGE --
+    if change_webui == 'Forge':
+        commandline_arguments += ' --cuda-stream --pin-shared-memory'
+
     get_ipython().system('COMMANDLINE_ARGS="{commandline_arguments}" python launch.py')