Upload 4 files

README.md

@@ -4,7 +4,7 @@ emoji: 🧩🖼️📦
 colorFrom: red
 colorTo: pink
 sdk: gradio
-sdk_version: 4.37.2
+sdk_version: 4.38.1
 app_file: app.py
 pinned: true
 header: mini

app.py

@@ -160,14 +160,6 @@ def process_string(input_string):
         return None
 
 
-directory_models = 'models'
-os.makedirs(directory_models, exist_ok=True)
-directory_loras = 'loras'
-os.makedirs(directory_loras, exist_ok=True)
-directory_vaes = 'vaes'
-os.makedirs(directory_vaes, exist_ok=True)
-
-
 ## BEGIN MOD
 from modutils import (
     download_private_repo,
@@ -179,70 +171,41 @@ from modutils import (
     list_sub,
     get_tupled_embed_list,
     update_lora_dict,
+    get_lora_model_list,
+)
+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,
+    directory_models,
+    directory_loras,
+    directory_vaes,
+    directory_embeds,
+    directory_embeds_sdxl,
+    directory_embeds_positive_sdxl,
+    load_diffusers_format_model,
+    download_model_list,
+    download_lora_list,
+    download_vae_list,
+    download_embeds,
 )
 
-# - **Download SD 1.5 Models**
-#download_model = "https://huggingface.co/frankjoshua/toonyou_beta6/resolve/main/toonyou_beta6.safetensors"
-download_model = ""
+# - **Download Models**
+download_model = ", ".join(download_model_list)
 # - **Download VAEs**
-download_vae_list = [
-    'https://huggingface.co/madebyollin/sdxl-vae-fp16-fix/resolve/main/sdxl.vae.safetensors?download=true',
-    'https://huggingface.co/nubby/blessed-sdxl-vae-fp16-fix/resolve/main/sdxl_vae-fp16fix-c-1.1-b-0.5.safetensors?download=true',
-    'https://huggingface.co/nubby/blessed-sdxl-vae-fp16-fix/resolve/main/sdxl_vae-fp16fix-blessed.safetensors?download=true',
-]
 download_vae = ", ".join(download_vae_list)
 # - **Download LoRAs**
-download_lora_list = []
 download_lora = ", ".join(download_lora_list)
 
 download_private_repo(HF_LORA_ESSENTIAL_PRIVATE_REPO, directory_loras, True)
-download_private_repo('John6666/vaetest', directory_vaes, False)
-
-load_diffusers_format_model = [
-    'stabilityai/stable-diffusion-xl-base-1.0',
-    'cagliostrolab/animagine-xl-3.1',
-    'misri/epicrealismXL_v7FinalDestination',
-    'misri/juggernautXL_juggernautX',
-    'misri/zavychromaxl_v80',
-    'SG161222/RealVisXL_V4.0',
-    'misri/newrealityxlAllInOne_Newreality40',
-    'eienmojiki/Anything-XL',
-    'eienmojiki/Starry-XL-v5.2',
-    'gsdf/CounterfeitXL',
-    'kitty7779/ponyDiffusionV6XL',
-    'John6666/ebara-mfcg-pony-mix-v12-sdxl',
-    'John6666/t-ponynai3-v51-sdxl',
-    'yodayo-ai/kivotos-xl-2.0',
-    'yodayo-ai/holodayo-xl-2.1',
-    'digiplay/majicMIX_sombre_v2',
-    'digiplay/majicMIX_realistic_v6',
-    'digiplay/majicMIX_realistic_v7',
-    'digiplay/DreamShaper_8',
-    'digiplay/BeautifulArt_v1',
-    'digiplay/DarkSushi2.5D_v1',
-    'digiplay/darkphoenix3D_v1.1',
-    'digiplay/BeenYouLiteL11_diffusers',
-    'rubbrband/revAnimated_v2Rebirth',
-    'youknownothing/cyberrealistic_v50',
-    'votepurchase/counterfeitV30_v30',
-    'Meina/MeinaMix_V11',
-    'Meina/MeinaUnreal_V5',
-    'Meina/MeinaPastel_V7',
-    'rubbrband/realcartoon3d_v16',
-    'rubbrband/realcartoonRealistic_v14',
-    'KBlueLeaf/Kohaku-XL-Epsilon-rev2',
-    'KBlueLeaf/Kohaku-XL-Epsilon-rev3',
-    'Raelina/Rae-Diffusion-XL-V2',
-    'Raelina/Raemu-XL-V4',
-]
+download_private_repo(HF_VAE_PRIVATE_REPO, directory_vaes, False)
 
 load_diffusers_format_model = list_uniq(get_model_id_list() + load_diffusers_format_model)
 ## END MOD
 
-CIVITAI_API_KEY = os.environ.get("CIVITAI_API_KEY")
-hf_token = os.environ.get("HF_TOKEN")
-
 # Download stuffs
 for url in [url.strip() for url in download_model.split(',')]:
     if not os.path.exists(f"./models/{url.split('/')[-1]}"):
@@ -255,14 +218,6 @@ for url in [url.strip() for url in download_lora.split(',')]:
         download_things(directory_loras, url, hf_token, CIVITAI_API_KEY)
 
 # Download Embeddings
-directory_embeds = 'embedings'
-os.makedirs(directory_embeds, exist_ok=True)
-download_embeds = [
-    'https://huggingface.co/datasets/Nerfgun3/bad_prompt/blob/main/bad_prompt_version2.pt',
-    'https://huggingface.co/embed/negative/resolve/main/EasyNegativeV2.safetensors',
-    'https://huggingface.co/embed/negative/resolve/main/bad-hands-5.pt',
-    ]
-
 for url_embed in download_embeds:
     if not os.path.exists(f"./embedings/{url_embed.split('/')[-1]}"):
         download_things(directory_embeds, url_embed, hf_token, CIVITAI_API_KEY)
@@ -272,19 +227,13 @@ embed_list = get_model_list(directory_embeds)
 model_list = get_model_list(directory_models)
 model_list = load_diffusers_format_model + model_list
 ## BEGIN MOD
-lora_model_list = list_uniq(get_private_lora_model_lists() + get_model_list(directory_loras))
-lora_model_list.insert(0, "None")
-lora_model_list.insert(0, "")
+lora_model_list = get_lora_model_list()
 vae_model_list = get_model_list(directory_vaes)
 vae_model_list.insert(0, "None")
 
-directory_embeds_sdxl = 'embedings_xl'
-os.makedirs(directory_embeds_sdxl, exist_ok=True)
-download_private_repo('John6666/embeddingstest', directory_embeds_sdxl, False)
-directory_embeds_postitive_sdxl = 'embedings_xl/positive'
-os.makedirs(directory_embeds_postitive_sdxl, exist_ok=True)
-download_private_repo('John6666/embeddingspositivetest', directory_embeds_postitive_sdxl, False)
-embed_sdxl_list = get_model_list(directory_embeds_sdxl) + get_model_list(directory_embeds_postitive_sdxl)
+download_private_repo(HF_SDXL_EMBEDS_NEGATIVE_PRIVATE_REPO, directory_embeds_sdxl, False)
+download_private_repo(HF_SDXL_EMBEDS_POSITIVE_PRIVATE_REPO, directory_embeds_positive_sdxl, False)
+embed_sdxl_list = get_model_list(directory_embeds_sdxl) + get_model_list(directory_embeds_positive_sdxl)
 
 def get_embed_list(pipeline_name):
     return get_tupled_embed_list(embed_sdxl_list if pipeline_name == "StableDiffusionXLPipeline" else embed_list)
@@ -303,9 +252,7 @@ def get_my_lora(link_url):
             new_path = Path(f'{path.parent.name}/{escape_lora_basename(path.stem)}{path.suffix}')
             path.resolve().rename(new_path.resolve())
             update_lora_dict(str(new_path))
-    new_lora_model_list = list_uniq(get_private_lora_model_lists() + get_model_list(directory_loras))
-    new_lora_model_list.insert(0, "None")
-    new_lora_model_list.insert(0, "")
+    new_lora_model_list = get_lora_model_list()
     
     return gr.update(
         choices=get_lora_tupled_list(new_lora_model_list), value=new_lora_model_list[-1]
@@ -638,6 +585,8 @@ class GuiSD:
 
 ## BEGIN MOD
         prompt, neg_prompt = insert_model_recom_prompt(prompt, neg_prompt, model_name)
+        global lora_model_list
+        lora_model_list = get_lora_model_list()
 ## END MOD
         
         if model_name in model_list:
@@ -1671,6 +1620,7 @@ with gr.Blocks(theme="NoCrypt/miku@>=1.2.2", elem_id="main", css=CSS) as app:
             fn=search_civitai_lora,
             inputs=[search_civitai_query_lora, search_civitai_basemodel_lora],
             outputs=[search_civitai_result_lora, search_civitai_desc_lora, search_civitai_button_lora, search_civitai_query_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)

env.py

@@ -0,0 +1,93 @@
+import os
+
+CIVITAI_API_KEY = os.environ.get("CIVITAI_API_KEY")
+hf_token = os.environ.get("HF_TOKEN")
+hf_read_token = os.environ.get('HF_READ_TOKEN') # only use for private repo
+
+# - **List Models**
+load_diffusers_format_model = [
+    'stabilityai/stable-diffusion-xl-base-1.0',
+    'cagliostrolab/animagine-xl-3.1',
+    'misri/epicrealismXL_v7FinalDestination',
+    'misri/juggernautXL_juggernautX',
+    'misri/zavychromaxl_v80',
+    'SG161222/RealVisXL_V4.0',
+    'misri/newrealityxlAllInOne_Newreality40',
+    'eienmojiki/Anything-XL',
+    'eienmojiki/Starry-XL-v5.2',
+    'gsdf/CounterfeitXL',
+    'kitty7779/ponyDiffusionV6XL',
+    'John6666/ebara-mfcg-pony-mix-v12-sdxl',
+    'John6666/t-ponynai3-v51-sdxl',
+    'yodayo-ai/kivotos-xl-2.0',
+    'yodayo-ai/holodayo-xl-2.1',
+    'digiplay/majicMIX_sombre_v2',
+    'digiplay/majicMIX_realistic_v6',
+    'digiplay/majicMIX_realistic_v7',
+    'digiplay/DreamShaper_8',
+    'digiplay/BeautifulArt_v1',
+    'digiplay/DarkSushi2.5D_v1',
+    'digiplay/darkphoenix3D_v1.1',
+    'digiplay/BeenYouLiteL11_diffusers',
+    'rubbrband/revAnimated_v2Rebirth',
+    'youknownothing/cyberrealistic_v50',
+    'votepurchase/counterfeitV30_v30',
+    'Meina/MeinaMix_V11',
+    'Meina/MeinaUnreal_V5',
+    'Meina/MeinaPastel_V7',
+    'rubbrband/realcartoon3d_v16',
+    'rubbrband/realcartoonRealistic_v14',
+    'KBlueLeaf/Kohaku-XL-Epsilon-rev2',
+    'KBlueLeaf/Kohaku-XL-Epsilon-rev3',
+    'Raelina/Rae-Diffusion-XL-V2',
+    'Raelina/Raemu-XL-V4',
+]
+
+# List all Models for specified user
+HF_MODEL_USER_LIKES = ["votepurchase"] # sorted by number of likes
+HF_MODEL_USER_EX = ["John6666"] # sorted by a special rule
+
+
+# - **Download Models**
+download_model_list = [
+]
+
+# - **Download VAEs**
+download_vae_list = [
+    'https://huggingface.co/madebyollin/sdxl-vae-fp16-fix/resolve/main/sdxl.vae.safetensors?download=true',
+    'https://huggingface.co/nubby/blessed-sdxl-vae-fp16-fix/resolve/main/sdxl_vae-fp16fix-c-1.1-b-0.5.safetensors?download=true',
+    'https://huggingface.co/nubby/blessed-sdxl-vae-fp16-fix/resolve/main/sdxl_vae-fp16fix-blessed.safetensors?download=true',
+]
+
+# - **Download LoRAs**
+download_lora_list = [
+]
+
+# Download Embeddings
+download_embeds = [
+    'https://huggingface.co/datasets/Nerfgun3/bad_prompt/blob/main/bad_prompt_version2.pt',
+    'https://huggingface.co/embed/negative/resolve/main/EasyNegativeV2.safetensors',
+    'https://huggingface.co/embed/negative/resolve/main/bad-hands-5.pt',
+]
+
+directory_models = 'models'
+os.makedirs(directory_models, exist_ok=True)
+directory_loras = 'loras'
+os.makedirs(directory_loras, exist_ok=True)
+directory_vaes = 'vaes'
+os.makedirs(directory_vaes, exist_ok=True)
+directory_embeds = 'embedings'
+os.makedirs(directory_embeds, exist_ok=True)
+
+directory_embeds_sdxl = 'embedings_xl'
+os.makedirs(directory_embeds_sdxl, exist_ok=True)
+directory_embeds_positive_sdxl = 'embedings_xl/positive'
+os.makedirs(directory_embeds_positive_sdxl, exist_ok=True)
+
+HF_LORA_PRIVATE_REPOS1 = ['John6666/loratest1', 'John6666/loratest3', 'John6666/loratest4', 'John6666/loratest6']
+HF_LORA_PRIVATE_REPOS2 = ['John6666/loratest10', 'John6666/loratest'] # to be sorted as 1 repo
+HF_LORA_PRIVATE_REPOS = HF_LORA_PRIVATE_REPOS1 + HF_LORA_PRIVATE_REPOS2
+HF_LORA_ESSENTIAL_PRIVATE_REPO = 'John6666/loratest1' # to be downloaded on run app
+HF_VAE_PRIVATE_REPO = 'John6666/vaetest'
+HF_SDXL_EMBEDS_NEGATIVE_PRIVATE_REPO = 'John6666/embeddingstest'
+HF_SDXL_EMBEDS_POSITIVE_PRIVATE_REPO = 'John6666/embeddingspositivetest'

modutils.py

@@ -1,18 +1,16 @@
-import os
 import json
 import gradio as gr
-from PIL import Image
 from huggingface_hub import HfApi
-from requests import HTTPError, Timeout
 from pathlib import Path
 
-HF_LORA_PRIVATE_REPOS1 = ['John6666/loratest1', 'John6666/loratest3', 'John6666/loratest4', 'John6666/loratest6']
-HF_LORA_PRIVATE_REPOS2 = ['John6666/loratest10', 'John6666/loratest'] # to be sorted as 1 repo
-HF_LORA_PRIVATE_REPOS = HF_LORA_PRIVATE_REPOS1 + HF_LORA_PRIVATE_REPOS2
-HF_LORA_ESSENTIAL_PRIVATE_REPO = 'John6666/loratest1' # to be downloaded on run app
-directory_loras = 'loras'
-CIVITAI_API_KEY = os.environ.get("CIVITAI_API_KEY")
-hf_read_token = os.environ.get('HF_READ_TOKEN')
+from env import (
+    HF_LORA_PRIVATE_REPOS1,
+    HF_LORA_PRIVATE_REPOS2,
+    HF_MODEL_USER_EX,
+    HF_MODEL_USER_LIKES,
+    directory_loras,
+    hf_read_token,
+)
 
 def get_user_agent():
     return 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:127.0) Gecko/20100101 Firefox/127.0'
@@ -103,7 +101,10 @@ def get_private_model_list(repo_id, dir_path):
     return model_list
 
 
+private_lora_model_list = []
 def get_private_lora_model_lists():
+    global private_lora_model_list
+    if len(private_lora_model_list) != 0: return private_lora_model_list
     models1 = []
     models2 = []
     for repo in HF_LORA_PRIVATE_REPOS1:
@@ -111,6 +112,7 @@ def get_private_lora_model_lists():
     for repo in HF_LORA_PRIVATE_REPOS2:
         models2.extend(get_private_model_list(repo, directory_loras))
     models = list_uniq(models1 + sorted(models2))
+    private_lora_model_list = models
     return models
 
 
@@ -139,15 +141,19 @@ def get_model_id_list():
     api = HfApi()
     model_ids = []
     try:
-        models_vp = api.list_models(author="votepurchase", cardData=True, sort="likes")
-        models_john = api.list_models(author="John6666", cardData=True, sort="last_modified")
+        models_likes = []
+        for author in HF_MODEL_USER_LIKES:
+            models_likes.extend(api.list_models(author=author, cardData=True, sort="likes"))
+        models_ex = []
+        for author in HF_MODEL_USER_EX:
+            models_ex = api.list_models(author=author, cardData=True, sort="last_modified")
     except Exception as e:
         return model_ids
-    for model in models_vp:
+    for model in models_likes:
         model_ids.append(model.id) if not model.private else ""
     anime_models = []
     real_models = []
-    for model in models_john:
+    for model in models_ex:
         if not model.private:
             anime_models.append(model.id) if 'anime' in model.tags else real_models.append(model.id)
     model_ids.extend(anime_models)
@@ -220,13 +226,15 @@ def save_gallery_images(images, progress=gr.Progress(track_tqdm=True)):
     output_paths = []
     for image in images:
         filename = basename + str(i) + ".png"
-        oldpath = Path(image[0]) # Path(image[0])
-        newpath = oldpath.resolve().rename(Path(filename).resolve())
+        i += 1
+        oldpath = Path(image[0])
+        newpath = oldpath
+        if oldpath.exists():
+            newpath = oldpath.resolve().rename(Path(filename).resolve())
         output_paths.append(str(newpath))
         output_images.append((str(newpath), str(filename)))
-        i += 1
     progress(1, desc="Gallery updated.")
-    return gr.update(value=output_images), gr.update(value=output_paths), gr.update(visible=True),
+    return gr.update(value=output_images), gr.update(value=output_paths), gr.update(visible=True)
 
 
 optimization_list = {
@@ -302,10 +310,13 @@ def set_lora_prompt(prompt_gui, prompt_syntax_gui, lora1_gui, lora_scale_1_gui,
 
 
 lora_trigger_dict = {"None": ["", "", "", "", ""], "": ["", "", "", "", ""]}
-with open('lora_dict.json', encoding='utf-8') as f:
-    temp_dict = json.load(f)
-    for k, v in temp_dict.items():
-        lora_trigger_dict[escape_lora_basename(k)] = v
+try:
+    with open('lora_dict.json', encoding='utf-8') as f:
+        temp_dict = json.load(f)
+        for k, v in temp_dict.items():
+            lora_trigger_dict[escape_lora_basename(k)] = v
+except Exception:
+    pass
 
 
 civitai_not_exists_list = []
@@ -332,7 +343,7 @@ def get_civitai_info(path):
     url = base_url + hash_sha256
     try:
         r = session.get(url, params=params, headers=headers, stream=True, timeout=(3.0, 15))
-    except (HTTPError, Timeout) as e:
+    except Exception as e:
         return ["", "", "", "", ""]
     if not r.ok: return None
     json = r.json()
@@ -357,6 +368,13 @@ def update_lora_dict(path):
     lora_trigger_dict[key] = items
 
 
+def get_lora_model_list():
+    loras = list_uniq(get_private_lora_model_lists() + get_local_model_list(directory_loras))
+    loras.insert(0, "None")
+    loras.insert(0, "")
+    return loras
+
+
 def get_lora_tupled_list(lora_model_list):
     global lora_trigger_dict
     if not lora_model_list: return []
@@ -389,7 +407,7 @@ def set_lora_trigger(lora_gui: str):
           gr.update(value="", visible=False), gr.update(value="")
     path = Path(lora_gui)
     new_path = Path(f'{path.parent.name}/{escape_lora_basename(path.stem)}{path.suffix}')
-    if not new_path.stem in lora_trigger_dict.keys() and not str(path) in set(get_private_lora_model_lists() + get_local_model_list(directory_loras)):
+    if not new_path.stem in lora_trigger_dict.keys() and not str(path) in set(get_lora_model_list()):
         return gr.update(value="", visible=False), gr.update(visible=False),\
               gr.update(value="", visible=False), gr.update(value="")
     if not new_path.exists():
@@ -416,7 +434,7 @@ def set_lora_trigger(lora_gui: str):
         elif items[3]:
             md = f'[LoRA Model URL]({items[3]})'
     if tag and flag:
-        new_lora_model_list = list_uniq(get_private_lora_model_lists() + get_local_model_list(directory_loras))
+        new_lora_model_list = get_lora_model_list()
         return gr.update(value=tag, label=label, visible=True), gr.update(visible=True),\
               gr.update(value=md, visible=True), gr.update(value=str(new_path), choices=get_lora_tupled_list(new_lora_model_list))
     elif tag:
@@ -456,9 +474,7 @@ def move_file_lora(filepaths):
         path.resolve().rename(newpath.resolve())
         update_lora_dict(str(newpath))
 
-    new_lora_model_list = list_uniq(get_private_lora_model_lists() + get_local_model_list(directory_loras))
-    new_lora_model_list.insert(0, "None")
-    new_lora_model_list.insert(0, "")
+    new_lora_model_list = get_lora_model_list()
     
     return gr.update(
         choices=get_lora_tupled_list(new_lora_model_list), value=new_lora_model_list[-1]
@@ -488,7 +504,7 @@ def search_lora_on_civitai(query: str, allow_model: list[str]):
     session.mount("https://", HTTPAdapter(max_retries=retries))
     try:
         r = session.get(base_url, params=params, headers=headers, stream=True, timeout=(3.0, 30))
-    except (HTTPError, Timeout) as e:
+    except Exception as e:
         return None
     if not r.ok: return None
     json = r.json()
@@ -781,10 +797,11 @@ def set_quick_presets(genre:str = "None", type:str = "Auto", speed:str = "None",
 
 
 textual_inversion_dict = {}
-with open('textual_inversion_dict.json', encoding='utf-8') as f:
-    textual_inversion_dict = json.load(f)
-
-
+try:
+    with open('textual_inversion_dict.json', encoding='utf-8') as f:
+        textual_inversion_dict = json.load(f)
+except Exception:
+    pass
 textual_inversion_file_token_list = []