Upload 4 files

app.py

@@ -157,34 +157,6 @@ UPSCALER_DICT_GUI = {
 
 UPSCALER_KEYS = list(UPSCALER_DICT_GUI.keys())
 
-def download_things(directory, url, hf_token="", civitai_api_key=""):
-    url = url.strip()
-    if "drive.google.com" in url:
-        original_dir = os.getcwd()
-        os.chdir(directory)
-        os.system(f"gdown --fuzzy {url}")
-        os.chdir(original_dir)
-    elif "huggingface.co" in url:
-        url = url.replace("?download=true", "")
-        # url = urllib.parse.quote(url, safe=':/')  # fix encoding
-        if "/blob/" in url:
-            url = url.replace("/blob/", "/resolve/")
-        user_header = f'"Authorization: Bearer {hf_token}"'
-        if hf_token:
-            os.system(f"aria2c --console-log-level=error --summary-interval=10 --header={user_header} -c -x 16 -k 1M -s 16 {url} -d {directory}  -o {url.split('/')[-1]}")
-        else:
-            os.system(f"aria2c --optimize-concurrent-downloads --console-log-level=error --summary-interval=10 -c -x 16 -k 1M -s 16 {url} -d {directory}  -o {url.split('/')[-1]}")
-    elif "civitai.com" in url:
-        if "?" in url:
-            url = url.split("?")[0]
-        if civitai_api_key:
-            url = url + f"?token={civitai_api_key}"
-            os.system(f"aria2c --console-log-level=error --summary-interval=10 -c -x 16 -k 1M -s 16 -d {directory} {url}")
-        else:
-            print("\033[91mYou need an API key to download Civitai models.\033[0m")
-    else:
-        os.system(f"aria2c --console-log-level=error --summary-interval=10 -c -x 16 -k 1M -s 16 -d {directory} {url}")
-
 def get_model_list(directory_path):
     model_list = []
     valid_extensions = {'.ckpt', '.pt', '.pth', '.safetensors', '.bin'}
@@ -202,9 +174,10 @@ def get_model_list(directory_path):
 from modutils import (list_uniq, download_private_repo, get_model_id_list, get_tupled_embed_list,
     get_lora_model_list, get_all_lora_tupled_list, update_loras, apply_lora_prompt, set_prompt_loras,
     get_my_lora, upload_file_lora, move_file_lora, search_civitai_lora, select_civitai_lora,
+    update_civitai_selection, get_civitai_tag, CIVITAI_SORT, CIVITAI_PERIOD, CIVITAI_BASEMODEL,
     set_textual_inversion_prompt, get_model_pipeline, change_interface_mode, get_t2i_model_info,
     get_tupled_model_list, save_gallery_images, set_optimization, set_sampler_settings,
-    set_quick_presets, process_style_prompt, optimization_list, save_images,
+    set_quick_presets, process_style_prompt, optimization_list, save_images, download_things,
     preset_styles, preset_quality, preset_sampler_setting, translate_to_en)
 from env import (HF_TOKEN, CIVITAI_API_KEY, HF_LORA_ESSENTIAL_PRIVATE_REPO, HF_VAE_PRIVATE_REPO,
     HF_SDXL_EMBEDS_NEGATIVE_PRIVATE_REPO, HF_SDXL_EMBEDS_POSITIVE_PRIVATE_REPO,
@@ -880,15 +853,14 @@ CSS ="""
 #gallery { flex-grow:1; !important; }
 .lora { min-width:480px; !important; }
 #model-info { text-align:center; }
+.title { font-size: 3em; align-items: center; text-align: center; }
+.info { align-items: center; text-align: center; }
+.desc [src$='#float'] { float: right; margin: 20px; }
 """
 
 with gr.Blocks(theme='NoCrypt/miku@>=1.2.2', elem_id="main", fill_width=True, css=CSS, delete_cache=(60, 3600)) as app:
-    gr.Markdown("# 🧩 DiffuseCraft Mod")
-    gr.Markdown(
-        f"""
-            This space is a modification of [r3gm's DiffuseCraft](https://huggingface.co/spaces/r3gm/DiffuseCraft).
-            """
-    )
+    gr.Markdown("# 🧩 DiffuseCraft Mod", elem_classes="title")
+    gr.Markdown("This space is a modification of [r3gm's DiffuseCraft](https://huggingface.co/spaces/r3gm/DiffuseCraft).", elem_classes="info")
     with gr.Column():
         with gr.Tab("Generation"):
             with gr.Row():
@@ -898,7 +870,7 @@ with gr.Blocks(theme='NoCrypt/miku@>=1.2.2', elem_id="main", fill_width=True, cs
                         task_gui = gr.Dropdown(label="Task", choices=SDXL_TASK, value=TASK_MODEL_LIST[0])
                         with gr.Group():
                             model_name_gui = gr.Dropdown(label="Model", info="You can enter a huggingface model repo_id to want to use.", choices=get_tupled_model_list(model_list), value="votepurchase/animagine-xl-3.1", allow_custom_value=True)
-                            model_info_gui = gr.Markdown(elem_id="model-info")
+                            model_info_gui = gr.Markdown(elem_classes="info")
                         with gr.Row():
                             quick_model_type_gui = gr.Radio(label="Model Type", choices=["None", "Auto", "Animagine", "Pony"], value="Auto", interactive=True)
                             quick_genre_gui = gr.Radio(label="Genre", choices=["Anime", "Photo"], value="Anime", interactive=True)
@@ -1146,14 +1118,17 @@ with gr.Blocks(theme='NoCrypt/miku@>=1.2.2', elem_id="main", fill_width=True, cs
                                     lora5_desc_gui = gr.Markdown(value="", visible=False)
                         with gr.Accordion("From URL", open=True, visible=True):
                             with gr.Row():
-                                search_civitai_basemodel_lora = 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"])
-                                search_civitai_sort_lora = gr.Radio(label="Sort", choices=["Highest Rated", "Most Downloaded", "Newest"], value="Highest Rated")
-                                search_civitai_period_lora = gr.Radio(label="Period", choices=["AllTime", "Year", "Month", "Week", "Day"], value="AllTime")
+                                search_civitai_basemodel_lora = gr.CheckboxGroup(label="Search LoRA for", choices=CIVITAI_BASEMODEL, value=["Pony", "SDXL 1.0"])
+                                search_civitai_sort_lora = gr.Radio(label="Sort", choices=CIVITAI_SORT, value="Highest Rated")
+                                search_civitai_period_lora = gr.Radio(label="Period", choices=CIVITAI_PERIOD, value="AllTime")
                             with gr.Row():
                                 search_civitai_query_lora = gr.Textbox(label="Query", placeholder="oomuro sakurako...", lines=1)
-                                search_civitai_tag_lora = gr.Textbox(label="Tag", lines=1)
-                                search_civitai_button_lora = gr.Button("Search on Civitai")
-                            search_civitai_desc_lora = gr.Markdown(value="", visible=False)
+                                search_civitai_tag_lora = gr.Dropdown(label="Tag", choices=get_civitai_tag(), value=get_civitai_tag()[0], allow_custom_value=True)
+                                search_civitai_user_lora = gr.Textbox(label="Username", lines=1)
+                            search_civitai_button_lora = gr.Button("Search on Civitai")
+                            search_civitai_desc_lora = gr.Markdown(value="", visible=False, elem_classes="desc")
+                            with gr.Accordion("Select from Gallery", open=False):
+                                search_civitai_gallery_lora = gr.Gallery([], label="Results", allow_preview=False, columns=5, show_share_button=False, interactive=False)
                             search_civitai_result_lora = gr.Dropdown(label="Search Results", choices=[("", "")], value="", allow_custom_value=True, visible=False)
                             text_lora = gr.Textbox(label="LoRA URL", placeholder="https://civitai.com/api/download/models/28907", lines=1)
                             button_lora = gr.Button("Get and update lists of LoRAs")
@@ -1578,14 +1553,16 @@ with gr.Blocks(theme='NoCrypt/miku@>=1.2.2', elem_id="main", fill_width=True, cs
         lora4_copy_gui.click(apply_lora_prompt, [prompt_gui, lora4_info_gui], [prompt_gui], queue=False)
         lora5_copy_gui.click(apply_lora_prompt, [prompt_gui, lora5_info_gui], [prompt_gui], queue=False)
         gr.on(
-            triggers=[search_civitai_button_lora.click, search_civitai_query_lora.submit, search_civitai_tag_lora.submit],
+            triggers=[search_civitai_button_lora.click, search_civitai_query_lora.submit],
             fn=search_civitai_lora,
-            inputs=[search_civitai_query_lora, search_civitai_basemodel_lora, search_civitai_sort_lora, search_civitai_period_lora, search_civitai_tag_lora],
-            outputs=[search_civitai_result_lora, search_civitai_desc_lora, search_civitai_button_lora, search_civitai_query_lora],
+            inputs=[search_civitai_query_lora, search_civitai_basemodel_lora, search_civitai_sort_lora, search_civitai_period_lora,
+                    search_civitai_tag_lora, search_civitai_user_lora, search_civitai_gallery_lora],
+            outputs=[search_civitai_result_lora, search_civitai_desc_lora, search_civitai_button_lora, search_civitai_query_lora, search_civitai_gallery_lora],
             queue=True,
             scroll_to_output=True,
         )
         search_civitai_result_lora.change(select_civitai_lora, [search_civitai_result_lora], [text_lora, search_civitai_desc_lora], queue=False, scroll_to_output=True)
+        search_civitai_gallery_lora.select(update_civitai_selection, None, [search_civitai_result_lora], queue=False, show_api=False)
         button_lora.click(get_my_lora, [text_lora], [lora1_gui, lora2_gui, lora3_gui, lora4_gui, lora5_gui], scroll_to_output=True)
         upload_button_lora.upload(upload_file_lora, [upload_button_lora], [file_output_lora, upload_button_lora]).success(
             move_file_lora, [file_output_lora], [lora1_gui, lora2_gui, lora3_gui, lora4_gui, lora5_gui], scroll_to_output=True)

lora_dict.json

@@ -4381,6 +4381,13 @@
     "https://civitai.com/models/577378",
     "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/459bd20d-a9d6-4a0b-8947-7dcebc061c0f/width=450/19781986.jpeg"
   ],
+  "genbaneko_v4_illustrious_uo_1024-000040": [
+    "genbaneko / cat, headwear, hat, grey headwear, baseball cap, / speech bubble, speech text,",
+    "SDXL 1.0",
+    "Shigotoneko(Genbaneko) Style - illustrious | \u4ed5\u4e8b\u732b\uff08\u73fe\u5834\u732b\uff09",
+    "https://civitai.com/models/859355",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/0f145509-d867-418c-b545-0c0e49275f48/width=450/34849585.jpeg"
+  ],
   "genshin_v4": [
     "hina_(genshin_impact) / sethos_(genshin_impact) / raiden_shogun_mitake",
     "Pony",

modutils.py

@@ -1,10 +1,17 @@
 import spaces
 import json
 import gradio as gr
-from huggingface_hub import HfApi
 import os
+import re
 from pathlib import Path
 from PIL import Image
+import shutil
+import requests
+from requests.adapters import HTTPAdapter
+from urllib3.util import Retry
+import urllib.parse
+import pandas as pd
+from huggingface_hub import HfApi, HfFolder, hf_hub_download, snapshot_download
 
 
 from env import (HF_LORA_PRIVATE_REPOS1, HF_LORA_PRIVATE_REPOS2,
@@ -36,7 +43,6 @@ def list_sub(a, b):
 
 
 def is_repo_name(s):
-    import re
     return re.fullmatch(r'^[^/]+?/[^/]+?$', s)
 
 
@@ -61,6 +67,50 @@ def get_local_model_list(dir_path):
     return model_list
 
 
+def get_token():
+    try:
+        token = HfFolder.get_token()
+    except Exception:
+        token = ""
+    return token
+
+
+def set_token(token):
+    try:
+        HfFolder.save_token(token)
+    except Exception:
+        print(f"Error: Failed to save token.")
+
+
+set_token(HF_TOKEN)
+
+
+def split_hf_url(url: str):
+    try:
+        s = list(re.findall(r'^(?:https?://huggingface.co/)(?:(datasets)/)?(.+?/.+?)/\w+?/.+?/(?:(.+)/)?(.+?.\w+)(?:\?download=true)?$', url)[0])
+        if len(s) < 4: return "", "", "", ""
+        repo_id = s[1]
+        repo_type = "dataset" if s[0] == "datasets" else "model"
+        subfolder = urllib.parse.unquote(s[2]) if s[2] else None
+        filename = urllib.parse.unquote(s[3])
+        return repo_id, filename, subfolder, repo_type
+    except Exception as e:
+        print(e)
+
+
+def download_hf_file(directory, url, progress=gr.Progress(track_tqdm=True)):
+    hf_token = get_token()
+    repo_id, filename, subfolder, repo_type = split_hf_url(url)
+    try:
+        print(f"Downloading {url} to {directory}")
+        if subfolder is not None: path = hf_hub_download(repo_id=repo_id, filename=filename, subfolder=subfolder, repo_type=repo_type, local_dir=directory, token=hf_token)
+        else: path = hf_hub_download(repo_id=repo_id, filename=filename, repo_type=repo_type, local_dir=directory, token=hf_token)
+        return path
+    except Exception as e:
+        print(f"Failed to download: {e}")
+        return None
+
+
 def download_things(directory, url, hf_token="", civitai_api_key=""):
     url = url.strip()
     if "drive.google.com" in url:
@@ -73,11 +123,7 @@ def download_things(directory, url, hf_token="", civitai_api_key=""):
         # url = urllib.parse.quote(url, safe=':/')  # fix encoding
         if "/blob/" in url:
             url = url.replace("/blob/", "/resolve/")
-        user_header = f'"Authorization: Bearer {hf_token}"'
-        if hf_token:
-            os.system(f"aria2c --console-log-level=error --summary-interval=10 --header={user_header} -c -x 16 -k 1M -s 16 {url} -d {directory}  -o {url.split('/')[-1]}")
-        else:
-            os.system(f"aria2c --optimize-concurrent-downloads --console-log-level=error --summary-interval=10 -c -x 16 -k 1M -s 16 {url} -d {directory}  -o {url.split('/')[-1]}")
+        download_hf_file(directory, url)
     elif "civitai.com" in url:
         if "?" in url:
             url = url.split("?")[0]
@@ -90,6 +136,33 @@ def download_things(directory, url, hf_token="", civitai_api_key=""):
         os.system(f"aria2c --console-log-level=error --summary-interval=10 -c -x 16 -k 1M -s 16 -d {directory} {url}")
 
 
+def get_download_file(temp_dir, url, civitai_key="", progress=gr.Progress(track_tqdm=True)):
+    if not "http" in url and is_repo_name(url) and not Path(url).exists():
+        print(f"Use HF Repo: {url}")
+        new_file = url
+    elif not "http" in url and Path(url).exists():
+        print(f"Use local file: {url}")
+        new_file = url
+    elif Path(f"{temp_dir}/{url.split('/')[-1]}").exists():
+        print(f"File to download alreday exists: {url}")
+        new_file = f"{temp_dir}/{url.split('/')[-1]}"
+    else:
+        print(f"Start downloading: {url}")
+        before = get_local_model_list(temp_dir)
+        try:
+            download_things(temp_dir, url.strip(), HF_TOKEN, civitai_key)
+        except Exception:
+            print(f"Download failed: {url}")
+            return ""
+        after = get_local_model_list(temp_dir)
+        new_file = list_sub(after, before)[0] if list_sub(after, before) else ""
+    if not new_file:
+        print(f"Download failed: {url}")
+        return ""
+    print(f"Download completed: {url}")
+    return new_file
+
+
 def escape_lora_basename(basename: str):
     return basename.replace(".", "_").replace(" ", "_").replace(",", "")
 
@@ -157,7 +230,6 @@ def save_gallery_images(images, progress=gr.Progress(track_tqdm=True)):
 
 
 def download_private_repo(repo_id, dir_path, is_replace):
-    from huggingface_hub import snapshot_download
     if not hf_read_token: return
     try:
         snapshot_download(repo_id=repo_id, local_dir=dir_path, allow_patterns=['*.ckpt', '*.pt', '*.pth', '*.safetensors', '*.bin'], use_auth_token=hf_read_token)
@@ -196,7 +268,6 @@ def get_private_model_list(repo_id, dir_path):
 
 
 def download_private_file(repo_id, path, is_replace):
-    from huggingface_hub import hf_hub_download
     file = Path(path)
     newpath = Path(f'{file.parent.name}/{escape_lora_basename(file.stem)}{file.suffix}') if is_replace else file
     if not hf_read_token or newpath.exists(): return
@@ -320,7 +391,9 @@ except Exception as e:
 loras_dict = {"None": ["", "", "", "", ""], "": ["", "", "", "", ""]} | private_lora_dict.copy()
 civitai_not_exists_list = []
 loras_url_to_path_dict = {} # {"URL to download": "local filepath", ...}
-civitai_lora_last_results = {}  # {"URL to download": {search results}, ...}
+civitai_last_results = {}  # {"URL to download": {search results}, ...}
+civitai_last_choices = [("", "")]
+civitai_last_gallery = []
 all_lora_list = []
 
 
@@ -344,9 +417,6 @@ private_lora_model_list = get_private_lora_model_lists()
 
 def get_civitai_info(path):
     global civitai_not_exists_list
-    import requests
-    from urllib3.util import Retry
-    from requests.adapters import HTTPAdapter
     if path in set(civitai_not_exists_list): return ["", "", "", "", ""]
     if not Path(path).exists(): return None
     user_agent = get_user_agent()
@@ -381,7 +451,7 @@ def get_civitai_info(path):
 
 
 def get_lora_model_list():
-    loras = list_uniq(get_private_lora_model_lists() + get_local_model_list(directory_loras) + DIFFUSERS_FORMAT_LORAS)
+    loras = list_uniq(get_private_lora_model_lists() + DIFFUSERS_FORMAT_LORAS + get_local_model_list(directory_loras))
     loras.insert(0, "None")
     loras.insert(0, "")
     return loras
@@ -456,7 +526,6 @@ def download_lora(dl_urls: str):
 
 
 def copy_lora(path: str, new_path: str):
-    import shutil
     if path == new_path: return new_path
     cpath = Path(path)
     npath = Path(new_path)
@@ -520,7 +589,6 @@ def get_valid_lora_path(query: str):
 
 
 def get_valid_lora_wt(prompt: str, lora_path: str, lora_wt: float):
-    import re
     wt = lora_wt
     result = re.findall(f'<lora:{to_lora_key(lora_path)}:(.+?)>', prompt)
     if not result: return wt
@@ -529,7 +597,6 @@ def get_valid_lora_wt(prompt: str, lora_path: str, lora_wt: float):
 
 
 def set_prompt_loras(prompt, prompt_syntax, model_name, lora1, lora1_wt, lora2, lora2_wt, lora3, lora3_wt, lora4, lora4_wt, lora5, lora5_wt):
-    import re
     if not "Classic" in str(prompt_syntax):  return lora1, lora1_wt, lora2, lora2_wt, lora3, lora3_wt, lora4, lora4_wt, lora5, lora5_wt
     lora1 = get_valid_lora_name(lora1, model_name)
     lora2 = get_valid_lora_name(lora2, model_name)
@@ -649,7 +716,6 @@ def apply_lora_prompt(prompt: str = "", lora_info: str = ""):
 
 
 def update_loras(prompt, prompt_syntax, lora1, lora1_wt, lora2, lora2_wt, lora3, lora3_wt, lora4, lora4_wt, lora5, lora5_wt):
-    import re
     on1, label1, tag1, md1 = get_lora_info(lora1)
     on2, label2, tag2, md2 = get_lora_info(lora2)
     on3, label3, tag3, md3 = get_lora_info(lora3)
@@ -696,7 +762,6 @@ def update_loras(prompt, prompt_syntax, lora1, lora1_wt, lora2, lora2_wt, lora3,
 
 
 def get_my_lora(link_url):
-    from pathlib import Path
     before = get_local_model_list(directory_loras)
     for url in [url.strip() for url in link_url.split(',')]:
         if not Path(f"{directory_loras}/{url.split('/')[-1]}").exists():
@@ -733,7 +798,6 @@ def upload_file_lora(files, progress=gr.Progress(track_tqdm=True)):
 
 
 def move_file_lora(filepaths):
-    import shutil
     for file in filepaths:
         path = Path(shutil.move(Path(file).resolve(), Path(f"./{directory_loras}").resolve()))
         newpath = Path(f'{path.parent.name}/{escape_lora_basename(path.stem)}{path.suffix}')
@@ -756,11 +820,13 @@ def move_file_lora(filepaths):
     )
 
 
+CIVITAI_SORT = ["Highest Rated", "Most Downloaded", "Newest"]
+CIVITAI_PERIOD = ["AllTime", "Year", "Month", "Week", "Day"]
+CIVITAI_BASEMODEL = ["Pony", "SD 1.5", "SDXL 1.0", "Flux.1 D", "Flux.1 S"]
+
+
 def get_civitai_info(path):
     global civitai_not_exists_list, loras_url_to_path_dict
-    import requests
-    from requests.adapters import HTTPAdapter
-    from urllib3.util import Retry
     default = ["", "", "", "", ""]
     if path in set(civitai_not_exists_list): return default
     if not Path(path).exists(): return None
@@ -798,16 +864,14 @@ def get_civitai_info(path):
 
 
 def search_lora_on_civitai(query: str, allow_model: list[str] = ["Pony", "SDXL 1.0"], limit: int = 100,
-                           sort: str = "Highest Rated", period: str = "AllTime", tag: str = ""):
-    import requests
-    from requests.adapters import HTTPAdapter
-    from urllib3.util import Retry
+                           sort: str = "Highest Rated", period: str = "AllTime", tag: str = "", user: str = "", page: int = 1):
     user_agent = get_user_agent()
     headers = {'User-Agent': user_agent, 'content-type': 'application/json'}
     base_url = 'https://civitai.com/api/v1/models'
-    params = {'types': ['LORA'], 'sort': sort, 'period': period, 'limit': limit, 'nsfw': 'true'}
+    params = {'types': ['LORA'], 'sort': sort, 'period': period, 'limit': limit, 'page': int(page), 'nsfw': 'true'}
     if query: params["query"] = query
     if tag: params["tag"] = tag
+    if user: params["username"] = user
     session = requests.Session()
     retries = Retry(total=5, backoff_factor=1, status_forcelist=[500, 502, 503, 504])
     session.mount("https://", HTTPAdapter(max_retries=retries))
@@ -824,46 +888,129 @@ def search_lora_on_civitai(query: str, allow_model: list[str] = ["Pony", "SDXL 1
         for j in json['items']:
             for model in j['modelVersions']:
                 item = {}
-                if model['baseModel'] not in set(allow_model): continue
+                if len(allow_model) != 0 and model['baseModel'] not in set(allow_model): continue
                 item['name'] = j['name']
-                item['creator'] = j['creator']['username']
-                item['tags'] = j['tags']
-                item['model_name'] = model['name']
-                item['base_model'] = model['baseModel']
+                item['creator'] = j['creator']['username'] if 'creator' in j.keys() and 'username' in j['creator'].keys() else ""
+                item['tags'] = j['tags'] if 'tags' in j.keys() else []
+                item['model_name'] = model['name'] if 'name' in model.keys() else ""
+                item['base_model'] = model['baseModel'] if 'baseModel' in model.keys() else ""
+                item['description'] = model['description'] if 'description' in model.keys() else ""
                 item['dl_url'] = model['downloadUrl']
-                item['md'] = f'<img src="{model["images"][0]["url"]}" alt="thumbnail" width="150" height="240"><br>[LoRA Model URL](https://civitai.com/models/{j["id"]})'
+                item['md'] = ""
+                if 'images' in model.keys() and len(model["images"]) != 0:
+                    item['img_url'] = model["images"][0]["url"]
+                    item['md'] += f'<img src="{model["images"][0]["url"]}#float" alt="thumbnail" width="150" height="240"><br>'
+                else: item['img_url'] = "/home/user/app/null.png"
+                item['md'] += f'''Model URL: [https://civitai.com/models/{j["id"]}](https://civitai.com/models/{j["id"]})<br>Model Name: {item["name"]}<br>
+                    Creator: {item["creator"]}<br>Tags: {", ".join(item["tags"])}<br>Base Model: {item["base_model"]}<br>Description: {item["description"]}'''
                 items.append(item)
         return items
 
 
-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)
 
 
+def download_my_lora_flux(dl_urls: str, lora):
+    path = download_lora(dl_urls)
+    if path: lora = path
+    choices = get_all_lora_tupled_list()
+    return gr.update(value=lora, choices=choices)
+
+
+def apply_lora_prompt_flux(lora_info: str):
+    if lora_info == "None": return ""
+    lora_tag = lora_info.replace("/",",")
+    lora_tags = lora_tag.split(",") if str(lora_info) != "None" else []
+    lora_prompts = normalize_prompt_list(lora_tags)
+    prompt = ", ".join(list_uniq(lora_prompts))
+    return prompt
+
+
+def update_loras_flux(prompt, lora, lora_wt):
+    on, label, tag, md = get_lora_info(lora)
+    choices = get_all_lora_tupled_list()
+    return gr.update(value=prompt), gr.update(value=lora, choices=choices), gr.update(value=lora_wt),\
+     gr.update(value=tag, label=label, visible=on), gr.update(value=md, visible=on)
+
+
+def search_civitai_lora_json(query, base_model):
+    results = {}
+    items = search_lora_on_civitai(query, base_model)
+    if not items: return gr.update(value=results)
+    for item in items:
+        results[item['dl_url']] = item
+    return gr.update(value=results)
+
+
+def get_civitai_tag():
+    default = [""]
+    user_agent = get_user_agent()
+    headers = {'User-Agent': user_agent, 'content-type': 'application/json'}
+    base_url = 'https://civitai.com/api/v1/tags'
+    params = {'limit': 200}
+    session = requests.Session()
+    retries = Retry(total=5, backoff_factor=1, status_forcelist=[500, 502, 503, 504])
+    session.mount("https://", HTTPAdapter(max_retries=retries))
+    url = base_url
+    try:
+        r = session.get(url, params=params, headers=headers, stream=True, timeout=(3.0, 15))
+        if not r.ok: return default
+        j = dict(r.json()).copy()
+        if "items" not in j.keys(): return default
+        items = []
+        for item in j["items"]:
+            items.append([str(item.get("name", "")), int(item.get("modelCount", 0))])
+        df = pd.DataFrame(items)
+        df.sort_values(1, ascending=False)
+        tags = df.values.tolist()
+        tags = [""] + [l[0] for l in tags]
+        return tags
+    except Exception as e:
+        print(e)
+        return default
+
+
 LORA_BASE_MODEL_DICT = {
     "diffusers:StableDiffusionPipeline": ["SD 1.5"],
     "diffusers:StableDiffusionXLPipeline": ["Pony", "SDXL 1.0"],
@@ -1108,15 +1255,6 @@ preset_quality = {k["name"]: (k["prompt"], k["negative_prompt"]) for k in qualit
 
 
 def process_style_prompt(prompt: str, neg_prompt: str, styles_key: str = "None", quality_key: str = "None", type: str = "Auto"):
-    def to_list(s):
-        return [x.strip() for x in s.split(",") if not s == ""]
-    
-    def list_sub(a, b):
-        return [e for e in a if e not in b]
-    
-    def list_uniq(l):
-        return sorted(set(l), key=l.index)
-
     animagine_ps = to_list("anime artwork, anime style, vibrant, studio anime, highly detailed, masterpiece, best quality, very aesthetic, absurdres")
     animagine_nps = to_list("lowres, (bad), text, error, fewer, extra, missing, worst quality, jpeg artifacts, low quality, watermark, unfinished, displeasing, oldest, early, chromatic aberration, signature, extra digits, artistic error, username, scan, [abstract]")
     pony_ps = to_list("source_anime, score_9, score_8_up, score_7_up, masterpiece, best quality, very aesthetic, absurdres")
@@ -1268,7 +1406,6 @@ def set_textual_inversion_prompt(textual_inversion_gui, prompt_gui, neg_prompt_g
 
 
 def get_model_pipeline(repo_id: str):
-    from huggingface_hub import HfApi
     api = HfApi(token=HF_TOKEN)
     default = "StableDiffusionPipeline"
     try: