update download code

files_cells/notebooks/en/auto-cleaner_en.ipynb

@@ -252,13 +252,18 @@
         "\"\"\" functions \"\"\"\n",
         "def clean_directory(directory):\n",
         "    deleted_files = 0\n",
+        "    image_dir = directories['Images']\n",
+        "\n",
         "    for root, dirs, files in os.walk(directory):\n",
         "        for file in files:\n",
+        "            file_path = os.path.join(root, file)\n",
+        "\n",
         "            if file.endswith(\".txt\"):\n",
         "                continue\n",
-        "            os.remove(os.path.join(root, file))\n",
-        "            if file.endswith((\".safetensors\", \".pt\")):\n",
+        "            if file.endswith((\".safetensors\", \".pt\")) or root == image_dir: # fix for image counter\n",
         "                deleted_files += 1\n",
+        "\n",
+        "            os.remove(file_path)\n",
         "    return deleted_files\n",
         "\n",
         "def update_memory_info():\n",
@@ -268,7 +273,7 @@
         "    free = disk_space.free / (1024 ** 3)\n",
         "\n",
         "    storage_info.value = f'''\n",
-        "    <div class=\"storage_info_AC\">Всего: {total:.2f} GB <span style=\"color: #555\">|</span> Используется: {used:.2f} GB <span style=\"color: #555\">|</span> Свободно: {free:.2f} GB</div>\n",
+        "    <div class=\"storage_info_AC\">Total storage: {total:.2f} GB <span style=\"color: #555\">|</span> Used: {used:.2f} GB <span style=\"color: #555\">|</span> Free: {free:.2f} GB</div>\n",
         "    '''\n",
         "\n",
         "def on_execute_button_press(button):\n",

files_cells/notebooks/en/downloading_en.ipynb

@@ -58,33 +58,31 @@
         "    print(\"💿 Installing the libraries, it's going to take a while:\\n\")\n",
         "\n",
         "    install_lib = {\n",
-        "        \"gdown\": \"pip install -U gdown\",\n",
-        "        \"aria2\": \"apt-get update && apt -y install aria2\",\n",
-        "        \"localtunnel\": \"npm install -g localtunnel &> /dev/null\",\n",
+        "        \"aria2\": \"apt -y install aria2\",\n",
+        "        \"localtunnel\": \"npm install -g localtunnel\",\n",
         "        \"insightface\": \"pip install insightface\",\n",
         "    }\n",
         "\n",
-        "    # Dictionary of additional libraries specific to certain environments\n",
         "    additional_libs = {\n",
         "        \"Google Colab\": {\n",
         "            \"xformers\": \"pip install xformers==0.0.26.post1 --no-deps\"\n",
         "        },\n",
         "        \"Kaggle\": {\n",
-        "            \"xformers\": \"pip install -q xformers==0.0.26.post1\",\n",
-        "            # \"torch\": \"pip install -q torch==2.1.2+cu121 torchvision==0.16.2+cu121 torchaudio==2.1.2 --extra-index-url https://download.pytorch.org/whl/cu121\"\n",
+        "            \"xformers\": \"pip install xformers==0.0.26.post1\",\n",
+        "            # \"torch\": \"pip install torch==2.1.2+cu121 torchvision==0.16.2+cu121 torchaudio==2.1.2 --extra-index-url https://download.pytorch.org/whl/cu121\",\n",
+        "            \"aiohttp\": \"pip install trash-cli && trash-put /opt/conda/lib/python3.10/site-packages/aiohttp*\" # fix install req\n",
         "        }\n",
         "    }\n",
         "\n",
-        "    # If the current environment has additional libraries, update the install_lib dictionary\n",
         "    if env in additional_libs:\n",
         "        install_lib.update(additional_libs[env])\n",
         "\n",
-        "    # Loop through libraries and execute install commands\n",
+        "    # Loop through libraries\n",
         "    for index, (package, install_cmd) in enumerate(install_lib.items(), start=1):\n",
         "        print(f\"\\r[{index}/{len(install_lib)}] \\033[32m>>\\033[0m Installing \\033[33m{package}\\033[0m...\" + \" \"*35, end='')\n",
         "        subprocess.run(install_cmd, shell=True, capture_output=True)\n",
         "\n",
-        "    # Additional manual installation steps for specific packages\n",
+        "    # Additional specific packages\n",
         "    with capture.capture_output() as cap:\n",
         "        !curl -s -OL https://github.com/DEX-1101/sd-webui-notebook/raw/main/res/new_tunnel --output-dir {root_path}\n",
         "        !curl -s -Lo /usr/bin/cl https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-amd64 && chmod +x /usr/bin/cl\n",
@@ -397,7 +395,7 @@
         "    basename = url.split(\"/\")[-1] if file_name is None else file_name\n",
         "    aria2_args = '--optimize-concurrent-downloads --console-log-level=error --summary-interval=10 -j5 -x16 -s16 -k1M -c'\n",
         "\n",
-        "    print(f\"\\n\\033[32m{'---'*45}\\n\\033[33mURL: \\033[34m{url}\\n\\033[33mSAVE DIR: \\033[34m{dst_dir}\\n\\033[33mFILE NAME: \\033[34m{file_name}033[0m\")\n",
+        "    print(f\"\\n\\033[32m{'---'*45}\\n\\033[33mURL: \\033[34m{url}\\n\\033[33mSAVE DIR: \\033[34m{dst_dir}\\n\\033[33mFILE NAME: \\033[34m{file_name}\\033[0m\")\n",
         "    # print(url, dst_dir, file_name)\n",
         "\n",
         "    # === CivitAi API ===\n",
@@ -420,6 +418,12 @@
         "\n",
         "    # -- GDrive --\n",
         "    if 'drive.google' in url:\n",
+        "        try:\n",
+        "            have_drive_link\n",
+        "        except:\n",
+        "            !pip install -U gdown > /dev/null\n",
+        "            have_drive_link = True\n",
+        "\n",
         "        if 'folders' in url:\n",
         "            !gdown --folder \"{url}\" -O {dst_dir} --fuzzy -c\n",
         "        else:\n",
@@ -435,12 +439,8 @@
         "        !aria2c {header_option} {aria2_args} -d {dst_dir} -o {basename} {url}\n",
         "\n",
         "    # -- Other --\n",
-        "    elif 'http' in url or 'magnet' in url:\n",
-        "        if file_name:\n",
-        "            !aria2c {aria2_args} -d {dst_dir} -o {file_name} {url}\n",
-        "        else:\n",
-        "            parsed_link = '\"{}\"'.format(url)\n",
-        "            !aria2c {aria2_args} -d {dst_dir} -Z {parsed_link}\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",

files_cells/notebooks/en/launch_en.ipynb

@@ -29,7 +29,9 @@
         "import time\n",
         "import json\n",
         "import requests\n",
+        "import cloudpickle as pickle\n",
         "from datetime import timedelta\n",
+        "from IPython.display import clear_output\n",
         "\n",
         "\n",
         "#  ================= DETECT ENV =================\n",
@@ -62,7 +64,7 @@
         "\n",
         "\n",
         "# ======================== TUNNEL ========================\n",
-        "import cloudpickle as pickle\n",
+        "print('Please Wait...')\n",
         "\n",
         "def get_public_ip(version='ipv4'):\n",
         "    try:\n",
@@ -77,7 +79,7 @@
         "public_ipv4 = get_public_ip(version='ipv4')\n",
         "\n",
         "tunnel_class = pickle.load(open(f\"{root_path}/new_tunnel\", \"rb\"), encoding=\"utf-8\")\n",
-        "tunnel_port= 1769\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",
@@ -86,31 +88,38 @@
         "if zrok_token:\n",
         "    get_ipython().system('zrok enable {zrok_token} &> /dev/null')\n",
         "    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",
+        " # 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",
-        "# ---\n",
         "!sed -i 's/\"sd_checkpoint_hash\": \".*\"/\"sd_checkpoint_hash\": \"\"/g; s/\"sd_model_checkpoint\": \".*\"/\"sd_model_checkpoint\": \"\"/g; s/\"sd_vae\": \".*\"/\"sd_vae\": \"None\"/g' {webui_path}/config.json\n",
         "\n",
         "\n",
         "with tunnel:\n",
         "    %cd {webui_path}\n",
-        "    commandline_arguments += f\" --port=1769\"\n",
         "\n",
+        "    commandline_arguments += f' --port={tunnel_port}'\n",
         "    if ngrok_token:\n",
-        "        commandline_arguments += ' --ngrok ' + ngrok_token\n",
+        "        commandline_arguments += f' --ngrok {ngrok_token}'\n",
         "    if env != \"Google Colab\":\n",
-        "        commandline_arguments += f\" --encrypt-pass=1769 --api\"\n",
+        "        commandline_arguments += f' --encrypt-pass={tunnel_port} --api'\n",
         "\n",
         "    !COMMANDLINE_ARGS=\"{commandline_arguments}\" python launch.py\n",
         "\n",
-        "    start_colab = float(open(f'{webui_path}/static/colabTimer.txt', 'r').read())\n",
-        "    time_since_start = str(timedelta(seconds=time.time()-start_colab)).split('.')[0]\n",
-        "    print(f\"\\n⌚️ \\033[0mYou have been conducting this session for - \\033[33m{time_since_start}\\033[0m\\n\\n\")"
+        "\n",
+        "# after runnig\n",
+        "start_colab = float(open(f'{webui_path}/static/colabTimer.txt', 'r').read())\n",
+        "time_since_start = str(timedelta(seconds=time.time()-start_colab)).split('.')[0]\n",
+        "print(f\"\\n⌚️ \\033[0mYou have been conducting this session for - \\033[33m{time_since_start}\\033[0m\\n\\n\")\n",
+        "\n",
+        "''' del zrok tunnel '''\n",
+        "if zrok_token:\n",
+        "    !zrok disable &> /dev/null"
       ]
     }
   ]

files_cells/notebooks/ru/auto-cleaner_ru.ipynb

@@ -252,13 +252,18 @@
         "\"\"\" functions \"\"\"\n",
         "def clean_directory(directory):\n",
         "    deleted_files = 0\n",
+        "    image_dir = directories['Изображения']\n",
+        "\n",
         "    for root, dirs, files in os.walk(directory):\n",
         "        for file in files:\n",
+        "            file_path = os.path.join(root, file)\n",
+        "\n",
         "            if file.endswith(\".txt\"):\n",
         "                continue\n",
-        "            os.remove(os.path.join(root, file))\n",
-        "            if file.endswith((\".safetensors\", \".pt\")):\n",
+        "            if file.endswith((\".safetensors\", \".pt\")) or root == image_dir: # fix for image counter\n",
         "                deleted_files += 1\n",
+        "\n",
+        "            os.remove(file_path)\n",
         "    return deleted_files\n",
         "\n",
         "def update_memory_info():\n",

files_cells/notebooks/ru/downloading_ru.ipynb

@@ -58,33 +58,31 @@
         "    print(\"💿 Установка библиотек, это займет какое-то время:\\n\")\n",
         "\n",
         "    install_lib = {\n",
-        "        \"gdown\": \"pip install -U gdown\",\n",
-        "        \"aria2\": \"apt-get update && apt -y install aria2\",\n",
-        "        \"localtunnel\": \"npm install -g localtunnel &> /dev/null\",\n",
+        "        \"aria2\": \"apt -y install aria2\",\n",
+        "        \"localtunnel\": \"npm install -g localtunnel\",\n",
         "        \"insightface\": \"pip install insightface\",\n",
         "    }\n",
         "\n",
-        "    # Dictionary of additional libraries specific to certain environments\n",
         "    additional_libs = {\n",
         "        \"Google Colab\": {\n",
         "            \"xformers\": \"pip install xformers==0.0.26.post1 --no-deps\"\n",
         "        },\n",
         "        \"Kaggle\": {\n",
-        "            \"xformers\": \"pip install -q xformers==0.0.26.post1\",\n",
-        "            # \"torch\": \"pip install -q torch==2.1.2+cu121 torchvision==0.16.2+cu121 torchaudio==2.1.2 --extra-index-url https://download.pytorch.org/whl/cu121\"\n",
+        "            \"xformers\": \"pip install xformers==0.0.26.post1\",\n",
+        "            # \"torch\": \"pip install torch==2.1.2+cu121 torchvision==0.16.2+cu121 torchaudio==2.1.2 --extra-index-url https://download.pytorch.org/whl/cu121\",\n",
+        "            \"aiohttp\": \"pip install trash-cli && trash-put /opt/conda/lib/python3.10/site-packages/aiohttp*\" # fix install req\n",
         "        }\n",
         "    }\n",
         "\n",
-        "    # If the current environment has additional libraries, update the install_lib dictionary\n",
         "    if env in additional_libs:\n",
         "        install_lib.update(additional_libs[env])\n",
         "\n",
-        "    # Loop through libraries and execute install commands\n",
+        "    # Loop through libraries\n",
         "    for index, (package, install_cmd) in enumerate(install_lib.items(), start=1):\n",
         "        print(f\"\\r[{index}/{len(install_lib)}] \\033[32m>>\\033[0m Installing \\033[33m{package}\\033[0m...\" + \" \"*35, end='')\n",
         "        subprocess.run(install_cmd, shell=True, capture_output=True)\n",
         "\n",
-        "    # Additional manual installation steps for specific packages\n",
+        "    # Additional specific packages\n",
         "    with capture.capture_output() as cap:\n",
         "        !curl -s -OL https://github.com/DEX-1101/sd-webui-notebook/raw/main/res/new_tunnel --output-dir {root_path}\n",
         "        !curl -s -Lo /usr/bin/cl https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-amd64 && chmod +x /usr/bin/cl\n",
@@ -397,7 +395,7 @@
         "    basename = url.split(\"/\")[-1] if file_name is None else file_name\n",
         "    aria2_args = '--optimize-concurrent-downloads --console-log-level=error --summary-interval=10 -j5 -x16 -s16 -k1M -c'\n",
         "\n",
-        "    print(f\"\\n\\033[32m{'---'*45}\\n\\033[33mURL: \\033[34m{url}\\n\\033[33mSAVE DIR: \\033[34m{dst_dir}\\n\\033[33mFILE NAME: \\033[34m{file_name}033[0m\")\n",
+        "    print(f\"\\n\\033[32m{'---'*45}\\n\\033[33mURL: \\033[34m{url}\\n\\033[33mSAVE DIR: \\033[34m{dst_dir}\\n\\033[33mFILE NAME: \\033[34m{file_name}\\033[0m\")\n",
         "    # print(url, dst_dir, file_name)\n",
         "\n",
         "    # === CivitAi API ===\n",
@@ -420,6 +418,12 @@
         "\n",
         "    # -- GDrive --\n",
         "    if 'drive.google' in url:\n",
+        "        try:\n",
+        "            have_drive_link\n",
+        "        except:\n",
+        "            !pip install -U gdown > /dev/null\n",
+        "            have_drive_link = True\n",
+        "\n",
         "        if 'folders' in url:\n",
         "            !gdown --folder \"{url}\" -O {dst_dir} --fuzzy -c\n",
         "        else:\n",
@@ -435,12 +439,8 @@
         "        !aria2c {header_option} {aria2_args} -d {dst_dir} -o {basename} {url}\n",
         "\n",
         "    # -- Other --\n",
-        "    elif 'http' in url or 'magnet' in url:\n",
-        "        if file_name:\n",
-        "            !aria2c {aria2_args} -d {dst_dir} -o {file_name} {url}\n",
-        "        else:\n",
-        "            parsed_link = '\"{}\"'.format(url)\n",
-        "            !aria2c {aria2_args} -d {dst_dir} -Z {parsed_link}\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",

files_cells/notebooks/ru/launch_ru.ipynb

@@ -29,7 +29,9 @@
         "import time\n",
         "import json\n",
         "import requests\n",
+        "import cloudpickle as pickle\n",
         "from datetime import timedelta\n",
+        "from IPython.display import clear_output\n",
         "\n",
         "\n",
         "#  ================= DETECT ENV =================\n",
@@ -62,7 +64,7 @@
         "\n",
         "\n",
         "# ======================== TUNNEL ========================\n",
-        "import cloudpickle as pickle\n",
+        "print('Please Wait...')\n",
         "\n",
         "def get_public_ip(version='ipv4'):\n",
         "    try:\n",
@@ -77,7 +79,7 @@
         "public_ipv4 = get_public_ip(version='ipv4')\n",
         "\n",
         "tunnel_class = pickle.load(open(f\"{root_path}/new_tunnel\", \"rb\"), encoding=\"utf-8\")\n",
-        "tunnel_port= 1769\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",
@@ -86,6 +88,8 @@
         "if zrok_token:\n",
         "    get_ipython().system('zrok enable {zrok_token} &> /dev/null')\n",
         "    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",
@@ -93,24 +97,29 @@
         "!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",
-        "# ---\n",
         "!sed -i 's/\"sd_checkpoint_hash\": \".*\"/\"sd_checkpoint_hash\": \"\"/g; s/\"sd_model_checkpoint\": \".*\"/\"sd_model_checkpoint\": \"\"/g; s/\"sd_vae\": \".*\"/\"sd_vae\": \"None\"/g' {webui_path}/config.json\n",
         "\n",
         "\n",
         "with tunnel:\n",
         "    %cd {webui_path}\n",
-        "    commandline_arguments += f\" --port=1769\"\n",
         "\n",
+        "    commandline_arguments += f' --port={tunnel_port}'\n",
         "    if ngrok_token:\n",
-        "        commandline_arguments += ' --ngrok ' + ngrok_token\n",
+        "        commandline_arguments += f' --ngrok {ngrok_token}'\n",
         "    if env != \"Google Colab\":\n",
-        "        commandline_arguments += f\" --encrypt-pass=1769 --api\"\n",
+        "        commandline_arguments += f' --encrypt-pass={tunnel_port} --api'\n",
         "\n",
         "    !COMMANDLINE_ARGS=\"{commandline_arguments}\" python launch.py\n",
         "\n",
-        "    start_colab = float(open(f'{webui_path}/static/colabTimer.txt', 'r').read())\n",
-        "    time_since_start = str(timedelta(seconds=time.time()-start_colab)).split('.')[0]\n",
-        "    print(f\"\\n⌚️ \\033[0mВы проводите эту сессию в течение - \\033[33m{time_since_start}\\033[0m\\n\\n\")"
+        "\n",
+        "# after runnig\n",
+        "start_colab = float(open(f'{webui_path}/static/colabTimer.txt', 'r').read())\n",
+        "time_since_start = str(timedelta(seconds=time.time()-start_colab)).split('.')[0]\n",
+        "print(f\"\\n⌚️ \\033[0mВы проводите эту сессию в течение - \\033[33m{time_since_start}\\033[0m\\n\\n\")\n",
+        "\n",
+        "''' del zrok tunnel '''\n",
+        "if zrok_token:\n",
+        "    !zrok disable &> /dev/null"
       ]
     }
   ]

files_cells/python/en/auto-cleaner_en.py

@@ -233,13 +233,18 @@ directories = {
 """ functions """
 def clean_directory(directory):
     deleted_files = 0
+    image_dir = directories['Images']
+
     for root, dirs, files in os.walk(directory):
         for file in files:
+            file_path = os.path.join(root, file)
+
             if file.endswith(".txt"):
                 continue
-            os.remove(os.path.join(root, file))
-            if file.endswith((".safetensors", ".pt")):
+            if file.endswith((".safetensors", ".pt")) or root == image_dir: # fix for image counter
                 deleted_files += 1
+
+            os.remove(file_path)
     return deleted_files
 
 def update_memory_info():
@@ -249,7 +254,7 @@ def update_memory_info():
     free = disk_space.free / (1024 ** 3)
 
     storage_info.value = f'''
-    <div class="storage_info_AC">Всего: {total:.2f} GB <span style="color: #555">|</span> Используется: {used:.2f} GB <span style="color: #555">|</span> Свободно: {free:.2f} GB</div>
+    <div class="storage_info_AC">Total storage: {total:.2f} GB <span style="color: #555">|</span> Used: {used:.2f} GB <span style="color: #555">|</span> Free: {free:.2f} GB</div>
     '''
 
 def on_execute_button_press(button):

files_cells/python/en/downloading_en.py

@@ -39,33 +39,31 @@ if not os.path.exists(flag_file):
     print("💿 Installing the libraries, it's going to take a while:\n")
 
     install_lib = {
-        "gdown": "pip install -U gdown",
-        "aria2": "apt-get update && apt -y install aria2",
-        "localtunnel": "npm install -g localtunnel &> /dev/null",
+        "aria2": "apt -y install aria2",
+        "localtunnel": "npm install -g localtunnel",
         "insightface": "pip install insightface",
     }
 
-    # Dictionary of additional libraries specific to certain environments
     additional_libs = {
         "Google Colab": {
             "xformers": "pip install xformers==0.0.26.post1 --no-deps"
         },
         "Kaggle": {
-            "xformers": "pip install -q xformers==0.0.26.post1",
-            # "torch": "pip install -q torch==2.1.2+cu121 torchvision==0.16.2+cu121 torchaudio==2.1.2 --extra-index-url https://download.pytorch.org/whl/cu121"
+            "xformers": "pip install xformers==0.0.26.post1",
+            # "torch": "pip install torch==2.1.2+cu121 torchvision==0.16.2+cu121 torchaudio==2.1.2 --extra-index-url https://download.pytorch.org/whl/cu121",
+            "aiohttp": "pip install trash-cli && trash-put /opt/conda/lib/python3.10/site-packages/aiohttp*" # fix install req
         }
     }
 
-    # If the current environment has additional libraries, update the install_lib dictionary
     if env in additional_libs:
         install_lib.update(additional_libs[env])
 
-    # Loop through libraries and execute install commands
+    # Loop through libraries
     for index, (package, install_cmd) in enumerate(install_lib.items(), start=1):
         print(f"\r[{index}/{len(install_lib)}] \033[32m>>\033[0m Installing \033[33m{package}\033[0m..." + " "*35, end='')
         subprocess.run(install_cmd, shell=True, capture_output=True)
 
-    # Additional manual installation steps for specific packages
+    # Additional specific packages
     with capture.capture_output() as cap:
         get_ipython().system('curl -s -OL https://github.com/DEX-1101/sd-webui-notebook/raw/main/res/new_tunnel --output-dir {root_path}')
         get_ipython().system('curl -s -Lo /usr/bin/cl https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-amd64 && chmod +x /usr/bin/cl')
@@ -378,7 +376,7 @@ def manual_download(url, dst_dir, file_name):
     basename = url.split("/")[-1] if file_name is None else file_name
     aria2_args = '--optimize-concurrent-downloads --console-log-level=error --summary-interval=10 -j5 -x16 -s16 -k1M -c'
 
-    print(f"\n\033[32m{'---'*45}\n\033[33mURL: \033[34m{url}\n\033[33mSAVE DIR: \033[34m{dst_dir}\n\033[33mFILE NAME: \033[34m{file_name}033[0m")
+    print(f"\n\033[32m{'---'*45}\n\033[33mURL: \033[34m{url}\n\033[33mSAVE DIR: \033[34m{dst_dir}\n\033[33mFILE NAME: \033[34m{file_name}\033[0m")
     # print(url, dst_dir, file_name)
 
     # === CivitAi API ===
@@ -401,6 +399,12 @@ def manual_download(url, dst_dir, file_name):
 
     # -- GDrive --
     if 'drive.google' in url:
+        try:
+            have_drive_link
+        except:
+            get_ipython().system('pip install -U gdown > /dev/null')
+            have_drive_link = True
+
         if 'folders' in url:
             get_ipython().system('gdown --folder "{url}" -O {dst_dir} --fuzzy -c')
         else:
@@ -416,12 +420,8 @@ def manual_download(url, dst_dir, file_name):
         get_ipython().system('aria2c {header_option} {aria2_args} -d {dst_dir} -o {basename} {url}')
 
     # -- Other --
-    elif 'http' in url or 'magnet' in url:
-        if file_name:
-            get_ipython().system('aria2c {aria2_args} -d {dst_dir} -o {file_name} {url}')
-        else:
-            parsed_link = '"{}"'.format(url)
-            get_ipython().system('aria2c {aria2_args} -d {dst_dir} -Z {parsed_link}')
+    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(',')

files_cells/python/en/launch_en.py

@@ -5,7 +5,9 @@ import re
 import time
 import json
 import requests
+import cloudpickle as pickle
 from datetime import timedelta
+from IPython.display import clear_output
 
 
 #  ================= DETECT ENV =================
@@ -38,7 +40,7 @@ commandline_arguments = settings['commandline_arguments']
 
 
 # ======================== TUNNEL ========================
-import cloudpickle as pickle
+print('Please Wait...')
 
 def get_public_ip(version='ipv4'):
     try:
@@ -53,7 +55,7 @@ def get_public_ip(version='ipv4'):
 public_ipv4 = get_public_ip(version='ipv4')
 
 tunnel_class = pickle.load(open(f"{root_path}/new_tunnel", "rb"), encoding="utf-8")
-tunnel_port= 1769
+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.")
@@ -62,29 +64,36 @@ tunnel.add_tunnel(command="lt --port {port}", name="lt", pattern=re.compile(r"[\
 if zrok_token:
     get_ipython().system('zrok enable {zrok_token} &> /dev/null')
     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
+ # 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')
 
 
 with tunnel:
     get_ipython().run_line_magic('cd', '{webui_path}')
-    commandline_arguments += f" --port=1769"
 
+    commandline_arguments += f' --port={tunnel_port}'
     if ngrok_token:
-        commandline_arguments += ' --ngrok ' + ngrok_token
+        commandline_arguments += f' --ngrok {ngrok_token}'
     if env != "Google Colab":
-        commandline_arguments += f" --encrypt-pass=1769 --api"
+        commandline_arguments += f' --encrypt-pass={tunnel_port} --api'
 
     get_ipython().system('COMMANDLINE_ARGS="{commandline_arguments}" python launch.py')
 
-    start_colab = float(open(f'{webui_path}/static/colabTimer.txt', 'r').read())
-    time_since_start = str(timedelta(seconds=time.time()-start_colab)).split('.')[0]
-    print(f"\n⌚️ \033[0mYou have been conducting this session for - \033[33m{time_since_start}\033[0m\n\n")
+
+# after runnig
+start_colab = float(open(f'{webui_path}/static/colabTimer.txt', 'r').read())
+time_since_start = str(timedelta(seconds=time.time()-start_colab)).split('.')[0]
+print(f"\n⌚️ \033[0mYou have been conducting this session for - \033[33m{time_since_start}\033[0m\n\n")
+
+''' del zrok tunnel '''
+if zrok_token:
+    get_ipython().system('zrok disable &> /dev/null')
 

files_cells/python/ru/auto-cleaner_ru.py

@@ -233,13 +233,18 @@ directories = {
 """ functions """
 def clean_directory(directory):
     deleted_files = 0
+    image_dir = directories['Изображения']
+
     for root, dirs, files in os.walk(directory):
         for file in files:
+            file_path = os.path.join(root, file)
+
             if file.endswith(".txt"):
                 continue
-            os.remove(os.path.join(root, file))
-            if file.endswith((".safetensors", ".pt")):
+            if file.endswith((".safetensors", ".pt")) or root == image_dir: # fix for image counter
                 deleted_files += 1
+
+            os.remove(file_path)
     return deleted_files
 
 def update_memory_info():

files_cells/python/ru/downloading_ru.py

@@ -39,33 +39,31 @@ if not os.path.exists(flag_file):
     print("💿 Установка библиотек, это займет какое-то время:\n")
 
     install_lib = {
-        "gdown": "pip install -U gdown",
-        "aria2": "apt-get update && apt -y install aria2",
-        "localtunnel": "npm install -g localtunnel &> /dev/null",
+        "aria2": "apt -y install aria2",
+        "localtunnel": "npm install -g localtunnel",
         "insightface": "pip install insightface",
     }
 
-    # Dictionary of additional libraries specific to certain environments
     additional_libs = {
         "Google Colab": {
             "xformers": "pip install xformers==0.0.26.post1 --no-deps"
         },
         "Kaggle": {
-            "xformers": "pip install -q xformers==0.0.26.post1",
-            # "torch": "pip install -q torch==2.1.2+cu121 torchvision==0.16.2+cu121 torchaudio==2.1.2 --extra-index-url https://download.pytorch.org/whl/cu121"
+            "xformers": "pip install xformers==0.0.26.post1",
+            # "torch": "pip install torch==2.1.2+cu121 torchvision==0.16.2+cu121 torchaudio==2.1.2 --extra-index-url https://download.pytorch.org/whl/cu121",
+            "aiohttp": "pip install trash-cli && trash-put /opt/conda/lib/python3.10/site-packages/aiohttp*" # fix install req
         }
     }
 
-    # If the current environment has additional libraries, update the install_lib dictionary
     if env in additional_libs:
         install_lib.update(additional_libs[env])
 
-    # Loop through libraries and execute install commands
+    # Loop through libraries
     for index, (package, install_cmd) in enumerate(install_lib.items(), start=1):
         print(f"\r[{index}/{len(install_lib)}] \033[32m>>\033[0m Installing \033[33m{package}\033[0m..." + " "*35, end='')
         subprocess.run(install_cmd, shell=True, capture_output=True)
 
-    # Additional manual installation steps for specific packages
+    # Additional specific packages
     with capture.capture_output() as cap:
         get_ipython().system('curl -s -OL https://github.com/DEX-1101/sd-webui-notebook/raw/main/res/new_tunnel --output-dir {root_path}')
         get_ipython().system('curl -s -Lo /usr/bin/cl https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-amd64 && chmod +x /usr/bin/cl')
@@ -378,7 +376,7 @@ def manual_download(url, dst_dir, file_name):
     basename = url.split("/")[-1] if file_name is None else file_name
     aria2_args = '--optimize-concurrent-downloads --console-log-level=error --summary-interval=10 -j5 -x16 -s16 -k1M -c'
 
-    print(f"\n\033[32m{'---'*45}\n\033[33mURL: \033[34m{url}\n\033[33mSAVE DIR: \033[34m{dst_dir}\n\033[33mFILE NAME: \033[34m{file_name}033[0m")
+    print(f"\n\033[32m{'---'*45}\n\033[33mURL: \033[34m{url}\n\033[33mSAVE DIR: \033[34m{dst_dir}\n\033[33mFILE NAME: \033[34m{file_name}\033[0m")
     # print(url, dst_dir, file_name)
 
     # === CivitAi API ===
@@ -401,6 +399,12 @@ def manual_download(url, dst_dir, file_name):
 
     # -- GDrive --
     if 'drive.google' in url:
+        try:
+            have_drive_link
+        except:
+            get_ipython().system('pip install -U gdown > /dev/null')
+            have_drive_link = True
+
         if 'folders' in url:
             get_ipython().system('gdown --folder "{url}" -O {dst_dir} --fuzzy -c')
         else:
@@ -416,12 +420,8 @@ def manual_download(url, dst_dir, file_name):
         get_ipython().system('aria2c {header_option} {aria2_args} -d {dst_dir} -o {basename} {url}')
 
     # -- Other --
-    elif 'http' in url or 'magnet' in url:
-        if file_name:
-            get_ipython().system('aria2c {aria2_args} -d {dst_dir} -o {file_name} {url}')
-        else:
-            parsed_link = '"{}"'.format(url)
-            get_ipython().system('aria2c {aria2_args} -d {dst_dir} -Z {parsed_link}')
+    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(',')

files_cells/python/ru/launch_ru.py

@@ -5,7 +5,9 @@ import re
 import time
 import json
 import requests
+import cloudpickle as pickle
 from datetime import timedelta
+from IPython.display import clear_output
 
 
 #  ================= DETECT ENV =================
@@ -38,7 +40,7 @@ commandline_arguments = settings['commandline_arguments']
 
 
 # ======================== TUNNEL ========================
-import cloudpickle as pickle
+print('Please Wait...')
 
 def get_public_ip(version='ipv4'):
     try:
@@ -53,7 +55,7 @@ def get_public_ip(version='ipv4'):
 public_ipv4 = get_public_ip(version='ipv4')
 
 tunnel_class = pickle.load(open(f"{root_path}/new_tunnel", "rb"), encoding="utf-8")
-tunnel_port= 1769
+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.")
@@ -62,6 +64,8 @@ tunnel.add_tunnel(command="lt --port {port}", name="lt", pattern=re.compile(r"[\
 if zrok_token:
     get_ipython().system('zrok enable {zrok_token} &> /dev/null')
     tunnel.add_tunnel(command="zrok share public http://localhost:{port}/ --headless", name="zrok", pattern=re.compile(r"[\w-]+\.share\.zrok\.io"))
+
+clear_output()
 # ======================== TUNNEL ========================
 
 
@@ -69,22 +73,27 @@ if zrok_token:
 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')
 
 
 with tunnel:
     get_ipython().run_line_magic('cd', '{webui_path}')
-    commandline_arguments += f" --port=1769"
 
+    commandline_arguments += f' --port={tunnel_port}'
     if ngrok_token:
-        commandline_arguments += ' --ngrok ' + ngrok_token
+        commandline_arguments += f' --ngrok {ngrok_token}'
     if env != "Google Colab":
-        commandline_arguments += f" --encrypt-pass=1769 --api"
+        commandline_arguments += f' --encrypt-pass={tunnel_port} --api'
 
     get_ipython().system('COMMANDLINE_ARGS="{commandline_arguments}" python launch.py')
 
-    start_colab = float(open(f'{webui_path}/static/colabTimer.txt', 'r').read())
-    time_since_start = str(timedelta(seconds=time.time()-start_colab)).split('.')[0]
-    print(f"\n⌚️ \033[0mВы проводите эту сессию в течение - \033[33m{time_since_start}\033[0m\n\n")
+
+# after runnig
+start_colab = float(open(f'{webui_path}/static/colabTimer.txt', 'r').read())
+time_since_start = str(timedelta(seconds=time.time()-start_colab)).split('.')[0]
+print(f"\n⌚️ \033[0mВы проводите эту сессию в течение - \033[33m{time_since_start}\033[0m\n\n")
+
+''' del zrok tunnel '''
+if zrok_token:
+    get_ipython().system('zrok disable &> /dev/null')