oops...?

files_cells/notebooks/en/downloading_en.ipynb

@@ -339,12 +339,14 @@
         "    \"vae:\",\n",
         "    \"lora:\",\n",
         "    \"embeddings:\",\n",
-        "    \"extensions:\"\n",
+        "    \"extensions:\",\n",
+        "    \"control:\"\n",
         "]\n",
         "\n",
         "!mkdir -p {models_dir} {vaes_dir} {embeddings_dir} {loras_dir} {control_dir}\n",
         "\n",
         "url = \"\"\n",
+        "ControlNet_url = \"\"\n",
         "hf_token = optional_huggingface_token if optional_huggingface_token else \"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\"\n",
         "user_header = f\"\\\"Authorization: Bearer {hf_token}\\\"\"\n",
         "# user_header = f\"\\\"Authorization: Bearer {optional_huggingface_token}\\\"\"\n",
@@ -357,7 +359,7 @@
         "    if file_name:\n",
         "        url = re.sub(r'\\[.*?\\]', '', url)\n",
         "\n",
-        "    dir_mapping = {\"model\": models_dir, \"vae\": vaes_dir, \"lora\": loras_dir, \"embeddings\": embeddings_dir, \"extensions\": None}\n",
+        "    dir_mapping = {\"model\": models_dir, \"vae\": vaes_dir, \"lora\": loras_dir, \"embeddings\": embeddings_dir, \"extensions\": None, \"control\": control_dir}\n",
         "\n",
         "    for prefix, dir in dir_mapping.items():\n",
         "        if original_url.startswith(f\"{prefix}:\"):\n",
@@ -458,7 +460,8 @@
         "        'vae': 'Vae_url',\n",
         "        'embed': 'Embedding_url',\n",
         "        'lora': 'LoRA_url',\n",
-        "        'extension': 'Extensions_url'\n",
+        "        'extension': 'Extensions_url',\n",
+        "        'control': 'ControlNet_url'\n",
         "    }\n",
         "\n",
         "    if file_url.startswith(\"http\"):\n",
@@ -487,15 +490,13 @@
         "    if not custom_file_urls.startswith('http'):\n",
         "        if not custom_file_urls.startswith(root_path):\n",
         "            custom_file_urls = f'{root_path}/{custom_file_urls}'\n",
-        "    if custom_file_urls.count('/content') >= 2:\n",
-        "        custom_file_urls = re.sub(r'(/content){2,}', '/content', custom_file_urls)\n",
         "\n",
         "    try:\n",
         "        process_file_download(custom_file_urls)\n",
         "    except FileNotFoundError:\n",
         "        pass\n",
         "\n",
-        "urls = [Model_url, Vae_url, LoRA_url, Embedding_url, Extensions_url]\n",
+        "urls = [Model_url, Vae_url, LoRA_url, Embedding_url, Extensions_url, ControlNet_url]\n",
         "\n",
         "for i, prefix in enumerate(prefixes):\n",
         "    if urls[i]:\n",

files_cells/notebooks/ru/downloading_ru.ipynb

@@ -91,8 +91,7 @@
         "        if env == \"Google Colab\":\n",
         "            !pip install -q pip install xformers==0.0.26.dev769 -U\n",
         "        else:\n",
-        "            if env != \"Kaggle\":\n",
-        "                !pip install -q {torch} -U\n",
+        "            !pip install -q {torch} -U\n",
         "            !pip install -q {xformers} -U\n",
         "\n",
         "        with open(flag_file, \"w\") as f:\n",
@@ -339,12 +338,14 @@
         "    \"vae:\",\n",
         "    \"lora:\",\n",
         "    \"embeddings:\",\n",
-        "    \"extensions:\"\n",
+        "    \"extensions:\",\n",
+        "    \"control:\"\n",
         "]\n",
         "\n",
         "!mkdir -p {models_dir} {vaes_dir} {embeddings_dir} {loras_dir} {control_dir}\n",
         "\n",
         "url = \"\"\n",
+        "ControlNet_url = \"\"\n",
         "hf_token = optional_huggingface_token if optional_huggingface_token else \"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\"\n",
         "user_header = f\"\\\"Authorization: Bearer {hf_token}\\\"\"\n",
         "# user_header = f\"\\\"Authorization: Bearer {optional_huggingface_token}\\\"\"\n",
@@ -357,7 +358,7 @@
         "    if file_name:\n",
         "        url = re.sub(r'\\[.*?\\]', '', url)\n",
         "\n",
-        "    dir_mapping = {\"model\": models_dir, \"vae\": vaes_dir, \"lora\": loras_dir, \"embeddings\": embeddings_dir, \"extensions\": None}\n",
+        "    dir_mapping = {\"model\": models_dir, \"vae\": vaes_dir, \"lora\": loras_dir, \"embeddings\": embeddings_dir, \"extensions\": None, \"control\": control_dir}\n",
         "\n",
         "    for prefix, dir in dir_mapping.items():\n",
         "        if original_url.startswith(f\"{prefix}:\"):\n",
@@ -452,13 +453,14 @@
         "    url += f\"{submodel['url']} {submodel['dst_dir']} {submodel['name']}, \"\n",
         "\n",
         "def process_file_download(file_url):\n",
-        "    global Model_url, Vae_url, LoRA_url, Embedding_url, Extensions_url\n",
+        "    global Model_url, Vae_url, LoRA_url, Embedding_url, Extensions_url, ControlNet_url\n",
         "    urls_dict = {\n",
         "        'model': 'Model_url',\n",
         "        'vae': 'Vae_url',\n",
         "        'embed': 'Embedding_url',\n",
         "        'lora': 'LoRA_url',\n",
-        "        'extension': 'Extensions_url'\n",
+        "        'extension': 'Extensions_url',\n",
+        "        'control': 'ControlNet_url'\n",
         "    }\n",
         "\n",
         "    if file_url.startswith(\"http\"):\n",
@@ -487,15 +489,13 @@
         "    if not custom_file_urls.startswith('http'):\n",
         "        if not custom_file_urls.startswith(root_path):\n",
         "            custom_file_urls = f'{root_path}/{custom_file_urls}'\n",
-        "    if custom_file_urls.count('/content') >= 2:\n",
-        "        custom_file_urls = re.sub(r'(/content){2,}', '/content', custom_file_urls)\n",
         "\n",
         "    try:\n",
         "        process_file_download(custom_file_urls)\n",
         "    except FileNotFoundError:\n",
         "        pass\n",
         "\n",
-        "urls = [Model_url, Vae_url, LoRA_url, Embedding_url, Extensions_url]\n",
+        "urls = [Model_url, Vae_url, LoRA_url, Embedding_url, Extensions_url, ControlNet_url]\n",
         "\n",
         "for i, prefix in enumerate(prefixes):\n",
         "    if urls[i]:\n",

files_cells/python/en/auto-cleaner_en.py

@@ -247,10 +247,11 @@ def clean_directory(directory):
     deleted_files = 0
     for root, dirs, files in os.walk(directory):
         for file in files:
-            if file.endswith((".txt", ".yaml")):
+            if file.endswith(".txt"):
                 continue
             os.remove(os.path.join(root, file))
-            deleted_files += 1
+            if not file.endswith(".yaml"):
+                deleted_files += 1
     return deleted_files
 
 

files_cells/python/en/downloading_en.py

@@ -320,12 +320,14 @@ prefixes = [
     "vae:",
     "lora:",
     "embeddings:",
-    "extensions:"
+    "extensions:",
+    "control:"
 ]
 
 get_ipython().system('mkdir -p {models_dir} {vaes_dir} {embeddings_dir} {loras_dir} {control_dir}')
 
 url = ""
+ControlNet_url = ""
 hf_token = optional_huggingface_token if optional_huggingface_token else "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"
 user_header = f"\"Authorization: Bearer {hf_token}\""
 # user_header = f"\"Authorization: Bearer {optional_huggingface_token}\""
@@ -338,7 +340,7 @@ def handle_manual(url):
     if file_name:
         url = re.sub(r'\[.*?\]', '', url)
 
-    dir_mapping = {"model": models_dir, "vae": vaes_dir, "lora": loras_dir, "embeddings": embeddings_dir, "extensions": None}
+    dir_mapping = {"model": models_dir, "vae": vaes_dir, "lora": loras_dir, "embeddings": embeddings_dir, "extensions": None, "control": control_dir}
 
     for prefix, dir in dir_mapping.items():
         if original_url.startswith(f"{prefix}:"):
@@ -439,7 +441,8 @@ def process_file_download(file_url):
         'vae': 'Vae_url',
         'embed': 'Embedding_url',
         'lora': 'LoRA_url',
-        'extension': 'Extensions_url'
+        'extension': 'Extensions_url',
+        'control': 'ControlNet_url'
     }
 
     if file_url.startswith("http"):
@@ -468,15 +471,13 @@ if custom_file_urls:
     if not custom_file_urls.startswith('http'):
         if not custom_file_urls.startswith(root_path):
             custom_file_urls = f'{root_path}/{custom_file_urls}'
-    if custom_file_urls.count('/content') >= 2:
-        custom_file_urls = re.sub(r'(/content){2,}', '/content', custom_file_urls)
 
     try:
         process_file_download(custom_file_urls)
     except FileNotFoundError:
         pass
 
-urls = [Model_url, Vae_url, LoRA_url, Embedding_url, Extensions_url]
+urls = [Model_url, Vae_url, LoRA_url, Embedding_url, Extensions_url, ControlNet_url]
 
 for i, prefix in enumerate(prefixes):
     if urls[i]:

files_cells/python/ru/auto-cleaner_ru.py

@@ -247,10 +247,11 @@ def clean_directory(directory):
     deleted_files = 0
     for root, dirs, files in os.walk(directory):
         for file in files:
-            if file.endswith((".txt", ".yaml")):
+            if file.endswith(".txt"):
                 continue
             os.remove(os.path.join(root, file))
-            deleted_files += 1
+            if not file.endswith(".yaml"):
+                deleted_files += 1
     return deleted_files
 
 

files_cells/python/ru/downloading_ru.py

@@ -72,8 +72,7 @@ if not os.path.exists(flag_file):
         if env == "Google Colab":
             get_ipython().system('pip install -q pip install xformers==0.0.26.dev769 -U')
         else:
-            if env != "Kaggle":
-                get_ipython().system('pip install -q {torch} -U')
+            get_ipython().system('pip install -q {torch} -U')
             get_ipython().system('pip install -q {xformers} -U')
 
         with open(flag_file, "w") as f:
@@ -320,12 +319,14 @@ prefixes = [
     "vae:",
     "lora:",
     "embeddings:",
-    "extensions:"
+    "extensions:",
+    "control:"
 ]
 
 get_ipython().system('mkdir -p {models_dir} {vaes_dir} {embeddings_dir} {loras_dir} {control_dir}')
 
 url = ""
+ControlNet_url = ""
 hf_token = optional_huggingface_token if optional_huggingface_token else "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"
 user_header = f"\"Authorization: Bearer {hf_token}\""
 # user_header = f"\"Authorization: Bearer {optional_huggingface_token}\""
@@ -338,7 +339,7 @@ def handle_manual(url):
     if file_name:
         url = re.sub(r'\[.*?\]', '', url)
 
-    dir_mapping = {"model": models_dir, "vae": vaes_dir, "lora": loras_dir, "embeddings": embeddings_dir, "extensions": None}
+    dir_mapping = {"model": models_dir, "vae": vaes_dir, "lora": loras_dir, "embeddings": embeddings_dir, "extensions": None, "control": control_dir}
 
     for prefix, dir in dir_mapping.items():
         if original_url.startswith(f"{prefix}:"):
@@ -433,13 +434,14 @@ for submodel in submodels:
     url += f"{submodel['url']} {submodel['dst_dir']} {submodel['name']}, "
 
 def process_file_download(file_url):
-    global Model_url, Vae_url, LoRA_url, Embedding_url, Extensions_url
+    global Model_url, Vae_url, LoRA_url, Embedding_url, Extensions_url, ControlNet_url
     urls_dict = {
         'model': 'Model_url',
         'vae': 'Vae_url',
         'embed': 'Embedding_url',
         'lora': 'LoRA_url',
-        'extension': 'Extensions_url'
+        'extension': 'Extensions_url',
+        'control': 'ControlNet_url'
     }
 
     if file_url.startswith("http"):
@@ -468,15 +470,13 @@ if custom_file_urls:
     if not custom_file_urls.startswith('http'):
         if not custom_file_urls.startswith(root_path):
             custom_file_urls = f'{root_path}/{custom_file_urls}'
-    if custom_file_urls.count('/content') >= 2:
-        custom_file_urls = re.sub(r'(/content){2,}', '/content', custom_file_urls)
 
     try:
         process_file_download(custom_file_urls)
     except FileNotFoundError:
         pass
 
-urls = [Model_url, Vae_url, LoRA_url, Embedding_url, Extensions_url]
+urls = [Model_url, Vae_url, LoRA_url, Embedding_url, Extensions_url, ControlNet_url]
 
 for i, prefix in enumerate(prefixes):
     if urls[i]: