➖ remove the addition network

files_cells/notebooks/en/downloading_en.ipynb

@@ -27,7 +27,6 @@
         "from IPython.display import clear_output\n",
         "from urllib.parse import urlparse, parse_qs\n",
         "\n",
-        "os.chdir(os.path.expanduser('~'))\n",
         "\n",
         "# Setup Env\n",
         "env = os.getenv('ENV_NAME')\n",
@@ -38,6 +37,7 @@
         "UI = os.getenv('SDW_UI')\n",
         "OLD_UI = os.getenv('SDW_OLD_UI')\n",
         "\n",
+        "os.chdir(root_path)\n",
         "\n",
         "# ============ loading settings V4 =============\n",
         "def load_settings(path):\n",
@@ -236,8 +236,6 @@
         "    !sed -i '521s/open=\\(False\\|True\\)/open=False/' {webui_path}/extensions/Umi-AI-Wildcards/scripts/wildcard_recursive.py  # Closed accordion by default\n",
         "    # --- Encrypt-Image ---\n",
         "    !sed -i '9,37d' {webui_path}/extensions/Encrypt-Image/javascript/encrypt_images_info.js # Removes the weird text in webui\n",
-        "    # --- Additional-Networks ---\n",
-        "    !wget -O {webui_path}/extensions/additional-networks/scripts/metadata_editor.py {anxety_repos}/extensions/Additional-Networks/fix/metadata_editor.py  # Fixing an error due to old style\n",
         "del cap\n",
         "\n",
         "\n",
@@ -293,7 +291,7 @@
         "    print(f\"\\033[33mFILE NAME: \\033[34m{file_name}\\033[0m\")\n",
         "\n",
         "    if 'civitai' in url and image_url:\n",
-        "        print(f\"\\033[32m[Preview DL]:\\033[0m {image_name} - {image_url}\\n\")\n",
+        "        print(f\"\\033[32m[Preview IMG]:\\033[0m {image_name} - {image_url}\\n\")\n",
         "\n",
         "''' GET CivitAi API - DATA '''\n",
         "\n",
@@ -437,9 +435,9 @@
         "    \"\"\" Formatted info output \"\"\"\n",
         "    model_name_or_basename = file_name if file_name else basename\n",
         "    try:\n",
-        "        format_output(clean_url or url, dst_dir, model_name_or_basename, image_name, image_url)\n",
+        "        format_output(clean_url, dst_dir, model_name_or_basename, image_name, image_url)\n",
         "    except UnboundLocalError:\n",
-        "        format_output(clean_url or url, dst_dir, model_name_or_basename, None, None)\n",
+        "        format_output(clean_url, dst_dir, model_name_or_basename, None, None)\n",
         "\n",
         "    # =====================\n",
         "    def run_aria2c(url, dst_dir, file_name=None, args=\"\", header=\"\"):\n",
@@ -474,57 +472,62 @@
         "\n",
         "# Separation of merged numbers\n",
         "def split_numbers(num_str, max_num):\n",
-        "    def helper(s):\n",
-        "        if not s:\n",
-        "            return []\n",
+        "    result = []\n",
+        "    i = 0\n",
+        "    while i < len(num_str):\n",
+        "        found = False\n",
         "        for length in range(2, 0, -1):\n",
-        "            if len(s) >= length:\n",
-        "                part = int(s[:length])\n",
+        "            if i + length <= len(num_str):\n",
+        "                part = int(num_str[i:i + length])\n",
         "                if part <= max_num:\n",
-        "                    result = helper(s[length:])\n",
-        "                    if result is not None:\n",
-        "                        return [part] + result\n",
-        "        return None\n",
-        "    return helper(num_str)\n",
+        "                    result.append(part)\n",
+        "                    i += length\n",
+        "                    found = True\n",
+        "                    break\n",
+        "        if not found:\n",
+        "            break\n",
+        "    return result\n",
         "\n",
         "def add_submodels(selection, num_selection, model_dict, dst_dir):\n",
-        "    selected_models = []\n",
         "    if selection == \"none\":\n",
-        "        return selected_models\n",
+        "        return []\n",
+        "    selected_models = []\n",
+        "\n",
         "    if selection == \"ALL\":\n",
-        "        for models in model_dict.values():\n",
-        "            selected_models.extend(models)\n",
+        "        selected_models = sum(model_dict.values(), [])\n",
         "    else:\n",
         "        if selection in model_dict:\n",
         "            selected_models.extend(model_dict[selection])\n",
+        "\n",
         "        nums = num_selection.replace(',', ' ').split()\n",
         "        max_num = len(model_dict)\n",
-        "        selected_nums = []\n",
+        "        unique_nums = set()\n",
         "\n",
         "        for num_part in nums:\n",
         "            split_nums = split_numbers(num_part, max_num)\n",
-        "            if split_nums:\n",
-        "                selected_nums.extend(split_nums)\n",
-        "\n",
-        "        unique_nums = list(set(selected_nums))\n",
+        "            unique_nums.update(split_nums)\n",
         "\n",
         "        for num in unique_nums:\n",
         "            if 1 <= num <= max_num:\n",
-        "                name = list(model_dict)[num - 1]\n",
+        "                name = list(model_dict.keys())[num - 1]\n",
         "                selected_models.extend(model_dict[name])\n",
         "\n",
-        "    unique_models = list({model['name']: model for model in selected_models}.values())\n",
+        "    unique_models = {model['name']: model for model in selected_models}.values()\n",
+        "\n",
         "    for model in unique_models:\n",
         "        model['dst_dir'] = dst_dir\n",
         "\n",
-        "    return unique_models\n",
+        "    return list(unique_models)\n",
         "\n",
         "def handle_submodels(selection, num_selection, model_dict, dst_dir, url):\n",
         "    submodels = add_submodels(selection, num_selection, model_dict, dst_dir)\n",
+        "    urls = []\n",
         "    for submodel in submodels:\n",
         "        if not inpainting_model and \"inpainting\" in submodel['name']:\n",
         "            continue\n",
-        "        url += f\"{submodel['url']} {submodel['dst_dir']} {submodel['name']}, \"\n",
+        "        urls.append(f\"{submodel['url']} {submodel['dst_dir']} {submodel['name']}\")\n",
+        "\n",
+        "    url += \", \".join(urls) + ', '\n",
         "    return url\n",
         "\n",
         "url = handle_submodels(model, model_num, model_list, models_dir, url)\n",

files_cells/notebooks/en/launch_en.ipynb

@@ -106,7 +106,6 @@
         "# ================= 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",

files_cells/notebooks/ru/downloading_ru.ipynb

@@ -37,7 +37,7 @@
         "UI = os.getenv('SDW_UI')\n",
         "OLD_UI = os.getenv('SDW_OLD_UI')\n",
         "\n",
-        "os.chdir(os.path.expanduser('~'))\n",
+        "os.chdir(root_path)\n",
         "\n",
         "# ============ loading settings V4 =============\n",
         "def load_settings(path):\n",
@@ -236,8 +236,6 @@
         "    !sed -i '521s/open=\\(False\\|True\\)/open=False/' {webui_path}/extensions/Umi-AI-Wildcards/scripts/wildcard_recursive.py  # Closed accordion by default\n",
         "    # --- Encrypt-Image ---\n",
         "    !sed -i '9,37d' {webui_path}/extensions/Encrypt-Image/javascript/encrypt_images_info.js # Removes the weird text in webui\n",
-        "    # --- Additional-Networks ---\n",
-        "    !wget -O {webui_path}/extensions/additional-networks/scripts/metadata_editor.py {anxety_repos}/extensions/Additional-Networks/fix/metadata_editor.py  # Fixing an error due to old style\n",
         "del cap\n",
         "\n",
         "\n",
@@ -293,7 +291,7 @@
         "    print(f\"\\033[33mFILE NAME: \\033[34m{file_name}\\033[0m\")\n",
         "\n",
         "    if 'civitai' in url and image_url:\n",
-        "        print(f\"\\033[32m[Preview DL]:\\033[0m {image_name} - {image_url}\\n\")\n",
+        "        print(f\"\\033[32m[Preview IMG]:\\033[0m {image_name} - {image_url}\\n\")\n",
         "\n",
         "''' GET CivitAi API - DATA '''\n",
         "\n",
@@ -437,9 +435,9 @@
         "    \"\"\" Formatted info output \"\"\"\n",
         "    model_name_or_basename = file_name if file_name else basename\n",
         "    try:\n",
-        "        format_output(clean_url or url, dst_dir, model_name_or_basename, image_name, image_url)\n",
+        "        format_output(clean_url, dst_dir, model_name_or_basename, image_name, image_url)\n",
         "    except UnboundLocalError:\n",
-        "        format_output(clean_url or url, dst_dir, model_name_or_basename, None, None)\n",
+        "        format_output(clean_url, dst_dir, model_name_or_basename, None, None)\n",
         "\n",
         "    # =====================\n",
         "    def run_aria2c(url, dst_dir, file_name=None, args=\"\", header=\"\"):\n",

files_cells/notebooks/ru/launch_ru.ipynb

@@ -106,7 +106,6 @@
         "# ================= 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",

files_cells/python/en/downloading_en.py

@@ -27,7 +27,7 @@ free_plan = os.getenv('FREE_PLAN')
 UI = os.getenv('SDW_UI')
 OLD_UI = os.getenv('SDW_OLD_UI')
 
-os.chdir(os.path.expanduser('~'))
+os.chdir(root_path)
 
 # ============ loading settings V4 =============
 def load_settings(path):
@@ -226,8 +226,6 @@ with capture.capture_output() as cap:
     get_ipython().system("sed -i '521s/open=\\(False\\|True\\)/open=False/' {webui_path}/extensions/Umi-AI-Wildcards/scripts/wildcard_recursive.py  # Closed accordion by default")
     # --- Encrypt-Image ---
     get_ipython().system("sed -i '9,37d' {webui_path}/extensions/Encrypt-Image/javascript/encrypt_images_info.js # Removes the weird text in webui")
-    # --- Additional-Networks ---
-    get_ipython().system('wget -O {webui_path}/extensions/additional-networks/scripts/metadata_editor.py {anxety_repos}/extensions/Additional-Networks/fix/metadata_editor.py  # Fixing an error due to old style')
 del cap
 
 
@@ -283,7 +281,7 @@ def format_output(url, dst_dir, file_name, image_name=None, image_url=None):
     print(f"\033[33mFILE NAME: \033[34m{file_name}\033[0m")
 
     if 'civitai' in url and image_url:
-        print(f"\033[32m[Preview DL]:\033[0m {image_name} - {image_url}\n")
+        print(f"\033[32m[Preview IMG]:\033[0m {image_name} - {image_url}\n")
 
 ''' GET CivitAi API - DATA '''
 
@@ -427,9 +425,9 @@ def manual_download(url, dst_dir, file_name, prefix=None):
     """ Formatted info output """
     model_name_or_basename = file_name if file_name else basename
     try:
-        format_output(clean_url or url, dst_dir, model_name_or_basename, image_name, image_url)
+        format_output(clean_url, dst_dir, model_name_or_basename, image_name, image_url)
     except UnboundLocalError:
-        format_output(clean_url or url, dst_dir, model_name_or_basename, None, None)
+        format_output(clean_url, dst_dir, model_name_or_basename, None, None)
 
     # =====================
     def run_aria2c(url, dst_dir, file_name=None, args="", header=""):
@@ -464,57 +462,62 @@ def manual_download(url, dst_dir, file_name, prefix=None):
 
 # Separation of merged numbers
 def split_numbers(num_str, max_num):
-    def helper(s):
-        if not s:
-            return []
+    result = []
+    i = 0
+    while i < len(num_str):
+        found = False
         for length in range(2, 0, -1):
-            if len(s) >= length:
-                part = int(s[:length])
+            if i + length <= len(num_str):
+                part = int(num_str[i:i + length])
                 if part <= max_num:
-                    result = helper(s[length:])
-                    if result is not None:
-                        return [part] + result
-        return None
-    return helper(num_str)
+                    result.append(part)
+                    i += length
+                    found = True
+                    break
+        if not found:
+            break
+    return result
 
 def add_submodels(selection, num_selection, model_dict, dst_dir):
-    selected_models = []
     if selection == "none":
-        return selected_models
+        return []
+    selected_models = []
+
     if selection == "ALL":
-        for models in model_dict.values():
-            selected_models.extend(models)
+        selected_models = sum(model_dict.values(), [])
     else:
         if selection in model_dict:
             selected_models.extend(model_dict[selection])
+
         nums = num_selection.replace(',', ' ').split()
         max_num = len(model_dict)
-        selected_nums = []
+        unique_nums = set()
 
         for num_part in nums:
             split_nums = split_numbers(num_part, max_num)
-            if split_nums:
-                selected_nums.extend(split_nums)
-
-        unique_nums = list(set(selected_nums))
+            unique_nums.update(split_nums)
 
         for num in unique_nums:
             if 1 <= num <= max_num:
-                name = list(model_dict)[num - 1]
+                name = list(model_dict.keys())[num - 1]
                 selected_models.extend(model_dict[name])
 
-    unique_models = list({model['name']: model for model in selected_models}.values())
+    unique_models = {model['name']: model for model in selected_models}.values()
+
     for model in unique_models:
         model['dst_dir'] = dst_dir
 
-    return unique_models
+    return list(unique_models)
 
 def handle_submodels(selection, num_selection, model_dict, dst_dir, url):
     submodels = add_submodels(selection, num_selection, model_dict, dst_dir)
+    urls = []
     for submodel in submodels:
         if not inpainting_model and "inpainting" in submodel['name']:
             continue
-        url += f"{submodel['url']} {submodel['dst_dir']} {submodel['name']}, "
+        urls.append(f"{submodel['url']} {submodel['dst_dir']} {submodel['name']}")
+
+    url += ", ".join(urls) + ', '
     return url
 
 url = handle_submodels(model, model_num, model_list, models_dir, url)

files_cells/python/en/launch_en.py

@@ -82,7 +82,6 @@ clear_output()
 # ================= 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": "",

files_cells/python/ru/downloading_ru.py

@@ -27,7 +27,7 @@ free_plan = os.getenv('FREE_PLAN')
 UI = os.getenv('SDW_UI')
 OLD_UI = os.getenv('SDW_OLD_UI')
 
-os.chdir(os.path.expanduser('~'))
+os.chdir(root_path)
 
 # ============ loading settings V4 =============
 def load_settings(path):
@@ -226,8 +226,6 @@ with capture.capture_output() as cap:
     get_ipython().system("sed -i '521s/open=\\(False\\|True\\)/open=False/' {webui_path}/extensions/Umi-AI-Wildcards/scripts/wildcard_recursive.py  # Closed accordion by default")
     # --- Encrypt-Image ---
     get_ipython().system("sed -i '9,37d' {webui_path}/extensions/Encrypt-Image/javascript/encrypt_images_info.js # Removes the weird text in webui")
-    # --- Additional-Networks ---
-    get_ipython().system('wget -O {webui_path}/extensions/additional-networks/scripts/metadata_editor.py {anxety_repos}/extensions/Additional-Networks/fix/metadata_editor.py  # Fixing an error due to old style')
 del cap
 
 
@@ -283,7 +281,7 @@ def format_output(url, dst_dir, file_name, image_name=None, image_url=None):
     print(f"\033[33mFILE NAME: \033[34m{file_name}\033[0m")
 
     if 'civitai' in url and image_url:
-        print(f"\033[32m[Preview DL]:\033[0m {image_name} - {image_url}\n")
+        print(f"\033[32m[Preview IMG]:\033[0m {image_name} - {image_url}\n")
 
 ''' GET CivitAi API - DATA '''
 
@@ -427,9 +425,9 @@ def manual_download(url, dst_dir, file_name, prefix=None):
     """ Formatted info output """
     model_name_or_basename = file_name if file_name else basename
     try:
-        format_output(clean_url or url, dst_dir, model_name_or_basename, image_name, image_url)
+        format_output(clean_url, dst_dir, model_name_or_basename, image_name, image_url)
     except UnboundLocalError:
-        format_output(clean_url or url, dst_dir, model_name_or_basename, None, None)
+        format_output(clean_url, dst_dir, model_name_or_basename, None, None)
 
     # =====================
     def run_aria2c(url, dst_dir, file_name=None, args="", header=""):

files_cells/python/ru/launch_ru.py

@@ -82,7 +82,6 @@ clear_output()
 # ================= 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": "",