~

files_cells/notebooks/en/auto-cleaner_en.ipynb

@@ -28,7 +28,7 @@
         "\n",
         "#  ================= DETECT ENV =================\n",
         "def detect_environment():\n",
-        "    free_plan = (os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES') / (1024. ** 3) <= 20)\n",
+        "    free_plan = (os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES') / (1024 ** 3) <= 20)\n",
         "    environments = {\n",
         "        'COLAB_GPU': ('Google Colab', \"/root\" if free_plan else \"/content\"),\n",
         "        'KAGGLE_URL_BASE': ('Kaggle', \"/kaggle/working/content\")\n",

files_cells/notebooks/en/downloading_en.ipynb

@@ -27,7 +27,7 @@
         "\n",
         "#  ================= DETECT ENV =================\n",
         "def detect_environment():\n",
-        "    free_plan = (os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES') / (1024. ** 3) <= 20)\n",
+        "    free_plan = (os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES') / (1024 ** 3) <= 20)\n",
         "    environments = {\n",
         "        'COLAB_GPU': ('Google Colab', \"/root\" if free_plan else \"/content\"),\n",
         "        'KAGGLE_URL_BASE': ('Kaggle', \"/kaggle/working/content\")\n",
@@ -338,18 +338,18 @@
         "\n",
         "''' Get Image Preview | CivitAi '''\n",
         "\n",
-        "def get_data_from_api(model_id, api_key): # get model data\n",
-        "    base_url = f\"https://civitai.com/api/v1/model-versions/{model_id}\"\n",
+        "def get_data_from_api(model_id): # get model data\n",
+        "    endpoint_url = f\"https://civitai.com/api/v1/model-versions/{model_id}\"\n",
         "    headers = {\"Content-Type\": \"application/json\"}\n",
         "    try:\n",
-        "        response = requests.get(base_url, headers=headers)\n",
+        "        response = requests.get(endpoint_url, headers=headers)\n",
         "        if response.status_code == 200:\n",
         "            return response.json()\n",
         "    except requests.exceptions.RequestException as e:\n",
         "        print(f\"An error occurred: {e}\")\n",
         "        return None\n",
         "\n",
-        "def extract_model_info(data, url, supported_types):\n",
+        "def extract_model_info(data, url):\n",
         "    if 'type=' in url:\n",
         "        model_type = parse_qs(urlparse(url).query).get('type', [''])[0]\n",
         "        model_name = data['files'][1]['name']\n",
@@ -401,9 +401,9 @@
         "        model_id = url.split('/')[-1]\n",
         "        clean_url = url.split('?')[0]\n",
         "\n",
-        "        data = get_data_from_api(model_id, civitai_token)\n",
+        "        data = get_data_from_api(model_id)\n",
         "        if data:\n",
-        "            model_type, model_name, image_url = extract_model_info(data, url, support_types)\n",
+        "            model_type, model_name, image_url = extract_model_info(data, url)\n",
         "            if model_name and image_url:\n",
         "                image_file_name = gen_preview_filename(model_name if not file_name else file_name, image_url)\n",
         "                if any(types in model_type for types in support_types):\n",
@@ -415,9 +415,9 @@
         "    \"\"\" information output \"\"\"\n",
         "    # -- wrold's best print info --\n",
         "    print(f\"\\n\\033[32m{'---'*45}\\n\\033[33mURL: \\033[34m{clean_url if 'civitai' in url else url}\\n\\033[33mSAVE DIR: \\033[34m{dst_dir}\\n\\033[33mFILE NAME: \\033[34m{file_name if not 'huggingface' in url else basename}\\033[0m\")\n",
-        "    print(\"\\033[31m[Data Info]:\\033[0m Failed to retrieve data from the API.\") if 'civitai' in url and not data else None\n",
+        "    print(\"\\033[31m[Data Info]:\\033[0m Failed to retrieve data from the API.\\n\") if 'civitai' in url and not data else None\n",
         "    if 'civitai' in url and data and any(types in model_type for types in support_types) and (locals().get('image_file_name') or ''):\n",
-        "        print(f\"\\033[32m[Preview DL]:\\033[0m {image_file_name} - {image_url}\")\n",
+        "        print(f\"\\033[32m[Preview DL]:\\033[0m {image_file_name} - {image_url}\\n\")\n",
         "    # ===================\n",
         "\n",
         "    # -- GDrive --\n",
@@ -505,7 +505,7 @@
         "\n",
         "submodels += add_submodels(Model, Model_Num, model_list, models_dir)                                                   # model\n",
         "submodels += add_submodels(Vae, Vae_Num, vae_list, vaes_dir)                                                           # vae\n",
-        "submodels += add_submodels(controlnet, \"\" if controlnet == \"ALL\" else controlnet_Num, controlnet_list, control_dir)    # controlnet\n",
+        "submodels += add_submodels(controlnet, controlnet_Num, controlnet_list, control_dir)    # controlnet\n",
         "\n",
         "for submodel in submodels:\n",
         "    if not Inpainting_Model and \"inpainting\" in submodel['name']:\n",

files_cells/notebooks/en/launch_en.ipynb

@@ -36,7 +36,7 @@
         "\n",
         "#  ================= DETECT ENV =================\n",
         "def detect_environment():\n",
-        "    free_plan = (os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES') / (1024. ** 3) <= 20)\n",
+        "    free_plan = (os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES') / (1024 ** 3) <= 20)\n",
         "    environments = {\n",
         "        'COLAB_GPU': ('Google Colab', \"/root\" if free_plan else \"/content\"),\n",
         "        'KAGGLE_URL_BASE': ('Kaggle', \"/kaggle/working/content\")\n",

files_cells/notebooks/en/widgets_en.ipynb

@@ -29,7 +29,7 @@
         "\n",
         "#  ================= DETECT ENV =================\n",
         "def detect_environment():\n",
-        "    free_plan = (os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES') / (1024. ** 3) <= 20)\n",
+        "    free_plan = (os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES') / (1024 ** 3) <= 20)\n",
         "    environments = {\n",
         "        'COLAB_GPU': ('Google Colab', \"/root\" if free_plan else \"/content\"),\n",
         "        'KAGGLE_URL_BASE': ('Kaggle', \"/kaggle/working/content\")\n",

files_cells/notebooks/ru/auto-cleaner_ru.ipynb

@@ -28,7 +28,7 @@
         "\n",
         "#  ================= DETECT ENV =================\n",
         "def detect_environment():\n",
-        "    free_plan = (os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES') / (1024. ** 3) <= 20)\n",
+        "    free_plan = (os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES') / (1024 ** 3) <= 20)\n",
         "    environments = {\n",
         "        'COLAB_GPU': ('Google Colab', \"/root\" if free_plan else \"/content\"),\n",
         "        'KAGGLE_URL_BASE': ('Kaggle', \"/kaggle/working/content\")\n",

files_cells/notebooks/ru/downloading_ru.ipynb

@@ -27,7 +27,7 @@
         "\n",
         "#  ================= DETECT ENV =================\n",
         "def detect_environment():\n",
-        "    free_plan = (os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES') / (1024. ** 3) <= 20)\n",
+        "    free_plan = (os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES') / (1024 ** 3) <= 20)\n",
         "    environments = {\n",
         "        'COLAB_GPU': ('Google Colab', \"/root\" if free_plan else \"/content\"),\n",
         "        'KAGGLE_URL_BASE': ('Kaggle', \"/kaggle/working/content\")\n",
@@ -338,18 +338,18 @@
         "\n",
         "''' Get Image Preview | CivitAi '''\n",
         "\n",
-        "def get_data_from_api(model_id, api_key): # get model data\n",
-        "    base_url = f\"https://civitai.com/api/v1/model-versions/{model_id}\"\n",
+        "def get_data_from_api(model_id): # get model data\n",
+        "    endpoint_url = f\"https://civitai.com/api/v1/model-versions/{model_id}\"\n",
         "    headers = {\"Content-Type\": \"application/json\"}\n",
         "    try:\n",
-        "        response = requests.get(base_url, headers=headers)\n",
+        "        response = requests.get(endpoint_url, headers=headers)\n",
         "        if response.status_code == 200:\n",
         "            return response.json()\n",
         "    except requests.exceptions.RequestException as e:\n",
         "        print(f\"An error occurred: {e}\")\n",
         "        return None\n",
         "\n",
-        "def extract_model_info(data, url, supported_types):\n",
+        "def extract_model_info(data, url):\n",
         "    if 'type=' in url:\n",
         "        model_type = parse_qs(urlparse(url).query).get('type', [''])[0]\n",
         "        model_name = data['files'][1]['name']\n",
@@ -401,9 +401,9 @@
         "        model_id = url.split('/')[-1]\n",
         "        clean_url = url.split('?')[0]\n",
         "\n",
-        "        data = get_data_from_api(model_id, civitai_token)\n",
+        "        data = get_data_from_api(model_id)\n",
         "        if data:\n",
-        "            model_type, model_name, image_url = extract_model_info(data, url, support_types)\n",
+        "            model_type, model_name, image_url = extract_model_info(data, url)\n",
         "            if model_name and image_url:\n",
         "                image_file_name = gen_preview_filename(model_name if not file_name else file_name, image_url)\n",
         "                if any(types in model_type for types in support_types):\n",
@@ -415,9 +415,9 @@
         "    \"\"\" information output \"\"\"\n",
         "    # -- wrold's best print info --\n",
         "    print(f\"\\n\\033[32m{'---'*45}\\n\\033[33mURL: \\033[34m{clean_url if 'civitai' in url else url}\\n\\033[33mSAVE DIR: \\033[34m{dst_dir}\\n\\033[33mFILE NAME: \\033[34m{file_name if not 'huggingface' in url else basename}\\033[0m\")\n",
-        "    print(\"\\033[31m[Data Info]:\\033[0m Failed to retrieve data from the API.\") if 'civitai' in url and not data else None\n",
+        "    print(\"\\033[31m[Data Info]:\\033[0m Failed to retrieve data from the API.\\n\") if 'civitai' in url and not data else None\n",
         "    if 'civitai' in url and data and any(types in model_type for types in support_types) and (locals().get('image_file_name') or ''):\n",
-        "        print(f\"\\033[32m[Preview DL]:\\033[0m {image_file_name} - {image_url}\")\n",
+        "        print(f\"\\033[32m[Preview DL]:\\033[0m {image_file_name} - {image_url}\\n\")\n",
         "    # ===================\n",
         "\n",
         "    # -- GDrive --\n",
@@ -505,7 +505,7 @@
         "\n",
         "submodels += add_submodels(Model, Model_Num, model_list, models_dir)                                                   # model\n",
         "submodels += add_submodels(Vae, Vae_Num, vae_list, vaes_dir)                                                           # vae\n",
-        "submodels += add_submodels(controlnet, \"\" if controlnet == \"ALL\" else controlnet_Num, controlnet_list, control_dir)    # controlnet\n",
+        "submodels += add_submodels(controlnet, controlnet_Num, controlnet_list, control_dir)    # controlnet\n",
         "\n",
         "for submodel in submodels:\n",
         "    if not Inpainting_Model and \"inpainting\" in submodel['name']:\n",

files_cells/notebooks/ru/launch_ru.ipynb

@@ -36,7 +36,7 @@
         "\n",
         "#  ================= DETECT ENV =================\n",
         "def detect_environment():\n",
-        "    free_plan = (os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES') / (1024. ** 3) <= 20)\n",
+        "    free_plan = (os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES') / (1024 ** 3) <= 20)\n",
         "    environments = {\n",
         "        'COLAB_GPU': ('Google Colab', \"/root\" if free_plan else \"/content\"),\n",
         "        'KAGGLE_URL_BASE': ('Kaggle', \"/kaggle/working/content\")\n",

files_cells/notebooks/ru/widgets_ru.ipynb

@@ -29,7 +29,7 @@
         "\n",
         "#  ================= DETECT ENV =================\n",
         "def detect_environment():\n",
-        "    free_plan = (os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES') / (1024. ** 3) <= 20)\n",
+        "    free_plan = (os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES') / (1024 ** 3) <= 20)\n",
         "    environments = {\n",
         "        'COLAB_GPU': ('Google Colab', \"/root\" if free_plan else \"/content\"),\n",
         "        'KAGGLE_URL_BASE': ('Kaggle', \"/kaggle/working/content\")\n",

files_cells/python/en/downloading_en.py

@@ -17,7 +17,7 @@ from urllib.parse import urlparse, parse_qs
 
 #  ================= 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")
@@ -328,18 +328,18 @@ user_header = f"\"Authorization: Bearer {hf_token}\""
 
 ''' Get Image Preview | CivitAi '''
 
-def get_data_from_api(model_id, api_key): # get model data
-    base_url = f"https://civitai.com/api/v1/model-versions/{model_id}"
+def get_data_from_api(model_id): # get model data
+    endpoint_url = f"https://civitai.com/api/v1/model-versions/{model_id}"
     headers = {"Content-Type": "application/json"}
     try:
-        response = requests.get(base_url, headers=headers)
+        response = requests.get(endpoint_url, headers=headers)
         if response.status_code == 200:
             return response.json()
     except requests.exceptions.RequestException as e:
         print(f"An error occurred: {e}")
         return None
 
-def extract_model_info(data, url, supported_types):
+def extract_model_info(data, url):
     if 'type=' in url:
         model_type = parse_qs(urlparse(url).query).get('type', [''])[0]
         model_name = data['files'][1]['name']
@@ -391,9 +391,9 @@ def manual_download(url, dst_dir, file_name):
         model_id = url.split('/')[-1]
         clean_url = url.split('?')[0]
 
-        data = get_data_from_api(model_id, civitai_token)
+        data = get_data_from_api(model_id)
         if data:
-            model_type, model_name, image_url = extract_model_info(data, url, support_types)
+            model_type, model_name, image_url = extract_model_info(data, url)
             if model_name and image_url:
                 image_file_name = gen_preview_filename(model_name if not file_name else file_name, image_url)
                 if any(types in model_type for types in support_types):
@@ -405,9 +405,9 @@ def manual_download(url, dst_dir, file_name):
     """ information output """
     # -- wrold's best print info --
     print(f"\n\033[32m{'---'*45}\n\033[33mURL: \033[34m{clean_url if 'civitai' in url else url}\n\033[33mSAVE DIR: \033[34m{dst_dir}\n\033[33mFILE NAME: \033[34m{file_name if not 'huggingface' in url else basename}\033[0m")
-    print("\033[31m[Data Info]:\033[0m Failed to retrieve data from the API.") if 'civitai' in url and not data else None
+    print("\033[31m[Data Info]:\033[0m Failed to retrieve data from the API.\n") if 'civitai' in url and not data else None
     if 'civitai' in url and data and any(types in model_type for types in support_types) and (locals().get('image_file_name') or ''):
-        print(f"\033[32m[Preview DL]:\033[0m {image_file_name} - {image_url}")
+        print(f"\033[32m[Preview DL]:\033[0m {image_file_name} - {image_url}\n")
     # ===================
 
     # -- GDrive --
@@ -495,7 +495,7 @@ def add_submodels(selection, num_selection, model_dict, dst_dir):
 
 submodels += add_submodels(Model, Model_Num, model_list, models_dir)                                                   # model
 submodels += add_submodels(Vae, Vae_Num, vae_list, vaes_dir)                                                           # vae
-submodels += add_submodels(controlnet, "" if controlnet == "ALL" else controlnet_Num, controlnet_list, control_dir)    # controlnet
+submodels += add_submodels(controlnet, controlnet_Num, controlnet_list, control_dir)    # controlnet
 
 for submodel in submodels:
     if not Inpainting_Model and "inpainting" in submodel['name']:

files_cells/python/ru/downloading_ru.py

@@ -17,7 +17,7 @@ from urllib.parse import urlparse, parse_qs
 
 #  ================= 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")
@@ -328,18 +328,18 @@ user_header = f"\"Authorization: Bearer {hf_token}\""
 
 ''' Get Image Preview | CivitAi '''
 
-def get_data_from_api(model_id, api_key): # get model data
-    base_url = f"https://civitai.com/api/v1/model-versions/{model_id}"
+def get_data_from_api(model_id): # get model data
+    endpoint_url = f"https://civitai.com/api/v1/model-versions/{model_id}"
     headers = {"Content-Type": "application/json"}
     try:
-        response = requests.get(base_url, headers=headers)
+        response = requests.get(endpoint_url, headers=headers)
         if response.status_code == 200:
             return response.json()
     except requests.exceptions.RequestException as e:
         print(f"An error occurred: {e}")
         return None
 
-def extract_model_info(data, url, supported_types):
+def extract_model_info(data, url):
     if 'type=' in url:
         model_type = parse_qs(urlparse(url).query).get('type', [''])[0]
         model_name = data['files'][1]['name']
@@ -391,9 +391,9 @@ def manual_download(url, dst_dir, file_name):
         model_id = url.split('/')[-1]
         clean_url = url.split('?')[0]
 
-        data = get_data_from_api(model_id, civitai_token)
+        data = get_data_from_api(model_id)
         if data:
-            model_type, model_name, image_url = extract_model_info(data, url, support_types)
+            model_type, model_name, image_url = extract_model_info(data, url)
             if model_name and image_url:
                 image_file_name = gen_preview_filename(model_name if not file_name else file_name, image_url)
                 if any(types in model_type for types in support_types):
@@ -405,9 +405,9 @@ def manual_download(url, dst_dir, file_name):
     """ information output """
     # -- wrold's best print info --
     print(f"\n\033[32m{'---'*45}\n\033[33mURL: \033[34m{clean_url if 'civitai' in url else url}\n\033[33mSAVE DIR: \033[34m{dst_dir}\n\033[33mFILE NAME: \033[34m{file_name if not 'huggingface' in url else basename}\033[0m")
-    print("\033[31m[Data Info]:\033[0m Failed to retrieve data from the API.") if 'civitai' in url and not data else None
+    print("\033[31m[Data Info]:\033[0m Failed to retrieve data from the API.\n") if 'civitai' in url and not data else None
     if 'civitai' in url and data and any(types in model_type for types in support_types) and (locals().get('image_file_name') or ''):
-        print(f"\033[32m[Preview DL]:\033[0m {image_file_name} - {image_url}")
+        print(f"\033[32m[Preview DL]:\033[0m {image_file_name} - {image_url}\n")
     # ===================
 
     # -- GDrive --
@@ -495,7 +495,7 @@ def add_submodels(selection, num_selection, model_dict, dst_dir):
 
 submodels += add_submodels(Model, Model_Num, model_list, models_dir)                                                   # model
 submodels += add_submodels(Vae, Vae_Num, vae_list, vaes_dir)                                                           # vae
-submodels += add_submodels(controlnet, "" if controlnet == "ALL" else controlnet_Num, controlnet_list, control_dir)    # controlnet
+submodels += add_submodels(controlnet, controlnet_Num, controlnet_list, control_dir)    # controlnet
 
 for submodel in submodels:
     if not Inpainting_Model and "inpainting" in submodel['name']: