🐛✨🚑️ | I kinda fixed a lot of things :3

files_cells/notebooks/en/downloading_en.ipynb

@@ -473,19 +473,44 @@
         "\n",
         "''' SubModels - Added URLs '''\n",
         "\n",
+        "# Separation of merged numbers\n",
+        "def split_numbers(num_str, max_num):\n",
+        "    def helper(s):\n",
+        "        if not s:\n",
+        "            return []\n",
+        "        for length in range(2, 0, -1):\n",
+        "            if len(s) >= length:\n",
+        "                part = int(s[: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",
+        "\n",
         "def add_submodels(selection, num_selection, model_dict, dst_dir):\n",
+        "    selected_models = []\n",
         "    if selection == \"none\":\n",
-        "        return []\n",
+        "        return selected_models\n",
         "    if selection == \"ALL\":\n",
-        "        all_models = []\n",
         "        for models in model_dict.values():\n",
-        "            all_models.extend(models)\n",
-        "        selected_models = all_models\n",
+        "            selected_models.extend(models)\n",
         "    else:\n",
-        "        selected_models = model_dict[selection]\n",
-        "        selected_nums = map(int, num_selection.replace(',', '').split())\n",
-        "        for num in selected_nums:\n",
-        "            if 1 <= num <= len(model_dict):\n",
+        "        if selection in model_dict:\n",
+        "            selected_models.extend(model_dict[selection])\n",
+        "        nums = num_selection.replace(',', ' ').split()\n",
+        "        max_num = len(model_dict)\n",
+        "        selected_nums = []\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",
+        "\n",
+        "        for num in unique_nums:\n",
+        "            if 1 <= num <= max_num:\n",
         "                name = list(model_dict)[num - 1]\n",
         "                selected_models.extend(model_dict[name])\n",
         "\n",

files_cells/notebooks/ru/downloading_ru.ipynb

@@ -473,19 +473,44 @@
         "\n",
         "''' SubModels - Added URLs '''\n",
         "\n",
+        "# Separation of merged numbers\n",
+        "def split_numbers(num_str, max_num):\n",
+        "    def helper(s):\n",
+        "        if not s:\n",
+        "            return []\n",
+        "        for length in range(2, 0, -1):\n",
+        "            if len(s) >= length:\n",
+        "                part = int(s[: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",
+        "\n",
         "def add_submodels(selection, num_selection, model_dict, dst_dir):\n",
+        "    selected_models = []\n",
         "    if selection == \"none\":\n",
-        "        return []\n",
+        "        return selected_models\n",
         "    if selection == \"ALL\":\n",
-        "        all_models = []\n",
         "        for models in model_dict.values():\n",
-        "            all_models.extend(models)\n",
-        "        selected_models = all_models\n",
+        "            selected_models.extend(models)\n",
         "    else:\n",
-        "        selected_models = model_dict[selection]\n",
-        "        selected_nums = map(int, num_selection.replace(',', '').split())\n",
-        "        for num in selected_nums:\n",
-        "            if 1 <= num <= len(model_dict):\n",
+        "        if selection in model_dict:\n",
+        "            selected_models.extend(model_dict[selection])\n",
+        "        nums = num_selection.replace(',', ' ').split()\n",
+        "        max_num = len(model_dict)\n",
+        "        selected_nums = []\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",
+        "\n",
+        "        for num in unique_nums:\n",
+        "            if 1 <= num <= max_num:\n",
         "                name = list(model_dict)[num - 1]\n",
         "                selected_models.extend(model_dict[name])\n",
         "\n",

files_cells/python/en/downloading_en.py

@@ -463,19 +463,44 @@ def manual_download(url, dst_dir, file_name, prefix=None):
 
 ''' SubModels - Added URLs '''
 
+# Separation of merged numbers
+def split_numbers(num_str, max_num):
+    def helper(s):
+        if not s:
+            return []
+        for length in range(2, 0, -1):
+            if len(s) >= length:
+                part = int(s[:length])
+                if part <= max_num:
+                    result = helper(s[length:])
+                    if result is not None:
+                        return [part] + result
+        return None
+    return helper(num_str)
+
 def add_submodels(selection, num_selection, model_dict, dst_dir):
+    selected_models = []
     if selection == "none":
-        return []
+        return selected_models
     if selection == "ALL":
-        all_models = []
         for models in model_dict.values():
-            all_models.extend(models)
-        selected_models = all_models
+            selected_models.extend(models)
     else:
-        selected_models = model_dict[selection]
-        selected_nums = map(int, num_selection.replace(',', '').split())
-        for num in selected_nums:
-            if 1 <= num <= len(model_dict):
+        if selection in model_dict:
+            selected_models.extend(model_dict[selection])
+        nums = num_selection.replace(',', ' ').split()
+        max_num = len(model_dict)
+        selected_nums = []
+
+        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))
+
+        for num in unique_nums:
+            if 1 <= num <= max_num:
                 name = list(model_dict)[num - 1]
                 selected_models.extend(model_dict[name])
 

files_cells/python/ru/downloading_ru.py

@@ -463,19 +463,44 @@ def manual_download(url, dst_dir, file_name, prefix=None):
 
 ''' SubModels - Added URLs '''
 
+# Separation of merged numbers
+def split_numbers(num_str, max_num):
+    def helper(s):
+        if not s:
+            return []
+        for length in range(2, 0, -1):
+            if len(s) >= length:
+                part = int(s[:length])
+                if part <= max_num:
+                    result = helper(s[length:])
+                    if result is not None:
+                        return [part] + result
+        return None
+    return helper(num_str)
+
 def add_submodels(selection, num_selection, model_dict, dst_dir):
+    selected_models = []
     if selection == "none":
-        return []
+        return selected_models
     if selection == "ALL":
-        all_models = []
         for models in model_dict.values():
-            all_models.extend(models)
-        selected_models = all_models
+            selected_models.extend(models)
     else:
-        selected_models = model_dict[selection]
-        selected_nums = map(int, num_selection.replace(',', '').split())
-        for num in selected_nums:
-            if 1 <= num <= len(model_dict):
+        if selection in model_dict:
+            selected_models.extend(model_dict[selection])
+        nums = num_selection.replace(',', ' ').split()
+        max_num = len(model_dict)
+        selected_nums = []
+
+        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))
+
+        for num in unique_nums:
+            if 1 <= num <= max_num:
                 name = list(model_dict)[num - 1]
                 selected_models.extend(model_dict[name])
 

modules/models_data.py

@@ -8,12 +8,12 @@ model_list = {
         {"url": "https://civitai.com/api/download/models/363850", "name": "BluMix_V7-inpainting.safetensors"}
     ],
     "3.Cetus-Mix [Anime] [V4] + INP": [
-        {"url": "https://civitai.com/api/download/models/130298", "name": "CetusMix_V4.safetensors"},
-        {"url": "https://civitai.com/api/download/models/139882", "name": "CetusMix_V4-inpainting.safetensors"}
+        {"url": "https://huggingface.co/fp16-guy/Cetus-Mix_v4_fp16_cleaned/resolve/main/cetusMix_v4_fp16.safetensors", "name": "CetusMix_V4.safetensors"},
+        {"url": "https://huggingface.co/fp16-guy/Cetus-Mix_v4_fp16_cleaned/resolve/main/cetusMix_v4_inp_fp16.safetensors", "name": "CetusMix_V4-inpainting.safetensors"}
     ],
     "4.Counterfeit [Anime] [V3] + INP": [
-        {"url": "https://huggingface.co/gsdf/Counterfeit-V3.0/resolve/main/Counterfeit-V3.0_fix_fp16.safetensors", "name": "Counterfeit_V3.safetensors"},
-        {"url": "https://civitai.com/api/download/models/137911", "name": "Counterfeit_V3-inpainting.safetensors"}
+        {"url": "https://huggingface.co/fp16-guy/Counterfeit-V3.0_fp16_cleaned/resolve/main/CounterfeitV30_v30_fp16.safetensors", "name": "Counterfeit_V3.safetensors"},
+        {"url": "https://huggingface.co/fp16-guy/Counterfeit-V3.0_fp16_cleaned/resolve/main/CounterfeitV30_v30_inp_fp16.safetensors", "name": "Counterfeit_V3-inpainting.safetensors"}
     ],
     "5.CuteColor [Anime] [V3]": [
         {"url": "https://civitai.com/api/download/models/138754", "name": "CuteColor_V3.safetensors"}
@@ -31,16 +31,21 @@ model_list = {
         {"url": "https://civitai.com/api/download/models/120702", "name": "MeinaMix_V11-inpainting.safetensors"}
     ],
     "9.Mix-Pro [Anime] [V4] + INP": [
-        {"url": "https://civitai.com/api/download/models/125668", "name": "MixPro_V4.safetensors"},
-        {"url": "https://civitai.com/api/download/models/139878", "name": "MixPro_V4-inpainting.safetensors"}
+        {"url": "https://huggingface.co/fp16-guy/MIX-Pro-V4_fp16_cleaned/resolve/main/mixProV4_v4_fp16.safetensors", "name": "MixPro_V4.safetensors"},
+        {"url": "https://huggingface.co/fp16-guy/MIX-Pro-V4_fp16_cleaned/resolve/main/mixProV4_v4_inp_fp16.safetensors", "name": "MixPro_V4-inpainting.safetensors"},
+        {"url": "https://huggingface.co/fp16-guy/MIX-Pro-V4.5_fp16_cleaned/resolve/main/mixProV45Colorbox_v45_fp16.safetensors", "name": "MixPro_V4_5.safetensors"},
+        {"url": "https://huggingface.co/fp16-guy/MIX-Pro-V4.5_fp16_cleaned/resolve/main/mixProV45Colorbox_v45_inp_fp16.safetensors", "name": "MixPro_V4_5-inpainting.safetensors"}
     ]
 }
 
 vae_list = {
-    "1.Anime.vae": [{"url": "https://civitai.com/api/download/models/311162", "name": "Anime.vae.safetensors"}],
-    "2.Anything.vae": [{"url": "https://huggingface.co/NoCrypt/resources/resolve/main/VAE/any.vae.safetensors", "name": "Anything.vae.safetensors"}],
-    "3.Blessed2.vae": [{"url": "https://huggingface.co/NoCrypt/resources/resolve/main/VAE/blessed2.vae.safetensors", "name": "Blessed2.vae.safetensors"}],
-    "4.ClearVae.vae": [{"url": "https://civitai.com/api/download/models/88156", "name": "ClearVae_23.vae.safetensors"}],
+    "1.Anime.vae": [
+      {"url": "https://huggingface.co/fp16-guy/anything_kl-f8-anime2_vae-ft-mse-840000-ema-pruned_blessed_clearvae_fp16_cleaned/resolve/main/kl-f8-anime2_fp16.safetensors", "name": "Anime-kl-f8.vae.safetensors"},
+      {"url": "https://huggingface.co/fp16-guy/anything_kl-f8-anime2_vae-ft-mse-840000-ema-pruned_blessed_clearvae_fp16_cleaned/resolve/main/vae-ft-mse-840000-ema-pruned_fp16.safetensors", "name": "Anime-mse.vae.safetensors"}
+    ],
+    "2.Anything.vae": [{"url": "https://huggingface.co/fp16-guy/anything_kl-f8-anime2_vae-ft-mse-840000-ema-pruned_blessed_clearvae_fp16_cleaned/resolve/main/anything_fp16.safetensors", "name": "Anything.vae.safetensors"}],
+    "3.Blessed2.vae": [{"url": "https://huggingface.co/fp16-guy/anything_kl-f8-anime2_vae-ft-mse-840000-ema-pruned_blessed_clearvae_fp16_cleaned/resolve/main/blessed2_fp16.safetensors", "name": "Blessed2.vae.safetensors"}],
+    "4.ClearVae.vae": [{"url": "https://huggingface.co/fp16-guy/anything_kl-f8-anime2_vae-ft-mse-840000-ema-pruned_blessed_clearvae_fp16_cleaned/resolve/main/ClearVAE_V2.3_fp16.safetensors", "name": "ClearVae_23.vae.safetensors"}],
     "5.WD.vae": [{"url": "https://huggingface.co/NoCrypt/resources/resolve/main/VAE/wd.vae.safetensors", "name": "WD.vae.safetensors"}]
 }