👀

files_cells/notebooks/en/downloading_en.ipynb

@@ -506,8 +506,8 @@
         "\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(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",
         "\n",
         "for submodel in submodels:\n",

files_cells/notebooks/en/launch_en.ipynb

@@ -64,7 +64,7 @@
         "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",
@@ -77,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",
@@ -91,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",

files_cells/notebooks/ru/downloading_ru.ipynb

@@ -506,8 +506,8 @@
         "\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(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",
         "\n",
         "for submodel in submodels:\n",

files_cells/notebooks/ru/launch_ru.ipynb

@@ -64,7 +64,7 @@
         "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",
@@ -77,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",
@@ -91,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",

files_cells/python/en/downloading_en.py

@@ -496,8 +496,8 @@ def add_submodels(selection, num_selection, model_dict, 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(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
 
 for submodel in submodels:

files_cells/python/en/launch_en.py

@@ -40,7 +40,7 @@ commandline_arguments = settings['commandline_arguments']
 change_webui = settings['change_webui']
 
 
-# ======================== TUNNEL ========================
+# ======================== TUNNEL V2 ========================
 print('Please Wait...')
 
 def get_public_ip(version='ipv4'):
@@ -53,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.")
@@ -67,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:

files_cells/python/ru/downloading_ru.py

@@ -496,8 +496,8 @@ def add_submodels(selection, num_selection, model_dict, 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(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
 
 for submodel in submodels:

files_cells/python/ru/launch_ru.py

@@ -40,7 +40,7 @@ commandline_arguments = settings['commandline_arguments']
 change_webui = settings['change_webui']
 
 
-# ======================== TUNNEL ========================
+# ======================== TUNNEL V2 ========================
 print('Please Wait...')
 
 def get_public_ip(version='ipv4'):
@@ -53,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.")
@@ -67,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: