hmm??

files_cells/notebooks/en/downloading_en.ipynb

@@ -138,7 +138,7 @@
         "        'models/ControlNet'\n",
         "    ]\n",
         "\n",
-        "    print(\"Moving files...\", end='')\n",
+        "    print(\"⌚ Moving files...\", end='')\n",
         "    time.sleep(1)\n",
         "    for item in items_to_copy:\n",
         "        src = os.path.join(src_base, item)\n",
@@ -151,12 +151,6 @@
         "            shutil.move(src, dst)\n",
         "    print(\"\\r🔥 Files moved!\" + \" \"*15)\n",
         "\n",
-        "def download_and_unpack(url, dest_path):\n",
-        "    aria2_args = \"--console-log-level=error -c -x 16 -s 16 -k 1M\"\n",
-        "    !aria2c {aria2_args} '{url}' -o repo.zip\n",
-        "    !unzip -q -o repo.zip -d {dest_path}\n",
-        "    !rm -rf repo.zip\n",
-        "\n",
         "def handle_colab_timer(webui_path, timer_colab):\n",
         "    timer_file_path = os.path.join(webui_path, 'static', 'colabTimer.txt')\n",
         "    if not os.path.exists(timer_file_path):\n",
@@ -176,7 +170,11 @@
         "        if UI == 'Forge':\n",
         "            download_url = \"https://huggingface.co/NagisaNao/fast_repo/resolve/main/FULL_REPO_forge.zip\"\n",
         "\n",
-        "        download_and_unpack(download_url, webui_path)\n",
+        "        aria2_args = \"--console-log-level=error -c -x 16 -s 16 -k 1M\"\n",
+        "        zip_path = f\"{root_path}/repo.zip\"\n",
+        "        !aria2c {aria2_args} {download_url} -d {root_path} -o repo.zip\n",
+        "        !unzip -q -o {zip_path} -d {webui_path}\n",
+        "        !rm -rf {zip_path}\n",
         "\n",
         "        get_ipython().system(f'echo -n {start_colab} > {webui_path}/static/colabTimer.txt')\n",
         "    del cap\n",
@@ -192,7 +190,7 @@
         "# ================= MAIN CODE ==================\n",
         "if os.path.exists(webui_path):\n",
         "    if UI != OLD_UI:\n",
-        "        print(f'Switching the WebUI from \\033[33m{OLD_UI}\\033[0m to \\033[33m{UI}\\033[0m:\\n')\n",
+        "        print(f'Switching the WebUI from \\033[33m{OLD_UI}\\033[0m to \\033[33m{UI}\\033[0m:')\n",
         "        copy_items_with_replace(webui_path, temporarily_dir)\n",
         "        _remove_dir(webui_path)\n",
         "        os.environ['SDW_OLD_UI'] = UI\n",

files_cells/notebooks/en/launch_en.ipynb

@@ -134,8 +134,10 @@
         "    if env != \"Google Colab\":\n",
         "        commandline_arguments += f' --encrypt-pass={tunnel_port} --api'\n",
         "\n",
-        "    if change_webui == 'Forge':\n",
-        "        commandline_arguments += ' --cuda-stream --pin-shared-memory'\n",
+        "    if change_webui == 'A1111':\n",
+        "        commandline_arguments += ' --xformers'\n",
+        "    else:\n",
+        "        commandline_arguments += ' --disable-xformers --opt-sdp-attention --cuda-stream --pin-shared-memory'\n",
         "\n",
         "    !COMMANDLINE_ARGS=\"{commandline_arguments}\" python launch.py\n",
         "\n",

files_cells/notebooks/en/widgets_en.ipynb

@@ -228,7 +228,7 @@
         "zrok_button = factory.create_html('<a href=\"https://colab.research.google.com/drive/1d2sjWDJi_GYBUavrHSuQyHTDuLy36WpU\" target=\"_blank\">Зарегать Zrok Токен</a>', class_name=\"button_ngrok\")\n",
         "zrok_widget = factory.create_hbox([zrok_token_widget, zrok_button])\n",
         "\n",
-        "commandline_arguments_options = \"--listen --enable-insecure-extension-access --theme dark --no-half-vae --disable-console-progressbars --xformers\"\n",
+        "commandline_arguments_options = \"--listen --enable-insecure-extension-access --theme dark --no-half-vae --disable-console-progressbars\"\n",
         "commandline_arguments_widget = factory.create_text('Arguments:', value=commandline_arguments_options)\n",
         "\n",
         "# Display Additional\n",

files_cells/notebooks/ru/downloading_ru.ipynb

@@ -138,7 +138,7 @@
         "        'models/ControlNet'\n",
         "    ]\n",
         "\n",
-        "    print(\"Перемещение файлов...\", end='')\n",
+        "    print(\"⌚ Перемещение файлов...\", end='')\n",
         "    time.sleep(1)\n",
         "    for item in items_to_copy:\n",
         "        src = os.path.join(src_base, item)\n",
@@ -151,12 +151,6 @@
         "            shutil.move(src, dst)\n",
         "    print(\"\\r🔥 Файлы перемещены!\" + \" \"*15)\n",
         "\n",
-        "def download_and_unpack(url, dest_path):\n",
-        "    aria2_args = \"--console-log-level=error -c -x 16 -s 16 -k 1M\"\n",
-        "    !aria2c {aria2_args} '{url}' -o repo.zip\n",
-        "    !unzip -q -o repo.zip -d {dest_path}\n",
-        "    !rm -rf repo.zip\n",
-        "\n",
         "def handle_colab_timer(webui_path, timer_colab):\n",
         "    timer_file_path = os.path.join(webui_path, 'static', 'colabTimer.txt')\n",
         "    if not os.path.exists(timer_file_path):\n",
@@ -176,7 +170,11 @@
         "        if UI == 'Forge':\n",
         "            download_url = \"https://huggingface.co/NagisaNao/fast_repo/resolve/main/FULL_REPO_forge.zip\"\n",
         "\n",
-        "        download_and_unpack(download_url, webui_path)\n",
+        "        aria2_args = \"--console-log-level=error -c -x 16 -s 16 -k 1M\"\n",
+        "        zip_path = f\"{root_path}/repo.zip\"\n",
+        "        !aria2c {aria2_args} {download_url} -d {root_path} -o repo.zip\n",
+        "        !unzip -q -o {zip_path} -d {webui_path}\n",
+        "        !rm -rf {zip_path}\n",
         "\n",
         "        get_ipython().system(f'echo -n {start_colab} > {webui_path}/static/colabTimer.txt')\n",
         "    del cap\n",
@@ -192,7 +190,7 @@
         "# ================= MAIN CODE ==================\n",
         "if os.path.exists(webui_path):\n",
         "    if UI != OLD_UI:\n",
-        "        print(f'Переключение веб-интерфейса с \\033[33m{OLD_UI}\\033[0m на \\033[33m{UI}\\033[0m:\\n')\n",
+        "        print(f'Переключение веб-интерфейса с \\033[33m{OLD_UI}\\033[0m на \\033[33m{UI}\\033[0m:')\n",
         "        copy_items_with_replace(webui_path, temporarily_dir)\n",
         "        _remove_dir(webui_path)\n",
         "        os.environ['SDW_OLD_UI'] = UI\n",

files_cells/notebooks/ru/launch_ru.ipynb

@@ -134,8 +134,10 @@
         "    if env != \"Google Colab\":\n",
         "        commandline_arguments += f' --encrypt-pass={tunnel_port} --api'\n",
         "\n",
-        "    if change_webui == 'Forge':\n",
-        "        commandline_arguments += ' --cuda-stream --pin-shared-memory'\n",
+        "    if change_webui == 'A1111':\n",
+        "        commandline_arguments += ' --xformers'\n",
+        "    else:\n",
+        "        commandline_arguments += ' --disable-xformers --opt-sdp-attention --cuda-stream --pin-shared-memory'\n",
         "\n",
         "    !COMMANDLINE_ARGS=\"{commandline_arguments}\" python launch.py\n",
         "\n",

files_cells/notebooks/ru/widgets_ru.ipynb

@@ -228,7 +228,7 @@
         "zrok_button = factory.create_html('<a href=\"https://colab.research.google.com/drive/1d2sjWDJi_GYBUavrHSuQyHTDuLy36WpU\" target=\"_blank\">Зарегать Zrok Токен</a>', class_name=\"button_ngrok\")\n",
         "zrok_widget = factory.create_hbox([zrok_token_widget, zrok_button])\n",
         "\n",
-        "commandline_arguments_options = \"--listen --enable-insecure-extension-access --theme dark --no-half-vae --disable-console-progressbars --xformers\"\n",
+        "commandline_arguments_options = \"--listen --enable-insecure-extension-access --theme dark --no-half-vae --disable-console-progressbars\"\n",
         "commandline_arguments_widget = factory.create_text('Аргументы:', value=commandline_arguments_options)\n",
         "\n",
         "# Display Additional\n",

files_cells/python/en/downloading_en.py

@@ -128,7 +128,7 @@ def copy_items_with_replace(src_base, dst_base):
         'models/ControlNet'
     ]
 
-    print("Moving files...", end='')
+    print("⌚ Moving files...", end='')
     time.sleep(1)
     for item in items_to_copy:
         src = os.path.join(src_base, item)
@@ -141,12 +141,6 @@ def copy_items_with_replace(src_base, dst_base):
             shutil.move(src, dst)
     print("\r🔥 Files moved!" + " "*15)
 
-def download_and_unpack(url, dest_path):
-    aria2_args = "--console-log-level=error -c -x 16 -s 16 -k 1M"
-    get_ipython().system("aria2c {aria2_args} '{url}' -o repo.zip")
-    get_ipython().system('unzip -q -o repo.zip -d {dest_path}')
-    get_ipython().system('rm -rf repo.zip')
-
 def handle_colab_timer(webui_path, timer_colab):
     timer_file_path = os.path.join(webui_path, 'static', 'colabTimer.txt')
     if not os.path.exists(timer_file_path):
@@ -166,7 +160,11 @@ def unpack_webui():
         if UI == 'Forge':
             download_url = "https://huggingface.co/NagisaNao/fast_repo/resolve/main/FULL_REPO_forge.zip"
 
-        download_and_unpack(download_url, webui_path)
+        aria2_args = "--console-log-level=error -c -x 16 -s 16 -k 1M"
+        zip_path = f"{root_path}/repo.zip"
+        get_ipython().system('aria2c {aria2_args} {download_url} -d {root_path} -o repo.zip')
+        get_ipython().system('unzip -q -o {zip_path} -d {webui_path}')
+        get_ipython().system('rm -rf {zip_path}')
 
         get_ipython().system(f'echo -n {start_colab} > {webui_path}/static/colabTimer.txt')
     del cap
@@ -182,7 +180,7 @@ def unpack_webui():
 # ================= MAIN CODE ==================
 if os.path.exists(webui_path):
     if UI != OLD_UI:
-        print(f'Switching the WebUI from \033[33m{OLD_UI}\033[0m to \033[33m{UI}\033[0m:\n')
+        print(f'Switching the WebUI from \033[33m{OLD_UI}\033[0m to \033[33m{UI}\033[0m:')
         copy_items_with_replace(webui_path, temporarily_dir)
         _remove_dir(webui_path)
         os.environ['SDW_OLD_UI'] = UI

files_cells/python/en/launch_en.py

@@ -110,8 +110,10 @@ with tunnel:
     if env != "Google Colab":
         commandline_arguments += f' --encrypt-pass={tunnel_port} --api'
 
-    if change_webui == 'Forge':
-        commandline_arguments += ' --cuda-stream --pin-shared-memory'
+    if change_webui == 'A1111':
+        commandline_arguments += ' --xformers'
+    else:
+        commandline_arguments += ' --disable-xformers --opt-sdp-attention --cuda-stream --pin-shared-memory'
 
     get_ipython().system('COMMANDLINE_ARGS="{commandline_arguments}" python launch.py')
 

files_cells/python/en/widgets_en.py

@@ -204,7 +204,7 @@ zrok_token_widget = factory.create_text('Zrok Token:')
 zrok_button = factory.create_html('<a href="https://colab.research.google.com/drive/1d2sjWDJi_GYBUavrHSuQyHTDuLy36WpU" target="_blank">Зарегать Zrok Токен</a>', class_name="button_ngrok")
 zrok_widget = factory.create_hbox([zrok_token_widget, zrok_button])
 
-commandline_arguments_options = "--listen --enable-insecure-extension-access --theme dark --no-half-vae --disable-console-progressbars --xformers"
+commandline_arguments_options = "--listen --enable-insecure-extension-access --theme dark --no-half-vae --disable-console-progressbars"
 commandline_arguments_widget = factory.create_text('Arguments:', value=commandline_arguments_options)
 
 # Display Additional

files_cells/python/ru/downloading_ru.py

@@ -128,7 +128,7 @@ def copy_items_with_replace(src_base, dst_base):
         'models/ControlNet'
     ]
 
-    print("Перемещение файлов...", end='')
+    print("⌚ Перемещение файлов...", end='')
     time.sleep(1)
     for item in items_to_copy:
         src = os.path.join(src_base, item)
@@ -141,12 +141,6 @@ def copy_items_with_replace(src_base, dst_base):
             shutil.move(src, dst)
     print("\r🔥 Файлы перемещены!" + " "*15)
 
-def download_and_unpack(url, dest_path):
-    aria2_args = "--console-log-level=error -c -x 16 -s 16 -k 1M"
-    get_ipython().system("aria2c {aria2_args} '{url}' -o repo.zip")
-    get_ipython().system('unzip -q -o repo.zip -d {dest_path}')
-    get_ipython().system('rm -rf repo.zip')
-
 def handle_colab_timer(webui_path, timer_colab):
     timer_file_path = os.path.join(webui_path, 'static', 'colabTimer.txt')
     if not os.path.exists(timer_file_path):
@@ -166,7 +160,11 @@ def unpack_webui():
         if UI == 'Forge':
             download_url = "https://huggingface.co/NagisaNao/fast_repo/resolve/main/FULL_REPO_forge.zip"
 
-        download_and_unpack(download_url, webui_path)
+        aria2_args = "--console-log-level=error -c -x 16 -s 16 -k 1M"
+        zip_path = f"{root_path}/repo.zip"
+        get_ipython().system('aria2c {aria2_args} {download_url} -d {root_path} -o repo.zip')
+        get_ipython().system('unzip -q -o {zip_path} -d {webui_path}')
+        get_ipython().system('rm -rf {zip_path}')
 
         get_ipython().system(f'echo -n {start_colab} > {webui_path}/static/colabTimer.txt')
     del cap
@@ -182,7 +180,7 @@ def unpack_webui():
 # ================= MAIN CODE ==================
 if os.path.exists(webui_path):
     if UI != OLD_UI:
-        print(f'Переключение веб-интерфейса с \033[33m{OLD_UI}\033[0m на \033[33m{UI}\033[0m:\n')
+        print(f'Переключение веб-интерфейса с \033[33m{OLD_UI}\033[0m на \033[33m{UI}\033[0m:')
         copy_items_with_replace(webui_path, temporarily_dir)
         _remove_dir(webui_path)
         os.environ['SDW_OLD_UI'] = UI

files_cells/python/ru/launch_ru.py

@@ -110,8 +110,10 @@ with tunnel:
     if env != "Google Colab":
         commandline_arguments += f' --encrypt-pass={tunnel_port} --api'
 
-    if change_webui == 'Forge':
-        commandline_arguments += ' --cuda-stream --pin-shared-memory'
+    if change_webui == 'A1111':
+        commandline_arguments += ' --xformers'
+    else:
+        commandline_arguments += ' --disable-xformers --opt-sdp-attention --cuda-stream --pin-shared-memory'
 
     get_ipython().system('COMMANDLINE_ARGS="{commandline_arguments}" python launch.py')
 

files_cells/python/ru/widgets_ru.py

@@ -204,7 +204,7 @@ zrok_token_widget = factory.create_text('Токен Zrok:')
 zrok_button = factory.create_html('<a href="https://colab.research.google.com/drive/1d2sjWDJi_GYBUavrHSuQyHTDuLy36WpU" target="_blank">Зарегать Zrok Токен</a>', class_name="button_ngrok")
 zrok_widget = factory.create_hbox([zrok_token_widget, zrok_button])
 
-commandline_arguments_options = "--listen --enable-insecure-extension-access --theme dark --no-half-vae --disable-console-progressbars --xformers"
+commandline_arguments_options = "--listen --enable-insecure-extension-access --theme dark --no-half-vae --disable-console-progressbars"
 commandline_arguments_widget = factory.create_text('Аргументы:', value=commandline_arguments_options)
 
 # Display Additional