Upload 3 files

app.py

@@ -1,6 +1,7 @@
 import gradio as gr
 from civitai_to_hf import (search_civitai, download_civitai, select_civitai_item, add_civitai_item, get_civitai_tag, select_civitai_all_item,
-                           update_civitai_selection, CIVITAI_TYPE, CIVITAI_BASEMODEL, CIVITAI_SORT, CIVITAI_PERIOD)
+                           update_civitai_selection, update_civitai_checkbox, from_civitai_checkbox,
+                           CIVITAI_TYPE, CIVITAI_BASEMODEL, CIVITAI_SORT, CIVITAI_PERIOD)
 
 css = """
 .title { font-size: 3em; align-items: center; text-align: center; }
@@ -34,8 +35,11 @@ with gr.Blocks(theme="NoCrypt/miku@>=1.2.2", fill_width=True, css=css, delete_ca
                     with gr.Column(scale=9):
                         with gr.Accordion("Select from Gallery", open=False):
                             search_civitai_gallery = gr.Gallery([], label="Results", allow_preview=False, columns=5, elem_id="gallery", show_share_button=False, interactive=False)
+                        with gr.Accordion("Select by Checkbox", open=False):
+                            search_civitai_result_checkbox = gr.CheckboxGroup(label="", choices=[], value=[])
                         search_civitai_result = gr.Dropdown(label="Search Results", choices=[("", "")], value=[],
                                                             allow_custom_value=True, visible=True, multiselect=True)
+                        search_civitai_result_info = gr.Markdown("Search result.", elem_classes="info")
                     with gr.Column(scale=1):
                         search_civitai_add = gr.Button("Add to download URLs")
                         search_civitai_select_all = gr.Button("Select All", variant="secondary", size="sm")
@@ -70,11 +74,13 @@ with gr.Blocks(theme="NoCrypt/miku@>=1.2.2", fill_width=True, css=css, delete_ca
         fn=search_civitai,
         inputs=[search_civitai_query, search_civitai_type, search_civitai_basemodel, search_civitai_sort,
                 search_civitai_period, search_civitai_tag, search_civitai_user, search_civitai_limit, search_civitai_page, search_civitai_gallery],
-        outputs=[search_civitai_result, search_civitai_desc, search_civitai_submit, search_civitai_query, search_civitai_gallery],
+        outputs=[search_civitai_result, search_civitai_desc, search_civitai_submit, search_civitai_query, search_civitai_gallery, search_civitai_result_checkbox, search_civitai_result_info],
         queue=True,
         show_api=False,
     )
-    search_civitai_result.change(select_civitai_item, [search_civitai_result], [search_civitai_desc, search_civitai_json], queue=False, show_api=False)
+    search_civitai_result.change(select_civitai_item, [search_civitai_result], [search_civitai_desc, search_civitai_json], queue=False, show_api=False)\
+    .success(update_civitai_checkbox, [search_civitai_result], [search_civitai_result_checkbox], queue=True, show_api=False)
+    search_civitai_result_checkbox.select(from_civitai_checkbox, [search_civitai_result_checkbox], [search_civitai_result], queue=False, show_api=False)
     search_civitai_add.click(add_civitai_item, [search_civitai_result, dl_url], [dl_url], queue=False, show_api=False)
     search_civitai_select_all.click(select_civitai_all_item, [search_civitai_select_all], [search_civitai_select_all, search_civitai_result], queue=False, show_api=False)
     search_civitai_gallery.select(update_civitai_selection, [search_civitai_result], [search_civitai_result], queue=False, show_api=False)

civitai_to_hf.py

@@ -140,7 +140,7 @@ def download_civitai(dl_url, civitai_key, hf_token, urls,
 
 
 CIVITAI_TYPE = ["Checkpoint", "TextualInversion", "Hypernetwork", "AestheticGradient", "LORA", "Controlnet", "Poses"]
-CIVITAI_BASEMODEL = ["Pony", "Illustrious", "SDXL 1.0", "SD 1.5", "Flux.1 D", "Flux.1 S"]
+CIVITAI_BASEMODEL = ["Pony", "Illustrious", "SDXL 1.0", "SD 1.5", "Flux.1 D", "Flux.1 S", "SD 3.5"]
 CIVITAI_SORT = ["Highest Rated", "Most Downloaded", "Newest"]
 CIVITAI_PERIOD = ["AllTime", "Year", "Month", "Week", "Day"]
 
@@ -200,27 +200,30 @@ def search_civitai(query, types, base_model=[], sort=CIVITAI_SORT[0], period=CIV
     civitai_last_choices = [("", "")]
     civitai_last_gallery = []
     civitai_last_results = {}
+    results_info = "No item found."
     items = search_on_civitai(query, types, base_model, int(limit), sort, period, tag, user, int(page))
     if not items: return gr.update(choices=[("", "")], value=[], visible=True),\
-          gr.update(value="", visible=False), gr.update(visible=True), gr.update(visible=True), gr.update(visible=True)
+          gr.update(value="", visible=False), gr.update(), gr.update(), gr.update(), gr.update(), results_info
     choices = []
     gallery = []
     for item in items:
         base_model_name = "Pony🐴" if item['base_model'] == "Pony" else item['base_model']
-        name = f"{item['name']} (for {base_model_name} / By: {item['creator']} / Tags: {', '.join(item['tags'])})"
+        #name = f"{item['name']} (for {base_model_name} / By: {item['creator']} / Tags: {', '.join(item['tags'])})"
+        name = f"{item['name']} (for {base_model_name} / By: {item['creator']})"
         value = item['dl_url']
         choices.append((name, value))
         gallery.append((item['img_url'], name))
         civitai_last_results[value] = item
     if not choices: return gr.update(choices=[("", "")], value=[], visible=True),\
-          gr.update(value="", visible=False), gr.update(visible=True), gr.update(visible=True), gr.update(visible=True)
+          gr.update(value="", visible=False), gr.update(), gr.update(), gr.update(), gr.update(), results_info
     #result = civitai_last_results.get(choices[0][1], "None") # for debug
     #md = result['md'] if result else "" # for debug
     md = ""
     civitai_last_choices = choices
     civitai_last_gallery = gallery
+    results_info = f"{int(len(choices))} items found."
     return gr.update(choices=choices, value=[], visible=True), gr.update(value=md, visible=True),\
-          gr.update(visible=True), gr.update(visible=True), gr.update(value=gallery)
+          gr.update(), gr.update(), gr.update(value=gallery), gr.update(choices=choices, value=[]), results_info
 
 
 def get_civitai_json(dl_url: str, is_html: bool=False, image_baseurl: str=""):
@@ -321,5 +324,12 @@ def update_civitai_selection(evt: gr.SelectData, value: list[str]):
         selected = list_uniq([v for v in value if v != ""] + [civitai_last_choices[selected_index][1]])
         return gr.update(value=selected)
     except Exception:
-        return gr.update(visible=True)
+        return gr.update()
 
+
+def update_civitai_checkbox(selected: list[str]):
+    return gr.update(value=selected)
+
+
+def from_civitai_checkbox(selected: list[str]):
+    return gr.update(value=selected)