Upload 6 files

app.py

@@ -232,6 +232,7 @@ load_diffusers_format_model = [
     'rubbrband/realcartoon3d_v16',
     'rubbrband/realcartoonRealistic_v14',
     'KBlueLeaf/Kohaku-XL-Epsilon-rev2',
+    'KBlueLeaf/Kohaku-XL-Epsilon-rev3',
     'Raelina/Rae-Diffusion-XL-V2',
     'Raelina/Raemu-XL-V4',
 ]
@@ -291,7 +292,7 @@ def get_my_lora(link_url):
     from pathlib import Path
     before = get_local_model_list(directory_loras)
     for url in [url.strip() for url in link_url.split(',')]:
-        if not Path(f"./loras/{url.split('/')[-1]}").exists():
+        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)
     new_files = list_sub(after, before)
@@ -401,8 +402,6 @@ warnings.filterwarnings(action="ignore", category=FutureWarning, module="transfo
 from stablepy import logger
 logger.setLevel(logging.CRITICAL)
 
-from transformers.utils.hub import move_cache
-move_cache()
 
 from v2 import (
     V2UI,
@@ -475,7 +474,7 @@ def info_html(json_data, title, subtitle):
         """
 
 class GuiSD:
-    def __init__(self, stream=True):
+    def __init__(self):
         self.model = None
     
         print("Loading model...")
@@ -487,6 +486,19 @@ class GuiSD:
             retain_task_model_in_cache=False,
         )
 
+    @spaces.GPU
+    def infer_short(self, model, pipe_params, progress=gr.Progress(track_tqdm=True)):
+        # Maybe fix lora issue: 'Cannot copy out of meta tensor; no data!''
+        model.pipe.to("cuda:0" if torch.cuda.is_available() else "cpu")
+        progress(0, desc="Start inference...")
+        images, image_list = model(**pipe_params)
+        progress(1, desc="Inference completed.")
+        if not isinstance(images, list): images = [images]
+        img = []
+        for image in images:
+            img.append((image, None))
+        return img
+
     def load_new_model(self, model_name, vae_model, task, progress=gr.Progress(track_tqdm=True)):
 
         yield f"Loading model: {model_name}"
@@ -512,7 +524,6 @@ class GuiSD:
         )
         yield f"Model loaded: {model_name}"
 
-    @spaces.GPU
     def generate_pipeline(
         self,
         prompt,
@@ -616,8 +627,10 @@ class GuiSD:
         model_ip2,
         mode_ip2,
         scale_ip2,
+        progress=gr.Progress(track_tqdm=True),
     ):
-        
+        progress(0, desc="Preparing inference...")
+
         vae_model = vae_model if vae_model != "None" else None
         loras_list = [lora1, lora2, lora3, lora4, lora5]
         vae_msg = f"VAE: {vae_model}" if vae_model else ""
@@ -677,10 +690,10 @@ class GuiSD:
         # First load
         model_precision = torch.float16
         if not self.model:
-            from modelstream import Model_Diffusers2
+            from stablepy import Model_Diffusers
 
             print("Loading model...")
-            self.model = Model_Diffusers2(
+            self.model = Model_Diffusers(
                 base_model_id=model_name,
                 task_name=task,
                 vae_model=vae_model if vae_model != "None" else None,
@@ -830,28 +843,15 @@ class GuiSD:
             "ip_adapter_scale": params_ip_scale,
         }
 
-        # print(pipe_params)
-
-        random_number = random.randint(1, 100)
-        if random_number < 25 and num_images < 3:
-            if not upscaler_model and steps < 45 and task in ["txt2img", "img2img"] and not adetailer_active_a and not adetailer_active_b:
-                num_images *=2
-                pipe_params["num_images"] = num_images
-                gr.Info("Num images x 2 🎉")
-
-        # Maybe fix lora issue: 'Cannot copy out of meta tensor; no data!''
-        self.model.pipe.to("cuda:0" if torch.cuda.is_available() else "cpu")
-
+        progress(1, desc="Preparing completed.")
         info_state = f"PROCESSING "
-        for img, seed, data in self.model(**pipe_params):
-            info_state += ">"
-            if data:
-                info_state = f"COMPLETED. Seeds: {str(seed)}"
-                if vae_msg:
-                    info_state = info_state + "<br>" + vae_msg
-                if msg_lora:
-                    info_state = info_state + "<br>" + "<br>".join(msg_lora)
-            yield img, info_state
+        info_state += ">"
+        info_state = f"COMPLETED. Seeds: {str(seed)}"
+        if vae_msg:
+            info_state = info_state + "<br>" + vae_msg
+        if msg_lora:
+            info_state = info_state + "<br>" + "<br>".join(msg_lora)
+        return self.infer_short(self.model, pipe_params), info_state
 
 
 sd_gen = GuiSD()
@@ -899,7 +899,7 @@ with gr.Blocks(theme="NoCrypt/miku@>=1.2.2", elem_id="main", css=CSS) as app:
                     model_name_gui = gr.Dropdown(label="Model", info="You can enter a huggingface model repo_id to want to use.", choices=get_tupled_model_list(model_list), value="votepurchase/animagine-xl-3.1", allow_custom_value=True)
                     model_info_gui = gr.Markdown()
                     with gr.Row():
-                        quick_model_type_gui = gr.Radio(label="Model Type", choices=["None", "Animagine", "Pony"], value="None", interactive=True)
+                        quick_model_type_gui = gr.Radio(label="Model Type", choices=["None", "Auto", "Animagine", "Pony"], value="Auto", interactive=True)
                         quick_genre_gui = gr.Radio(label="Genre", choices=["Anime", "Photo"], value="Anime", interactive=True)
                         quick_speed_gui = gr.Radio(label="Speed", choices=["Fast", "Standard", "Heavy"], value="Standard", interactive=True)
                         quick_aspect_gui = gr.Radio(label="Aspect Ratio", choices=["1:1", "3:4"], value="1:1", interactive=True)
@@ -1259,17 +1259,17 @@ with gr.Blocks(theme="NoCrypt/miku@>=1.2.2", elem_id="main", css=CSS) as app:
                             mask_padding_b_gui = gr.Number(label="Mask padding:", value=32, minimum=1)
 
                     with gr.Accordion("Other settings", open=False, visible=True) as menu_other:
-                        image_previews_gui = gr.Checkbox(value=True, label="Image Previews")
+                        image_previews_gui = gr.Checkbox(value=False, label="Image Previews")
                         hires_before_adetailer_gui = gr.Checkbox(value=False, label="Hires Before Adetailer")
                         hires_after_adetailer_gui = gr.Checkbox(value=True, label="Hires After Adetailer")
                         generator_in_cpu_gui = gr.Checkbox(value=False, label="Generator in CPU")
 
                     with gr.Accordion("More settings", open=False, visible=False):
                         loop_generation_gui = gr.Slider(minimum=1, value=1, label="Loop Generation")
-                        retain_task_cache_gui = gr.Checkbox(value=False, label="Retain task model in cache")
+                        retain_task_cache_gui = gr.Checkbox(value=True, label="Retain task model in cache")
                         leave_progress_bar_gui = gr.Checkbox(value=True, label="Leave Progress Bar")
                         disable_progress_bar_gui = gr.Checkbox(value=False, label="Disable Progress Bar")
-                        display_images_gui = gr.Checkbox(value=True, label="Display Images")
+                        display_images_gui = gr.Checkbox(value=False, label="Display Images")
                         save_generated_images_gui = gr.Checkbox(value=False, label="Save Generated Images")
                         image_storage_location_gui = gr.Textbox(value="./images", label="Image Storage Location")
                         retain_compel_previous_load_gui = gr.Checkbox(value=False, label="Retain Compel Previous Load")
@@ -1619,62 +1619,44 @@ with gr.Blocks(theme="NoCrypt/miku@>=1.2.2", elem_id="main", css=CSS) as app:
         )
         model_name_gui.change(get_t2i_model_info, [model_name_gui], [model_info_gui], queue=False)
 
-        quick_model_type_gui.change(
-            set_quick_presets,
-            [quick_genre_gui, quick_model_type_gui, quick_speed_gui, quick_aspect_gui],
-            [quality_selector_gui, style_selector_gui, sampler_selector_gui, optimization_gui],
-            queue=False,
-        )
-        quick_genre_gui.change(
-            set_quick_presets,
-            [quick_genre_gui, quick_model_type_gui, quick_speed_gui, quick_aspect_gui],
-            [quality_selector_gui, style_selector_gui, sampler_selector_gui, optimization_gui],
-            queue=False,
-        )
-        quick_speed_gui.change(
-            set_quick_presets,
-            [quick_genre_gui, quick_model_type_gui, quick_speed_gui, quick_aspect_gui],
-            [quality_selector_gui, style_selector_gui, sampler_selector_gui, optimization_gui],
-            queue=False,
-        )
-        quick_aspect_gui.change(
-            set_quick_presets,
-            [quick_genre_gui, quick_model_type_gui, quick_speed_gui, quick_aspect_gui],
-            [quality_selector_gui, style_selector_gui, sampler_selector_gui, optimization_gui],
-            queue=False,
-        )
-        quality_selector_gui.change(
-            process_style_prompt,
-            [prompt_gui, neg_prompt_gui, style_selector_gui, quality_selector_gui, insert_prompt_gui],
-            [prompt_gui, neg_prompt_gui],
+        gr.on(
+            triggers=[quick_model_type_gui.change, quick_genre_gui.change, quick_speed_gui.change, quick_aspect_gui.change],
+            fn=set_quick_presets,
+            inputs=[quick_genre_gui, quick_model_type_gui, quick_speed_gui, quick_aspect_gui],
+            outputs=[quality_selector_gui, style_selector_gui, sampler_selector_gui, optimization_gui, insert_prompt_gui],
             queue=False,
+            trigger_mode="once",
         )
-        style_selector_gui.change(
-            process_style_prompt,
-            [prompt_gui, neg_prompt_gui, style_selector_gui, quality_selector_gui, insert_prompt_gui],
-            [prompt_gui, neg_prompt_gui],
+        gr.on(
+            triggers=[quality_selector_gui.change, style_selector_gui.change, insert_prompt_gui.change],
+            fn=process_style_prompt,
+            inputs=[prompt_gui, neg_prompt_gui, style_selector_gui, quality_selector_gui, insert_prompt_gui],
+            outputs=[prompt_gui, neg_prompt_gui, quick_model_type_gui],
             queue=False,
+            trigger_mode="once",
         )
         sampler_selector_gui.change(set_sampler_settings, [sampler_selector_gui], [sampler_gui, steps_gui, cfg_gui, clip_skip_gui, img_width_gui, img_height_gui, optimization_gui], queue=False)
         optimization_gui.change(set_optimization, [optimization_gui, steps_gui, cfg_gui, sampler_gui, clip_skip_gui, lora5_gui, lora_scale_5_gui], [steps_gui, cfg_gui, sampler_gui, clip_skip_gui, lora5_gui, lora_scale_5_gui], queue=False)
 
-        lora1_gui.change(set_lora_prompt, [prompt_gui, prompt_syntax_gui, lora1_gui, lora_scale_1_gui, lora2_gui, lora_scale_2_gui, lora3_gui, lora_scale_3_gui, lora4_gui, lora_scale_4_gui, lora5_gui, lora_scale_5_gui], [prompt_gui])\
-        .success(set_lora_trigger, [lora1_gui], [lora1_trigger_gui, lora1_copy_button, lora1_desc_gui, lora1_gui], scroll_to_output=True)
-        lora2_gui.change(set_lora_prompt, [prompt_gui, prompt_syntax_gui, lora1_gui, lora_scale_1_gui, lora2_gui, lora_scale_2_gui, lora3_gui, lora_scale_3_gui, lora4_gui, lora_scale_4_gui, lora5_gui, lora_scale_5_gui], [prompt_gui])\
-        .success(set_lora_trigger, [lora2_gui], [lora2_trigger_gui, lora2_copy_button, lora2_desc_gui, lora2_gui], scroll_to_output=True)
-        lora3_gui.change(set_lora_prompt, [prompt_gui, prompt_syntax_gui, lora1_gui, lora_scale_1_gui, lora2_gui, lora_scale_2_gui, lora3_gui, lora_scale_3_gui, lora4_gui, lora_scale_4_gui, lora5_gui, lora_scale_5_gui], [prompt_gui])\
-        .success(set_lora_trigger, [lora3_gui], [lora3_trigger_gui, lora3_copy_button, lora3_desc_gui, lora3_gui], scroll_to_output=True)
-        lora4_gui.change(set_lora_prompt, [prompt_gui, prompt_syntax_gui, lora1_gui, lora_scale_1_gui, lora2_gui, lora_scale_2_gui, lora3_gui, lora_scale_3_gui, lora4_gui, lora_scale_4_gui, lora5_gui, lora_scale_5_gui], [prompt_gui])\
-        .success(set_lora_trigger, [lora4_gui], [lora4_trigger_gui, lora4_copy_button, lora4_desc_gui, lora4_gui], scroll_to_output=True)
-        lora5_gui.change(set_lora_prompt, [prompt_gui, prompt_syntax_gui, lora1_gui, lora_scale_1_gui, lora2_gui, lora_scale_2_gui, lora3_gui, lora_scale_3_gui, lora4_gui, lora_scale_4_gui, lora5_gui, lora_scale_5_gui], [prompt_gui])\
-        .success(set_lora_trigger, [lora5_gui], [lora5_trigger_gui, lora5_copy_button, lora5_desc_gui, lora5_gui], scroll_to_output=True)
+        lora1_gui.change(set_lora_prompt, [prompt_gui, prompt_syntax_gui, lora1_gui, lora_scale_1_gui, lora2_gui, lora_scale_2_gui, lora3_gui, lora_scale_3_gui, lora4_gui, lora_scale_4_gui, lora5_gui, lora_scale_5_gui], [prompt_gui], queue=False)\
+        .success(set_lora_trigger, [lora1_gui], [lora1_trigger_gui, lora1_copy_button, lora1_desc_gui, lora1_gui], scroll_to_output=True, queue=False)
+        lora2_gui.change(set_lora_prompt, [prompt_gui, prompt_syntax_gui, lora1_gui, lora_scale_1_gui, lora2_gui, lora_scale_2_gui, lora3_gui, lora_scale_3_gui, lora4_gui, lora_scale_4_gui, lora5_gui, lora_scale_5_gui], [prompt_gui], queue=False)\
+        .success(set_lora_trigger, [lora2_gui], [lora2_trigger_gui, lora2_copy_button, lora2_desc_gui, lora2_gui], scroll_to_output=True, queue=False)
+        lora3_gui.change(set_lora_prompt, [prompt_gui, prompt_syntax_gui, lora1_gui, lora_scale_1_gui, lora2_gui, lora_scale_2_gui, lora3_gui, lora_scale_3_gui, lora4_gui, lora_scale_4_gui, lora5_gui, lora_scale_5_gui], [prompt_gui], queue=False)\
+        .success(set_lora_trigger, [lora3_gui], [lora3_trigger_gui, lora3_copy_button, lora3_desc_gui, lora3_gui], scroll_to_output=True, queue=False)
+        lora4_gui.change(set_lora_prompt, [prompt_gui, prompt_syntax_gui, lora1_gui, lora_scale_1_gui, lora2_gui, lora_scale_2_gui, lora3_gui, lora_scale_3_gui, lora4_gui, lora_scale_4_gui, lora5_gui, lora_scale_5_gui], [prompt_gui], queue=False)\
+        .success(set_lora_trigger, [lora4_gui], [lora4_trigger_gui, lora4_copy_button, lora4_desc_gui, lora4_gui], scroll_to_output=True, queue=False)
+        lora5_gui.change(set_lora_prompt, [prompt_gui, prompt_syntax_gui, lora1_gui, lora_scale_1_gui, lora2_gui, lora_scale_2_gui, lora3_gui, lora_scale_3_gui, lora4_gui, lora_scale_4_gui, lora5_gui, lora_scale_5_gui], [prompt_gui], queue=False)\
+        .success(set_lora_trigger, [lora5_gui], [lora5_trigger_gui, lora5_copy_button, lora5_desc_gui, lora5_gui], scroll_to_output=True, queue=False)
         gr.on(
-            triggers=[lora_scale_1_gui.change, lora_scale_2_gui.change, lora_scale_3_gui.change,\
+            triggers=[lora_scale_1_gui.change, lora_scale_2_gui.change, lora_scale_3_gui.change,
                        lora_scale_4_gui.change, lora_scale_5_gui.change, prompt_syntax_gui.change],
             fn=set_lora_prompt,
-            inputs=[prompt_gui, prompt_syntax_gui, lora1_gui, lora_scale_1_gui, lora2_gui, lora_scale_2_gui,\
+            inputs=[prompt_gui, prompt_syntax_gui, lora1_gui, lora_scale_1_gui, lora2_gui, lora_scale_2_gui,
                      lora3_gui, lora_scale_3_gui, lora4_gui, lora_scale_4_gui, lora5_gui, lora_scale_5_gui],
             outputs=[prompt_gui],
+            trigger_mode="once",
+            queue=False,
         )
         lora1_copy_button.click(apply_lora_prompt, [prompt_gui, lora1_trigger_gui], [prompt_gui], queue=False)
         lora2_copy_button.click(apply_lora_prompt, [prompt_gui, lora2_trigger_gui], [prompt_gui], queue=False)
@@ -1712,12 +1694,6 @@ with gr.Blocks(theme="NoCrypt/miku@>=1.2.2", elem_id="main", css=CSS) as app:
         v2b.input_components = [model_name_dbt, series_dbt, character_dbt, prompt_gui,
             rating_dbt, aspect_ratio_dbt, length_dbt, identity_dbt, ban_tags_dbt]
         
-        insert_prompt_gui.change(
-            process_style_prompt,
-            [prompt_gui, neg_prompt_gui, style_selector_gui, quality_selector_gui, insert_prompt_gui],
-            [prompt_gui, neg_prompt_gui],
-            queue=False,
-        )
         prompt_type_button.click(convert_danbooru_to_e621_prompt, [prompt_gui, prompt_type_gui], [prompt_gui], queue=False)
         random_character_gui.click(select_random_character, [series_dbt, character_dbt], [series_dbt, character_dbt], queue=False)
         generate_db_random_button.click(
@@ -1845,9 +1821,9 @@ with gr.Blocks(theme="NoCrypt/miku@>=1.2.2", elem_id="main", css=CSS) as app:
                 mode_ip2,
                 scale_ip2,
             ],
-            outputs=[result_images, actual_task_info],
+            outputs=[result_images, actual_task_info], 
             queue=True,
-            show_progress="minimal",
+            show_progress="full",
         ).success(save_gallery_images, [result_images], [result_images, result_images_files, result_images_files], queue=False)
 
         with gr.Tab("Danbooru Tags Transformer with WD Tagger", render=True):

lora_dict.json

@@ -587,6 +587,13 @@
     "https://civitai.com/models/534612",
     "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/ba21785e-9a19-4fb7-944b-2651a36cb0c9/width=450/16953072.jpeg"
   ],
+  "Female_Cunnilingus_POV": [
+    "female cunnilingus POV, female, cunnilingus, POV, Nostra666, visible viewer breasts, female pov,",
+    "Pony",
+    "Female Cunnilingus POV Helper",
+    "https://civitai.com/models/573102",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/6d84052f-fa1a-40cf-963b-c9417187139b/width=450/19517005.jpeg"
+  ],
   "Fine_Anime_Screencap-PonyV2": [
     "fine anime screencap_xl, anime screencap",
     "Pony",
@@ -741,6 +748,13 @@
     "https://civitai.com/models/537014",
     "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/7370deac-a20d-4229-91e8-07950973d8d5/width=450/17133393.jpeg"
   ],
+  "Hentai_Pussy_inspection2_Pony_V1": [
+    "solo, multiple views, close-up, looking at viewer, cowboy shot, nude, female masturbation, (perfect hand), presenting, anus, clitoris, urethra, pussy, spread pussy, breasts, nipples, pussy juice, cervix, collarbone, sweat, navel, ass, clitoral hood, shiny,  gaping, fingernails, shiny skin, stomach, nude, lying, on back, simple background, on bed,   blush, smile,  full body, standing, ",
+    "Pony",
+    "Hentai Pussy inspection 2shot Pony XL",
+    "https://civitai.com/models/573817",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/e7545528-96c3-4eea-a546-c39d54b11f2c/width=450/19551004.jpeg"
+  ],
   "Hentai_Pussy_inspection_Pony_V1": [
     "(Multiple layers), multiple views, simple bacground, Character profile, radar chart,zoom layer, close-up layer, breasts out, nippleless clothes, crotch cutout, breastless clothes, no panties, torn clothes,  breasts, nipples, puffy nipples, pussy, fat mons, anus, clitoris, gaping, erect clitoris, large CLITORIS, Clitoral hood,",
     "Pony",
@@ -790,6 +804,13 @@
     "https://civitai.com/models/495860",
     "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/913dfaaa-3959-4def-83e9-991112db2782/width=450/14638692.jpeg"
   ],
+  "Hussy_in_Phone": [
+    "2GIRLS, HUSSY IN PHONE",
+    "SDXL 1.0",
+    "Hussy in Phone",
+    "https://civitai.com/models/571833",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/a091138c-3be3-4475-b70f-fe927558392f/width=450/19533815.jpeg"
+  ],
   "Hyper-SDXL-12steps-CFG-lora": [
     "",
     "SDXL Hyper",
@@ -1049,6 +1070,13 @@
     "https://civitai.com/models/544619",
     "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/50c852ef-82ad-49f5-b5e0-f7ff3548c155/width=450/17631835.jpeg"
   ],
+  "MilkCharacterMeme": [
+    "pi-mlk-chr-mm, inset, holding",
+    "Pony",
+    "Character on Milk Carton Meme",
+    "https://civitai.com/models/562753",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/6f136e74-5105-4fc8-9970-8601566df7d1/width=450/18834618.jpeg"
+  ],
   "MiniAXV9XLScreencap": [
     "Anime Screencap",
     "Pony",
@@ -1098,6 +1126,13 @@
     "https://civitai.com/models/558150",
     "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/e903e134-ad96-4c65-93b5-50b6f7aefd24/width=450/18695088.jpeg"
   ],
+  "Neoteny": [
+    "neoteny /  large eyes / small nose /  small mouth / plump lips",
+    "Pony",
+    "Neoteny (Youthful Facial Features)",
+    "https://civitai.com/models/568847",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/d560bb85-4916-42d6-8276-d984857089a0/width=450/19494094.jpeg"
+  ],
   "Nimura_YuujiXL": [
     "",
     "SDXL 1.0",
@@ -1182,6 +1217,13 @@
     "https://civitai.com/models/345352",
     "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/2fc201a9-840c-4c7d-a648-db2cd3639ac3/width=450/16860750.jpeg"
   ],
+  "PVC": [
+    "PVC",
+    "SDXL 1.0",
+    "PVC LoRA/PVC style/PVC\u30b9\u30bf\u30a4\u30eb/PVC \uc2a4\ud0c0\uc77c",
+    "https://civitai.com/models/572550",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/f6721ee0-5f8e-4029-bdb7-12a049f141c3/width=450/19473087.jpeg"
+  ],
   "PaiControlPdxlDwnsty-000005": [
     "paizuri motion / motion line, motion blur, speed lines",
     "Pony",
@@ -1343,6 +1385,13 @@
     "https://civitai.com/models/540624",
     "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/f15654c4-f436-42f4-8334-b8ec45e9ccb1/width=450/17379632.jpeg"
   ],
+  "RealisticSkinv1_ponyv6_loraplus": [
+    "<lora:RealisticSkinv1_ponyv6_loraplus:1.15:step=15-28>real skin, freckles, mole, dirty skin, ",
+    "Pony",
+    "Realistic Skin for pony",
+    "https://civitai.com/models/572899",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/453eb876-a8dd-45ab-aba5-e56c88595d3a/width=450/19501372.jpeg"
+  ],
   "Reverse_Fellatio_LoRa__PonyXL": [
     "1girl, 1boy, reverse fellatio, head back, deepthroat, uncensored",
     "Pony",
@@ -1595,6 +1644,13 @@
     "https://civitai.com/models/563212",
     "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/02536d33-fce2-4f1b-988e-a02517591fe2/width=450/18850029.jpeg"
   ],
+  "Transparent_Male_PXL": [
+    "transparent male / disembodied transparent limb / disembodied transparent penis",
+    "Pony",
+    "Transparent Male [PonyXL]",
+    "https://civitai.com/models/573936",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/84262209-e3e2-4821-84a5-bdf564e5ff6f/width=450/19557719.jpeg"
+  ],
   "Tribadism_for_Pony": [
     "tribadism / scissoring / tribbing / trib / vaginal rubbing / pussies grinding",
     "Pony",
@@ -1665,6 +1721,13 @@
     "https://civitai.com/models/504990",
     "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/708e949d-7dfd-473b-952a-e09317b679ca/width=450/15176927.jpeg"
   ],
+  "VibingDance_(frieren_vibing)_LoRA_PDXL_Anzhc": [
+    "vibingdance, animation sheet, chibi, dancing / simple background, white background",
+    "Pony",
+    "Vibing Dance (Frieren Vibing meme) PDXL",
+    "https://civitai.com/models/571967",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/a2a343d6-9357-46fb-9865-a00de2e6b39a/width=450/19429555.jpeg"
+  ],
   "WatashiHentaiPony": [
     "",
     "Pony",
@@ -1700,6 +1763,13 @@
     "https://civitai.com/models/570360",
     "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/af88a2b0-ab45-4e67-a03f-ce3f8d3befce/width=450/19316294.jpeg"
   ],
+  "X-Ray_Phone": [
+    "X-RAY PHONE",
+    "Pony",
+    "X-Ray Phone",
+    "https://civitai.com/models/570386",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/4807350e-69af-48d8-806d-e3d5f5ca5bbb/width=450/19421507.jpeg"
+  ],
   "X-ray_Ver_2_0": [
     "x-ray / x-ray-blowjob / x-ray, anal",
     "Pony",
@@ -1791,6 +1861,13 @@
     "https://civitai.com/models/476605",
     "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/9015abba-f2a7-4a37-bae5-5b80e37ebba1/width=450/13607816.jpeg"
   ],
+  "_sdxl-dontstop-pony": [
+    "dontstop",
+    "Pony",
+    "for PONY, don't_you_ever_stop_(meme) - \u6b62\u307e\u308b\u3093\u3058\u3083\u306d\u3048\u305e LoRA",
+    "https://civitai.com/models/573722",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/345f8f21-c9af-4faf-83c6-2b5c6cce261a/width=450/19545975.jpeg"
+  ],
   "_sdxl-effectnewtype-pony": [
     "effectnewtype",
     "Pony",
@@ -2148,6 +2225,13 @@
     "https://civitai.com/models/474245",
     "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/004510d3-810d-41b2-85f3-9cf3dc3f84d9/width=450/16422785.jpeg"
   ],
+  "bind_four_sdxl": [
+    "1girl, solo, bind_all, machine, spread legs, bdsm",
+    "Pony",
+    "Hands and legs are bound by the machine",
+    "https://civitai.com/models/572367",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/65cc350f-a83f-49af-a098-03843d14658b/width=450/19460194.jpeg"
+  ],
   "bioluminescence_monmusu_v15": [
     "bioluminescence / blue glow / cyan glow / green glow / red glow / monster girl / monster girl encyclopedia / scylla / shoggoth / shark girl / mind flayer girl / kraken girl / anglerfish girl / sea slug girl / mermaid / xeno'jiiva / sangonomiya kokomi / skadi dragenfelt / firefly / jellyfish / mushroom / glowworm / phytoplankton / swell shark",
     "Pony",
@@ -2547,6 +2631,13 @@
     "https://civitai.com/models/145887",
     "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/d5944f71-a1a7-4dcc-927b-5ea70aa1ca5f/width=450/10955692.jpeg"
   ],
+  "creepydoll": [
+    "doll / long arms, long legs",
+    "Pony",
+    "Creepy Doll",
+    "https://civitai.com/models/570966",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/054ce404-1106-4c7e-a459-d90d670aaac2/width=450/19380314.jpeg"
+  ],
   "crimepreventionbuzzer_Pony_v1": [
     "crime prevention buzzer",
     "Pony",
@@ -3030,6 +3121,13 @@
     "https://civitai.com/models/568857",
     "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/ed855025-54e5-4dae-bc62-bd18a546a993/width=450/19208208.jpeg"
   ],
+  "hair_ribbon_braid_XL_V1_0": [
+    "hair ribbon braid,hair ribbon / braid",
+    "SDXL 1.0",
+    "\u7de8\u307f\u8fbc\u307f\u30ea\u30dc\u30f3/hair ribbon braid",
+    "https://civitai.com/models/572391",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/8e51c565-3c37-4525-88fc-b24b72246d81/width=450/19462384.jpeg"
+  ],
   "hair_ribbon_pony_V1_0": [
     "hair ribbon",
     "Pony",
@@ -3037,6 +3135,34 @@
     "https://civitai.com/models/568857",
     "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/b66e4ada-d395-4d06-a6fe-50d2b12008bf/width=450/19226354.jpeg"
   ],
+  "hairless_pussy_baihu": [
+    "Heimuerbaihu Pussy / Pussy / heibaihu pussy",
+    "Pony",
+    "Shaved Pussy\u65e0\u6bdb\u7a74Pony",
+    "https://civitai.com/models/573028",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/a09bdec1-7f00-451a-8437-8ded4af989cd/width=450/19511290.jpeg"
+  ],
+  "hairy_pussy": [
+    "hairy pussy / maomao / heimuer",
+    "Pony",
+    "hairy pussy\u9ed1\u6728\u8033\u9c8d\u9c7cPony",
+    "https://civitai.com/models/572312",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/953380b7-3116-42cb-950d-c47b50ad8fa3/width=450/19465465.jpeg"
+  ],
+  "hairy_pussystanding": [
+    "Hairy Pussy / yingmao",
+    "Pony",
+    "Hairy Pussy(Standing)",
+    "https://civitai.com/models/572665",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/d666c491-d65f-49e5-bfe2-b0658ed035df/width=450/19485170.jpeg"
+  ],
+  "hairywomenxl": [
+    "1woman, excessive pubic hair, pussy juice, hairy anus, anus, hairy arms, hairy legs, hairy thighs, hairy stomach, hairy armpits, happy trail, (Pubic Hair:1.4), large breasts / hairywomenxl",
+    "SDXL 1.0",
+    "hairy_womenXL",
+    "https://civitai.com/models/572643",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/ca34c1d0-9cb4-4c0b-b572-e0bd50327080/width=450/19481548.jpeg"
+  ],
   "hamipan_XL_V1_0": [
     " hamipan, panties under clothes / buruma / shorts",
     "SDXL 1.0",
@@ -3646,6 +3772,13 @@
     "https://civitai.com/models/320709",
     "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/121cc0d1-e20f-460d-b27d-e4dae494976f/width=450/7081151.jpeg"
   ],
+  "mugshot_pony_ver1": [
+    "mugshot / holding sign",
+    "Pony",
+    "(Pony) mugshot",
+    "https://civitai.com/models/573056",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/c3c99a9a-f2cf-4c20-ae4b-a03ded327311/width=450/19512503.jpeg"
+  ],
   "multi_prolapse_ponyXL_v1": [
     "anal prolapse /  uterine prolapse /  double prolapse /  ovary prolapse",
     "Pony",
@@ -4185,6 +4318,13 @@
     "https://civitai.com/models/541663",
     "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/f4a1ad57-1835-4088-9ed1-8772d802c249/width=450/17440119.jpeg"
   ],
+  "pubic_hair_XL_V1_0": [
+    "pubic hair",
+    "SDXL 1.0",
+    "\u30de\u30f3\u6bdb/pubic hair",
+    "https://civitai.com/models/572782",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/bf9525c7-e755-475d-86d6-c958af21be24/width=450/19491907.jpeg"
+  ],
   "pubic_tattoo_Pony_V1_0": [
     "pubic tattoo,tattoo / heart",
     "Pony",
@@ -4584,6 +4724,13 @@
     "https://civitai.com/models/542280",
     "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/98ef287c-0e72-4582-b5af-ed200c8e2824/width=450/17471785.jpeg"
   ],
+  "spfigmaFigurineXLPony2": [
+    "3d, figma, depth of field, blurry background",
+    "Pony",
+    "[PonyXL] Figma Figurines \u30d5\u30a3\u30b0\u30de || Concept / Style",
+    "https://civitai.com/models/573646",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/99afd187-fba0-443b-b34b-63060541789b/width=450/19544489.jpeg"
+  ],
   "splitXL2": [
     "split",
     "SDXL 1.0",
@@ -4675,6 +4822,13 @@
     "https://civitai.com/models/544991",
     "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/731ad22b-7f48-46a2-b071-653d6f35baf0/width=450/17658185.jpeg"
   ],
+  "suction_dildo_masturbation": [
+    "fuckingherself, 1woman, suction_dildo, suction_cup_dildo, dildo, female_masturbation, vaginal, uncensored pussy, looking_back, ahegao, pussy juice,  / against_glass, glass_wall,  / against wall, wall, ",
+    "SDXL 1.0",
+    "suction_dildo_masturbation",
+    "https://civitai.com/models/572613",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/ad3ce7ac-af94-412d-9c1a-de186f8b9df9/width=450/19479975.jpeg"
+  ],
   "sukumizu_Pony_V1_1": [
     "swimsuit,school swimsuit / blue one-piece swimsuit / white one-piece swimsuit",
     "Pony",
@@ -5095,6 +5249,13 @@
     "https://civitai.com/models/557389",
     "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/deedeed2-8c1a-4121-8036-5c7e984c40e7/width=450/18485212.jpeg"
   ],
+  "vore_frog": [
+    "vored / frog / ass / breast",
+    "Pony",
+    "[PonyXL] Vored by Frog",
+    "https://civitai.com/models/572375",
+    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/0b409539-77e6-494e-b5fd-c4266a8cc7e1/width=450/19460494.jpeg"
+  ],
   "wadingpool_Pony_v1": [
     "wading pool",
     "Pony",

modutils.py

@@ -224,8 +224,7 @@ def get_tupled_model_list(model_list):
 
 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)
+    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
@@ -234,7 +233,7 @@ def save_gallery_images(images):
     for image in images:
         from pathlib import Path
         filename = basename + str(i) + ".png"
-        oldpath = Path(image[0])
+        oldpath = Path(image[0]) # Path(image[0])
         newpath = oldpath.resolve().rename(Path(filename).resolve())
         output_paths.append(str(newpath))
         output_images.append((str(newpath), str(filename)))
@@ -261,7 +260,7 @@ optimization_list = {
 }
 
 
-def set_optimization(opt, steps_gui, cfg_gui, sampler_gui, clip_skip_gui, lora1_gui, lora_scale_1_gui):
+def set_optimization(opt, steps_gui, cfg_gui, sampler_gui, clip_skip_gui, lora_gui, lora_scale_gui):
     if not opt in list(optimization_list.keys()): opt = "None"
     def_steps_gui = 28
     def_cfg_gui = 7.
@@ -269,8 +268,8 @@ def set_optimization(opt, steps_gui, cfg_gui, sampler_gui, clip_skip_gui, lora1_
     cfg = optimization_list.get(opt, "None")[1]
     sampler = optimization_list.get(opt, "None")[2]
     clip_skip = optimization_list.get(opt, "None")[3]
-    lora1 = optimization_list.get(opt, "None")[4]
-    lora_scale_1 = optimization_list.get(opt, "None")[5]
+    lora = optimization_list.get(opt, "None")[4]
+    lora_scale = optimization_list.get(opt, "None")[5]
     if opt == "None":
         steps = max(steps_gui, def_steps_gui)
         cfg = max(cfg_gui, def_cfg_gui)
@@ -280,7 +279,7 @@ def set_optimization(opt, steps_gui, cfg_gui, sampler_gui, clip_skip_gui, lora1_
         cfg = max(cfg_gui, def_cfg_gui)
 
     return gr.update(value=steps), gr.update(value=cfg), gr.update(value=sampler),\
-          gr.update(value=clip_skip), gr.update(value=lora1), gr.update(value=lora_scale_1),
+          gr.update(value=clip_skip), gr.update(value=lora), gr.update(value=lora_scale),
 
 
 def set_lora_prompt(prompt_gui, prompt_syntax_gui, lora1_gui, lora_scale_1_gui, lora2_gui, lora_scale_2_gui,\
@@ -460,8 +459,10 @@ def apply_lora_prompt(prompt_gui: str, lora_trigger_gui: str):
     return gr.update(value=prompt)
 
 
-def upload_file_lora(files):
+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)
 
 
@@ -686,7 +687,7 @@ preset_styles = {k["name"]: (k["prompt"], k["negative_prompt"]) for k in style_l
 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 process_style_prompt(prompt: str, neg_prompt: str, styles_key: str = "None", quality_key: str = "None", type: str = "Auto"):
     def to_list(s):
         return [x.strip() for x in s.split(",") if not s == ""]
     
@@ -723,8 +724,8 @@ def process_style_prompt(prompt: str, neg_prompt: str, styles_key: str = "None",
     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 []
+    last_empty_p = [""] if not prompts and type != "None" and type != "Auto" and styles_key != "None" and quality_key != "None" else []
+    last_empty_np = [""] if not neg_prompts and type != "None" and type != "Auto" and styles_key != "None" and quality_key != "None" else []
 
     if type == "Animagine":
         prompts = prompts + animagine_ps
@@ -739,17 +740,17 @@ def process_style_prompt(prompt: str, neg_prompt: str, styles_key: str = "None",
     prompt = ", ".join(list_uniq(prompts) + last_empty_p)
     neg_prompt = ", ".join(list_uniq(neg_prompts) + last_empty_np)
 
-    return prompt, neg_prompt
+    return gr.update(value=prompt), gr.update(value=neg_prompt), gr.update(value=type) 
 
 
-def set_quick_presets(genre:str = "None", type:str = "None", speed:str = "None", aspect:str = "None"):
+def set_quick_presets(genre:str = "None", type:str = "Auto", speed:str = "None", aspect:str = "None"):
     quality = "None"
     style = "None"
     sampler = "None"
     opt = "None"
 
     if genre == "Anime":
-        style = "Anime"
+        if type != "None" and type != "Auto": style = "Anime"
         if aspect == "1:1":
             if speed == "Heavy":
                 sampler = "Anime 1:1 Heavy"
@@ -766,10 +767,12 @@ def set_quick_presets(genre:str = "None", type:str = "None", speed:str = "None",
                 sampler = "Anime 3:4 Standard"
         if type == "Pony":
             quality = "Pony Anime Common"
-        else:
+        elif type == "Animagine":
             quality = "Animagine Common"
+        else:
+            quality = "None"
     elif genre == "Photo":
-        style = "Photographic"
+        if type != "None" and type != "Auto": style = "Photographic"
         if aspect == "1:1":
             if speed == "Heavy":
                 sampler = "Photo 1:1 Heavy"
@@ -791,9 +794,9 @@ def set_quick_presets(genre:str = "None", type:str = "None", speed:str = "None",
 
     if speed == "Fast":
         opt = "DPO Turbo"
-        if genre == "Anime" and type != "Pony": quality = "Animagine Light v3.1"
+        if genre == "Anime" and type != "Pony" and type != "Auto": quality = "Animagine Light v3.1"
 
-    return gr.update(value=quality), gr.update(value=style), gr.update(value=sampler), gr.update(value=opt)
+    return gr.update(value=quality), gr.update(value=style), gr.update(value=sampler), gr.update(value=opt), gr.update(value=type)
 
 
 textual_inversion_dict = {}

requirements.txt

@@ -1,4 +1,4 @@
-git+https://github.com/R3gm/stablepy.git@test_stream
+git+https://github.com/R3gm/stablepy.git@dev2
 torch==2.2.0
 gdown
 opencv-python