Upload 23 files

app.py

@@ -3,11 +3,11 @@ import gradio as gr
 import numpy as np
 
 # DiffuseCraft
-from dc import (infer, _infer, pass_result, get_diffusers_model_list, get_samplers,
+from dc import (infer, _infer, pass_result, get_diffusers_model_list, get_samplers, save_image_history,
     get_vaes, enable_model_recom_prompt, enable_diffusers_model_detail, extract_exif_data, esrgan_upscale, UPSCALER_KEYS,
     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_BASEMODEL
+    download_my_lora, search_civitai_lora, update_civitai_selection, select_civitai_lora, search_civitai_lora_json,
+    get_t2i_model_info, get_civitai_tag, CIVITAI_SORT, CIVITAI_PERIOD, CIVITAI_BASEMODEL)
 # Translator
 from llmdolphin import (dolphin_respond_auto, dolphin_parse_simple,
     get_llm_formats, get_dolphin_model_format, get_dolphin_models,
@@ -57,9 +57,16 @@ with gr.Blocks(fill_width=True, elem_id="container", css=css, delete_cache=(60,
                 run_translate_button = gr.Button("Run with LLM Enhance", variant="secondary", scale=3)
                 auto_trans = gr.Checkbox(label="Auto translate to English", value=False, scale=2)
 
-            result = gr.Image(label="Result", elem_id="result", format="png", show_label=False, interactive=False,
-                              show_download_button=True, show_share_button=False, container=True)
-                
+            with gr.Group():
+                result = gr.Image(label="Result", elem_id="result", format="png", show_label=False, interactive=False,
+                                show_download_button=True, show_share_button=False, container=True)
+                with gr.Accordion("History", open=False):
+                    history_gallery = gr.Gallery(label="History", columns=6, object_fit="contain", format="png", interactive=False, show_share_button=False,
+                    show_download_button=True)
+                    history_files = gr.Files(interactive=False, visible=False)
+                    history_clear_button = gr.Button(value="Clear History", variant="secondary")
+                    history_clear_button.click(lambda: ([], []), None, [history_gallery, history_files], queue=False, show_api=False)
+
             with gr.Accordion("Advanced Settings", open=False):
                 with gr.Row():
                     negative_prompt = gr.Text(label="Negative prompt", lines=1, max_lines=6, placeholder="Enter a negative prompt",
@@ -215,7 +222,7 @@ with gr.Blocks(fill_width=True, elem_id="container", css=css, delete_cache=(60,
     ).success(
         fn=dolphin_respond_auto,
         inputs=[prompt, chatbot],
-        outputs=[chatbot],
+        outputs=[chatbot, result],
         queue=True,
         show_progress="full",
         show_api=False,
@@ -238,6 +245,8 @@ with gr.Blocks(fill_width=True, elem_id="container", css=css, delete_cache=(60,
     ).success(lambda: None, None, chatbot, queue=False, show_api=False)\
     .success(pass_result, [result], [result], queue=False, show_api=False) # dummy fn for api
 
+    result.change(save_image_history, [result, history_gallery, history_files, model_name], [history_gallery, history_files], queue=False, show_api=False)
+
     gr.on(
         triggers=[lora1.change, lora1_wt.change, lora2.change, lora2_wt.change, lora3.change, lora3_wt.change,
                    lora4.change, lora4_wt.change, lora5.change, lora5_wt.change],
@@ -425,4 +434,4 @@ with gr.Blocks(fill_width=True, elem_id="container", css=css, delete_cache=(60,
     gr.DuplicateButton(value="Duplicate Space for private use (This demo does not work on CPU. Requires GPU Space)")
 
 demo.queue()
-demo.launch()
+demo.launch(show_error=True, debug=True)

constants.py

@@ -0,0 +1,453 @@
+import os
+from stablepy.diffusers_vanilla.constants import FLUX_CN_UNION_MODES
+from stablepy import (
+    scheduler_names,
+    SD15_TASKS,
+    SDXL_TASKS,
+)
+
+# - **Download Models**
+DOWNLOAD_MODEL = "https://civitai.com/api/download/models/574369, https://huggingface.co/TechnoByte/MilkyWonderland/resolve/main/milkyWonderland_v40.safetensors"
+
+# - **Download VAEs**
+DOWNLOAD_VAE = "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, https://huggingface.co/digiplay/VAE/resolve/main/vividReal_v20.safetensors?download=true, https://huggingface.co/fp16-guy/anything_kl-f8-anime2_vae-ft-mse-840000-ema-pruned_blessed_clearvae_fp16_cleaned/resolve/main/vae-ft-mse-840000-ema-pruned_fp16.safetensors?download=true"
+
+# - **Download LoRAs**
+DOWNLOAD_LORA = "https://huggingface.co/Leopain/color/resolve/main/Coloring_book_-_LineArt.safetensors, https://civitai.com/api/download/models/135867, https://huggingface.co/Linaqruf/anime-detailer-xl-lora/resolve/main/anime-detailer-xl.safetensors?download=true, https://huggingface.co/Linaqruf/style-enhancer-xl-lora/resolve/main/style-enhancer-xl.safetensors?download=true, https://huggingface.co/ByteDance/Hyper-SD/resolve/main/Hyper-SD15-8steps-CFG-lora.safetensors?download=true, https://huggingface.co/ByteDance/Hyper-SD/resolve/main/Hyper-SDXL-8steps-CFG-lora.safetensors?download=true"
+
+LOAD_DIFFUSERS_FORMAT_MODEL = [
+    'stabilityai/stable-diffusion-xl-base-1.0',
+    'black-forest-labs/FLUX.1-dev',
+    'John6666/blue-pencil-flux1-v021-fp8-flux',
+    'John6666/wai-ani-flux-v10forfp8-fp8-flux',
+    'John6666/xe-anime-flux-v04-fp8-flux',
+    'John6666/lyh-anime-flux-v2a1-fp8-flux',
+    'John6666/carnival-unchained-v10-fp8-flux',
+    'cagliostrolab/animagine-xl-3.1',
+    'John6666/epicrealism-xl-v8kiss-sdxl',
+    'misri/epicrealismXL_v7FinalDestination',
+    'misri/juggernautXL_juggernautX',
+    'misri/zavychromaxl_v80',
+    'SG161222/RealVisXL_V4.0',
+    'SG161222/RealVisXL_V5.0',
+    'misri/newrealityxlAllInOne_Newreality40',
+    'eienmojiki/Anything-XL',
+    'eienmojiki/Starry-XL-v5.2',
+    'gsdf/CounterfeitXL',
+    'KBlueLeaf/Kohaku-XL-Zeta',
+    'John6666/silvermoon-mix-01xl-v11-sdxl',
+    'WhiteAiZ/autismmixSDXL_autismmixConfetti_diffusers',
+    'kitty7779/ponyDiffusionV6XL',
+    'GraydientPlatformAPI/aniverse-pony',
+    'John6666/ras-real-anime-screencap-v1-sdxl',
+    'John6666/duchaiten-pony-xl-no-score-v60-sdxl',
+    'John6666/mistoon-anime-ponyalpha-sdxl',
+    'John6666/3x3x3mixxl-v2-sdxl',
+    'John6666/3x3x3mixxl-3dv01-sdxl',
+    'John6666/ebara-mfcg-pony-mix-v12-sdxl',
+    'John6666/t-ponynai3-v51-sdxl',
+    'John6666/t-ponynai3-v65-sdxl',
+    'John6666/prefect-pony-xl-v3-sdxl',
+    'John6666/mala-anime-mix-nsfw-pony-xl-v5-sdxl',
+    'John6666/wai-real-mix-v11-sdxl',
+    'John6666/wai-c-v6-sdxl',
+    'John6666/iniverse-mix-xl-sfwnsfw-pony-guofeng-v43-sdxl',
+    'John6666/photo-realistic-pony-v5-sdxl',
+    'John6666/pony-realism-v21main-sdxl',
+    'John6666/pony-realism-v22main-sdxl',
+    'John6666/cyberrealistic-pony-v63-sdxl',
+    'John6666/cyberrealistic-pony-v64-sdxl',
+    'John6666/cyberrealistic-pony-v65-sdxl',
+    'GraydientPlatformAPI/realcartoon-pony-diffusion',
+    'John6666/nova-anime-xl-pony-v5-sdxl',
+    'John6666/autismmix-sdxl-autismmix-pony-sdxl',
+    'John6666/aimz-dream-real-pony-mix-v3-sdxl',
+    'John6666/duchaiten-pony-real-v11fix-sdxl',
+    'John6666/duchaiten-pony-real-v20-sdxl',
+    'yodayo-ai/kivotos-xl-2.0',
+    'yodayo-ai/holodayo-xl-2.1',
+    'yodayo-ai/clandestine-xl-1.0',
+    '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',
+    'Yntec/RevAnimatedV2Rebirth',
+    'youknownothing/cyberrealistic_v50',
+    'youknownothing/deliberate-v6',
+    'GraydientPlatformAPI/deliberate-cyber3',
+    'GraydientPlatformAPI/picx-real',
+    'GraydientPlatformAPI/perfectworld6',
+    'emilianJR/epiCRealism',
+    'votepurchase/counterfeitV30_v30',
+    'votepurchase/ChilloutMix',
+    'Meina/MeinaMix_V11',
+    'Meina/MeinaUnreal_V5',
+    'Meina/MeinaPastel_V7',
+    'GraydientPlatformAPI/realcartoon3d-17',
+    'GraydientPlatformAPI/realcartoon-pixar11',
+    'GraydientPlatformAPI/realcartoon-real17',
+]
+
+DIFFUSERS_FORMAT_LORAS = [
+    "nerijs/animation2k-flux",
+    "XLabs-AI/flux-RealismLora",
+]
+
+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',
+    ]
+
+CIVITAI_API_KEY = os.environ.get("CIVITAI_API_KEY")
+HF_TOKEN = os.environ.get("HF_READ_TOKEN")
+
+DIRECTORY_MODELS = 'models'
+DIRECTORY_LORAS = 'loras'
+DIRECTORY_VAES = 'vaes'
+DIRECTORY_EMBEDS = 'embedings'
+
+PREPROCESSOR_CONTROLNET = {
+  "openpose": [
+    "Openpose",
+    "None",
+  ],
+  "scribble": [
+    "HED",
+    "PidiNet",
+    "None",
+  ],
+  "softedge": [
+    "PidiNet",
+    "HED",
+    "HED safe",
+    "PidiNet safe",
+    "None",
+  ],
+  "segmentation": [
+    "UPerNet",
+    "None",
+  ],
+  "depth": [
+    "DPT",
+    "Midas",
+    "None",
+  ],
+  "normalbae": [
+    "NormalBae",
+    "None",
+  ],
+  "lineart": [
+    "Lineart",
+    "Lineart coarse",
+    "Lineart (anime)",
+    "None",
+    "None (anime)",
+  ],
+  "lineart_anime": [
+    "Lineart",
+    "Lineart coarse",
+    "Lineart (anime)",
+    "None",
+    "None (anime)",
+  ],
+  "shuffle": [
+    "ContentShuffle",
+    "None",
+  ],
+  "canny": [
+    "Canny",
+    "None",
+  ],
+  "mlsd": [
+    "MLSD",
+    "None",
+  ],
+  "ip2p": [
+    "ip2p"
+  ],
+  "recolor": [
+    "Recolor luminance",
+    "Recolor intensity",
+    "None",
+  ],
+  "tile": [
+    "Mild Blur",
+    "Moderate Blur",
+    "Heavy Blur",
+    "None",
+  ],
+
+}
+
+TASK_STABLEPY = {
+    'txt2img': 'txt2img',
+    'img2img': 'img2img',
+    'inpaint': 'inpaint',
+    # 'canny T2I Adapter': 'sdxl_canny_t2i',  # NO HAVE STEP CALLBACK PARAMETERS SO NOT WORKS WITH DIFFUSERS 0.29.0
+    # 'sketch  T2I Adapter': 'sdxl_sketch_t2i',
+    # 'lineart  T2I Adapter': 'sdxl_lineart_t2i',
+    # 'depth-midas  T2I Adapter': 'sdxl_depth-midas_t2i',
+    # 'openpose  T2I Adapter': 'sdxl_openpose_t2i',
+    'openpose ControlNet': 'openpose',
+    'canny ControlNet': 'canny',
+    'mlsd ControlNet': 'mlsd',
+    'scribble ControlNet': 'scribble',
+    'softedge ControlNet': 'softedge',
+    'segmentation ControlNet': 'segmentation',
+    'depth ControlNet': 'depth',
+    'normalbae ControlNet': 'normalbae',
+    'lineart ControlNet': 'lineart',
+    'lineart_anime ControlNet': 'lineart_anime',
+    'shuffle ControlNet': 'shuffle',
+    'ip2p ControlNet': 'ip2p',
+    'optical pattern ControlNet': 'pattern',
+    'recolor ControlNet': 'recolor',
+    'tile ControlNet': 'tile',
+}
+
+TASK_MODEL_LIST = list(TASK_STABLEPY.keys())
+
+UPSCALER_DICT_GUI = {
+    None: None,
+    "Lanczos": "Lanczos",
+    "Nearest": "Nearest",
+    'Latent': 'Latent',
+    'Latent (antialiased)': 'Latent (antialiased)',
+    'Latent (bicubic)': 'Latent (bicubic)',
+    'Latent (bicubic antialiased)': 'Latent (bicubic antialiased)',
+    'Latent (nearest)': 'Latent (nearest)',
+    'Latent (nearest-exact)': 'Latent (nearest-exact)',
+    "RealESRGAN_x4plus": "https://github.com/xinntao/Real-ESRGAN/releases/download/v0.1.0/RealESRGAN_x4plus.pth",
+    "RealESRNet_x4plus": "https://github.com/xinntao/Real-ESRGAN/releases/download/v0.1.1/RealESRNet_x4plus.pth",
+    "RealESRGAN_x4plus_anime_6B": "https://github.com/xinntao/Real-ESRGAN/releases/download/v0.2.2.4/RealESRGAN_x4plus_anime_6B.pth",
+    "RealESRGAN_x2plus": "https://github.com/xinntao/Real-ESRGAN/releases/download/v0.2.1/RealESRGAN_x2plus.pth",
+    "realesr-animevideov3": "https://github.com/xinntao/Real-ESRGAN/releases/download/v0.2.5.0/realesr-animevideov3.pth",
+    "realesr-general-x4v3": "https://github.com/xinntao/Real-ESRGAN/releases/download/v0.2.5.0/realesr-general-x4v3.pth",
+    "realesr-general-wdn-x4v3": "https://github.com/xinntao/Real-ESRGAN/releases/download/v0.2.5.0/realesr-general-wdn-x4v3.pth",
+    "4x-UltraSharp": "https://huggingface.co/Shandypur/ESRGAN-4x-UltraSharp/resolve/main/4x-UltraSharp.pth",
+    "4x_foolhardy_Remacri": "https://huggingface.co/FacehugmanIII/4x_foolhardy_Remacri/resolve/main/4x_foolhardy_Remacri.pth",
+    "Remacri4xExtraSmoother": "https://huggingface.co/hollowstrawberry/upscalers-backup/resolve/main/ESRGAN/Remacri%204x%20ExtraSmoother.pth",
+    "AnimeSharp4x": "https://huggingface.co/hollowstrawberry/upscalers-backup/resolve/main/ESRGAN/AnimeSharp%204x.pth",
+    "lollypop": "https://huggingface.co/hollowstrawberry/upscalers-backup/resolve/main/ESRGAN/lollypop.pth",
+    "RealisticRescaler4x": "https://huggingface.co/hollowstrawberry/upscalers-backup/resolve/main/ESRGAN/RealisticRescaler%204x.pth",
+    "NickelbackFS4x": "https://huggingface.co/hollowstrawberry/upscalers-backup/resolve/main/ESRGAN/NickelbackFS%204x.pth"
+}
+
+UPSCALER_KEYS = list(UPSCALER_DICT_GUI.keys())
+
+PROMPT_W_OPTIONS = [
+    ("Compel format: (word)weight", "Compel"),
+    ("Classic format: (word:weight)", "Classic"),
+    ("Classic-original format: (word:weight)", "Classic-original"),
+    ("Classic-no_norm format: (word:weight)", "Classic-no_norm"),
+    ("Classic-ignore", "Classic-ignore"),
+    ("None", "None"),
+]
+
+WARNING_MSG_VAE = (
+    "Use the right VAE for your model to maintain image quality. The wrong"
+    " VAE can lead to poor results, like blurriness in the generated images."
+)
+
+SDXL_TASK = [k for k, v in TASK_STABLEPY.items() if v in SDXL_TASKS]
+SD_TASK = [k for k, v in TASK_STABLEPY.items() if v in SD15_TASKS]
+FLUX_TASK = list(TASK_STABLEPY.keys())[:3] + [k for k, v in TASK_STABLEPY.items() if v in FLUX_CN_UNION_MODES.keys()]
+
+MODEL_TYPE_TASK = {
+    "SD 1.5": SD_TASK,
+    "SDXL": SDXL_TASK,
+    "FLUX": FLUX_TASK,
+}
+
+MODEL_TYPE_CLASS = {
+    "diffusers:StableDiffusionPipeline": "SD 1.5",
+    "diffusers:StableDiffusionXLPipeline": "SDXL",
+    "diffusers:FluxPipeline": "FLUX",
+}
+
+POST_PROCESSING_SAMPLER = ["Use same sampler"] + scheduler_names[:-2]
+
+SUBTITLE_GUI = (
+    "### This demo uses [diffusers](https://github.com/huggingface/diffusers)"
+    " to perform different tasks in image generation."
+)
+
+HELP_GUI = (
+    """### Help:
+    - The current space runs on a ZERO GPU which is assigned for approximately 60 seconds; Therefore, if you submit expensive tasks, the operation may be canceled upon reaching the maximum allowed time with 'GPU TASK ABORTED'.
+    - Distorted or strange images often result from high prompt weights, so it's best to use low weights and scales, and consider using Classic variants like 'Classic-original'.
+    - For better results with Pony Diffusion, try using sampler DPM++ 1s or DPM2 with Compel or Classic prompt weights.
+    """
+)
+
+EXAMPLES_GUI_HELP = (
+    """### The following examples perform specific tasks:
+    1. Generation with SDXL and upscale
+    2. Generation with FLUX dev
+    3. ControlNet Canny SDXL
+    4. Optical pattern (Optical illusion) SDXL
+    5. Convert an image to a coloring drawing
+    6. ControlNet OpenPose SD 1.5 and Latent upscale
+
+    - Different tasks can be performed, such as img2img or using the IP adapter, to preserve a person's appearance or a specific style based on an image.
+    """
+)
+
+EXAMPLES_GUI = [
+    [
+        "1girl, souryuu asuka langley, neon genesis evangelion, rebuild of evangelion, lance of longinus, cat hat, plugsuit, pilot suit, red bodysuit, sitting, crossed legs, black eye patch, throne, looking down, from bottom, looking at viewer, outdoors, (masterpiece), (best quality), (ultra-detailed), very aesthetic, illustration, disheveled hair, perfect composition, moist skin, intricate details",
+        "nfsw, lowres, bad anatomy, bad hands, text, error, missing fingers, extra digit, cropped, worst quality, low quality, normal quality, jpeg artifacts, signature, watermark, username, blurry, unfinished, very displeasing, oldest, early, chromatic aberration, artistic error, scan, abstract",
+        28,
+        7.0,
+        -1,
+        "None",
+        0.33,
+        "Euler a",
+        1152,
+        896,
+        "cagliostrolab/animagine-xl-3.1",
+        "txt2img",
+        "image.webp",  # img conttol
+        1024,  # img resolution
+        0.35,  # strength
+        1.0,  # cn scale
+        0.0,  # cn start
+        1.0,  # cn end
+        "Classic",
+        "Nearest",
+        45,
+        False,
+    ],
+    [
+        "a digital illustration of a movie poster titled 'Finding Emo', finding nemo parody poster, featuring a depressed cartoon clownfish with black emo hair, eyeliner, and piercings, bored expression, swimming in a dark underwater scene, in the background, movie title in a dripping, grungy font, moody blue and purple color palette",
+        "",
+        24,
+        3.5,
+        -1,
+        "None",
+        0.33,
+        "Euler a",
+        1152,
+        896,
+        "black-forest-labs/FLUX.1-dev",
+        "txt2img",
+        None,  # img conttol
+        1024,  # img resolution
+        0.35,  # strength
+        1.0,  # cn scale
+        0.0,  # cn start
+        1.0,  # cn end
+        "Classic",
+        None,
+        70,
+        True,
+    ],
+    [
+        "((masterpiece)), best quality, blonde disco girl, detailed face, realistic face, realistic hair, dynamic pose, pink pvc, intergalactic disco background, pastel lights, dynamic contrast, airbrush, fine detail, 70s vibe, midriff",
+        "(worst quality:1.2), (bad quality:1.2), (poor quality:1.2), (missing fingers:1.2), bad-artist-anime, bad-artist, bad-picture-chill-75v",
+        48,
+        3.5,
+        -1,
+        "None",
+        0.33,
+        "DPM++ 2M SDE Lu",
+        1024,
+        1024,
+        "misri/epicrealismXL_v7FinalDestination",
+        "canny ControlNet",
+        "image.webp",  # img conttol
+        1024,  # img resolution
+        0.35,  # strength
+        1.0,  # cn scale
+        0.0,  # cn start
+        1.0,  # cn end
+        "Classic",
+        None,
+        44,
+        False,
+    ],
+    [
+        "cinematic scenery old city ruins",
+        "(worst quality, low quality, illustration, 3d, 2d, painting, cartoons, sketch), (illustration, 3d, 2d, painting, cartoons, sketch, blurry, film grain, noise), (low quality, worst quality:1.2)",
+        50,
+        4.0,
+        -1,
+        "None",
+        0.33,
+        "Euler a",
+        1024,
+        1024,
+        "misri/juggernautXL_juggernautX",
+        "optical pattern ControlNet",
+        "spiral_no_transparent.png",  # img conttol
+        1024,  # img resolution
+        0.35,  # strength
+        1.0,  # cn scale
+        0.05,  # cn start
+        0.75,  # cn end
+        "Classic",
+        None,
+        35,
+        False,
+    ],
+    [
+        "black and white, line art, coloring drawing, clean line art, black strokes, no background, white, black, free lines, black scribbles, on paper, A blend of comic book art and lineart full of black and white color, masterpiece, high-resolution, trending on Pixiv fan box, palette knife, brush strokes, two-dimensional, planar vector, T-shirt design, stickers, and T-shirt design, vector art, fantasy art, Adobe Illustrator, hand-painted, digital painting, low polygon, soft lighting, aerial view, isometric style, retro aesthetics, 8K resolution, black sketch lines, monochrome, invert color",
+        "color, red, green, yellow, colored, duplicate, blurry, abstract, disfigured, deformed, animated, toy, figure, framed, 3d, bad art, poorly drawn, extra limbs, close up, b&w, weird colors, blurry, watermark, blur haze, 2 heads, long neck, watermark, elongated body, cropped image, out of frame, draft, deformed hands, twisted fingers, double image, malformed hands, multiple heads, extra limb, ugly, poorly drawn hands, missing limb, cut-off, over satured, grain, lowères, bad anatomy, poorly drawn face, mutation, mutated, floating limbs, disconnected limbs, out of focus, long body, disgusting, extra fingers, groos proportions, missing arms, mutated hands, cloned face, missing legs, ugly, tiling, poorly drawn hands, poorly drawn feet, poorly drawn face, out of frame, extra limbs, disfigured, deformed, body out of frame, blurry, bad anatomy, blurred, watermark, grainy, signature, cut off, draft, deformed, blurry, bad anatomy, disfigured, poorly drawn face, mutation, bluelish, blue",
+        20,
+        4.0,
+        -1,
+        "loras/Coloring_book_-_LineArt.safetensors",
+        1.0,
+        "DPM++ 2M SDE Karras",
+        1024,
+        1024,
+        "cagliostrolab/animagine-xl-3.1",
+        "lineart ControlNet",
+        "color_image.png",  # img conttol
+        896,  # img resolution
+        0.35,  # strength
+        1.0,  # cn scale
+        0.0,  # cn start
+        1.0,  # cn end
+        "Compel",
+        None,
+        35,
+        False,
+    ],
+    [
+        "1girl,face,curly hair,red hair,white background,",
+        "(worst quality:2),(low quality:2),(normal quality:2),lowres,watermark,",
+        38,
+        5.0,
+        -1,
+        "None",
+        0.33,
+        "DPM++ 2M SDE Karras",
+        512,
+        512,
+        "digiplay/majicMIX_realistic_v7",
+        "openpose ControlNet",
+        "image.webp",  # img conttol
+        1024,  # img resolution
+        0.35,  # strength
+        1.0,  # cn scale
+        0.0,  # cn start
+        0.9,  # cn end
+        "Compel",
+        "Latent (antialiased)",
+        46,
+        False,
+    ],
+]
+
+RESOURCES = (
+    """### Resources
+    - John6666's space has some great features you might find helpful [link](https://huggingface.co/spaces/John6666/DiffuseCraftMod).
+    - You can also try the image generator in Colab’s free tier, which provides free GPU [link](https://github.com/R3gm/SD_diffusers_interactive).
+    """
+)

dc.py

@@ -1,31 +1,49 @@
 import spaces
 import os
 from stablepy import Model_Diffusers
+from constants import (
+    PREPROCESSOR_CONTROLNET,
+    TASK_STABLEPY,
+    TASK_MODEL_LIST,
+    UPSCALER_DICT_GUI,
+    UPSCALER_KEYS,
+    PROMPT_W_OPTIONS,
+    WARNING_MSG_VAE,
+    SDXL_TASK,
+    MODEL_TYPE_TASK,
+    POST_PROCESSING_SAMPLER,
+
+)
 from stablepy.diffusers_vanilla.style_prompt_config import STYLE_NAMES
-from stablepy.diffusers_vanilla.constants import FLUX_CN_UNION_MODES
 import torch
 import re
-from huggingface_hub import HfApi
 from stablepy import (
-    CONTROLNET_MODEL_IDS,
-    VALID_TASKS,
-    T2I_PREPROCESSOR_NAME,
-    FLASH_LORA,
-    SCHEDULER_CONFIG_MAP,
     scheduler_names,
-    IP_ADAPTER_MODELS,
     IP_ADAPTERS_SD,
     IP_ADAPTERS_SDXL,
-    REPO_IMAGE_ENCODER,
-    ALL_PROMPT_WEIGHT_OPTIONS,
-    SD15_TASKS,
-    SDXL_TASKS,
 )
 import time
 from PIL import ImageFile
-#import urllib.parse
+from utils import (
+    get_model_list,
+    extract_parameters,
+    get_model_type,
+    extract_exif_data,
+    create_mask_now,
+    download_diffuser_repo,
+    progress_step_bar,
+    html_template_message,
+)
+from datetime import datetime
+import gradio as gr
+import logging
+import diffusers
+import warnings
+from stablepy import logger
+# import urllib.parse
 
 ImageFile.LOAD_TRUNCATED_IMAGES = True
+# os.environ["PYTORCH_NO_CUDA_MEMORY_CACHING"] = "1"
 print(os.getenv("SPACES_ZERO_GPU"))
 
 import gradio as gr
@@ -38,7 +56,7 @@ warnings.filterwarnings(action="ignore", category=FutureWarning, module="diffuse
 warnings.filterwarnings(action="ignore", category=UserWarning, module="diffusers")
 warnings.filterwarnings(action="ignore", category=FutureWarning, module="transformers")
 from stablepy import logger
-logger.setLevel(logging.CRITICAL)
+logger.setLevel(logging.DEBUG)
 
 from env import (
     HF_TOKEN, hf_read_token, # to use only for private repos
@@ -783,8 +801,9 @@ 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, CIVITAI_SORT, CIVITAI_PERIOD,
-    normalize_prompt_list, get_civitai_info, search_lora_on_civitai, translate_to_en)
+    get_valid_lora_path, get_valid_lora_wt, get_lora_info, CIVITAI_SORT, CIVITAI_PERIOD, CIVITAI_BASEMODEL,
+    normalize_prompt_list, get_civitai_info, search_lora_on_civitai, translate_to_en, get_t2i_model_info, get_civitai_tag, save_image_history)
+
 
 sd_gen = GuiSD()
 #@spaces.GPU
@@ -958,7 +977,7 @@ except Exception:
 private_lora_model_list = get_private_lora_model_lists()
 loras_dict = {"None": ["", "", "", "", ""], "": ["", "", "", "", ""]} | private_lora_dict.copy()
 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}, ...}
 all_lora_list = []
 
 

env.py

@@ -2,10 +2,10 @@ 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
+HF_READ_TOKEN = os.environ.get('HF_READ_TOKEN') # only use for private repo
 
 # - **List Models**
-load_diffusers_format_model = [
+LOAD_DIFFUSERS_FORMAT_MODEL = [
     'votepurchase/animagine-xl-3.1',
     'votepurchase/NSFW-GEN-ANIME-v2',
     'votepurchase/kivotos-xl-2.0',
@@ -138,11 +138,11 @@ HF_MODEL_USER_EX = ["John6666"] # sorted by a special rule
 
 
 # - **Download Models**
-download_model_list = [
+DOWNLOAD_MODEL_LIST = [
 ]
 
 # - **Download VAEs**
-download_vae_list = [
+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/blob/main/sdxl_vae-fp16fix-blessed.safetensors",
@@ -151,29 +151,26 @@ download_vae_list = [
 ]
 
 # - **Download LoRAs**
-download_lora_list = [
+DOWNLOAD_LORA_LIST = [
 ]
 
 # Download Embeddings
-download_embeds = [
+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_MODELS = 'models'
+DIRECTORY_LORAS = 'loras'
+DIRECTORY_VAES = 'vaes'
+DIRECTORY_EMBEDS = 'embedings'
+DIRECTORY_EMBEDS_SDXL = 'embedings_xl'
+DIRECTORY_EMBEDS_POSITIVE_SDXL = 'embedings_xl/positive'
 
-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)
+directories = [DIRECTORY_MODELS, DIRECTORY_LORAS, DIRECTORY_VAES, DIRECTORY_EMBEDS, DIRECTORY_EMBEDS_SDXL, DIRECTORY_EMBEDS_POSITIVE_SDXL]
+for directory in directories:
+    os.makedirs(directory, exist_ok=True)
 
 HF_LORA_PRIVATE_REPOS1 = ['John6666/loratest1', 'John6666/loratest3', 'John6666/loratest4', 'John6666/loratest6']
 HF_LORA_PRIVATE_REPOS2 = ['John6666/loratest10', 'John6666/loratest11','John6666/loratest'] # to be sorted as 1 repo

formatter.py

@@ -0,0 +1,43 @@
+from llama_cpp_agent.messages_formatter import MessagesFormatter, PromptMarkers, Roles
+
+mistral_v1_markers = {
+    Roles.system: PromptMarkers(""" [INST]""", """ [/INST] Understood.</s>"""),
+    Roles.user: PromptMarkers(""" [INST]""", """ [/INST]"""),
+    Roles.assistant: PromptMarkers(" ", "</s>"),
+    Roles.tool: PromptMarkers("", ""),
+}
+
+mistral_v1_formatter = MessagesFormatter(
+    pre_prompt="",
+    prompt_markers=mistral_v1_markers,
+    include_sys_prompt_in_first_user_message=False,
+    default_stop_sequences=["</s>"]
+)
+
+mistral_v2_markers = {
+    Roles.system: PromptMarkers("""[INST] """, """[/INST] Understood.</s>"""),
+    Roles.user: PromptMarkers("""[INST] """, """[/INST]"""),
+    Roles.assistant: PromptMarkers(" ", "</s>"),
+    Roles.tool: PromptMarkers("", ""),
+}
+
+mistral_v2_formatter = MessagesFormatter(
+    pre_prompt="",
+    prompt_markers=mistral_v2_markers,
+    include_sys_prompt_in_first_user_message=False,
+    default_stop_sequences=["</s>"]
+)
+
+mistral_v3_tekken_markers = {
+    Roles.system: PromptMarkers("""[INST]""", """[/INST]Understood.</s>"""),
+    Roles.user: PromptMarkers("""[INST]""", """[/INST]"""),
+    Roles.assistant: PromptMarkers("", "</s>"),
+    Roles.tool: PromptMarkers("", ""),
+}
+
+mistral_v3_tekken_formatter = MessagesFormatter(
+    pre_prompt="",
+    prompt_markers=mistral_v3_tekken_markers,
+    include_sys_prompt_in_first_user_message=False,
+    default_stop_sequences=["</s>"]
+)

llmdolphin.py

@@ -8,7 +8,8 @@ from llama_cpp_agent.chat_history.messages import Roles
 from ja_to_danbooru.ja_to_danbooru import jatags_to_danbooru_tags
 import wrapt_timeout_decorator
 from pathlib import Path
-
+from llama_cpp_agent.messages_formatter import MessagesFormatter
+from formatter import mistral_v1_formatter, mistral_v2_formatter, mistral_v3_tekken_formatter
 
 llm_models_dir = "./llm_models"
 llm_models = {
@@ -18,8 +19,10 @@ llm_models = {
     #"": ["", MessagesFormatterType.OPEN_CHAT],
     #"": ["", MessagesFormatterType.CHATML],
     #"": ["", MessagesFormatterType.PHI_3],
+    #"": ["", MessagesFormatterType.GEMMA_2],
     "mn-12b-lyra-v2a1-q5_k_m.gguf": ["HalleyStarbun/MN-12B-Lyra-v2a1-Q5_K_M-GGUF", MessagesFormatterType.CHATML],
     "L3-8B-Tamamo-v1.i1-Q5_K_M.gguf": ["mradermacher/L3-8B-Tamamo-v1-i1-GGUF", MessagesFormatterType.LLAMA_3],
+    "MN-Chinofun-12B-2.i1-Q4_K_M.gguf": ["mradermacher/MN-Chinofun-12B-2-i1-GGUF", MessagesFormatterType.MISTRAL],
     "Mahou-1.5-mistral-nemo-12B.i1-Q4_K_M.gguf": ["mradermacher/Mahou-1.5-mistral-nemo-12B-i1-GGUF", MessagesFormatterType.MISTRAL],
     "MN-12B-Mag-Mell-Q4_K_M.gguf": ["inflatebot/MN-12B-Mag-Mell-R1-GGUF", MessagesFormatterType.MISTRAL],
     "Qwen2.5-14B-Instruct-Q4_K_M.gguf": ["bartowski/Qwen2.5-14B-Instruct-GGUF", MessagesFormatterType.OPEN_CHAT],
@@ -59,12 +62,51 @@ llm_models = {
     "Qwen2.5-14B_Uncensored_Instruct.Q4_K_M.gguf": ["mradermacher/Qwen2.5-14B_Uncensored_Instruct-GGUF", MessagesFormatterType.OPEN_CHAT],
     "EVA-Qwen2.5-14B-v0.0.i1-IQ4_XS.gguf": ["mradermacher/EVA-Qwen2.5-14B-v0.0-i1-GGUF", MessagesFormatterType.OPEN_CHAT],
     "MN-12B-Vespa-x1.i1-Q4_K_M.gguf": ["mradermacher/MN-12B-Vespa-x1-i1-GGUF", MessagesFormatterType.CHATML],
+    "Rocinante-12B-v2h-Q4_K_M.gguf": ["BeaverAI/Rocinante-12B-v2h-GGUF", MessagesFormatterType.MISTRAL],
     "Mistral-Nemo-12B-ArliAI-RPMax-v1.1.i1-Q4_K_M.gguf": ["mradermacher/Mistral-Nemo-12B-ArliAI-RPMax-v1.1-i1-GGUF", MessagesFormatterType.MISTRAL],
     "Trinas_Nectar-8B-model_stock.i1-Q4_K_M.gguf": ["mradermacher/Trinas_Nectar-8B-model_stock-i1-GGUF", MessagesFormatterType.MISTRAL],
     "ChatWaifu_12B_v2.0.Q5_K_M.gguf": ["mradermacher/ChatWaifu_12B_v2.0-GGUF", MessagesFormatterType.MISTRAL],
     "ChatWaifu_22B_v2.0_preview.Q4_K_S.gguf": ["mradermacher/ChatWaifu_22B_v2.0_preview-GGUF", MessagesFormatterType.MISTRAL],
     "ChatWaifu_v1.4.Q5_K_M.gguf": ["mradermacher/ChatWaifu_v1.4-GGUF", MessagesFormatterType.MISTRAL],
     "ChatWaifu_v1.3.1.Q4_K_M.gguf": ["mradermacher/ChatWaifu_v1.3.1-GGUF", MessagesFormatterType.MISTRAL],
+    "Magnum_Dark_Madness_12b.Q4_K_S.gguf": ["mradermacher/Magnum_Dark_Madness_12b-GGUF", MessagesFormatterType.MISTRAL],
+    "Magnum_Lyra_Darkness_12b.Q4_K_M.gguf": ["mradermacher/Magnum_Lyra_Darkness_12b-GGUF", MessagesFormatterType.MISTRAL],
+    "Heart_Stolen-8B-task.i1-Q4_K_M.gguf": ["mradermacher/Heart_Stolen-8B-task-i1-GGUF", MessagesFormatterType.LLAMA_3],
+    "Magnum_Backyard_Party_12b.Q4_K_M.gguf": ["mradermacher/Magnum_Backyard_Party_12b-GGUF", MessagesFormatterType.MISTRAL],
+    "Magnum_Madness-12b.Q4_K_M.gguf": ["mradermacher/Magnum_Madness-12b-GGUF", MessagesFormatterType.MISTRAL],
+    "L3.1-Moe-2x8B-v0.2.i1-Q4_K_M.gguf": ["mradermacher/L3.1-Moe-2x8B-v0.2-i1-GGUF", MessagesFormatterType.LLAMA_3],
+    "Qwen2.5-14B-Wernicke-DPO.i1-Q4_K_M.gguf": ["mradermacher/Qwen2.5-14B-Wernicke-DPO-i1-GGUF", MessagesFormatterType.OPEN_CHAT],
+    "Gemma-2-Ataraxy-v4d-9B.i1-Q4_K_M.gguf": ["mradermacher/Gemma-2-Ataraxy-v4d-9B-i1-GGUF", MessagesFormatterType.GEMMA_2],
+    "qwen2.5-14b-megamerge-pt2-q5_k_m.gguf": ["CultriX/Qwen2.5-14B-MegaMerge-pt2-Q5_K_M-GGUF", MessagesFormatterType.OPEN_CHAT],
+    "quantqwen2-merged-16bit-q4_k_m.gguf": ["davidbzyk/QuantQwen2-merged-16bit-Q4_K_M-GGUF", MessagesFormatterType.OPEN_CHAT],
+    "Mistral-nemo-ja-rp-v0.2-Q4_K_S.gguf": ["ascktgcc/Mistral-nemo-ja-rp-v0.2-GGUF", MessagesFormatterType.MISTRAL],
+    "llama3.1-darkstorm-aspire-8b-q4_k_m.gguf": ["ZeroXClem/Llama3.1-DarkStorm-Aspire-8B-Q4_K_M-GGUF", MessagesFormatterType.LLAMA_3],
+    "llama-3-yggdrasil-astralspice-8b-q4_k_m.gguf": ["ZeroXClem/Llama-3-Yggdrasil-AstralSpice-8B-Q4_K_M-GGUF", MessagesFormatterType.LLAMA_3],
+    "hermes-llama3-roleplay-1000-v2.Q5_K_M.gguf": ["mradermacher/hermes-llama3-roleplay-1000-v2-GGUF", MessagesFormatterType.LLAMA_3],
+    "hermes-stheno-8B-v0.1.i1-Q5_K_M.gguf": ["mradermacher/hermes-stheno-8B-v0.1-i1-GGUF", MessagesFormatterType.LLAMA_3],
+    "qwen-carpmuscle-r-v0.3.Q4_K_M.gguf": ["mradermacher/qwen-carpmuscle-r-v0.3-GGUF", MessagesFormatterType.OPEN_CHAT],
+    "magnum-v4-12b.i1-Q4_K_M.gguf": ["mradermacher/magnum-v4-12b-i1-GGUF", MessagesFormatterType.MISTRAL],
+    "magnum-consolidatum-v1-12b.Q4_K_M.gguf": ["mradermacher/magnum-consolidatum-v1-12b-GGUF", MessagesFormatterType.MISTRAL],
+    "sillyrp-7b.i1-Q5_K_M.gguf": ["mradermacher/sillyrp-7b-i1-GGUF", MessagesFormatterType.CHATML],
+    "BlackSheep-Coder.i1-Q4_K_M.gguf": ["mradermacher/BlackSheep-Coder-i1-GGUF", MessagesFormatterType.OPEN_CHAT],
+    "Gemmasutra-9B-v1.Q4_K_M.gguf": ["mradermacher/Gemmasutra-9B-v1-GGUF", MessagesFormatterType.ALPACA],
+    "Tiger-Gemma-9B-v3.Q4_K_M.gguf": ["mradermacher/Tiger-Gemma-9B-v3-GGUF", MessagesFormatterType.ALPACA],
+    "mt-merge-gemma-2-9b-q6_k.gguf": ["zelk12/MT-Merge-gemma-2-9B-Q6_K-GGUF", MessagesFormatterType.ALPACA],
+    "Qwen2.5-14B-Wernicke.i1-Q4_K_M.gguf": ["mradermacher/Qwen2.5-14B-Wernicke-i1-GGUF", MessagesFormatterType.OPEN_CHAT],
+    "Llama-3SOME-8B-v2.Q5_K_M.gguf": ["mradermacher/Llama-3SOME-8B-v2-GGUF", MessagesFormatterType.LLAMA_3],
+    "Ministral-8B-Instruct-2410-Q5_K_M.gguf": ["bartowski/Ministral-8B-Instruct-2410-GGUF", MessagesFormatterType.MISTRAL],
+    "mahou-1.5-mistral-nemo-12b-lorablated.Q4_K_M.gguf": ["nbeerbower/Mahou-1.5-mistral-nemo-12B-lorablated-GGUF", MessagesFormatterType.MISTRAL],
+    "Gemma2-Eclipse-9B.i1-Q4_K_M.gguf": ["mradermacher/Gemma2-Eclipse-9B-i1-GGUF", MessagesFormatterType.ALPACA],
+    "ldm_soup_Llama-3.1-8B-Inst.Q5_K_M.gguf": ["mradermacher/ldm_soup_Llama-3.1-8B-Inst-GGUF", MessagesFormatterType.LLAMA_3],
+    "L3.1-ChubbyBase-10B.i1-Q4_K_M.gguf": ["mradermacher/L3.1-ChubbyBase-10B-i1-GGUF", MessagesFormatterType.LLAMA_3],
+    "MN-Tiramisu-12B.i1-Q4_K_M.gguf": ["mradermacher/MN-Tiramisu-12B-i1-GGUF", MessagesFormatterType.CHATML],
+    "llama-3.2-3b-instruct-uncensored-q6_k.gguf": ["nolynn/Llama-3.2-3B-Instruct-uncensored-Q6_K-GGUF", MessagesFormatterType.LLAMA_3],
+    "thea-3b-25r.i1-Q5_K_M.gguf": ["mradermacher/thea-3b-25r-i1-GGUF", MessagesFormatterType.LLAMA_3],
+    "Gemma-2-9B-It-SPPO-Iter3.i1-Q4_K_M.gguf": ["mradermacher/Gemma-2-9B-It-SPPO-Iter3-i1-GGUF", MessagesFormatterType.ALPACA],
+    "Qwenslerp3-14B.Q4_K_M.gguf": ["mradermacher/Qwenslerp3-14B-GGUF", MessagesFormatterType.OPEN_CHAT],
+    "magnum-v4-9b.Q4_K_M.gguf": ["mradermacher/magnum-v4-9b-GGUF", MessagesFormatterType.ALPACA],
+    "make_my_monster_grow-12b-model_stock-q4_k_m.gguf": ["DreadPoor/Make_My_Monster_Grow-12B-Model_Stock-Q4_K_M-GGUF", MessagesFormatterType.MISTRAL],
+    "emu_eggs-9b-model_stock-q4_k_m.gguf": ["DreadPoor/Emu_Eggs-9B-Model_Stock-Q4_K_M-GGUF", MessagesFormatterType.ALPACA],
     "Aster-G2-9B-v1.Q4_K_S.gguf": ["mradermacher/Aster-G2-9B-v1-GGUF", MessagesFormatterType.ALPACA],
     "nemo-12b-rp-merge.Q4_K_S.gguf": ["mradermacher/nemo-12b-rp-merge-GGUF", MessagesFormatterType.MISTRAL],
     "SthenoMix3.3.Q5_K_M.gguf": ["mradermacher/SthenoMix3.3-GGUF", MessagesFormatterType.LLAMA_3],
@@ -792,8 +834,12 @@ llm_formats = {
     "PHI 3": MessagesFormatterType.PHI_3,
     "Autocoder": MessagesFormatterType.AUTOCODER,
     "DeepSeek Coder v2": MessagesFormatterType.DEEP_SEEK_CODER_2,
-    "Gemma 2": MessagesFormatterType.ALPACA,
+    "Gemma 2": MessagesFormatterType.GEMMA_2,
     "Qwen2": MessagesFormatterType.OPEN_CHAT,
+    "Open Interpreter": MessagesFormatterType.OPEN_INTERPRETER,
+    "Mistral Tokenizer V1": mistral_v1_formatter,
+    "Mistral Tokenizer V2": mistral_v2_formatter,
+    "Mistral Tokenizer V3 - Tekken": mistral_v3_tekken_formatter,
 }
 # https://github.com/Maximilian-Winter/llama-cpp-agent
 llm_languages = ["English", "Japanese", "Chinese", "Korean", "Spanish", "Portuguese", "German", "French", "Finnish", "Russian"]
@@ -1213,7 +1259,8 @@ def dolphin_respond(
     agent = LlamaCppAgent(
         provider,
         system_prompt=f"{system_message}",
-        predefined_messages_formatter_type=chat_template,
+        predefined_messages_formatter_type=chat_template if not isinstance(chat_template, MessagesFormatter) else None,
+        custom_messages_formatter=chat_template if isinstance(chat_template, MessagesFormatter) else None,
         debug_output=False
     )
     
@@ -1307,7 +1354,8 @@ def dolphin_respond_auto(
     agent = LlamaCppAgent(
         provider,
         system_prompt=f"{system_message}",
-        predefined_messages_formatter_type=chat_template,
+        predefined_messages_formatter_type=chat_template if not isinstance(chat_template, MessagesFormatter) else None,
+        custom_messages_formatter=chat_template if isinstance(chat_template, MessagesFormatter) else None,
         debug_output=False
     )
     
@@ -1347,7 +1395,7 @@ def dolphin_respond_auto(
     outputs = ""
     for output in stream:
         outputs += output
-        yield [(outputs, None)]
+        yield [(outputs, None)], gr.update()
 
 
 def dolphin_parse_simple(
@@ -1402,7 +1450,8 @@ def respond_playground(
     agent = LlamaCppAgent(
         provider,
         system_prompt=f"{system_message}",
-        predefined_messages_formatter_type=chat_template,
+        predefined_messages_formatter_type=chat_template if not isinstance(chat_template, MessagesFormatter) else None,
+        custom_messages_formatter=chat_template if isinstance(chat_template, MessagesFormatter) else None,
         debug_output=False
     )
     

lora_dict.json

@@ -1490,6 +1490,13 @@
     "https://civitai.com/models/844457",
     "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/0740f561-8808-425c-a4e0-90575f887262/width=450/34033551.jpeg"
   ],
+  "MORTARHEADD_like_mecha_v1_2": [
+    "MORTARHEADD / MH-POSE /  MH-BUSTER /  MH-KOG /  MH-LED-MIRAGE /  MH-Engage-SR1 /  MH-the-BANG / MH-Neptune / MH-BTK",
+    "SDXL 1.0",
+    "FSS Mortar headd Like mecha <The Five Star Stories>",
+    "https://civitai.com/models/844457",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/2c156011-ae37-476b-9c88-b7ee614b57c3/width=450/35788486.jpeg"
+  ],
   "MS_PDXL_AfterSex_Lite": [
     "after sex, cum, lying, cumdrip, ass, on stomach, on back, fucked silly, sweat, cum pool, bukkake, trembling",
     "Pony",
@@ -2120,6 +2127,13 @@
     "https://civitai.com/models/187744",
     "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/96984154-3d8b-4b34-8cd6-3db03af93563/width=450/3359107.jpeg"
   ],
+  "ShungikuTenUdon_Pony_V1": [
+    "(shungikutenudon) , 1girl, solo, breasts, nipples,  spread legs,  spread pussy,  erection clitoris,  clitoris, clitoral foreskin, cute pussy, enlarged labia, developed inner labia, urethra,spread urethra,  pussy juice, close-up pussy, gaping, cervix,  / (close-up clitoris), (close-up layers),(Multiple layers), (multiple views), simple bacground, zoom layer, close-up layer,",
+    "Pony",
+    "Hentai Huge Clitoris Spread Pussy (shungiku tenudon) Pony XL | \u5de8\u5927\u30af\u30ea\u30c8\u30ea\u30b9 \u307e\u3093\u3053\u304f\u3071\u3041 (\u6625\u83ca\u5929\u3046\u3069\u3093)",
+    "https://civitai.com/models/868507",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/e4a41d92-8bae-404a-b8df-d12a2687b160/width=450/35391164.jpeg"
+  ],
   "Side-by-Side_Cowgirl_position": [
     "",
     "Pony",
@@ -2176,6 +2190,13 @@
     "https://civitai.com/models/595321",
     "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/bc52e939-7385-4858-be93-dd370279d0ca/width=450/20952551.jpeg"
   ],
+  "SpreadPussy_STU_Pony_V2": [
+    "(dilation Vagina),(Put fingers in Vagina), (spread Vagina wide), (Perfect hands),cervix, Vagina,spread legs,  erection clitoris,  clitoris, clitoral foreskin, enlarged labia, developed inner labia, urethra,spread urethra, pussy juice, close-up pussy, cum in pussy, cum in anal, after sex, cum string, cum drip, cum pool, (close-up clitoris), (close-up layers:1.2),(Multiple layers:1.2), (multiple views:1.2), simple bacground, zoom layer, close-up layer,",
+    "Pony",
+    "Hentai Pussy inspection (Gaping Pussy Opened in Fingers) Pony XL | \u307e\u3093\u3053\u691c\u67fb\uff08\u5965\u307e\u3067\u6307\u3092\u5165\u308c\u3066\u304f\u3071\u3041\u2665\uff09",
+    "https://civitai.com/models/870724",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/be0c3a9b-f287-47dd-9d27-8e1650add4df/width=450/35523008.jpeg"
+  ],
   "Squatting_PonyXL_v1": [
     "squatting / legs together, from below,",
     "Pony",
@@ -2967,6 +2988,13 @@
     "https://civitai.com/models/526774",
     "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/b40d42c4-66df-4c6e-9351-2b0343007979/width=450/16455415.jpeg"
   ],
+  "armcannon_XL_v1": [
+    "arm cannon",
+    "SDXL 1.0",
+    "arm cannon / \u30a2\u30fc\u30e0\u30ad\u30e3\u30ce\u30f3 / \u30ed\u30c3\u30af\u30d0\u30b9\u30bf\u30fc / \u30b5\u30a4\u30b3\u30ac\u30f3",
+    "https://civitai.com/models/870619",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/6fd8ed3c-794d-4c56-a994-6fa45a5b09ca/width=450/35509987.jpeg"
+  ],
   "armp1tt1ckl3": [
     "armp1tt1ckl3",
     "Pony",
@@ -3975,6 +4003,20 @@
     "https://civitai.com/models/628775",
     "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/83566548-b845-4d8b-a0d0-be8cc8822a81/width=450/23142557.jpeg"
   ],
+  "danmen_illustrious_V1_0": [
+    "danmen,penis,vaginal / uterus / x-ray / cross-section /  internal cumshot",
+    "Illustrious",
+    "\u65ad\u9762\u56f3/uterus",
+    "https://civitai.com/models/853101",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/441cbbf7-aa73-4991-b9aa-21432686b715/width=450/36094538.jpeg"
+  ],
+  "danmen_pony_V1_0": [
+    " danmen, sex, vaginal / uterus / cross-section / x-ray",
+    "Pony",
+    "\u65ad\u9762\u56f3/uterus",
+    "https://civitai.com/models/853101",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/9bbdb650-67f6-4b7a-b020-2f1b15363919/width=450/34507990.jpeg"
+  ],
   "dawa": [
     "dawa",
     "SDXL 1.0",
@@ -4381,6 +4423,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",
@@ -4647,6 +4696,20 @@
     "https://civitai.com/models/462635",
     "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/8cac72e3-3107-44ba-b860-f0b0eed4d8a3/width=450/12869927.jpeg"
   ],
+  "haraboko_XL_V1_0": [
+    "extrem insertion, stomach bulge",
+    "SDXL 1.0",
+    "\u8179\u307c\u3053/extrem insertion(XL,pony)",
+    "https://civitai.com/models/486122",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/b1388bbf-c16c-4165-b32f-b63ee7d7ed14/width=450/33120289.jpeg"
+  ],
+  "haraboko_XL_illustrious_V1_0": [
+    " extrem insertion, stomach bulge",
+    "Illustrious",
+    "\u8179\u307c\u3053/extrem insertion(XL,pony)",
+    "https://civitai.com/models/486122",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/031fb13c-3d5e-4ddf-b49f-1661b8db9c09/width=450/35521696.jpeg"
+  ],
   "haraboko_pony_V2_0": [
     "stomach bulge",
     "Pony",
@@ -4654,6 +4717,13 @@
     "https://civitai.com/models/486122",
     "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/b6735506-c5c4-4a3a-8796-c1f86bcc7654/width=450/16987795.jpeg"
   ],
+  "haraboko_pony_V3_0": [
+    "extrem insertion,stomach bulge",
+    "Pony",
+    "\u8179\u307c\u3053/extrem insertion(XL,pony)",
+    "https://civitai.com/models/486122",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/50cfd157-5340-48d2-9189-d1332391a82a/width=450/33111898.jpeg"
+  ],
   "harmonicaSY": [
     "harmonica",
     "SDXL 1.0",
@@ -4689,6 +4759,20 @@
     "https://civitai.com/models/412943",
     "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/e9a0d288-32fe-40a5-8576-3056d4562dfe/width=450/10426060.jpeg"
   ],
+  "heart_hands_XL_illustrious_V1_0": [
+    "heart hands",
+    "Illustrious",
+    "\u624b\u30cf\u30fc\u30c8/heart hands",
+    "https://civitai.com/models/870734",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/6e0665ea-3861-42f5-9f21-ad8d4aa7cb37/width=450/35520723.jpeg"
+  ],
+  "hekohakost2": [
+    "koshi_heko_standing, hkhkstanding, (motion lines, sound effects:1.3) / koshi_heko_squatting, hkhksquatting, (motion lines, sound effects:1.3), squatting / koshi_heko_back, hkhkback, (motion lines, sound effects:1.3) / koshi_heko_lying, hkhklying, (motion lines, sound effects:1.3), lying",
+    "Pony",
+    "(CONCEPT) Hip thrust / \u8170\u30d8\u30b3\u30fb\u30c1\u30f3\u5a9a\u3073\u30c0\u30f3\u30b9",
+    "https://civitai.com/models/869186",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/9a480935-7849-4ebd-8a71-a428cd5b14e1/width=450/35459697.jpeg"
+  ],
   "hennnachoco_face_XL-v1": [
     "looking at viewer,close-up,blurry background",
     "SDXL 1.0",
@@ -4787,6 +4871,62 @@
     "https://civitai.com/models/498731",
     "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/06a0dc3a-42ba-42b5-9ea9-d6b6faa3543b/width=450/14812284.jpeg"
   ],
+  "hotarueye_xl_tareme1_v10": [
+    "",
+    "Pony",
+    "[SDXL] Tareme(\u30bf\u30ec\u76ee) set 1",
+    "https://civitai.com/models/881360",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/5c1447f9-fd31-4907-833d-a2e21b4eb2fe/width=450/36138850.jpeg"
+  ],
+  "hotarueye_xl_tareme2_v10": [
+    "",
+    "Pony",
+    "[SDXL] Tareme(\u30bf\u30ec\u76ee) set 1",
+    "https://civitai.com/models/881360",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/c432f738-1d46-4a74-b8df-b1a2d5113c88/width=450/36138998.jpeg"
+  ],
+  "hotarueye_xl_tareme3_v10": [
+    "",
+    "Pony",
+    "[SDXL] Tareme(\u30bf\u30ec\u76ee) set 1",
+    "https://civitai.com/models/881360",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/8fb96219-49ba-42d0-a21e-064ab8795b76/width=450/36139352.jpeg"
+  ],
+  "hotarueye_xl_tareme4_v10": [
+    "",
+    "Pony",
+    "[SDXL] Tareme(\u30bf\u30ec\u76ee) set 1",
+    "https://civitai.com/models/881360",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/202efac0-15b4-4fa4-9b43-95bff83ab3d4/width=450/36139463.jpeg"
+  ],
+  "hotarueye_xl_tsurime1_v10": [
+    "",
+    "Pony",
+    "[SDXL] Tsurime(\u540a\u308a\u76ee) set 1",
+    "https://civitai.com/models/881323",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/b071a8a7-5b3a-447b-ac3d-fb4ca00ef696/width=450/36137296.jpeg"
+  ],
+  "hotarueye_xl_tsurime2_v10": [
+    "",
+    "Pony",
+    "[SDXL] Tsurime(\u540a\u308a\u76ee) set 1",
+    "https://civitai.com/models/881323",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/597d6089-ceba-492a-bdf1-b99dfd50f6fb/width=450/36137387.jpeg"
+  ],
+  "hotarueye_xl_tsurime3_v10": [
+    "",
+    "Pony",
+    "[SDXL] Tsurime(\u540a\u308a\u76ee) set 1",
+    "https://civitai.com/models/881323",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/2881d878-991f-46b6-b622-c8e8f07614dc/width=450/36137559.jpeg"
+  ],
+  "hotarueye_xl_tsurime4_v10": [
+    "",
+    "Pony",
+    "[SDXL] Tsurime(\u540a\u308a\u76ee) set 1",
+    "https://civitai.com/models/881323",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/cd106f42-92fe-4b8b-92cb-918ed9dbfdd2/width=450/36137786.jpeg"
+  ],
   "hotpants_XL_V1_0": [
     "hotpants",
     "SDXL 1.0",
@@ -4843,6 +4983,20 @@
     "https://civitai.com/models/363398",
     "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/e8f31f60-8949-42da-b740-c6541e0d6d9b/width=450/8398353.jpeg"
   ],
+  "imminent_penetration_illustrious_V1_0": [
+    "imminent penetration, penis, blush, 1boy, erection,speead legs",
+    "Illustrious",
+    "\u633f\u5165\u524d/ imminent penetration",
+    "https://civitai.com/models/856070",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/51e16b51-8225-41ab-a951-dd3e459def6b/width=450/36030387.jpeg"
+  ],
+  "imminent_penetration_pony_V1_0": [
+    " imminent penetration,penis",
+    "Pony",
+    "\u633f\u5165\u524d/ imminent penetration",
+    "https://civitai.com/models/856070",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/61c8e398-0d48-4dac-ae4d-d29c77b87457/width=450/34669225.jpeg"
+  ],
   "implied_fellatio_v0_1-pony": [
     "implied fellatio",
     "Pony",
@@ -4948,6 +5102,20 @@
     "https://civitai.com/models/445063",
     "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/9555de99-1fba-4af8-9cb2-f03f7ae6e094/width=450/32416800.jpeg"
   ],
+  "jyojifuku_XL_illustrious_V1_0": [
+    " jyojifuku, print clothes, pastel color clothes,shirt, skirt, thighhighs,backpack",
+    "Illustrious",
+    "\u5973\u5150\u670d/girl's clothes(XL,Pony)",
+    "https://civitai.com/models/445063",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/cc797a2d-28f4-467d-9021-7379616e1ea1/width=450/35071752.jpeg"
+  ],
+  "jyojifuku_pony_V2_1": [
+    " jyojifuku, print clothes,pastel color clothes, shirt, skirt, thighhighs / panties / socks / backpack / shoes",
+    "Pony",
+    "\u5973\u5150\u670d/girl's clothes(XL,Pony)",
+    "https://civitai.com/models/445063",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/4d912b6a-5390-4451-b837-dac74009a0a5/width=450/32545900.jpeg"
+  ],
   "jyojimizugi_Pony_V1_0": [
     "jyojimizugi,bikini,frills",
     "Pony",
@@ -4983,6 +5151,13 @@
     "https://civitai.com/models/234887",
     "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/4d94a5a1-b7d2-40b7-b864-f112b26e09a7/width=450/4642510.jpeg"
   ],
+  "kakefuton_pony_V1": [
+    " futon, pillow, closed eyes, bed, sleeping, lying, under covers, blanket, ",
+    "Pony",
+    "\u639b\u3051\u5e03\u56e3 / comforter PONY",
+    "https://civitai.com/models/884844",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/e74e1575-7eb1-41a7-8e8e-0371361904f7/width=450/36347575.jpeg"
+  ],
   "kakigoori_pony_V1_0": [
     "kakigoori / shaved ice / spoon",
     "Pony",
@@ -5130,6 +5305,13 @@
     "https://civitai.com/models/574993",
     "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/e6148d75-f33f-4f56-8203-4d88a48231e2/width=450/21439541.jpeg"
   ],
+  "kuro_gyaru_XL_illustrious_V1_0": [
+    "kuro gyaru, dark skin, blonde hair",
+    "Illustrious",
+    "\u9ed2\u30ae\u30e3\u30eb/Black Gal(XL,pony)",
+    "https://civitai.com/models/574993",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/4cb23d9a-ae9b-4b4a-9066-c94c23f7180c/width=450/35412051.jpeg"
+  ],
   "kuro_gyaru_pony_V1_0": [
     "kuro gyaru / dark skin / blonde hair",
     "Pony",
@@ -5480,6 +5662,13 @@
     "https://civitai.com/models/549761",
     "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/5059fb4e-8cb0-4870-babe-2e62d93ec592/width=450/18112025.jpeg"
   ],
+  "mating_press_illustrious_V1_0": [
+    "mating press, penis, sex, 1boy, ass, vaginal, testicles,anus, lying,cum",
+    "Illustrious",
+    "\u7a2e\u4ed8\u3051\u30d7\u30ec\u30b9/mating press",
+    "https://civitai.com/models/866324",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/5295fcb9-8f85-4ce7-af66-c14357e55014/width=450/36296038.jpeg"
+  ],
   "matsubamuzushi_pony_V1_0": [
     "matsubakuzushi, sex, leg lift, leg up, 1boy, 1girl,lying",
     "Pony",
@@ -5788,6 +5977,13 @@
     "https://civitai.com/models/551712",
     "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/b17f1a24-390b-4a5c-a4a1-bc479b627177/width=450/18108188.jpeg"
   ],
+  "ohogao_XL_illustrious_V1_0": [
+    "ohogao",
+    "Illustrious",
+    "\u304a\u307b\u9854/ohogao",
+    "https://civitai.com/models/870999",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/62037f5d-ec33-4cd7-a4e7-d731df042c13/width=450/35536765.jpeg"
+  ],
   "ojou-sama_pose__pony": [
     "ojou-sama_pose ",
     "Pony",
@@ -5865,6 +6061,20 @@
     "https://civitai.com/models/503381",
     "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/d376245b-d55f-4635-8a68-c7317268f1e9/width=450/15093929.jpeg"
   ],
+  "onedari_illustrious_V1_0": [
+    "onedari,spread ass",
+    "Illustrious",
+    "\u304a\u306d\u3060\u308a\u306e\u30dd\u30fc\u30b9/spread ass",
+    "https://civitai.com/models/823132",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/e30a145a-6408-4fbc-a4e3-b44a2f2b55cc/width=450/36044323.jpeg"
+  ],
+  "onedari_pony_V1_0": [
+    " onedari, ass,spread ass",
+    "Pony",
+    "\u304a\u306d\u3060\u308a\u306e\u30dd\u30fc\u30b9/spread ass",
+    "https://civitai.com/models/823132",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/d9a4f767-9a70-4828-a418-0eeabe52d378/width=450/32736802.jpeg"
+  ],
   "onimai_pony": [
     "onimai",
     "Pony",
@@ -5963,6 +6173,13 @@
     "https://civitai.com/models/454066",
     "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/d73c20b4-a1bb-4c9d-88ba-150be2e49cb9/width=450/14888108.jpeg"
   ],
+  "paleface_xl_v10": [
+    "",
+    "Pony",
+    "[SDXL] Paled face / \u9752\u3056\u3081\u305f\u9854",
+    "https://civitai.com/models/884477",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/1c789f11-fade-4f80-a282-0d29ebdbc271/width=450/36325889.jpeg"
+  ],
   "panties_aside_XL_V1_0": [
     "panties / panties aside / pussy / anal",
     "SDXL 1.0",
@@ -6159,6 +6376,13 @@
     "https://civitai.com/models/159333",
     "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/4b04073f-f9c0-446a-9a2b-b8a818cf96f8/width=450/9737393.jpeg"
   ],
+  "playing_with_own_hair_XL_illustrious_V1_0": [
+    " playing with own hair",
+    "Illustrious",
+    "\u9aea\u3044\u3058\u308a/playing with own hair",
+    "https://civitai.com/models/869504",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/7deb7e3b-7fbe-4616-b973-87b58cdb562e/width=450/35502284.jpeg"
+  ],
   "pointing_a31-3": [
     "pointing, chibi, fang, open mouth,",
     "SDXL 1.0",
@@ -6551,6 +6775,13 @@
     "https://civitai.com/models/473507",
     "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/e0e9a011-421e-4d30-afaa-eb113ed9653c/width=450/13448210.jpeg"
   ],
+  "rei_no_kabe_pony_V2": [
+    "reinokabe, checkered wall, checkered background, english text, blue theme, meme,",
+    "Pony",
+    "\u4f8b\u306e\u58c1 rei no kabe PONY",
+    "https://civitai.com/models/473507",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/ef4388c1-c6a1-49b5-8e12-230fd963ec6c/width=450/35420263.jpeg"
+  ],
   "rei_no_pool_PONY_V1": [
     "reinopool, pool, window, scenery, indoors, tiles, water, tile floor, pool ladder, plant",
     "Pony",
@@ -6817,6 +7048,20 @@
     "https://civitai.com/models/600296",
     "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/3ac9e35e-3e3f-492e-a81f-9791ff6e6914/width=450/21281952.jpeg"
   ],
+  "sex_from_behind_XL_illustrious_V1_0": [
+    " sex from behind, 1boy, vaginal, penis",
+    "Illustrious",
+    "\u30d0\u30c3\u30af\u30bb\u30c3\u30af\u30b9/sex from behind(XL,pony)",
+    "https://civitai.com/models/868502",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/bae209c8-bf57-4c55-b0b1-46c046040b7a/width=450/35562464.jpeg"
+  ],
+  "sex_from_behind_pony_V1_0": [
+    "sex from behind",
+    "Pony",
+    "\u30d0\u30c3\u30af\u30bb\u30c3\u30af\u30b9/sex from behind(XL,pony)",
+    "https://civitai.com/models/868502",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/a1f8b538-c071-44fb-b54b-6094de0999cf/width=450/35389190.jpeg"
+  ],
   "sfw1": [
     "",
     "Pony",
@@ -6894,6 +7139,13 @@
     "https://civitai.com/models/102603",
     "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/ce030fc2-c6c8-4153-ae51-5fa6fbc51b8e/width=450/20563893.jpeg"
   ],
+  "side_ponytail_pony_V1_0": [
+    "side ponytail",
+    "Pony",
+    "\u30b5\u30a4\u30c9\u30dd\u30cb\u30fc\u30c6\u30a4\u30eb/side ponytail",
+    "https://civitai.com/models/867848",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/c6588028-00de-47e4-96cf-bd4c562af36c/width=450/35345790.jpeg"
+  ],
   "sidepositionxl16": [
     "side,scenery,part of landscape",
     "SDXL 1.0",
@@ -6992,6 +7244,13 @@
     "https://civitai.com/models/552152",
     "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/9ee78490-d6c5-45c1-a1a0-92cb965faa10/width=450/18135129.jpeg"
   ],
+  "sob_XL_illustrious_V1_0": [
+    "sob,tears,hands on eyes",
+    "Illustrious",
+    "\u6ce3\u304d\u3058\u3083\u304f\u308b/sob",
+    "https://civitai.com/models/871126",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/70ff31df-699e-4e9a-821e-d50b962a3a93/width=450/35544209.jpeg"
+  ],
   "soccer_uniform_pony_V1_1": [
     "soccer uniform / soccer",
     "Pony",
@@ -7097,6 +7356,13 @@
     "https://civitai.com/models/273357",
     "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/d529909d-2115-4e32-8226-28537d5b1763/width=450/8178754.jpeg"
   ],
+  "ss_mss_illustrious": [
+    "ss_mss, miniature_school_swimsuit, groin, highleg, partially visible vulva, wedgie, undersized clothes, nipples, cleavage,",
+    "Illustrious",
+    "Miniature School Swimsuit",
+    "https://civitai.com/models/575540",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/0552741b-1fca-4960-a483-75dacc8404d7/width=450/35919632.jpeg"
+  ],
   "ss_mss_pony-000005": [
     "ss_mss, miniature_school_swimsuit, groin, highleg, partially visible vulva, wedgie, undersized clothes, nipples, cleavage",
     "Pony",
@@ -7111,6 +7377,20 @@
     "https://civitai.com/models/434763",
     "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/1434e8b5-0aa1-46b4-a366-fc5271a922a3/width=450/12693104.jpeg"
   ],
+  "stirring_Pony_v1": [
+    "stirring",
+    "Pony",
+    "[SDXL&Pony] stirring / \u934b\u304b\u304d\u6df7\u305c",
+    "https://civitai.com/models/863366",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/995b7ed1-f3c2-47b7-babd-524d2aec81b7/width=450/35858737.jpeg"
+  ],
+  "stirring_XL_v1": [
+    "stirring",
+    "Illustrious",
+    "[SDXL&Pony] stirring / \u934b\u304b\u304d\u6df7\u305c",
+    "https://civitai.com/models/863366",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/31072869-41b7-4efd-b34a-8573ba7e92d5/width=450/35074986.jpeg"
+  ],
   "stradding_chair_XL": [
     "",
     "SDXL 1.0",
@@ -7202,6 +7482,13 @@
     "https://civitai.com/models/461839",
     "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/f1f48385-5230-4eab-ba2a-080c1bb2af1a/width=450/13712411.jpeg"
   ],
+  "sukumizu_XL_illustrious_V1_0": [
+    "school swimsuit / one-piece swimsuit / white one-piece swimsuit",
+    "Illustrious",
+    "\u30b9\u30af\u6c34/school swimsuit(XL,pony)",
+    "https://civitai.com/models/461839",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/718d3dca-83b7-405d-8758-1ff7aaa2926f/width=450/35041111.jpeg"
+  ],
   "sukumizutan_XL_v1": [
     "sukumizutan, tanlines, tan",
     "SDXL 1.0",
@@ -7636,6 +7923,13 @@
     "https://civitai.com/models/563723",
     "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/1cdf9e3a-9412-4a37-aea6-01524c61f4ce/width=450/18879048.jpeg"
   ],
+  "ultra_rise": [
+    "ultra rise,tokusatsu,full body,from above,",
+    "Pony",
+    "Ultraman Rising \u3050\u3093\u3050\u3093\u30ab\u30c3\u30c8",
+    "https://civitai.com/models/876021",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/e0da72af-c5c1-4d40-8142-d5bcf89da2b3/width=450/35960405.jpeg"
+  ],
   "under_the_table_blowjob": [
     "under_the_table_blowjob",
     "Pony",
@@ -8091,6 +8385,27 @@
     "https://civitai.com/models/454664",
     "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/e81c4662-b60a-4169-a30b-31753f93c7e7/width=450/15517389.jpeg"
   ],
+  "yudedako_xl_type1_v10": [
+    "",
+    "Pony",
+    "[SDXL] Embarrased face / \u8d64\u9762\uff08\u8339\u3067\u30c0\u30b3\u9854\uff09",
+    "https://civitai.com/models/884440",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/18a0fc9c-00ae-4a1d-a65c-cd0b344f5395/width=450/36323502.jpeg"
+  ],
+  "yudedako_xl_type2_v10": [
+    "",
+    "Pony",
+    "[SDXL] Embarrased face / \u8d64\u9762\uff08\u8339\u3067\u30c0\u30b3\u9854\uff09",
+    "https://civitai.com/models/884440",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/d5178802-d2ef-4274-8910-4376fb1239ef/width=450/36323833.jpeg"
+  ],
+  "yudedako_xl_type3_v10": [
+    "",
+    "Pony",
+    "[SDXL] Embarrased face / \u8d64\u9762\uff08\u8339\u3067\u30c0\u30b3\u9854\uff09",
+    "https://civitai.com/models/884440",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/a9825ad3-e3fa-4590-9143-ec6f35b25ade/width=450/36323941.jpeg"
+  ],
   "yukata_pony_V1_0": [
     " jyojifuku, yukata, japanese clothes, floral print,hair ornament,sandals",
     "Pony",

modutils.py

@@ -12,11 +12,16 @@ from urllib3.util import Retry
 import urllib.parse
 import pandas as pd
 from huggingface_hub import HfApi, HfFolder, hf_hub_download, snapshot_download
+from translatepy import Translator
+from unidecode import unidecode
+import copy
+from datetime import datetime, timezone, timedelta
+FILENAME_TIMEZONE = timezone(timedelta(hours=9)) # JST
 
 
 from env import (HF_LORA_PRIVATE_REPOS1, HF_LORA_PRIVATE_REPOS2,
     HF_MODEL_USER_EX, HF_MODEL_USER_LIKES, DIFFUSERS_FORMAT_LORAS,
-    directory_loras, hf_read_token, HF_TOKEN, CIVITAI_API_KEY)
+    DIRECTORY_LORAS, HF_READ_TOKEN, HF_TOKEN, CIVITAI_API_KEY)
 
 
 MODEL_TYPE_DICT = {
@@ -46,7 +51,6 @@ def is_repo_name(s):
     return re.fullmatch(r'^[^/]+?/[^/]+?$', s)
 
 
-from translatepy import Translator
 translator = Translator()
 def translate_to_en(input: str):
     try:
@@ -64,6 +68,7 @@ def get_local_model_list(dir_path):
         if file.suffix in valid_extensions:
             file_path = str(Path(f"{dir_path}/{file.name}"))
             model_list.append(file_path)
+            #print('\033[34mFILE: ' + file_path + '\033[0m')
     return model_list
 
 
@@ -98,21 +103,81 @@ def split_hf_url(url: str):
         print(e)
 
 
-def download_hf_file(directory, url, progress=gr.Progress(track_tqdm=True)):
-    hf_token = get_token()
+def download_hf_file(directory, url, force_filename="", hf_token="", progress=gr.Progress(track_tqdm=True)):
     repo_id, filename, subfolder, repo_type = split_hf_url(url)
+    kwargs = {}
+    if subfolder is not None: kwargs["subfolder"] = subfolder
+    if force_filename: kwargs["force_filename"] = force_filename
     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)
+        print(f"Start downloading: {url} to {directory}")
+        path = hf_hub_download(repo_id=repo_id, filename=filename, repo_type=repo_type, local_dir=directory, token=hf_token, **kwargs)
         return path
     except Exception as e:
-        print(f"Failed to download: {e}")
+        print(f"Download failed: {url} {e}")
         return None
 
 
-def download_things(directory, url, hf_token="", civitai_api_key=""):
+USER_AGENT = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:127.0) Gecko/20100101 Firefox/127.0'
+
+
+def request_json_data(url):
+    model_version_id = url.split('/')[-1]
+    if "?modelVersionId=" in model_version_id:
+        match = re.search(r'modelVersionId=(\d+)', url)
+        model_version_id = match.group(1)
+
+    endpoint_url = f"https://civitai.com/api/v1/model-versions/{model_version_id}"
+
+    params = {}
+    headers = {'User-Agent': USER_AGENT, 'content-type': 'application/json'}
+    session = requests.Session()
+    retries = Retry(total=5, backoff_factor=1, status_forcelist=[500, 502, 503, 504])
+    session.mount("https://", HTTPAdapter(max_retries=retries))
+
+    try:
+        result = session.get(endpoint_url, params=params, headers=headers, stream=True, timeout=(3.0, 15))
+        result.raise_for_status()
+        json_data = result.json()
+        return json_data if json_data else None
+    except Exception as e:
+        print(f"Error: {e}")
+        return None
+
+
+class ModelInformation:
+    def __init__(self, json_data):
+        self.model_version_id = json_data.get("id", "")
+        self.model_id = json_data.get("modelId", "")
+        self.download_url = json_data.get("downloadUrl", "")
+        self.model_url = f"https://civitai.com/models/{self.model_id}?modelVersionId={self.model_version_id}"
+        self.filename_url = next(
+            (v.get("name", "") for v in json_data.get("files", []) if str(self.model_version_id) in v.get("downloadUrl", "")), ""
+        )
+        self.filename_url = self.filename_url if self.filename_url else ""
+        self.description = json_data.get("description", "")
+        if self.description is None: self.description = ""
+        self.model_name = json_data.get("model", {}).get("name", "")
+        self.model_type = json_data.get("model", {}).get("type", "")
+        self.nsfw = json_data.get("model", {}).get("nsfw", False)
+        self.poi = json_data.get("model", {}).get("poi", False)
+        self.images = [img.get("url", "") for img in json_data.get("images", [])]
+        self.example_prompt = json_data.get("trainedWords", [""])[0] if json_data.get("trainedWords") else ""
+        self.original_json = copy.deepcopy(json_data)
+
+
+def retrieve_model_info(url):
+    json_data = request_json_data(url)
+    if not json_data:
+        return None
+    model_descriptor = ModelInformation(json_data)
+    return model_descriptor
+
+
+def download_things(directory, url, hf_token="", civitai_api_key="", romanize=False):
+    hf_token = get_token()
     url = url.strip()
+    downloaded_file_path = None
+
     if "drive.google.com" in url:
         original_dir = os.getcwd()
         os.chdir(directory)
@@ -123,18 +188,48 @@ 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/")
-        download_hf_file(directory, url)
+
+        filename = unidecode(url.split('/')[-1]) if romanize else url.split('/')[-1]
+
+        download_hf_file(directory, url, filename, hf_token)
+
+        downloaded_file_path = os.path.join(directory, filename)
+
     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:
+
+        if not civitai_api_key:
             print("\033[91mYou need an API key to download Civitai models.\033[0m")
+
+        model_profile = retrieve_model_info(url)
+        if model_profile.download_url and model_profile.filename_url:
+            url = model_profile.download_url
+            filename = unidecode(model_profile.filename_url) if romanize else model_profile.filename_url
+        else:
+            if "?" in url:
+                url = url.split("?")[0]
+            filename = ""
+
+        url_dl = url + f"?token={civitai_api_key}"
+        print(f"Filename: {filename}")
+
+        param_filename = ""
+        if filename:
+            param_filename = f"-o '{filename}'"
+
+        aria2_command = (
+            f'aria2c --console-log-level=error --summary-interval=10 -c -x 16 '
+            f'-k 1M -s 16 -d "{directory}" {param_filename} "{url_dl}"'
+        )
+        os.system(aria2_command)
+
+        if param_filename and os.path.exists(os.path.join(directory, filename)):
+            downloaded_file_path = os.path.join(directory, filename)
+
     else:
         os.system(f"aria2c --console-log-level=error --summary-interval=10 -c -x 16 -k 1M -s 16 -d {directory} {url}")
 
+    return downloaded_file_path
+
 
 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():
@@ -173,7 +268,7 @@ def to_lora_key(path: str):
 
 def to_lora_path(key: str):
     if Path(key).is_file(): return key
-    path = Path(f"{directory_loras}/{escape_lora_basename(key)}.safetensors")
+    path = Path(f"{DIRECTORY_LORAS}/{escape_lora_basename(key)}.safetensors")
     return str(path)
 
 
@@ -203,25 +298,24 @@ def save_images(images: list[Image.Image], metadatas: list[str]):
         raise Exception(f"Failed to save image file:") from e
 
 
-def save_gallery_images(images, progress=gr.Progress(track_tqdm=True)):
-    from datetime import datetime, timezone, timedelta
+def save_gallery_images(images, model_name="", progress=gr.Progress(track_tqdm=True)):
     progress(0, desc="Updating gallery...")
-    dt_now = datetime.now(timezone(timedelta(hours=9)))
-    basename = dt_now.strftime('%Y%m%d_%H%M%S_')
-    i = 1
-    if not images: return images, gr.update(visible=False)
+    #dt_now = datetime.now(timezone(timedelta(hours=9)))
+    #dt_now = datetime.now(FILENAME_TIMEZONE)
+    #basename = dt_now.strftime('%Y%m%d_%H%M%S_')
+    basename = f"{model_name.split('/')[-1]}_{datetime.now(FILENAME_TIMEZONE).strftime('%Y%m%d_%H%M%S')}_"
+    if not images: return images, gr.update()
     output_images = []
     output_paths = []
-    for image in images:
-        filename = basename + str(i) + ".png"
-        i += 1
+    for i, image in enumerate(images):
+        filename = f"{basename}{str(i + 1)}.png"
         oldpath = Path(image[0])
         newpath = oldpath
         try:
             if oldpath.exists():
                 newpath = oldpath.resolve().rename(Path(filename).resolve())
         except Exception as e:
-           print(e)
+            print(e)
         finally: 
             output_paths.append(str(newpath))
             output_images.append((str(newpath), str(filename)))
@@ -229,10 +323,39 @@ def save_gallery_images(images, progress=gr.Progress(track_tqdm=True)):
     return gr.update(value=output_images), gr.update(value=output_paths, visible=True)
 
 
+def save_gallery_history(images, files, history_gallery, history_files, progress=gr.Progress(track_tqdm=True)):
+    if not images or not files: return gr.update(), gr.update()
+    if not history_gallery: history_gallery = []
+    if not history_files: history_files = []
+    output_gallery = images + history_gallery
+    output_files = files + history_files
+    return gr.update(value=output_gallery), gr.update(value=output_files, visible=True)
+
+
+def save_image_history(image: str, gallery, files, model_name: str, progress=gr.Progress(track_tqdm=True)):
+    basename = f"{model_name.split('/')[-1]}_{datetime.now(FILENAME_TIMEZONE).strftime('%Y%m%d_%H%M%S')}"
+    if not image: return gr.update(), gr.update()
+    if not gallery: gallery = []
+    if not files: files = []
+    filename = f"{basename}.png"
+    oldpath = Path(image)
+    newpath = oldpath
+    try:
+        if newpath != oldpath and oldpath.exists():
+            shutil.copy(oldpath.resolve(), Path(filename).resolve())
+            newpath = Path(filename).resolve()
+    except Exception as e:
+        print(e)
+    finally: 
+        files.isnert(0, str(newpath))
+        gallery.insert(0, (str(newpath), str(filename)))
+    return gr.update(value=gallery), gr.update(value=files, visible=True)
+
+
 def download_private_repo(repo_id, dir_path, is_replace):
-    if not hf_read_token: return
+    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)
+        snapshot_download(repo_id=repo_id, local_dir=dir_path, allow_patterns=['*.ckpt', '*.pt', '*.pth', '*.safetensors', '*.bin'], token=HF_READ_TOKEN)
     except Exception as e:
         print(f"Error: Failed to download {repo_id}.")
         print(e)
@@ -250,9 +373,9 @@ private_model_path_repo_dict = {} # {"local filepath": "huggingface repo_id", ..
 def get_private_model_list(repo_id, dir_path):
     global private_model_path_repo_dict
     api = HfApi()
-    if not hf_read_token: return []
+    if not HF_READ_TOKEN: return []
     try:
-        files = api.list_repo_files(repo_id, token=hf_read_token)
+        files = api.list_repo_files(repo_id, token=HF_READ_TOKEN)
     except Exception as e:
         print(f"Error: Failed to list {repo_id}.")
         print(e)
@@ -270,11 +393,11 @@ def get_private_model_list(repo_id, dir_path):
 def download_private_file(repo_id, path, is_replace):
     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
+    if not HF_READ_TOKEN or newpath.exists(): return
     filename = file.name
     dirname = file.parent.name
     try:
-        hf_hub_download(repo_id=repo_id, filename=filename, local_dir=dirname, use_auth_token=hf_read_token)
+        hf_hub_download(repo_id=repo_id, filename=filename, local_dir=dirname, token=HF_READ_TOKEN)
     except Exception as e:
         print(f"Error: Failed to download {filename}.")
         print(e)
@@ -404,9 +527,9 @@ def get_private_lora_model_lists():
     models1 = []
     models2 = []
     for repo in HF_LORA_PRIVATE_REPOS1:
-        models1.extend(get_private_model_list(repo, directory_loras))
+        models1.extend(get_private_model_list(repo, DIRECTORY_LORAS))
     for repo in HF_LORA_PRIVATE_REPOS2:
-        models2.extend(get_private_model_list(repo, directory_loras))
+        models2.extend(get_private_model_list(repo, DIRECTORY_LORAS))
     models = list_uniq(models1 + sorted(models2))
     private_lora_model_list = models.copy()
     return models
@@ -451,7 +574,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
@@ -503,14 +626,14 @@ def update_lora_dict(path):
 def download_lora(dl_urls: str):
     global loras_url_to_path_dict
     dl_path = ""
-    before = get_local_model_list(directory_loras)
+    before = get_local_model_list(DIRECTORY_LORAS)
     urls = []
     for url in [url.strip() for url in dl_urls.split(',')]:
-        local_path = f"{directory_loras}/{url.split('/')[-1]}"
+        local_path = f"{DIRECTORY_LORAS}/{url.split('/')[-1]}"
         if not Path(local_path).exists():
-            download_things(directory_loras, url, HF_TOKEN, CIVITAI_API_KEY)
+            download_things(DIRECTORY_LORAS, url, HF_TOKEN, CIVITAI_API_KEY)
             urls.append(url)
-    after = get_local_model_list(directory_loras)
+    after = get_local_model_list(DIRECTORY_LORAS)
     new_files = list_sub(after, before)
     i = 0
     for file in new_files:
@@ -761,12 +884,14 @@ def update_loras(prompt, prompt_syntax, lora1, lora1_wt, lora2, lora2_wt, lora3,
      gr.update(value=tag5, label=label5, visible=on5), gr.update(visible=on5), gr.update(value=md5, visible=on5)
 
 
-def get_my_lora(link_url):
-    before = get_local_model_list(directory_loras)
+def get_my_lora(link_url, romanize):
+    l_name = ""
+    l_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():
-            download_things(directory_loras, url, HF_TOKEN, CIVITAI_API_KEY)
-    after = get_local_model_list(directory_loras)
+        if not Path(f"{DIRECTORY_LORAS}/{url.split('/')[-1]}").exists():
+            l_name = download_things(DIRECTORY_LORAS, url, HF_TOKEN, CIVITAI_API_KEY, romanize)
+    after = get_local_model_list(DIRECTORY_LORAS)
     new_files = list_sub(after, before)
     for file in new_files:
         path = Path(file)
@@ -774,11 +899,16 @@ 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))
+            l_path = str(new_path)
     new_lora_model_list = get_lora_model_list()
     new_lora_tupled_list = get_all_lora_tupled_list()
-    
+    msg_lora = "Downloaded"
+    if l_name:
+        msg_lora += f": <b>{l_name}</b>"
+        print(msg_lora)
+
     return gr.update(
-        choices=new_lora_tupled_list, value=new_lora_model_list[-1]
+        choices=new_lora_tupled_list, value=l_path
     ), gr.update(
         choices=new_lora_tupled_list
     ), gr.update(
@@ -787,6 +917,8 @@ def get_my_lora(link_url):
         choices=new_lora_tupled_list
     ), gr.update(
         choices=new_lora_tupled_list
+    ), gr.update(
+        value=msg_lora
     )
 
 
@@ -794,12 +926,12 @@ def upload_file_lora(files, progress=gr.Progress(track_tqdm=True)):
     progress(0, desc="Uploading...")
     file_paths = [file.name for file in files]
     progress(1, desc="Uploaded.")
-    return gr.update(value=file_paths, visible=True), gr.update(visible=True)
+    return gr.update(value=file_paths, visible=True), gr.update()
 
 
 def move_file_lora(filepaths):
     for file in filepaths:
-        path = Path(shutil.move(Path(file).resolve(), Path(f"./{directory_loras}").resolve()))
+        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}')
         path.resolve().rename(newpath.resolve())
         update_lora_dict(str(newpath))
@@ -941,7 +1073,7 @@ def update_civitai_selection(evt: gr.SelectData):
         selected = civitai_last_choices[selected_index][1]
         return gr.update(value=selected)
     except Exception:
-        return gr.update(visible=True)
+        return gr.update()
 
 
 def select_civitai_lora(search_result):
@@ -1425,3 +1557,78 @@ def get_model_pipeline(repo_id: str):
     else:
         return default
 
+
+EXAMPLES_GUI = [
+    [
+        "1girl, souryuu asuka langley, neon genesis evangelion, plugsuit, pilot suit, red bodysuit, sitting, crossing legs, black eye patch, cat hat, throne, symmetrical, looking down, from bottom, looking at viewer, outdoors, masterpiece, best quality, very aesthetic, absurdres",
+        "nsfw, 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]",
+        1,
+        30,
+        7.5,
+        True,
+        -1,
+        "Euler a",
+        1152,
+        896,
+        "votepurchase/animagine-xl-3.1",
+    ],
+    [
+        "solo, princess Zelda OOT, score_9, score_8_up, score_8, medium breasts, cute, eyelashes, cute small face, long hair, crown braid, hairclip, pointy ears, soft curvy body, looking at viewer, smile, blush, white dress, medium body, (((holding the Master Sword))), standing, deep forest in the background",
+        "score_6, score_5, score_4, busty, ugly face, mutated hands, low res, blurry face, black and white,",
+        1,
+        30,
+        5.,
+        True,
+        -1,
+        "Euler a",
+        1024,
+        1024,
+        "votepurchase/ponyDiffusionV6XL",
+    ],
+    [
+        "1girl, oomuro sakurako, yuru yuri, official art, school uniform, anime artwork, anime style, vibrant, studio anime, highly detailed, masterpiece, best quality, very aesthetic, absurdres",
+        "photo, deformed, black and white, realism, disfigured, low contrast, 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]",
+        1,
+        40,
+        7.0,
+        True,
+        -1,
+        "Euler a",
+        1024,
+        1024,
+        "Raelina/Rae-Diffusion-XL-V2",
+    ],
+    [
+        "1girl, akaza akari, yuru yuri, official art, anime artwork, anime style, vibrant, studio anime, highly detailed, masterpiece, best quality, very aesthetic, absurdres",
+        "photo, deformed, black and white, realism, disfigured, low contrast, 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]",
+        1,
+        35,
+        7.0,
+        True,
+        -1,
+        "Euler a",
+        1024,
+        1024,
+        "Raelina/Raemu-XL-V4",
+    ],
+    [
+        "yoshida yuuko, machikado mazoku, 1girl, solo, demon horns,horns, school uniform, long hair, open mouth, skirt, demon girl, ahoge, shiny, shiny hair, anime artwork",
+        "nsfw, 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]",
+        1,
+        50,
+        7.,
+        True,
+        -1,
+        "Euler a",
+        1024,
+        1024,
+        "cagliostrolab/animagine-xl-3.1",
+    ],
+]
+
+
+RESOURCES = (
+    """### Resources
+    - You can also try the image generator in Colab’s free tier, which provides free GPU [link](https://github.com/R3gm/SD_diffusers_interactive).
+    """
+)

requirements.txt

@@ -1,6 +1,5 @@
 spaces
 accelerate
-spaces>=0.30.3
 diffusers
 invisible_watermark
 transformers
@@ -21,4 +20,5 @@ dartrs
 translatepy
 timm
 wrapt-timeout-decorator
-sentencepiece
+sentencepiece
+unidecode

utils.py

@@ -0,0 +1,421 @@
+import os
+import re
+import gradio as gr
+from constants import (
+    DIFFUSERS_FORMAT_LORAS,
+    CIVITAI_API_KEY,
+    HF_TOKEN,
+    MODEL_TYPE_CLASS,
+    DIRECTORY_LORAS,
+)
+from huggingface_hub import HfApi
+from diffusers import DiffusionPipeline
+from huggingface_hub import model_info as model_info_data
+from diffusers.pipelines.pipeline_loading_utils import variant_compatible_siblings
+from pathlib import PosixPath
+from unidecode import unidecode
+import urllib.parse
+import copy
+import requests
+from requests.adapters import HTTPAdapter
+from urllib3.util import Retry
+
+USER_AGENT = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:127.0) Gecko/20100101 Firefox/127.0'
+
+
+def request_json_data(url):
+    model_version_id = url.split('/')[-1]
+    if "?modelVersionId=" in model_version_id:
+        match = re.search(r'modelVersionId=(\d+)', url)
+        model_version_id = match.group(1)
+
+    endpoint_url = f"https://civitai.com/api/v1/model-versions/{model_version_id}"
+
+    params = {}
+    headers = {'User-Agent': USER_AGENT, 'content-type': 'application/json'}
+    session = requests.Session()
+    retries = Retry(total=5, backoff_factor=1, status_forcelist=[500, 502, 503, 504])
+    session.mount("https://", HTTPAdapter(max_retries=retries))
+
+    try:
+        result = session.get(endpoint_url, params=params, headers=headers, stream=True, timeout=(3.0, 15))
+        result.raise_for_status()
+        json_data = result.json()
+        return json_data if json_data else None
+    except Exception as e:
+        print(f"Error: {e}")
+        return None
+
+
+class ModelInformation:
+    def __init__(self, json_data):
+        self.model_version_id = json_data.get("id", "")
+        self.model_id = json_data.get("modelId", "")
+        self.download_url = json_data.get("downloadUrl", "")
+        self.model_url = f"https://civitai.com/models/{self.model_id}?modelVersionId={self.model_version_id}"
+        self.filename_url = next(
+            (v.get("name", "") for v in json_data.get("files", []) if str(self.model_version_id) in v.get("downloadUrl", "")), ""
+        )
+        self.filename_url = self.filename_url if self.filename_url else ""
+        self.description = json_data.get("description", "")
+        if self.description is None: self.description = ""
+        self.model_name = json_data.get("model", {}).get("name", "")
+        self.model_type = json_data.get("model", {}).get("type", "")
+        self.nsfw = json_data.get("model", {}).get("nsfw", False)
+        self.poi = json_data.get("model", {}).get("poi", False)
+        self.images = [img.get("url", "") for img in json_data.get("images", [])]
+        self.example_prompt = json_data.get("trainedWords", [""])[0] if json_data.get("trainedWords") else ""
+        self.original_json = copy.deepcopy(json_data)
+
+
+def retrieve_model_info(url):
+    json_data = request_json_data(url)
+    if not json_data:
+        return None
+    model_descriptor = ModelInformation(json_data)
+    return model_descriptor
+
+
+def download_things(directory, url, hf_token="", civitai_api_key="", romanize=False):
+    url = url.strip()
+    downloaded_file_path = None
+
+    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}"'
+
+        filename = unidecode(url.split('/')[-1]) if romanize else url.split('/')[-1]
+
+        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 {filename}")
+        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 {filename}")
+
+        downloaded_file_path = os.path.join(directory, filename)
+
+    elif "civitai.com" in url:
+
+        if not civitai_api_key:
+            print("\033[91mYou need an API key to download Civitai models.\033[0m")
+
+        model_profile = retrieve_model_info(url)
+        if model_profile.download_url and model_profile.filename_url:
+            url = model_profile.download_url
+            filename = unidecode(model_profile.filename_url) if romanize else model_profile.filename_url
+        else:
+            if "?" in url:
+                url = url.split("?")[0]
+            filename = ""
+
+        url_dl = url + f"?token={civitai_api_key}"
+        print(f"Filename: {filename}")
+
+        param_filename = ""
+        if filename:
+            param_filename = f"-o '{filename}'"
+
+        aria2_command = (
+            f'aria2c --console-log-level=error --summary-interval=10 -c -x 16 '
+            f'-k 1M -s 16 -d "{directory}" {param_filename} "{url_dl}"'
+        )
+        os.system(aria2_command)
+
+        if param_filename and os.path.exists(os.path.join(directory, filename)):
+            downloaded_file_path = os.path.join(directory, filename)
+
+        # # PLAN B
+        # # Follow the redirect to get the actual download URL
+        # curl_command = (
+        #     f'curl -L -sI --connect-timeout 5 --max-time 5 '
+        #     f'-H "Content-Type: application/json" '
+        #     f'-H "Authorization: Bearer {civitai_api_key}" "{url}"'
+        # )
+
+        # headers = os.popen(curl_command).read()
+
+        # # Look for the redirected "Location" URL
+        # location_match = re.search(r'location: (.+)', headers, re.IGNORECASE)
+
+        # if location_match:
+        #     redirect_url = location_match.group(1).strip()
+
+        #     # Extract the filename from the redirect URL's "Content-Disposition"
+        #     filename_match = re.search(r'filename%3D%22(.+?)%22', redirect_url)
+        #     if filename_match:
+        #         encoded_filename = filename_match.group(1)
+        #         # Decode the URL-encoded filename
+        #         decoded_filename = urllib.parse.unquote(encoded_filename)
+
+        #         filename = unidecode(decoded_filename) if romanize else decoded_filename
+        #         print(f"Filename: {filename}")
+
+        #         aria2_command = (
+        #             f'aria2c --console-log-level=error --summary-interval=10 -c -x 16 '
+        #             f'-k 1M -s 16 -d "{directory}" -o "{filename}" "{redirect_url}"'
+        #         )
+        #         return_code = os.system(aria2_command)
+
+        #         # if return_code != 0:
+        #         #     raise RuntimeError(f"Failed to download file: {filename}. Error code: {return_code}")
+        #         downloaded_file_path = os.path.join(directory, filename)
+        #         if not os.path.exists(downloaded_file_path):
+        #             downloaded_file_path = None
+
+        # if not downloaded_file_path:
+        #     # Old method
+        #     if "?" in url:
+        #         url = url.split("?")[0]
+        #     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:
+        os.system(f"aria2c --console-log-level=error --summary-interval=10 -c -x 16 -k 1M -s 16 -d {directory} {url}")
+
+    return downloaded_file_path
+
+
+def get_model_list(directory_path):
+    model_list = []
+    valid_extensions = {'.ckpt', '.pt', '.pth', '.safetensors', '.bin'}
+
+    for filename in os.listdir(directory_path):
+        if os.path.splitext(filename)[1] in valid_extensions:
+            # name_without_extension = os.path.splitext(filename)[0]
+            file_path = os.path.join(directory_path, filename)
+            # model_list.append((name_without_extension, file_path))
+            model_list.append(file_path)
+            print('\033[34mFILE: ' + file_path + '\033[0m')
+    return model_list
+
+
+def extract_parameters(input_string):
+    parameters = {}
+    input_string = input_string.replace("\n", "")
+
+    if "Negative prompt:" not in input_string:
+        if "Steps:" in input_string:
+            input_string = input_string.replace("Steps:", "Negative prompt: Steps:")
+        else:
+            print("Invalid metadata")
+            parameters["prompt"] = input_string
+            return parameters
+
+    parm = input_string.split("Negative prompt:")
+    parameters["prompt"] = parm[0].strip()
+    if "Steps:" not in parm[1]:
+        print("Steps not detected")
+        parameters["neg_prompt"] = parm[1].strip()
+        return parameters
+    parm = parm[1].split("Steps:")
+    parameters["neg_prompt"] = parm[0].strip()
+    input_string = "Steps:" + parm[1]
+
+    # Extracting Steps
+    steps_match = re.search(r'Steps: (\d+)', input_string)
+    if steps_match:
+        parameters['Steps'] = int(steps_match.group(1))
+
+    # Extracting Size
+    size_match = re.search(r'Size: (\d+x\d+)', input_string)
+    if size_match:
+        parameters['Size'] = size_match.group(1)
+        width, height = map(int, parameters['Size'].split('x'))
+        parameters['width'] = width
+        parameters['height'] = height
+
+    # Extracting other parameters
+    other_parameters = re.findall(r'(\w+): (.*?)(?=, \w+|$)', input_string)
+    for param in other_parameters:
+        parameters[param[0]] = param[1].strip('"')
+
+    return parameters
+
+
+def get_my_lora(link_url, romanize):
+    l_name = ""
+    for url in [url.strip() for url in link_url.split(',')]:
+        if not os.path.exists(f"./loras/{url.split('/')[-1]}"):
+            l_name = download_things(DIRECTORY_LORAS, url, HF_TOKEN, CIVITAI_API_KEY, romanize)
+    new_lora_model_list = get_model_list(DIRECTORY_LORAS)
+    new_lora_model_list.insert(0, "None")
+    new_lora_model_list = new_lora_model_list + DIFFUSERS_FORMAT_LORAS
+    msg_lora = "Downloaded"
+    if l_name:
+        msg_lora += f": <b>{l_name}</b>"
+        print(msg_lora)
+
+    return gr.update(
+        choices=new_lora_model_list
+    ), gr.update(
+        choices=new_lora_model_list
+    ), gr.update(
+        choices=new_lora_model_list
+    ), gr.update(
+        choices=new_lora_model_list
+    ), gr.update(
+        choices=new_lora_model_list
+    ), gr.update(
+        value=msg_lora
+    )
+
+
+def info_html(json_data, title, subtitle):
+    return f"""
+        <div style='padding: 0; border-radius: 10px;'>
+            <p style='margin: 0; font-weight: bold;'>{title}</p>
+            <details>
+                <summary>Details</summary>
+                <p style='margin: 0; font-weight: bold;'>{subtitle}</p>
+            </details>
+        </div>
+        """
+
+
+def get_model_type(repo_id: str):
+    api = HfApi(token=os.environ.get("HF_TOKEN"))  # if use private or gated model
+    default = "SD 1.5"
+    try:
+        model = api.model_info(repo_id=repo_id, timeout=5.0)
+        tags = model.tags
+        for tag in tags:
+            if tag in MODEL_TYPE_CLASS.keys(): return MODEL_TYPE_CLASS.get(tag, default)
+    except Exception:
+        return default
+    return default
+
+
+def restart_space(repo_id: str, factory_reboot: bool):
+    api = HfApi(token=os.environ.get("HF_TOKEN"))
+    try:
+        runtime = api.get_space_runtime(repo_id=repo_id)
+        if runtime.stage == "RUNNING":
+            api.restart_space(repo_id=repo_id, factory_reboot=factory_reboot)
+            print(f"Restarting space: {repo_id}")
+        else:
+            print(f"Space {repo_id} is in stage: {runtime.stage}")
+    except Exception as e:
+        print(e)
+
+
+def extract_exif_data(image):
+    if image is None: return ""
+
+    try:
+        metadata_keys = ['parameters', 'metadata', 'prompt', 'Comment']
+
+        for key in metadata_keys:
+            if key in image.info:
+                return image.info[key]
+
+        return str(image.info)
+
+    except Exception as e:
+        return f"Error extracting metadata: {str(e)}"
+
+
+def create_mask_now(img, invert):
+    import numpy as np
+    import time
+
+    time.sleep(0.5)
+
+    transparent_image = img["layers"][0]
+
+    # Extract the alpha channel
+    alpha_channel = np.array(transparent_image)[:, :, 3]
+
+    # Create a binary mask by thresholding the alpha channel
+    binary_mask = alpha_channel > 1
+
+    if invert:
+        print("Invert")
+        # Invert the binary mask so that the drawn shape is white and the rest is black
+        binary_mask = np.invert(binary_mask)
+
+    # Convert the binary mask to a 3-channel RGB mask
+    rgb_mask = np.stack((binary_mask,) * 3, axis=-1)
+
+    # Convert the mask to uint8
+    rgb_mask = rgb_mask.astype(np.uint8) * 255
+
+    return img["background"], rgb_mask
+
+
+def download_diffuser_repo(repo_name: str, model_type: str, revision: str = "main", token=True):
+
+    variant = None
+    if token is True and not os.environ.get("HF_TOKEN"):
+        token = None
+
+    if model_type == "SDXL":
+        info = model_info_data(
+            repo_name,
+            token=token,
+            revision=revision,
+            timeout=5.0,
+        )
+
+        filenames = {sibling.rfilename for sibling in info.siblings}
+        model_filenames, variant_filenames = variant_compatible_siblings(
+            filenames, variant="fp16"
+        )
+
+        if len(variant_filenames):
+            variant = "fp16"
+
+    cached_folder = DiffusionPipeline.download(
+        pretrained_model_name=repo_name,
+        force_download=False,
+        token=token,
+        revision=revision,
+        # mirror="https://hf-mirror.com",
+        variant=variant,
+        use_safetensors=True,
+        trust_remote_code=False,
+        timeout=5.0,
+    )
+
+    if isinstance(cached_folder, PosixPath):
+        cached_folder = cached_folder.as_posix()
+
+    # Task model
+    # from huggingface_hub import hf_hub_download
+    # hf_hub_download(
+    #     task_model,
+    #     filename="diffusion_pytorch_model.safetensors",  # fix fp16 variant
+    # )
+
+    return cached_folder
+
+
+def progress_step_bar(step, total):
+    # Calculate the percentage for the progress bar width
+    percentage = min(100, ((step / total) * 100))
+
+    return f"""
+        <div style="position: relative; width: 100%; background-color: gray; border-radius: 5px; overflow: hidden;">
+            <div style="width: {percentage}%; height: 17px; background-color: #800080; transition: width 0.5s;"></div>
+            <div style="position: absolute; width: 100%; text-align: center; color: white; top: 0; line-height: 19px; font-size: 13px;">
+                {int(percentage)}%
+            </div>
+        </div>
+        """
+
+
+def html_template_message(msg):
+    return f"""
+        <div style="position: relative; width: 100%; background-color: gray; border-radius: 5px; overflow: hidden;">
+            <div style="width: 0%; height: 17px; background-color: #800080; transition: width 0.5s;"></div>
+            <div style="position: absolute; width: 100%; text-align: center; color: white; top: 0; line-height: 19px; font-size: 14px; font-weight: bold; text-shadow: 1px 1px 2px black;">
+                {msg}
+            </div>
+        </div>
+        """