Upload 2 files

app.py

@@ -5,10 +5,9 @@ import numpy as np
 # DiffuseCraft
 from dc import (infer, _infer, pass_result, get_diffusers_model_list, get_samplers,
     get_vaes, enable_model_recom_prompt, enable_diffusers_model_detail, extract_exif_data, esrgan_upscale, UPSCALER_KEYS,
-    preset_quality, preset_styles, process_style_prompt)
-from modutils import (get_t2i_model_info, get_all_lora_tupled_list, update_loras,
-    apply_lora_prompt, download_my_lora, search_civitai_lora, update_civitai_selection, get_civitai_tag, CIVITAI_SORT, CIVITAI_PERIOD,
-    select_civitai_lora, search_civitai_lora_json)
+    preset_quality, preset_styles, process_style_prompt, get_all_lora_tupled_list, update_loras, apply_lora_prompt,
+    download_my_lora, search_civitai_lora, update_civitai_selection, select_civitai_lora, search_civitai_lora_json)
+from modutils import get_t2i_model_info, get_civitai_tag, CIVITAI_SORT, CIVITAI_PERIOD, CIVITAI_BASE_MODEL
 # Translator
 from llmdolphin import (dolphin_respond_auto, dolphin_parse_simple,
     get_llm_formats, get_dolphin_model_format, get_dolphin_models,
@@ -142,7 +141,7 @@ with gr.Blocks(fill_width=True, elem_id="container", css=css, delete_cache=(60,
                             lora5_md = gr.Markdown(value="", visible=False)
                     with gr.Accordion("From URL", open=True, visible=True):
                         with gr.Row():
-                            lora_search_civitai_basemodel = gr.CheckboxGroup(label="Search LoRA for", choices=["Pony", "SD 1.5", "SDXL 1.0", "Flux.1 D", "Flux.1 S"], value=["Pony", "SDXL 1.0"])
+                            lora_search_civitai_basemodel = gr.CheckboxGroup(label="Search LoRA for", choices=CIVITAI_BASE_MODEL, value=["Pony", "SDXL 1.0"])
                             lora_search_civitai_sort = gr.Radio(label="Sort", choices=CIVITAI_SORT, value="Highest Rated")
                             lora_search_civitai_period = gr.Radio(label="Period", choices=CIVITAI_PERIOD, value="AllTime")
                         with gr.Row():

dc.py

@@ -783,7 +783,7 @@ from PIL import Image
 import random, json
 from modutils import (safe_float, escape_lora_basename, to_lora_key, to_lora_path,
     get_local_model_list, get_private_lora_model_lists, get_valid_lora_name,
-    get_valid_lora_path, get_valid_lora_wt, get_lora_info,
+    get_valid_lora_path, get_valid_lora_wt, get_lora_info, CIVITAI_SORT, CIVITAI_PERIOD,
     normalize_prompt_list, get_civitai_info, search_lora_on_civitai, translate_to_en)
 
 sd_gen = GuiSD()
@@ -893,35 +893,6 @@ def enable_diffusers_model_detail(is_enable: bool = False, model_name: str = "")
     return gr.update(value=is_enable), gr.update(value=new_value, choices=get_diffusers_model_list())
 
 
-def get_t2i_model_info(repo_id: str):
-    from huggingface_hub import HfApi
-    api = HfApi()
-    try:
-        if " " in repo_id or not api.repo_exists(repo_id): return ""
-        model = api.model_info(repo_id=repo_id)
-    except Exception as e:
-        print(f"Error: Failed to get {repo_id}'s info. {e}")
-        return ""
-    if model.private or model.gated: return ""
-    tags = model.tags
-    info = []
-    url = f"https://huggingface.co/{repo_id}/"
-    if not 'diffusers' in tags: return ""
-    if 'diffusers:FluxPipeline' in tags:
-        info.append("FLUX.1")
-    elif 'diffusers:StableDiffusionXLPipeline' in tags:
-        info.append("SDXL")
-    elif 'diffusers:StableDiffusionPipeline' in tags:
-        info.append("SD1.5")
-    if model.card_data and model.card_data.tags:
-        info.extend(list_sub(model.card_data.tags, ['text-to-image', 'stable-diffusion', 'stable-diffusion-api', 'safetensors', 'stable-diffusion-xl']))
-    info.append(f"DLs: {model.downloads}")
-    info.append(f"likes: {model.likes}")
-    info.append(model.last_modified.strftime("lastmod: %Y-%m-%d"))
-    md = f"Model Info: {', '.join(info)}, [Model Repo]({url})"
-    return gr.update(value=md)
-
-
 def load_model_prompt_dict():
     import json
     dict = {}
@@ -1209,30 +1180,46 @@ def update_loras(prompt, lora1, lora1_wt, lora2, lora2_wt, lora3, lora3_wt, lora
      gr.update(value=tag5, label=label5, visible=on5), gr.update(visible=on5), gr.update(value=md5, visible=on5)
 
 
-def search_civitai_lora(query, base_model, sort="Highest Rated", period="AllTime", tag=""):
-    global civitai_lora_last_results
-    items = search_lora_on_civitai(query, base_model, 100, sort, period, tag)
+def search_civitai_lora(query, base_model=[], sort=CIVITAI_SORT[0], period=CIVITAI_PERIOD[0], tag="", user="", gallery=[]):
+    global civitai_last_results, civitai_last_choices, civitai_last_gallery
+    civitai_last_choices = [("", "")]
+    civitai_last_gallery = []
+    civitai_last_results = {}
+    items = search_lora_on_civitai(query, base_model, 100, sort, period, tag, user)
     if not items: return gr.update(choices=[("", "")], value="", visible=False),\
-          gr.update(value="", visible=False), gr.update(visible=True), gr.update(visible=True)
-    civitai_lora_last_results = {}
+          gr.update(value="", visible=False), gr.update(visible=True), gr.update(visible=True), gr.update(visible=True)
+    civitai_last_results = {}
     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'])})"
         value = item['dl_url']
         choices.append((name, value))
-        civitai_lora_last_results[value] = item
+        gallery.append((item['img_url'], name))
+        civitai_last_results[value] = item
     if not choices: return gr.update(choices=[("", "")], value="", visible=False),\
-          gr.update(value="", visible=False), gr.update(visible=True), gr.update(visible=True)
-    result = civitai_lora_last_results.get(choices[0][1], "None")
+          gr.update(value="", visible=False), gr.update(visible=True), gr.update(visible=True), gr.update(visible=True)
+    civitai_last_choices = choices
+    civitai_last_gallery = gallery
+    result = civitai_last_results.get(choices[0][1], "None")
     md = result['md'] if result else ""
     return gr.update(choices=choices, value=choices[0][1], visible=True), gr.update(value=md, visible=True),\
-          gr.update(visible=True), gr.update(visible=True)
+          gr.update(visible=True), gr.update(visible=True), gr.update(value=gallery)
+
+
+def update_civitai_selection(evt: gr.SelectData):
+    try:
+        selected_index = evt.index
+        selected = civitai_last_choices[selected_index][1]
+        return gr.update(value=selected)
+    except Exception:
+        return gr.update(visible=True)
 
 
 def select_civitai_lora(search_result):
     if not "http" in search_result: return gr.update(value=""), gr.update(value="None", visible=True)
-    result = civitai_lora_last_results.get(search_result, "None")
+    result = civitai_last_results.get(search_result, "None")
     md = result['md'] if result else ""
     return gr.update(value=search_result), gr.update(value=md, visible=True)