Update app.py

app.py

@@ -7,15 +7,10 @@ from threading import RLock
 from datetime import datetime
 
 preSetPrompt = "cute tall slender athletic 20+ caucasian woman. gorgeous face. perky tits. sensual expression. lifting shirt. photorealistic. cinematic. f1.4"
-# preSetPrompt = "cute tall slender athletic 20+ nude caucasian woman. gorgeous face. perky tits. gaping outie pussy. pussy juice. sly smile. explicit pose. artistic. photorealistic. cinematic. f1.4"
-
-# H. R. Giger prompt:
-# preSetPrompt = "a tall slender athletic caucasian nude 18+ female cyborg. gorgeous face. perky tits. wet skin. sensual expression. she is entangled in rusty chains, rusty barbed wire and electric cables. old dark dusty decaying spaceship designed by h.r. giger. rusty metal dildos. wet tubes and wet plastic hoses. dark, gloomy teal cinematic light. photorealistic."
-
 negPreSetPrompt = "[deformed | disfigured], poorly drawn, [bad : wrong] anatomy, [extra | missing | floating | disconnected] limb, (mutated hands and fingers), blurry, text, fuzziness"
 
 lock = RLock()
-HF_TOKEN = os.environ.get("HF_TOKEN") if os.environ.get("HF_TOKEN") else None # If private or gated models aren't used, ENV setting is unnecessary.
+HF_TOKEN = os.environ.get("HF_TOKEN") if os.environ.get("HF_TOKEN") else None
 
 def get_current_time():
     now = datetime.now()
@@ -35,34 +30,26 @@ def load_fn(models):
                 m = gr.Interface(lambda: None, ['text'], ['image'])
             models_load.update({model: m})
 
-
 load_fn(models)
 
-
 num_models = 6
 max_images = 6
 inference_timeout = 400
 default_models = models[:num_models]
 MAX_SEED = 2**32-1
 
-
 def extend_choices(choices):
     return choices[:num_models] + (num_models - len(choices[:num_models])) * ['NA']
 
-
 def update_imgbox(choices):
     choices_plus = extend_choices(choices[:num_models])
     return [gr.Image(None, label=m, visible=(m!='NA')) for m in choices_plus]
 
-
 def random_choices():
     import random
     random.seed()
     return random.choices(models, k=num_models)
 
-
-# https://huggingface.co/docs/api-inference/detailed_parameters
-# https://huggingface.co/docs/huggingface_hub/package_reference/inference_client
 async def infer(model_str, prompt, nprompt="", height=0, width=0, steps=0, cfg=0, seed=-1, timeout=inference_timeout):
     kwargs = {}
     if height > 0: kwargs["height"] = height
@@ -94,16 +81,15 @@ async def infer(model_str, prompt, nprompt="", height=0, width=0, steps=0, cfg=0
         raise Exception() from e
     if task.done() and result is not None and not isinstance(result, tuple):
         with lock:
-            # png_path = "img.png"
-            # png_path = get_current_time() + "_" + model_str.replace("/", "_") + ".png"
-            # png_path =  model_str.replace("/", "_") + " - " +  prompt + " - " + get_current_time() + ".png"
             png_path =  model_str.replace("/", "_") + " - " + get_current_time() + "_" + str(theSeed) + ".png"
             image = save_image(result, png_path, model_str, prompt, nprompt, height, width, steps, cfg, seed)
         return image
     return None
 
-
 def gen_fn(model_str, prompt, nprompt="", height=0, width=0, steps=0, cfg=0, seed=-1):
+    if model_str == 'NA':
+        return None
+        
     try:
         loop = asyncio.new_event_loop()
         result = loop.run_until_complete(infer(model_str, prompt, nprompt,
@@ -117,16 +103,16 @@ def gen_fn(model_str, prompt, nprompt="", height=0, width=0, steps=0, cfg=0, see
         loop.close()
     return result
 
-
 def add_gallery(image, model_str, gallery):
-    if gallery is None: gallery = []
+    if gallery is None: 
+        gallery = []
+    if model_str == 'NA':
+        return gallery
     with lock:
-        if image is not None: gallery.insert(0, (image, model_str))
+        if image is not None:
+            gallery.insert(0, (image, model_str))
     return gallery
 
-
-
-
 js_func = """
 function refresh() {
     const url = new URL(window.location);
@@ -150,10 +136,8 @@ js_AutoSave="""
             });
         });
         observer.observe(img1, {attributes : true});
-        
 """
 
-
 CSS="""
 .gradio-container { max-width: 1200px; margin: 0 auto; background: linear-gradient(to bottom, #1a1a1a, #2d2d2d); !important; }
 .output { 
@@ -193,7 +177,6 @@ with gr.Blocks(theme='NoCrypt/miku@>=1.2.2', fill_width=True, css=CSS) as demo:
                </a>""")
     
     with gr.Column(scale=2):
-        # 모델 선택 부분 추가
         with gr.Accordion("Model Selection", open=True):
             model_choice = gr.CheckboxGroup(
                 models,
@@ -264,7 +247,6 @@ with gr.Blocks(theme='NoCrypt/miku@>=1.2.2', fill_width=True, css=CSS) as demo:
             rows=2
         ) 
 
-    # 이벤트 핸들러 추가
     model_choice.change(update_imgbox, model_choice, output)
     model_choice.change(extend_choices, model_choice, current_models)
     random_button.click(random_choices, None, model_choice)
@@ -272,12 +254,16 @@ with gr.Blocks(theme='NoCrypt/miku@>=1.2.2', fill_width=True, css=CSS) as demo:
     for m, o in zip(current_models, output):
         gen_event = gr.on(
             triggers=[gen_button.click, txt_input.submit],
-            fn=gen_fn,
-            inputs=[m, txt_input, neg_input, height, width, steps, cfg, seed],
+            fn=lambda m=m, *args: gen_fn(m.value, *args) if m.value != 'NA' else None,
+            inputs=[txt_input, neg_input, height, width, steps, cfg, seed],
             outputs=[o],
             concurrency_limit=None,
             queue=False
         )
-        o.change(add_gallery, [o, m, gallery], [gallery])
+        o.change(
+            fn=lambda img, m=m, g: add_gallery(img, m.value, g) if m.value != 'NA' else g,
+            inputs=[o, gallery],
+            outputs=[gallery]
+        )
 
 demo.launch(show_api=False, max_threads=400)