Upload 2 files

app.py

@@ -169,6 +169,12 @@ os.makedirs(directory_vaes, exist_ok=True)
 
 
 ## BEGIN MOD
+from modutils import (
+    download_private_repo,
+    get_model_id_list,
+    list_uniq,
+)
+
 # - **Download SD 1.5 Models**
 #download_model = "https://huggingface.co/frankjoshua/toonyou_beta6/resolve/main/toonyou_beta6.safetensors"
 download_model = ""
@@ -183,35 +189,9 @@ download_vae = ", ".join(download_vae_list)
 download_lora_list = []
 download_lora = ", ".join(download_lora_list)
 
-def download_private_repo(repo_id, dir_path):
-    from huggingface_hub import snapshot_download
-    snapshot_download(repo_id=repo_id, local_dir=dir_path, allow_patterns=["*.safetensors"], use_auth_token=os.environ['HF_READ_TOKEN'])
-
 download_private_repo('John6666/loratest', directory_loras)
 download_private_repo('John6666/vaetest', directory_vaes)
 
-def get_model_id_list():
-    from huggingface_hub import HfApi
-    api = HfApi()
-    model_ids = []
-
-    models_vp = api.list_models(author="votepurchase", cardData=True, sort="likes")
-    models_john = api.list_models(author="John6666", cardData=True, sort="last_modified")
-
-    for model in models_vp:
-        model_ids.append(model.id) if not model.private else ""
-
-    anime_models = []
-    real_models = []
-    for model in models_john:
-        if not model.private:
-            anime_models.append(model.id) if 'anime' in model.tags else real_models.append(model.id)
-
-    model_ids.extend(anime_models)
-    model_ids.extend(real_models)
-
-    return model_ids
-
 load_diffusers_format_model = [
     'stabilityai/stable-diffusion-xl-base-1.0',
     'cagliostrolab/animagine-xl-3.1',
@@ -247,9 +227,6 @@ load_diffusers_format_model = [
     'Raelina/Rae-Diffusion-XL-V2',
 ]
 
-def list_uniq(l):
-        return sorted(set(l), key=l.index)
-
 load_diffusers_format_model = list_uniq(get_model_id_list() + load_diffusers_format_model)
 ## END MOD
 
@@ -417,6 +394,13 @@ from tagger import (
 from fl2sd3longcap import (
     predict_tags_fl2_sd3,
 )
+from modutils import (
+    save_gallery_images,
+    set_optimization,
+    process_style_prompt,
+    preset_styles,
+    preset_quality,
+)
 def description_ui():
     gr.Markdown(
         """
@@ -816,11 +800,14 @@ class GuiSD:
 
 sd_gen = GuiSD()
 
+## BEGIN MOD
 CSS ="""
 .contain { display: flex; flex-direction: column; }
 #component-0 { height: 100%; }
 #gallery { flex-grow: 1; }
 """
+## END MOD
+
 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 ]
 def update_task_options(model_name, task_name):
@@ -837,9 +824,10 @@ def update_task_options(model_name, task_name):
     else:
         return gr.update(value=task_name, choices=task_model_list)
 
-
 ## BEGIN MOD
 with gr.Blocks(theme="NoCrypt/miku", elem_id="main", css=CSS) as app:
+    allow_flagging="never"
+    title="DiffuseCraft Mod"
     gr.Markdown("# 🧩 DiffuseCraft Mod")
     gr.Markdown(
         f"""
@@ -853,7 +841,9 @@ with gr.Blocks(theme="NoCrypt/miku", elem_id="main", css=CSS) as app:
                 with gr.Accordion("Model and Task", open=False):
                     task_gui = gr.Dropdown(label="Task", choices=sdxl_task, value=task_model_list[0])
                     model_name_gui = gr.Dropdown(label="Model", choices=model_list, value="votepurchase/animagine-xl-3.1", allow_custom_value=True)
-                    optimization_gui = gr.Radio(label="Optimization for SDXL", choices=["None", "Default", "SPO", "DPO", "DPO Turbo", "Hyper-SDXL", "PCM 16step", "PCM 8step"], value="None", interactive=True)
+                    quality_selector_gui = gr.Dropdown(label="Quality Tags Presets", interactive=True, choices=list(preset_quality.keys()), value="None")
+                    style_selector_gui = gr.Dropdown(label="Style Preset", interactive=True, choices=list(preset_styles.keys()), value="None")
+                    optimization_gui = gr.Dropdown(label="Optimization for SDXL", choices=["None", "Default", "SPO", "DPO", "DPO Turbo", "Hyper-SDXL", "PCM 16step", "PCM 8step"], value="None", interactive=True)
                 with gr.Accordion("Generate prompt from Image", open=False):
                     input_image_gui = gr.Image(label="Input image", type="pil", sources=["upload", "clipboard"], height=256)
                     with gr.Accordion(label="Advanced options", open=False):
@@ -915,7 +905,7 @@ with gr.Blocks(theme="NoCrypt/miku", elem_id="main", css=CSS) as app:
                     format="png",
                 )
 
-                result_images_files = gr.Files(interactive=False)
+                result_images_files = gr.Files(interactive=False, visible=False)
 
                 actual_task_info = gr.HTML()
 
@@ -1016,7 +1006,7 @@ with gr.Blocks(theme="NoCrypt/miku", elem_id="main", css=CSS) as app:
                     upscaler_keys = list(upscaler_dict_gui.keys())
 
                     upscaler_model_path_gui = gr.Dropdown(label="Upscaler", choices=upscaler_keys, value=None)
-                    upscaler_increases_size_gui = gr.Slider(minimum=1.1, maximum=6., step=0.1, value=1.4, label="Upscale by")
+                    upscaler_increases_size_gui = gr.Slider(minimum=1.1, maximum=6., step=0.1, value=1.0, label="Upscale by")
                     esrgan_tile_gui = gr.Slider(minimum=0, value=100, maximum=500, step=1, label="ESRGAN Tile")
                     esrgan_tile_overlap_gui = gr.Slider(minimum=1, maximum=200, step=1, value=10, label="ESRGAN Tile Overlap")
                     hires_steps_gui = gr.Slider(minimum=0, value=30, maximum=100, step=1, label="Hires Steps")
@@ -1412,6 +1402,7 @@ with gr.Blocks(theme="NoCrypt/miku", elem_id="main", css=CSS) as app:
                         ],
                         outputs=[result_images],
                         cache_examples=False,
+                        elem_id="examples",
                     )
 ## END MOD
 
@@ -1479,45 +1470,8 @@ with gr.Blocks(theme="NoCrypt/miku", elem_id="main", css=CSS) as app:
                 btn_send.click(send_img, [img_source, img_result], [image_control, image_mask_gui])
 
 ## BEGIN MOD
-        def set_optimization(opt, steps_gui, cfg_gui, sampler_gui, clip_skip_gui, lora1_gui, lora_scale_1_gui):
-            if opt == 'SPO':
-                return 28, 7., 'Euler a', True, 'loras/spo_sdxl_10ep_4k-data_lora_diffusers.safetensors', 1.
-            elif opt == 'PCM 16step':
-                return 16, 6., 'Euler a trailing', True, 'loras/pcm_sdxl_normalcfg_16step_converted.safetensors', 1.
-            elif opt == 'PCM 8step':
-                return 8, 6., 'Euler a trailing', True, 'loras/pcm_sdxl_normalcfg_8step_converted.safetensors', 1.
-            elif opt == 'DPO':
-                return 28, 7., 'Euler', True, 'loras/sdxl-DPO-LoRA.safetensors', 1.
-            elif opt == 'DPO Turbo':
-                return 8, 2.5, 'LCM', True, 'loras/sd_xl_dpo_turbo_lora_v1-128dim.safetensors', 1.
-            elif opt == 'Hyper-SDXL':
-                return 12, 6., 'Euler', True, 'loras/Hyper-SDXL-12steps-CFG-lora.safetensors', 0.9
-            elif opt == 'Default':
-                return 28, 7., 'Euler a', False, None, 1.
-            else: # None
-                return steps_gui, cfg_gui, sampler_gui, clip_skip_gui, lora1_gui, lora_scale_1_gui
-
         optimization_gui.change(set_optimization, [optimization_gui, steps_gui, cfg_gui, sampler_gui, clip_skip_gui, lora1_gui, lora_scale_1_gui], [steps_gui, cfg_gui, sampler_gui, clip_skip_gui, lora1_gui, lora_scale_1_gui])
 
-        def save_gallery_images(images):
-            from datetime import datetime, timezone, timedelta
-            japan_tz = timezone(timedelta(hours=9))
-            dt_now = datetime.utcnow().replace(tzinfo=timezone.utc).astimezone(japan_tz)
-            basename = dt_now.strftime('%Y%m%d_%H%M%S_')
-            i = 1
-            if not images: return images
-            output_images = []
-            output_paths = []
-            for image in images:
-                from pathlib import Path
-                filename = basename + str(i) + ".png"
-                oldpath = Path(image[0])
-                newpath = oldpath.rename(Path(filename))
-                output_paths.append(str(newpath))
-                output_images.append((str(newpath), str(filename)))
-                i += 1
-            return output_images, output_paths
-
         generate_from_image_btn_gui.click(
             predict_tags_wd,
             inputs=[input_image_gui, prompt_gui, image_algorithms, general_threshold_gui, character_threshold_gui],
@@ -1554,8 +1508,20 @@ with gr.Blocks(theme="NoCrypt/miku", elem_id="main", css=CSS) as app:
         ]
         
         insert_prompt_gui.change(
-            insert_recom_prompt,
-            inputs=[prompt_gui, neg_prompt_gui, insert_prompt_gui],
+            process_style_prompt,
+            inputs=[prompt_gui, neg_prompt_gui, style_selector_gui, quality_selector_gui, insert_prompt_gui],
+            outputs=[prompt_gui, neg_prompt_gui],
+        )
+
+        quality_selector_gui.change(
+            process_style_prompt,
+            inputs=[prompt_gui, neg_prompt_gui, style_selector_gui, quality_selector_gui, insert_prompt_gui],
+            outputs=[prompt_gui, neg_prompt_gui],
+        )
+
+        style_selector_gui.change(
+            process_style_prompt,
+            inputs=[prompt_gui, neg_prompt_gui, style_selector_gui, quality_selector_gui, insert_prompt_gui],
             outputs=[prompt_gui, neg_prompt_gui],
         )
 
@@ -1695,7 +1661,7 @@ with gr.Blocks(theme="NoCrypt/miku", elem_id="main", css=CSS) as app:
             outputs=[result_images, actual_task_info],
             queue=True,
             show_progress="minimal",
-        ).success(save_gallery_images, [result_images], [result_images, result_images_files])
+        ).success(save_gallery_images, [result_images], [result_images, result_images_files, result_images_files])
 
         with gr.Tab("Danbooru Tags Transformer with WD Tagger", render=True):
             v2 = V2UI()

modutils.py

@@ -0,0 +1,235 @@
+import os
+import gradio as gr
+from PIL import Image
+
+
+def list_uniq(l):
+        return sorted(set(l), key=l.index)
+
+
+def download_private_repo(repo_id, dir_path):
+    from huggingface_hub import snapshot_download
+    hf_read_token = os.environ.get('HF_READ_TOKEN')
+    if not hf_read_token: return
+    snapshot_download(repo_id=repo_id, local_dir=dir_path, allow_patterns=["*.safetensors"], use_auth_token=hf_read_token)
+
+
+def get_model_id_list():
+    from huggingface_hub import HfApi
+    api = HfApi()
+    model_ids = []
+
+    models_vp = api.list_models(author="votepurchase", cardData=True, sort="likes")
+    models_john = api.list_models(author="John6666", cardData=True, sort="last_modified")
+
+    for model in models_vp:
+        model_ids.append(model.id) if not model.private else ""
+
+    anime_models = []
+    real_models = []
+    for model in models_john:
+        if not model.private:
+            anime_models.append(model.id) if 'anime' in model.tags else real_models.append(model.id)
+
+    model_ids.extend(anime_models)
+    model_ids.extend(real_models)
+
+    return model_ids
+
+
+def set_optimization(opt, steps_gui, cfg_gui, sampler_gui, clip_skip_gui, lora1_gui, lora_scale_1_gui):
+    def_steps_gui = 28
+    def_cfg_gui = 7.
+    if opt == 'SPO':
+        return max(steps_gui, def_steps_gui), max(cfg_gui, def_cfg_gui), 'Euler a', True, 'loras/spo_sdxl_10ep_4k-data_lora_diffusers.safetensors', 1.
+    elif opt == 'PCM 16step':
+        return 16, 6., 'Euler a trailing', True, 'loras/pcm_sdxl_normalcfg_16step_converted.safetensors', 1.
+    elif opt == 'PCM 8step':
+        return 8, 6., 'Euler a trailing', True, 'loras/pcm_sdxl_normalcfg_8step_converted.safetensors', 1.
+    elif opt == 'DPO':
+        return max(steps_gui, def_steps_gui), max(cfg_gui, def_cfg_gui), 'Euler', True, 'loras/sdxl-DPO-LoRA.safetensors', 1.
+    elif opt == 'DPO Turbo':
+        return 8, 2.5, 'LCM', True, 'loras/sd_xl_dpo_turbo_lora_v1-128dim.safetensors', 1.
+    elif opt == 'Hyper-SDXL':
+        return 12, 6., 'Euler', True, 'loras/Hyper-SDXL-12steps-CFG-lora.safetensors', 0.9
+    elif opt == 'Default':
+        return def_steps_gui, def_cfg_gui, 'Euler a', False, None, 1.
+    else: # None
+        return steps_gui, cfg_gui, sampler_gui, clip_skip_gui, lora1_gui, lora_scale_1_gui
+
+
+def save_gallery_images(images):
+    from datetime import datetime, timezone, timedelta
+    japan_tz = timezone(timedelta(hours=9))
+    dt_now = datetime.utcnow().replace(tzinfo=timezone.utc).astimezone(japan_tz)
+    basename = dt_now.strftime('%Y%m%d_%H%M%S_')
+    i = 1
+    if not images: return images
+    output_images = []
+    output_paths = []
+    for image in images:
+        from pathlib import Path
+        filename = basename + str(i) + ".png"
+        oldpath = Path(image[0])
+        newpath = oldpath.rename(Path(filename))
+        output_paths.append(str(newpath))
+        output_images.append((str(newpath), str(filename)))
+        i += 1
+    return output_images, output_paths, gr.update(visible=True),
+
+
+quality_prompt_list = [
+    {
+        "name": "None",
+        "prompt": "",
+        "negative_prompt": "lowres",
+    },
+    {
+        "name": "Animagine Common",
+        "prompt": "anime artwork, anime style, key visual, vibrant, studio anime, highly detailed, masterpiece, best quality, very aesthetic, absurdres",
+        "negative_prompt": "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]",
+    },
+    {
+        "name": "Pony Anime Models Common",
+        "prompt": "source_anime, score_9, score_8_up, score_7_up, masterpiece, best quality, very aesthetic, absurdres",
+        "negative_prompt": "source_pony, source_furry, source_cartoon, score_6, score_5, score_4, busty, ugly face, mutated hands, low res, blurry face, black and white, the simpsons, overwatch, apex legends",
+    },
+    {
+        "name": "Pony Common",
+        "prompt": "source_anime, score_9, score_8_up, score_7_up",
+        "negative_prompt": "source_pony, source_furry, source_cartoon, score_6, score_5, score_4, busty, ugly face, mutated hands, low res, blurry face, black and white, the simpsons, overwatch, apex legends",
+    },
+    {
+        "name": "Animagine Standard v3.0",
+        "prompt": "masterpiece, best quality",
+        "negative_prompt": "lowres, bad anatomy, bad hands, text, error, missing fingers, extra digit, fewer digits, cropped, worst quality, low quality, normal quality, jpeg artifacts, signature, watermark, username, blurry, artist name",
+    },
+    {
+        "name": "Animagine Standard v3.1",
+        "prompt": "masterpiece, best quality, very aesthetic, absurdres",
+        "negative_prompt": "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]",
+    },
+    {
+        "name": "Animagine Light v3.1",
+        "prompt": "(masterpiece), best quality, very aesthetic, perfect face",
+        "negative_prompt": "(low quality, worst quality:1.2), very displeasing, 3d, watermark, signature, ugly, poorly drawn",
+    },
+    {
+        "name": "Animagine Heavy v3.1",
+        "prompt": "(masterpiece), (best quality), (ultra-detailed), very aesthetic, illustration, disheveled hair, perfect composition, moist skin, intricate details",
+        "negative_prompt": "longbody, lowres, bad anatomy, bad hands, missing fingers, pubic hair, extra digit, fewer digits, cropped, worst quality, low quality, very displeasing",
+    },
+]
+
+style_list = [
+    {
+        "name": "None",
+        "prompt": "",
+        "negative_prompt": "",
+    },
+    {
+        "name": "Cinematic",
+        "prompt": "cinematic still, emotional, harmonious, vignette, highly detailed, high budget, bokeh, cinemascope, moody, epic, gorgeous, film grain, grainy",
+        "negative_prompt": "cartoon, graphic, text, painting, crayon, graphite, abstract, glitch, deformed, mutated, ugly, disfigured",
+    },
+    {
+        "name": "Photographic",
+        "prompt": "cinematic photo, 35mm photograph, film, bokeh, professional, 4k, highly detailed",
+        "negative_prompt": "drawing, painting, crayon, sketch, graphite, impressionist, noisy, blurry, soft, deformed, ugly",
+    },
+    {
+        "name": "Anime",
+        "prompt": "anime artwork, anime style, key visual, vibrant, studio anime, highly detailed",
+        "negative_prompt": "photo, deformed, black and white, realism, disfigured, low contrast",
+    },
+    {
+        "name": "Manga",
+        "prompt": "manga style, vibrant, high-energy, detailed, iconic, Japanese comic style",
+        "negative_prompt": "ugly, deformed, noisy, blurry, low contrast, realism, photorealistic, Western comic style",
+    },
+    {
+        "name": "Digital Art",
+        "prompt": "concept art, digital artwork, illustrative, painterly, matte painting, highly detailed",
+        "negative_prompt": "photo, photorealistic, realism, ugly",
+    },
+    {
+        "name": "Pixel art",
+        "prompt": "pixel-art, low-res, blocky, pixel art style, 8-bit graphics",
+        "negative_prompt": "sloppy, messy, blurry, noisy, highly detailed, ultra textured, photo, realistic",
+    },
+    {
+        "name": "Fantasy art",
+        "prompt": "ethereal fantasy concept art, magnificent, celestial, ethereal, painterly, epic, majestic, magical, fantasy art, cover art, dreamy",
+        "negative_prompt": "photographic, realistic, realism, 35mm film, dslr, cropped, frame, text, deformed, glitch, noise, noisy, off-center, deformed, cross-eyed, closed eyes, bad anatomy, ugly, disfigured, sloppy, duplicate, mutated, black and white",
+    },
+    {
+        "name": "Neonpunk",
+        "prompt": "neonpunk style, cyberpunk, vaporwave, neon, vibes, vibrant, stunningly beautiful, crisp, detailed, sleek, ultramodern, magenta highlights, dark purple shadows, high contrast, cinematic, ultra detailed, intricate, professional",
+        "negative_prompt": "painting, drawing, illustration, glitch, deformed, mutated, cross-eyed, ugly, disfigured",
+    },
+    {
+        "name": "3D Model",
+        "prompt": "professional 3d model, octane render, highly detailed, volumetric, dramatic lighting",
+        "negative_prompt": "ugly, deformed, noisy, low poly, blurry, painting",
+    },
+]
+
+preset_styles = {k["name"]: (k["prompt"], k["negative_prompt"]) for k in style_list}
+preset_quality = {k["name"]: (k["prompt"], k["negative_prompt"]) for k in quality_prompt_list}
+
+
+def process_style_prompt(prompt: str, neg_prompt: str, styles_key: str = "None", quality_key: str = "None", type: str = "None"):
+    def to_list(s):
+        return [x.strip() for x in s.split(",") if not s == ""]
+    
+    def list_sub(a, b):
+        return [e for e in a if e not in b]
+    
+    def list_uniq(l):
+        return sorted(set(l), key=l.index)
+
+    animagine_ps = to_list("anime artwork, anime style, key visual, vibrant, studio anime, highly detailed, masterpiece, best quality, very aesthetic, absurdres")
+    animagine_nps = to_list("lowres, (bad), text, error, fewer, extra, missing, worst quality, jpeg artifacts, low quality, watermark, unfinished, displeasing, oldest, early, chromatic aberration, signature, extra digits, artistic error, username, scan, [abstract]")
+    pony_ps = to_list("source_anime, score_9, score_8_up, score_7_up, masterpiece, best quality, very aesthetic, absurdres")
+    pony_nps = to_list("source_pony, source_furry, source_cartoon, score_6, score_5, score_4, busty, ugly face, mutated hands, low res, blurry face, black and white, the simpsons, overwatch, apex legends")
+    prompts = to_list(prompt)
+    neg_prompts = to_list(neg_prompt)
+
+    all_styles_ps = []
+    all_styles_nps = []
+    for d in style_list:
+        all_styles_ps.extend(to_list(str(d.get("prompt", ""))))
+        all_styles_nps.extend(to_list(str(d.get("negative_prompt", ""))))
+
+    all_quality_ps = []
+    all_quality_nps = []
+    for d in quality_prompt_list:
+        all_quality_ps.extend(to_list(str(d.get("prompt", ""))))
+        all_quality_nps.extend(to_list(str(d.get("negative_prompt", ""))))
+
+    quality_ps = to_list(preset_quality[quality_key][0])
+    quality_nps = to_list(preset_quality[quality_key][1])
+    styles_ps = to_list(preset_styles[styles_key][0])
+    styles_nps = to_list(preset_styles[styles_key][1])
+
+    prompts = list_sub(prompts, animagine_ps + pony_ps + all_styles_ps + all_quality_ps)
+    neg_prompts = list_sub(neg_prompts, animagine_nps + pony_nps + all_styles_nps + all_quality_nps)
+
+    last_empty_p = [""] if not prompts and type != "None" and styles_key != "None" and quality_key != "None" else []
+    last_empty_np = [""] if not neg_prompts and type != "None" and styles_key != "None" and quality_key != "None" else []
+
+    if type == "Animagine":
+        prompts = prompts + animagine_ps
+        neg_prompts = neg_prompts + animagine_nps
+    elif type == "Pony":
+        prompts = prompts + pony_ps
+        neg_prompts = neg_prompts + pony_nps
+
+    prompts = prompts + styles_ps + quality_ps
+    neg_prompts = neg_prompts + styles_nps + quality_nps
+
+    prompt = ", ".join(list_uniq(prompts) + last_empty_p)
+    neg_prompt = ", ".join(list_uniq(neg_prompts) + last_empty_np)
+
+    return prompt, neg_prompt
+