test zrok tunnel

files_cells/notebooks/en/downloading_en.ipynb

@@ -75,6 +75,7 @@
         "        !npm install -g localtunnel &> /dev/null\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",
+        "        !curl -sLO https://github.com/openziti/zrok/releases/download/v0.4.23/zrok_0.4.23_linux_amd64.tar.gz && tar -xzf zrok_0.4.23_linux_amd64.tar.gz && rm -rf zrok_0.4.23_linux_amd64.tar.gz && mv {root_path}/zrok /usr/bin/zrok\n",
         "        !pip install insightface\n",
         "\n",
         "        if env == \"SageMaker Studio Lab\":\n",
@@ -114,7 +115,7 @@
         "    'Vae', 'Vae_Num',\n",
         "    'latest_webui', 'latest_exstensions', 'detailed_download',\n",
         "    'controlnet', 'controlnet_Num', 'commit_hash', 'optional_huggingface_token',\n",
-        "    'ngrok_token', 'commandline_arguments',\n",
+        "    'ngrok_token', 'zrok_token', 'commandline_arguments',\n",
         "    'Model_url', 'Vae_url', 'LoRA_url', 'Embedding_url', 'Extensions_url', 'custom_file_urls'\n",
         "]\n",
         "\n",
@@ -353,6 +354,8 @@
         "hf_token = optional_huggingface_token if optional_huggingface_token else \"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\"\n",
         "user_header = f\"\\\"Authorization: Bearer {hf_token}\\\"\"\n",
         "\n",
+        "''' main download code '''\n",
+        "\n",
         "def handle_manual(url):\n",
         "    original_url = url\n",
         "    url = url.split(':', 1)[1]\n",
@@ -419,6 +422,8 @@
         "        url, dst_dir, file_name = link_or_path.split()\n",
         "        manual_download(url, dst_dir, file_name)\n",
         "\n",
+        "''' submodels - added urls '''\n",
+        "\n",
         "submodels = []\n",
         "\n",
         "def add_submodels(selection, num_selection, model_dict, dst_dir):\n",
@@ -454,6 +459,10 @@
         "        continue\n",
         "    url += f\"{submodel['url']} {submodel['dst_dir']} {submodel['name']}, \"\n",
         "\n",
+        "''' file.txt - added urls '''\n",
+        "\n",
+        "unique_urls = []\n",
+        "\n",
         "def process_file_download(file_url):\n",
         "    if file_url.startswith(\"http\"):\n",
         "        if \"blob\" in file_url:\n",
@@ -466,27 +475,28 @@
         "\n",
         "    current_tag = None\n",
         "    for line in lines:\n",
-        "        if line.strip().startswith('#'):\n",
-        "            if any(tag in line.lower() for tag in prefixes):\n",
-        "                current_tag = next((tag for tag in prefixes if tag in line.lower()))\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.strip() for url in line.split()]\n",
+        "        urls = [url.strip() for url in line.split(',')]\n",
         "        for url in urls:\n",
-        "            if url.startswith(\"http\"):\n",
+        "            if url.startswith(\"http\") and url not in unique_urls:\n",
         "                globals()[prefixes[current_tag][1]] += \", \" + url\n",
+        "                unique_urls.append(url)\n",
         "\n",
         "# fix all possible errors/options and function call\n",
         "if custom_file_urls:\n",
-        "    if not custom_file_urls.endswith('.txt'):\n",
-        "        custom_file_urls += '.txt'\n",
-        "    if not custom_file_urls.startswith('http'):\n",
-        "        if not custom_file_urls.startswith(root_path):\n",
-        "            custom_file_urls = f'{root_path}/{custom_file_urls}'\n",
-        "\n",
-        "    try:\n",
-        "        process_file_download(custom_file_urls)\n",
-        "    except FileNotFoundError:\n",
-        "        pass\n",
+        "    for custom_file_url in custom_file_urls.replace(',', '').split():\n",
+        "        if not custom_file_url.endswith('.txt'):\n",
+        "            custom_file_url += '.txt'\n",
+        "        if not custom_file_url.startswith('http'):\n",
+        "            if not custom_file_url.startswith(root_path):\n",
+        "                custom_file_url = f'{root_path}/{custom_file_url}'\n",
+        "\n",
+        "        try:\n",
+        "            process_file_download(custom_file_url)\n",
+        "        except FileNotFoundError:\n",
+        "            pass\n",
         "\n",
         "# url prefixing\n",
         "urls = [globals()[urls[1]] for urls in prefixes.values()]\n",

files_cells/notebooks/en/launch_en.ipynb

@@ -82,6 +82,11 @@
         "    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",
+        "\n",
+        "''' add zrok tunnel '''\n",
+        "if zrok_token:\n",
+        "    !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",
         "# ======================== TUNNEL ========================\n",
         "\n",
         "\n",

files_cells/notebooks/en/widgets_en.ipynb

@@ -308,7 +308,12 @@
         "\n",
         ".button_save:active,\n",
         ".button_ngrok:active {\n",
-        "    filter: brightness(0.75);\n",
+        "    filter: brightness(0.75) !important;\n",
+        "}\n",
+        "\n",
+        "/* Removes ugly stroke from widget buttons. */\n",
+        ".jupyter-widgets.lm-Widget:focus {\n",
+        "    outline: none;\n",
         "}\n",
         "\n",
         "\n",
@@ -499,12 +504,13 @@
         "ngrok_token_widget = widgets.Text(description='Ngrok Token:', style=style, layout=widgets.Layout(width='1047px'))\n",
         "ngrock_button = widgets.HTML('<a href=\"https://dashboard.ngrok.com/get-started/your-authtoken\" target=\"_blank\">Get Ngrok Token</a>').add_class(\"button_ngrok\")\n",
         "ngrok_widget = widgets.HBox([ngrok_token_widget, ngrock_button], style=style, layout=layout)\n",
+        "zrok_token_widget = widgets.Text(description='Zrok Token:', style=style, layout=layout)\n",
         "# ---\n",
         "commandline_arguments_options = \"--listen --enable-insecure-extension-access --theme dark --no-half-vae --disable-console-progressbars --xformers\"\n",
         "commandline_arguments_widget = widgets.Text(description='Arguments:', value=commandline_arguments_options, style=style, layout=layout)\n",
         "\n",
         "''' Display Additional'''\n",
-        "additional_widget_list = [additional_header, latest_changes_widget, HR, controlnet_widget, controlnet_Num_widget, commit_hash_widget, optional_huggingface_token_widget, ngrok_widget, HR, commandline_arguments_widget]\n",
+        "additional_widget_list = [additional_header, latest_changes_widget, HR, controlnet_widget, controlnet_Num_widget, commit_hash_widget, optional_huggingface_token_widget, ngrok_widget, zrok_token_widget, HR, commandline_arguments_widget]\n",
         "if free_plan and env == \"Google Colab\":\n",
         "    additional_widget_list.remove(ngrok_widget)\n",
         "# ```\n",
@@ -564,7 +570,7 @@
         "    'Vae', 'Vae_Num',\n",
         "    'latest_webui', 'latest_exstensions', 'detailed_download',\n",
         "    'controlnet', 'controlnet_Num', 'commit_hash', 'optional_huggingface_token',\n",
-        "    'ngrok_token', 'commandline_arguments',\n",
+        "    'ngrok_token', 'zrok_token', 'commandline_arguments',\n",
         "    'Model_url', 'Vae_url', 'LoRA_url', 'Embedding_url', 'Extensions_url', 'custom_file_urls'\n",
         "]\n",
         "\n",

files_cells/notebooks/ru/downloading_ru.ipynb

@@ -353,6 +353,8 @@
         "hf_token = optional_huggingface_token if optional_huggingface_token else \"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\"\n",
         "user_header = f\"\\\"Authorization: Bearer {hf_token}\\\"\"\n",
         "\n",
+        "''' main download code '''\n",
+        "\n",
         "def handle_manual(url):\n",
         "    original_url = url\n",
         "    url = url.split(':', 1)[1]\n",
@@ -419,6 +421,8 @@
         "        url, dst_dir, file_name = link_or_path.split()\n",
         "        manual_download(url, dst_dir, file_name)\n",
         "\n",
+        "''' submodels - added urls '''\n",
+        "\n",
         "submodels = []\n",
         "\n",
         "def add_submodels(selection, num_selection, model_dict, dst_dir):\n",
@@ -454,6 +458,10 @@
         "        continue\n",
         "    url += f\"{submodel['url']} {submodel['dst_dir']} {submodel['name']}, \"\n",
         "\n",
+        "''' file.txt - added urls '''\n",
+        "\n",
+        "unique_urls = []\n",
+        "\n",
         "def process_file_download(file_url):\n",
         "    if file_url.startswith(\"http\"):\n",
         "        if \"blob\" in file_url:\n",
@@ -466,27 +474,28 @@
         "\n",
         "    current_tag = None\n",
         "    for line in lines:\n",
-        "        if line.strip().startswith('#'):\n",
-        "            if any(tag in line.lower() for tag in prefixes):\n",
-        "                current_tag = next((tag for tag in prefixes if tag in line.lower()))\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.strip() for url in line.split()]\n",
+        "        urls = [url.strip() for url in line.split(',')]\n",
         "        for url in urls:\n",
-        "            if url.startswith(\"http\"):\n",
+        "            if url.startswith(\"http\") and url not in unique_urls:\n",
         "                globals()[prefixes[current_tag][1]] += \", \" + url\n",
+        "                unique_urls.append(url)\n",
         "\n",
         "# fix all possible errors/options and function call\n",
         "if custom_file_urls:\n",
-        "    if not custom_file_urls.endswith('.txt'):\n",
-        "        custom_file_urls += '.txt'\n",
-        "    if not custom_file_urls.startswith('http'):\n",
-        "        if not custom_file_urls.startswith(root_path):\n",
-        "            custom_file_urls = f'{root_path}/{custom_file_urls}'\n",
-        "\n",
-        "    try:\n",
-        "        process_file_download(custom_file_urls)\n",
-        "    except FileNotFoundError:\n",
-        "        pass\n",
+        "    for custom_file_url in custom_file_urls.replace(',', '').split():\n",
+        "        if not custom_file_url.endswith('.txt'):\n",
+        "            custom_file_url += '.txt'\n",
+        "        if not custom_file_url.startswith('http'):\n",
+        "            if not custom_file_url.startswith(root_path):\n",
+        "                custom_file_url = f'{root_path}/{custom_file_url}'\n",
+        "\n",
+        "        try:\n",
+        "            process_file_download(custom_file_url)\n",
+        "        except FileNotFoundError:\n",
+        "            pass\n",
         "\n",
         "# url prefixing\n",
         "urls = [globals()[urls[1]] for urls in prefixes.values()]\n",

files_cells/notebooks/ru/widgets_ru.ipynb

@@ -308,7 +308,12 @@
         "\n",
         ".button_save:active,\n",
         ".button_ngrok:active {\n",
-        "    filter: brightness(0.75);\n",
+        "    filter: brightness(0.75) !important;\n",
+        "}\n",
+        "\n",
+        "/* Removes ugly stroke from widget buttons. */\n",
+        ".jupyter-widgets.lm-Widget:focus {\n",
+        "    outline: none;\n",
         "}\n",
         "\n",
         "\n",

files_cells/python/en/downloading_en.py

@@ -56,6 +56,7 @@ if not os.path.exists(flag_file):
         get_ipython().system('npm install -g localtunnel &> /dev/null')
         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')
+        get_ipython().system('curl -sLO https://github.com/openziti/zrok/releases/download/v0.4.23/zrok_0.4.23_linux_amd64.tar.gz && tar -xzf zrok_0.4.23_linux_amd64.tar.gz && rm -rf zrok_0.4.23_linux_amd64.tar.gz && mv {root_path}/zrok /usr/bin/zrok')
         get_ipython().system('pip install insightface')
 
         if env == "SageMaker Studio Lab":
@@ -95,7 +96,7 @@ variables = [
     'Vae', 'Vae_Num',
     'latest_webui', 'latest_exstensions', 'detailed_download',
     'controlnet', 'controlnet_Num', 'commit_hash', 'optional_huggingface_token',
-    'ngrok_token', 'commandline_arguments',
+    'ngrok_token', 'zrok_token', 'commandline_arguments',
     'Model_url', 'Vae_url', 'LoRA_url', 'Embedding_url', 'Extensions_url', 'custom_file_urls'
 ]
 
@@ -334,6 +335,8 @@ ControlNet_url = ""
 hf_token = optional_huggingface_token if optional_huggingface_token else "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"
 user_header = f"\"Authorization: Bearer {hf_token}\""
 
+''' main download code '''
+
 def handle_manual(url):
     original_url = url
     url = url.split(':', 1)[1]
@@ -400,6 +403,8 @@ def download(url):
         url, dst_dir, file_name = link_or_path.split()
         manual_download(url, dst_dir, file_name)
 
+''' submodels - added urls '''
+
 submodels = []
 
 def add_submodels(selection, num_selection, model_dict, dst_dir):
@@ -435,6 +440,10 @@ for submodel in submodels:
         continue
     url += f"{submodel['url']} {submodel['dst_dir']} {submodel['name']}, "
 
+''' file.txt - added urls '''
+
+unique_urls = []
+
 def process_file_download(file_url):
     if file_url.startswith("http"):
         if "blob" in file_url:
@@ -447,27 +456,28 @@ def process_file_download(file_url):
 
     current_tag = None
     for line in lines:
-        if line.strip().startswith('#'):
-            if any(tag in line.lower() for tag in prefixes):
-                current_tag = next((tag for tag in prefixes if tag in line.lower()))
+        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.strip() for url in line.split()]
+        urls = [url.strip() for url in line.split(',')]
         for url in urls:
-            if url.startswith("http"):
+            if url.startswith("http") and url not in unique_urls:
                 globals()[prefixes[current_tag][1]] += ", " + url
+                unique_urls.append(url)
 
 # fix all possible errors/options and function call
 if custom_file_urls:
-    if not custom_file_urls.endswith('.txt'):
-        custom_file_urls += '.txt'
-    if not custom_file_urls.startswith('http'):
-        if not custom_file_urls.startswith(root_path):
-            custom_file_urls = f'{root_path}/{custom_file_urls}'
-
-    try:
-        process_file_download(custom_file_urls)
-    except FileNotFoundError:
-        pass
+    for custom_file_url in custom_file_urls.replace(',', '').split():
+        if not custom_file_url.endswith('.txt'):
+            custom_file_url += '.txt'
+        if not custom_file_url.startswith('http'):
+            if not custom_file_url.startswith(root_path):
+                custom_file_url = f'{root_path}/{custom_file_url}'
+
+        try:
+            process_file_download(custom_file_url)
+        except FileNotFoundError:
+            pass
 
 # url prefixing
 urls = [globals()[urls[1]] for urls in prefixes.values()]

files_cells/python/en/launch_en.py

@@ -58,6 +58,11 @@ if env != "SageMaker Studio Lab":
     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.")
+
+''' add zrok tunnel '''
+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"))
 # ======================== TUNNEL ========================
 
 

files_cells/python/en/widgets_en.py

@@ -289,7 +289,12 @@ hr {
 
 .button_save:active,
 .button_ngrok:active {
-    filter: brightness(0.75);
+    filter: brightness(0.75) !important;
+}
+
+/* Removes ugly stroke from widget buttons. */
+.jupyter-widgets.lm-Widget:focus {
+    outline: none;
 }
 
 
@@ -480,12 +485,13 @@ optional_huggingface_token_widget = widgets.Text(description='HuggingFace Token:
 ngrok_token_widget = widgets.Text(description='Ngrok Token:', style=style, layout=widgets.Layout(width='1047px'))
 ngrock_button = widgets.HTML('<a href="https://dashboard.ngrok.com/get-started/your-authtoken" target="_blank">Get Ngrok Token</a>').add_class("button_ngrok")
 ngrok_widget = widgets.HBox([ngrok_token_widget, ngrock_button], style=style, layout=layout)
+zrok_token_widget = widgets.Text(description='Zrok Token:', style=style, layout=layout)
 # ---
 commandline_arguments_options = "--listen --enable-insecure-extension-access --theme dark --no-half-vae --disable-console-progressbars --xformers"
 commandline_arguments_widget = widgets.Text(description='Arguments:', value=commandline_arguments_options, style=style, layout=layout)
 
 ''' Display Additional'''
-additional_widget_list = [additional_header, latest_changes_widget, HR, controlnet_widget, controlnet_Num_widget, commit_hash_widget, optional_huggingface_token_widget, ngrok_widget, HR, commandline_arguments_widget]
+additional_widget_list = [additional_header, latest_changes_widget, HR, controlnet_widget, controlnet_Num_widget, commit_hash_widget, optional_huggingface_token_widget, ngrok_widget, zrok_token_widget, HR, commandline_arguments_widget]
 if free_plan and env == "Google Colab":
     additional_widget_list.remove(ngrok_widget)
 # ```
@@ -545,7 +551,7 @@ settings_keys = [
     'Vae', 'Vae_Num',
     'latest_webui', 'latest_exstensions', 'detailed_download',
     'controlnet', 'controlnet_Num', 'commit_hash', 'optional_huggingface_token',
-    'ngrok_token', 'commandline_arguments',
+    'ngrok_token', 'zrok_token', 'commandline_arguments',
     'Model_url', 'Vae_url', 'LoRA_url', 'Embedding_url', 'Extensions_url', 'custom_file_urls'
 ]
 

files_cells/python/ru/downloading_ru.py

@@ -334,6 +334,8 @@ ControlNet_url = ""
 hf_token = optional_huggingface_token if optional_huggingface_token else "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"
 user_header = f"\"Authorization: Bearer {hf_token}\""
 
+''' main download code '''
+
 def handle_manual(url):
     original_url = url
     url = url.split(':', 1)[1]
@@ -400,6 +402,8 @@ def download(url):
         url, dst_dir, file_name = link_or_path.split()
         manual_download(url, dst_dir, file_name)
 
+''' submodels - added urls '''
+
 submodels = []
 
 def add_submodels(selection, num_selection, model_dict, dst_dir):
@@ -435,6 +439,10 @@ for submodel in submodels:
         continue
     url += f"{submodel['url']} {submodel['dst_dir']} {submodel['name']}, "
 
+''' file.txt - added urls '''
+
+unique_urls = []
+
 def process_file_download(file_url):
     if file_url.startswith("http"):
         if "blob" in file_url:
@@ -447,27 +455,28 @@ def process_file_download(file_url):
 
     current_tag = None
     for line in lines:
-        if line.strip().startswith('#'):
-            if any(tag in line.lower() for tag in prefixes):
-                current_tag = next((tag for tag in prefixes if tag in line.lower()))
+        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.strip() for url in line.split()]
+        urls = [url.strip() for url in line.split(',')]
         for url in urls:
-            if url.startswith("http"):
+            if url.startswith("http") and url not in unique_urls:
                 globals()[prefixes[current_tag][1]] += ", " + url
+                unique_urls.append(url)
 
 # fix all possible errors/options and function call
 if custom_file_urls:
-    if not custom_file_urls.endswith('.txt'):
-        custom_file_urls += '.txt'
-    if not custom_file_urls.startswith('http'):
-        if not custom_file_urls.startswith(root_path):
-            custom_file_urls = f'{root_path}/{custom_file_urls}'
-
-    try:
-        process_file_download(custom_file_urls)
-    except FileNotFoundError:
-        pass
+    for custom_file_url in custom_file_urls.replace(',', '').split():
+        if not custom_file_url.endswith('.txt'):
+            custom_file_url += '.txt'
+        if not custom_file_url.startswith('http'):
+            if not custom_file_url.startswith(root_path):
+                custom_file_url = f'{root_path}/{custom_file_url}'
+
+        try:
+            process_file_download(custom_file_url)
+        except FileNotFoundError:
+            pass
 
 # url prefixing
 urls = [globals()[urls[1]] for urls in prefixes.values()]

files_cells/python/ru/widgets_ru.py

@@ -289,7 +289,12 @@ hr {
 
 .button_save:active,
 .button_ngrok:active {
-    filter: brightness(0.75);
+    filter: brightness(0.75) !important;
+}
+
+/* Removes ugly stroke from widget buttons. */
+.jupyter-widgets.lm-Widget:focus {
+    outline: none;
 }