✨ file download update

- Automatically get an extension for a custom file name

files_cells/notebooks/en/auto_cleaner_en.ipynb

@@ -131,9 +131,9 @@
         "auto_cleaner_widget = widgets.SelectMultiple(options=AutoCleaner_options, layout=widgets.Layout(width='auto')).add_class(\"custom-select-multiple_AC\")\n",
         "output = widgets.Output().add_class(\"output_AC\")\n",
         "# ---\n",
-        "execute_button = Button(description='Execute Cleaning').add_class(\"button_execute_AC\").add_class(\"button_AC\")\n",
+        "execute_button = widgets.Button(description='Execute Cleaning').add_class(\"button_execute_AC\").add_class(\"button_AC\")\n",
         "execute_button.on_click(on_execute_button_press)\n",
-        "clear_button = Button(description='Hide Widget').add_class(\"button_clear_AC\").add_class(\"button_AC\")\n",
+        "clear_button = widgets.Button(description='Hide Widget').add_class(\"button_clear_AC\").add_class(\"button_AC\")\n",
         "clear_button.on_click(on_clear_button_press)\n",
         "# ---\n",
         "storage_info = widgets.HTML(f'''\n",
@@ -143,7 +143,7 @@
         "buttons = widgets.HBox([execute_button, clear_button])\n",
         "lower_information_panel = widgets.HBox([buttons, storage_info]).add_class(\"lower_information_panel_AC\")\n",
         "\n",
-        "container = VBox([instruction_label, widgets.HTML('<hr>'), auto_cleaner_widget, output, widgets.HTML('<hr>'), lower_information_panel]).add_class(\"container_AC\")\n",
+        "container = widgets.VBox([instruction_label, widgets.HTML('<hr>'), auto_cleaner_widget, output, widgets.HTML('<hr>'), lower_information_panel]).add_class(\"container_AC\")\n",
         "\n",
         "display(container)"
       ],

files_cells/notebooks/en/downloading_en.ipynb

@@ -330,6 +330,12 @@
         "                model_type = data['files'][1]['type']\n",
         "                model_name = data['files'][1]['name']\n",
         "\n",
+        "        if file_name and '.' not in file_name:\n",
+        "            file_extension = model_name.split('.')[-1]\n",
+        "            model_name = f\"{file_name}.{file_extension}\"\n",
+        "        elif file_name:\n",
+        "            model_name = file_name\n",
+        "\n",
         "        return model_type, model_name\n",
         "\n",
         "    def get_download_url(data, model_type):\n",
@@ -352,7 +358,6 @@
         "        return None, None\n",
         "\n",
         "    model_type, model_name = get_model_info(url, data)\n",
-        "    model_name = file_name or model_name\n",
         "    download_url = get_download_url(data, model_type)\n",
         "    image_url, image_name = get_image_info(data, model_type, model_name)\n",
         "\n",
@@ -421,8 +426,12 @@
         "            command = [\"aria2c\"] + aria2_args.split() + [\"-d\", dst_dir, \"-o\", image_name, image_url]\n",
         "            subprocess.run(command, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)\n",
         "\n",
-        "    elif 'github' in url or \"huggingface.co\" in url:\n",
-        "        file_name = clean_url.split(\"/\")[-1] if file_name is None else file_name\n",
+        "    elif 'github' in url or 'huggingface.co' in url:\n",
+        "        if file_name and '.' not in file_name:\n",
+        "            file_extension = f\"{clean_url.split('/')[-1].split('.', 1)[1]}\"\n",
+        "            file_name = f\"{file_name}.{file_extension}\"\n",
+        "        if not file_name:\n",
+        "            file_name = clean_url.split(\"/\")[-1]\n",
         "\n",
         "    \"\"\" Formatted info output \"\"\"\n",
         "    try:\n",

files_cells/notebooks/ru/auto_cleaner_ru.ipynb

@@ -136,9 +136,9 @@
         "auto_cleaner_widget = widgets.SelectMultiple(options=AutoCleaner_options, layout=widgets.Layout(width=\"auto\")).add_class(\"custom-select-multiple_AC\")\n",
         "output = widgets.Output().add_class(\"output_AC\")\n",
         "\n",
-        "execute_button = Button(description='Выполнить Очистку').add_class(\"button_execute_AC\").add_class(\"button_AC\")\n",
+        "execute_button = widgets.Button(description='Выполнить Очистку').add_class(\"button_execute_AC\").add_class(\"button_AC\")\n",
         "execute_button.on_click(on_execute_button_press)\n",
-        "clear_button = Button(description='Скрыть Виджет').add_class(\"button_clear_AC\").add_class(\"button_AC\")\n",
+        "clear_button = widgets.Button(description='Скрыть Виджет').add_class(\"button_clear_AC\").add_class(\"button_AC\")\n",
         "clear_button.on_click(on_clear_button_press)\n",
         "\n",
         "storage_info = widgets.HTML(f'''\n",
@@ -148,7 +148,7 @@
         "buttons = widgets.HBox([execute_button, clear_button])\n",
         "lower_information_panel = widgets.HBox([buttons, storage_info]).add_class(\"lower_information_panel_AC\")\n",
         "\n",
-        "container = VBox([instruction_label, widgets.HTML('<hr>'), auto_cleaner_widget, output, widgets.HTML('<hr>'), lower_information_panel]).add_class(\"container_AC\")\n",
+        "container = widgets.VBox([instruction_label, widgets.HTML('<hr>'), auto_cleaner_widget, output, widgets.HTML('<hr>'), lower_information_panel]).add_class(\"container_AC\")\n",
         "\n",
         "display(container)"
       ]

files_cells/notebooks/ru/downloading_ru.ipynb

@@ -95,7 +95,7 @@
         "        subprocess.run(install_cmd, shell=True, capture_output=True)\n",
         "\n",
         "    # Additional specific packages\n",
-        "    with capture.capture_output()\n",
+        "    with capture.capture_output():\n",
         "        !curl -s -OL https://github.com/DEX-1101/sd-webui-notebook/raw/main/res/new_tunnel --output-dir {root_path}\n",
         "        !curl -s -Lo /usr/bin/cl https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-amd64 && chmod +x /usr/bin/cl\n",
         "        !curl -sLO https://github.com/openziti/zrok/releases/download/v0.4.32/zrok_0.4.32_linux_amd64.tar.gz && tar -xzf zrok_0.4.32_linux_amd64.tar.gz -C /usr/bin && rm -f zrok_0.4.32_linux_amd64.tar.gz\n",
@@ -330,6 +330,12 @@
         "                model_type = data['files'][1]['type']\n",
         "                model_name = data['files'][1]['name']\n",
         "\n",
+        "        if file_name and '.' not in file_name:\n",
+        "            file_extension = model_name.split('.')[-1]\n",
+        "            model_name = f\"{file_name}.{file_extension}\"\n",
+        "        elif file_name:\n",
+        "            model_name = file_name\n",
+        "\n",
         "        return model_type, model_name\n",
         "\n",
         "    def get_download_url(data, model_type):\n",
@@ -352,7 +358,6 @@
         "        return None, None\n",
         "\n",
         "    model_type, model_name = get_model_info(url, data)\n",
-        "    model_name = file_name or model_name\n",
         "    download_url = get_download_url(data, model_type)\n",
         "    image_url, image_name = get_image_info(data, model_type, model_name)\n",
         "\n",
@@ -421,8 +426,12 @@
         "            command = [\"aria2c\"] + aria2_args.split() + [\"-d\", dst_dir, \"-o\", image_name, image_url]\n",
         "            subprocess.run(command, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)\n",
         "\n",
-        "    elif 'github' in url or \"huggingface.co\" in url:\n",
-        "        file_name = clean_url.split(\"/\")[-1] if file_name is None else file_name\n",
+        "    elif 'github' in url or 'huggingface.co' in url:\n",
+        "        if file_name and '.' not in file_name:\n",
+        "            file_extension = f\"{clean_url.split('/')[-1].split('.', 1)[1]}\"\n",
+        "            file_name = f\"{file_name}.{file_extension}\"\n",
+        "        if not file_name:\n",
+        "            file_name = clean_url.split(\"/\")[-1]\n",
         "\n",
         "    \"\"\" Formatted info output \"\"\"\n",
         "    try:\n",

files_cells/python/en/auto_cleaner_en.py

@@ -112,9 +112,9 @@ instruction_label = widgets.HTML('''
 auto_cleaner_widget = widgets.SelectMultiple(options=AutoCleaner_options, layout=widgets.Layout(width='auto')).add_class("custom-select-multiple_AC")
 output = widgets.Output().add_class("output_AC")
 # ---
-execute_button = Button(description='Execute Cleaning').add_class("button_execute_AC").add_class("button_AC")
+execute_button = widgets.Button(description='Execute Cleaning').add_class("button_execute_AC").add_class("button_AC")
 execute_button.on_click(on_execute_button_press)
-clear_button = Button(description='Hide Widget').add_class("button_clear_AC").add_class("button_AC")
+clear_button = widgets.Button(description='Hide Widget').add_class("button_clear_AC").add_class("button_AC")
 clear_button.on_click(on_clear_button_press)
 # ---
 storage_info = widgets.HTML(f'''
@@ -124,7 +124,7 @@ storage_info = widgets.HTML(f'''
 buttons = widgets.HBox([execute_button, clear_button])
 lower_information_panel = widgets.HBox([buttons, storage_info]).add_class("lower_information_panel_AC")
 
-container = VBox([instruction_label, widgets.HTML('<hr>'), auto_cleaner_widget, output, widgets.HTML('<hr>'), lower_information_panel]).add_class("container_AC")
+container = widgets.VBox([instruction_label, widgets.HTML('<hr>'), auto_cleaner_widget, output, widgets.HTML('<hr>'), lower_information_panel]).add_class("container_AC")
 
 display(container)
 

files_cells/python/en/downloading_en.py

@@ -320,6 +320,12 @@ def CivitAi_API(url, file_name=None):
                 model_type = data['files'][1]['type']
                 model_name = data['files'][1]['name']
 
+        if file_name and '.' not in file_name:
+            file_extension = model_name.split('.')[-1]
+            model_name = f"{file_name}.{file_extension}"
+        elif file_name:
+            model_name = file_name
+
         return model_type, model_name
 
     def get_download_url(data, model_type):
@@ -342,7 +348,6 @@ def CivitAi_API(url, file_name=None):
         return None, None
 
     model_type, model_name = get_model_info(url, data)
-    model_name = file_name or model_name
     download_url = get_download_url(data, model_type)
     image_url, image_name = get_image_info(data, model_type, model_name)
 
@@ -411,8 +416,12 @@ def manual_download(url, dst_dir, file_name, prefix=None):
             command = ["aria2c"] + aria2_args.split() + ["-d", dst_dir, "-o", image_name, image_url]
             subprocess.run(command, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
 
-    elif 'github' in url or "huggingface.co" in url:
-        file_name = clean_url.split("/")[-1] if file_name is None else file_name
+    elif 'github' in url or 'huggingface.co' in url:
+        if file_name and '.' not in file_name:
+            file_extension = f"{clean_url.split('/')[-1].split('.', 1)[1]}"
+            file_name = f"{file_name}.{file_extension}"
+        if not file_name:
+            file_name = clean_url.split("/")[-1]
 
     """ Formatted info output """
     try:

files_cells/python/ru/auto_cleaner_ru.py

@@ -112,9 +112,9 @@ instruction_label = widgets.HTML('''
 auto_cleaner_widget = widgets.SelectMultiple(options=AutoCleaner_options, layout=widgets.Layout(width="auto")).add_class("custom-select-multiple_AC")
 output = widgets.Output().add_class("output_AC")
 
-execute_button = Button(description='Выполнить Очистку').add_class("button_execute_AC").add_class("button_AC")
+execute_button = widgets.Button(description='Выполнить Очистку').add_class("button_execute_AC").add_class("button_AC")
 execute_button.on_click(on_execute_button_press)
-clear_button = Button(description='Скрыть Виджет').add_class("button_clear_AC").add_class("button_AC")
+clear_button = widgets.Button(description='Скрыть Виджет').add_class("button_clear_AC").add_class("button_AC")
 clear_button.on_click(on_clear_button_press)
 
 storage_info = widgets.HTML(f'''
@@ -124,7 +124,7 @@ storage_info = widgets.HTML(f'''
 buttons = widgets.HBox([execute_button, clear_button])
 lower_information_panel = widgets.HBox([buttons, storage_info]).add_class("lower_information_panel_AC")
 
-container = VBox([instruction_label, widgets.HTML('<hr>'), auto_cleaner_widget, output, widgets.HTML('<hr>'), lower_information_panel]).add_class("container_AC")
+container = widgets.VBox([instruction_label, widgets.HTML('<hr>'), auto_cleaner_widget, output, widgets.HTML('<hr>'), lower_information_panel]).add_class("container_AC")
 
 display(container)
 

files_cells/python/ru/downloading_ru.py

@@ -85,7 +85,7 @@ if not os.path.exists(flag_file):
         subprocess.run(install_cmd, shell=True, capture_output=True)
 
     # Additional specific packages
-    with capture.capture_output()
+    with capture.capture_output():
         get_ipython().system('curl -s -OL https://github.com/DEX-1101/sd-webui-notebook/raw/main/res/new_tunnel --output-dir {root_path}')
         get_ipython().system('curl -s -Lo /usr/bin/cl https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-amd64 && chmod +x /usr/bin/cl')
         get_ipython().system('curl -sLO https://github.com/openziti/zrok/releases/download/v0.4.32/zrok_0.4.32_linux_amd64.tar.gz && tar -xzf zrok_0.4.32_linux_amd64.tar.gz -C /usr/bin && rm -f zrok_0.4.32_linux_amd64.tar.gz')
@@ -320,6 +320,12 @@ def CivitAi_API(url, file_name=None):
                 model_type = data['files'][1]['type']
                 model_name = data['files'][1]['name']
 
+        if file_name and '.' not in file_name:
+            file_extension = model_name.split('.')[-1]
+            model_name = f"{file_name}.{file_extension}"
+        elif file_name:
+            model_name = file_name
+
         return model_type, model_name
 
     def get_download_url(data, model_type):
@@ -342,7 +348,6 @@ def CivitAi_API(url, file_name=None):
         return None, None
 
     model_type, model_name = get_model_info(url, data)
-    model_name = file_name or model_name
     download_url = get_download_url(data, model_type)
     image_url, image_name = get_image_info(data, model_type, model_name)
 
@@ -411,8 +416,12 @@ def manual_download(url, dst_dir, file_name, prefix=None):
             command = ["aria2c"] + aria2_args.split() + ["-d", dst_dir, "-o", image_name, image_url]
             subprocess.run(command, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
 
-    elif 'github' in url or "huggingface.co" in url:
-        file_name = clean_url.split("/")[-1] if file_name is None else file_name
+    elif 'github' in url or 'huggingface.co' in url:
+        if file_name and '.' not in file_name:
+            file_extension = f"{clean_url.split('/')[-1].split('.', 1)[1]}"
+            file_name = f"{file_name}.{file_extension}"
+        if not file_name:
+            file_name = clean_url.split("/")[-1]
 
     """ Formatted info output """
     try: