test forge

files_cells/notebooks/en/downloading_en.ipynb

@@ -109,7 +109,7 @@
         "variables = [\n",
         "    'Model', 'Model_Num', 'Inpainting_Model',\n",
         "    'Vae', 'Vae_Num',\n",
-        "    'latest_webui', 'latest_exstensions', 'detailed_download',\n",
+        "    'latest_webui', 'latest_exstensions', 'change_webui', 'detailed_download',\n",
         "    'controlnet', 'controlnet_Num', 'commit_hash', 'optional_huggingface_token',\n",
         "    'ngrok_token', 'zrok_token', 'commandline_arguments',\n",
         "    'Model_url', 'Vae_url', 'LoRA_url', 'Embedding_url', 'Extensions_url', 'custom_file_urls'\n",
@@ -139,7 +139,10 @@
         "    start_install = int(time.time())\n",
         "    print(\"⌚ Unpacking Stable Diffusion...\", end='')\n",
         "    with capture.capture_output() as cap:\n",
-        "        !aria2c --console-log-level=error -c -x 16 -s 16 -k 1M https://huggingface.co/NagisaNao/fast_repo/resolve/main/FULL_REPO.zip -o repo.zip\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",
+        "        !{aria2_command} {url} -o repo.zip\n",
+        "\n",
         "        !unzip -q -o repo.zip -d {webui_path}\n",
         "        !rm -rf repo.zip\n",
         "\n",

files_cells/notebooks/en/widgets_en.ipynb

@@ -503,8 +503,9 @@
         "additional_header = widgets.HTML('<div class=\"header\">Additional</div>')\n",
         "latest_webui_widget = widgets.Checkbox(value=True, description='Update WebUI', style=style)\n",
         "latest_exstensions_widget = widgets.Checkbox(value=True, description='Update Extensions', style=style)\n",
+        "change_webui_widget = widgets.Dropdown(options=['A1111', 'Forge'], value='A1111', description='Change WebUI:', style=style)\n",
         "detailed_download_widget = widgets.Dropdown(options=['off', 'on'], value='off', description='Detailed Download:', style=style)\n",
-        "latest_changes_widget = HBox([latest_webui_widget, latest_exstensions_widget, detailed_download_widget], layout=widgets.Layout(justify_content='space-between'))\n",
+        "latest_changes_widget = HBox([latest_webui_widget, latest_exstensions_widget, change_webui_widget, detailed_download_widget], layout=widgets.Layout(justify_content='space-between'))\n",
         "controlnet_options = ['none', 'ALL', '1.canny',\n",
         "                      '2.openpose', '3.depth',\n",
         "                      '4.normal_map', '5.mlsd',\n",
@@ -531,6 +532,8 @@
         "additional_widget_list = [additional_header, latest_changes_widget, HR, controlnet_widget, controlnet_Num_widget, commit_hash_widget, optional_huggingface_token_widget, ngrok_widget, zrok_widget, HR, commandline_arguments_widget]\n",
         "if free_plan and env == \"Google Colab\": # remove ngrok from colab\n",
         "    additional_widget_list.remove(ngrok_widget)\n",
+        "if os.path.exists(webui_path): # remove selection after selection ;3\n",
+        "    latest_changes_widget.children = [widget for widget in latest_changes_widget.children if widget != change_webui_widget]\n",
         "# ```\n",
         "all_additional_box = widgets.VBox(additional_widget_list).add_class(\"container\").add_class(\"image_3\")\n",
         "display(all_additional_box)\n",
@@ -586,7 +589,7 @@
         "settings_keys = [\n",
         "    'Model', 'Model_Num', 'Inpainting_Model',\n",
         "    'Vae', 'Vae_Num',\n",
-        "    'latest_webui', 'latest_exstensions', 'detailed_download',\n",
+        "    'latest_webui', 'latest_exstensions', 'change_webui', 'detailed_download',\n",
         "    'controlnet', 'controlnet_Num', 'commit_hash', 'optional_huggingface_token',\n",
         "    'ngrok_token', 'zrok_token', 'commandline_arguments',\n",
         "    'Model_url', 'Vae_url', 'LoRA_url', 'Embedding_url', 'Extensions_url', 'custom_file_urls'\n",

files_cells/notebooks/ru/downloading_ru.ipynb

@@ -109,7 +109,7 @@
         "variables = [\n",
         "    'Model', 'Model_Num', 'Inpainting_Model',\n",
         "    'Vae', 'Vae_Num',\n",
-        "    'latest_webui', 'latest_exstensions', 'detailed_download',\n",
+        "    'latest_webui', 'latest_exstensions', 'change_webui', 'detailed_download',\n",
         "    'controlnet', 'controlnet_Num', 'commit_hash', 'optional_huggingface_token',\n",
         "    'ngrok_token', 'zrok_token', 'commandline_arguments',\n",
         "    'Model_url', 'Vae_url', 'LoRA_url', 'Embedding_url', 'Extensions_url', 'custom_file_urls'\n",
@@ -137,9 +137,12 @@
         "# ================= MAIN CODE =================\n",
         "if not os.path.exists(webui_path):\n",
         "    start_install = int(time.time())\n",
-        "    print(\"⌚ Распаковка Stable Diffusion...\", end='')\n",
+        "    print(\"⌚ Распаковка Stable Diffusion...\" if change_webui != 'Forge' else \"⌚ Распаковка Stable Diffusion (Forge)...\", end='')\n",
         "    with capture.capture_output() as cap:\n",
-        "        !aria2c --console-log-level=error -c -x 16 -s 16 -k 1M https://huggingface.co/NagisaNao/fast_repo/resolve/main/FULL_REPO.zip -o repo.zip\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",
+        "        !{aria2_command} {url} -o repo.zip\n",
+        "\n",
         "        !unzip -q -o repo.zip -d {webui_path}\n",
         "        !rm -rf repo.zip\n",
         "\n",
@@ -579,7 +582,7 @@
         "\n",
         "## Install of Custom extensions\n",
         "if len(extension_repo) > 0:\n",
-        "    print(\"✨ Устанвока кастомных расширений...\", end='', flush=True)\n",
+        "    print(\"✨ Установка кастомных расширений...\", end='', flush=True)\n",
         "    with capture.capture_output() as cap:\n",
         "        for repo, repo_name in extension_repo:\n",
         "            if not repo_name:\n",

files_cells/notebooks/ru/widgets_ru.ipynb

@@ -503,8 +503,9 @@
         "additional_header = widgets.HTML('<div class=\"header\">Дополнительно</div>')\n",
         "latest_webui_widget = widgets.Checkbox(value=True, description='Обновить WebUI', style=style)\n",
         "latest_exstensions_widget = widgets.Checkbox(value=True, description='Обновить Расширения', style=style)\n",
+        "change_webui_widget = widgets.Dropdown(options=['A1111', 'Forge'], value='A1111', description='Изменить WebUI:', style=style)\n",
         "detailed_download_widget = widgets.Dropdown(options=['off', 'on'], value='off', description='Подробная Загрузка:', style=style)\n",
-        "latest_changes_widget = HBox([latest_webui_widget, latest_exstensions_widget, detailed_download_widget], layout=widgets.Layout(justify_content='space-between'))\n",
+        "latest_changes_widget = HBox([latest_webui_widget, latest_exstensions_widget, change_webui_widget, detailed_download_widget], layout=widgets.Layout(justify_content='space-between'))\n",
         "controlnet_options = ['none', 'ALL', '1.canny',\n",
         "                      '2.openpose', '3.depth',\n",
         "                      '4.normal_map', '5.mlsd',\n",
@@ -531,6 +532,8 @@
         "additional_widget_list = [additional_header, latest_changes_widget, HR, controlnet_widget, controlnet_Num_widget, commit_hash_widget, optional_huggingface_token_widget, ngrok_widget, zrok_widget, HR, commandline_arguments_widget]\n",
         "if free_plan and env == \"Google Colab\": # remove ngrok from colab\n",
         "    additional_widget_list.remove(ngrok_widget)\n",
+        "if os.path.exists(webui_path): # remove selection after selection ;3\n",
+        "    latest_changes_widget.children = [widget for widget in latest_changes_widget.children if widget != change_webui_widget]\n",
         "# ```\n",
         "all_additional_box = widgets.VBox(additional_widget_list).add_class(\"container\").add_class(\"image_3\")\n",
         "display(all_additional_box)\n",
@@ -586,7 +589,7 @@
         "settings_keys = [\n",
         "    'Model', 'Model_Num', 'Inpainting_Model',\n",
         "    'Vae', 'Vae_Num',\n",
-        "    'latest_webui', 'latest_exstensions', 'detailed_download',\n",
+        "    'latest_webui', 'latest_exstensions', 'change_webui', 'detailed_download',\n",
         "    'controlnet', 'controlnet_Num', 'commit_hash', 'optional_huggingface_token',\n",
         "    'ngrok_token', 'zrok_token', 'commandline_arguments',\n",
         "    'Model_url', 'Vae_url', 'LoRA_url', 'Embedding_url', 'Extensions_url', 'custom_file_urls'\n",

files_cells/python/en/downloading_en.py

@@ -99,7 +99,7 @@ settings = load_settings(f'{root_path}/settings.json')
 variables = [
     'Model', 'Model_Num', 'Inpainting_Model',
     'Vae', 'Vae_Num',
-    'latest_webui', 'latest_exstensions', 'detailed_download',
+    'latest_webui', 'latest_exstensions', 'change_webui', 'detailed_download',
     'controlnet', 'controlnet_Num', 'commit_hash', 'optional_huggingface_token',
     'ngrok_token', 'zrok_token', 'commandline_arguments',
     'Model_url', 'Vae_url', 'LoRA_url', 'Embedding_url', 'Extensions_url', 'custom_file_urls'
@@ -129,7 +129,10 @@ if not os.path.exists(webui_path):
     start_install = int(time.time())
     print("⌚ Unpacking Stable Diffusion...", end='')
     with capture.capture_output() as cap:
-        get_ipython().system('aria2c --console-log-level=error -c -x 16 -s 16 -k 1M https://huggingface.co/NagisaNao/fast_repo/resolve/main/FULL_REPO.zip -o repo.zip')
+        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"
+        get_ipython().system('{aria2_command} {url} -o repo.zip')
+
         get_ipython().system('unzip -q -o repo.zip -d {webui_path}')
         get_ipython().system('rm -rf repo.zip')
 

files_cells/python/en/widgets_en.py

@@ -10,7 +10,7 @@ from IPython.display import display, HTML, Javascript, 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")
@@ -484,8 +484,9 @@ display(all_vae_box)
 additional_header = widgets.HTML('<div class="header">Additional</div>')
 latest_webui_widget = widgets.Checkbox(value=True, description='Update WebUI', style=style)
 latest_exstensions_widget = widgets.Checkbox(value=True, description='Update Extensions', style=style)
+change_webui_widget = widgets.Dropdown(options=['A1111', 'Forge'], value='A1111', description='Change WebUI:', style=style)
 detailed_download_widget = widgets.Dropdown(options=['off', 'on'], value='off', description='Detailed Download:', style=style)
-latest_changes_widget = HBox([latest_webui_widget, latest_exstensions_widget, detailed_download_widget], layout=widgets.Layout(justify_content='space-between'))
+latest_changes_widget = HBox([latest_webui_widget, latest_exstensions_widget, change_webui_widget, detailed_download_widget], layout=widgets.Layout(justify_content='space-between'))
 controlnet_options = ['none', 'ALL', '1.canny',
                       '2.openpose', '3.depth',
                       '4.normal_map', '5.mlsd',
@@ -512,6 +513,8 @@ commandline_arguments_widget = widgets.Text(description='Arguments:', value=comm
 additional_widget_list = [additional_header, latest_changes_widget, HR, controlnet_widget, controlnet_Num_widget, commit_hash_widget, optional_huggingface_token_widget, ngrok_widget, zrok_widget, HR, commandline_arguments_widget]
 if free_plan and env == "Google Colab": # remove ngrok from colab
     additional_widget_list.remove(ngrok_widget)
+if os.path.exists(webui_path): # remove selection after selection ;3
+    latest_changes_widget.children = [widget for widget in latest_changes_widget.children if widget != change_webui_widget]
 # ```
 all_additional_box = widgets.VBox(additional_widget_list).add_class("container").add_class("image_3")
 display(all_additional_box)
@@ -567,7 +570,7 @@ SETTINGS_FILE = f'{root_path}/settings.json'
 settings_keys = [
     'Model', 'Model_Num', 'Inpainting_Model',
     'Vae', 'Vae_Num',
-    'latest_webui', 'latest_exstensions', 'detailed_download',
+    'latest_webui', 'latest_exstensions', 'change_webui', 'detailed_download',
     'controlnet', 'controlnet_Num', 'commit_hash', 'optional_huggingface_token',
     '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

@@ -99,7 +99,7 @@ settings = load_settings(f'{root_path}/settings.json')
 variables = [
     'Model', 'Model_Num', 'Inpainting_Model',
     'Vae', 'Vae_Num',
-    'latest_webui', 'latest_exstensions', 'detailed_download',
+    'latest_webui', 'latest_exstensions', 'change_webui', 'detailed_download',
     'controlnet', 'controlnet_Num', 'commit_hash', 'optional_huggingface_token',
     'ngrok_token', 'zrok_token', 'commandline_arguments',
     'Model_url', 'Vae_url', 'LoRA_url', 'Embedding_url', 'Extensions_url', 'custom_file_urls'
@@ -127,9 +127,12 @@ adetailer_dir = f"{webui_path}/models/adetailer"
 # ================= MAIN CODE =================
 if not os.path.exists(webui_path):
     start_install = int(time.time())
-    print("⌚ Распаковка Stable Diffusion...", end='')
+    print("⌚ Распаковка Stable Diffusion..." if change_webui != 'Forge' else "⌚ Распаковка Stable Diffusion (Forge)...", end='')
     with capture.capture_output() as cap:
-        get_ipython().system('aria2c --console-log-level=error -c -x 16 -s 16 -k 1M https://huggingface.co/NagisaNao/fast_repo/resolve/main/FULL_REPO.zip -o repo.zip')
+        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"
+        get_ipython().system('{aria2_command} {url} -o repo.zip')
+
         get_ipython().system('unzip -q -o repo.zip -d {webui_path}')
         get_ipython().system('rm -rf repo.zip')
 
@@ -569,7 +572,7 @@ get_ipython().system('find {webui_path} \\( -type d \\( -name ".ipynb_checkpoint
 
 ## Install of Custom extensions
 if len(extension_repo) > 0:
-    print("✨ Устанвока кастомных расширений...", end='', flush=True)
+    print("✨ Установка кастомных расширений...", end='', flush=True)
     with capture.capture_output() as cap:
         for repo, repo_name in extension_repo:
             if not repo_name:

files_cells/python/ru/widgets_ru.py

@@ -10,7 +10,7 @@ from IPython.display import display, HTML, Javascript, 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")
@@ -484,8 +484,9 @@ display(all_vae_box)
 additional_header = widgets.HTML('<div class="header">Дополнительно</div>')
 latest_webui_widget = widgets.Checkbox(value=True, description='Обновить WebUI', style=style)
 latest_exstensions_widget = widgets.Checkbox(value=True, description='Обновить Расширения', style=style)
+change_webui_widget = widgets.Dropdown(options=['A1111', 'Forge'], value='A1111', description='Изменить WebUI:', style=style)
 detailed_download_widget = widgets.Dropdown(options=['off', 'on'], value='off', description='Подробная Загрузка:', style=style)
-latest_changes_widget = HBox([latest_webui_widget, latest_exstensions_widget, detailed_download_widget], layout=widgets.Layout(justify_content='space-between'))
+latest_changes_widget = HBox([latest_webui_widget, latest_exstensions_widget, change_webui_widget, detailed_download_widget], layout=widgets.Layout(justify_content='space-between'))
 controlnet_options = ['none', 'ALL', '1.canny',
                       '2.openpose', '3.depth',
                       '4.normal_map', '5.mlsd',
@@ -512,6 +513,8 @@ commandline_arguments_widget = widgets.Text(description='Аргументы:', v
 additional_widget_list = [additional_header, latest_changes_widget, HR, controlnet_widget, controlnet_Num_widget, commit_hash_widget, optional_huggingface_token_widget, ngrok_widget, zrok_widget, HR, commandline_arguments_widget]
 if free_plan and env == "Google Colab": # remove ngrok from colab
     additional_widget_list.remove(ngrok_widget)
+if os.path.exists(webui_path): # remove selection after selection ;3
+    latest_changes_widget.children = [widget for widget in latest_changes_widget.children if widget != change_webui_widget]
 # ```
 all_additional_box = widgets.VBox(additional_widget_list).add_class("container").add_class("image_3")
 display(all_additional_box)
@@ -567,7 +570,7 @@ SETTINGS_FILE = f'{root_path}/settings.json'
 settings_keys = [
     'Model', 'Model_Num', 'Inpainting_Model',
     'Vae', 'Vae_Num',
-    'latest_webui', 'latest_exstensions', 'detailed_download',
+    'latest_webui', 'latest_exstensions', 'change_webui', 'detailed_download',
     'controlnet', 'controlnet_Num', 'commit_hash', 'optional_huggingface_token',
     'ngrok_token', 'zrok_token', 'commandline_arguments',
     'Model_url', 'Vae_url', 'LoRA_url', 'Embedding_url', 'Extensions_url', 'custom_file_urls'