Update app.py

app.py

@@ -213,37 +213,7 @@ def randomize_seed_fn(seed: int, randomize_seed: bool) -> int:
         seed = random.randint(0, MAX_SEED)
     return seed
 
-@spaces.GPU(duration=60)
-def generate(prompt, progress=gr.Progress(track_tqdm=True)):
-    negative_prompt = cfg.get("negative_prompt", "")
-    style_selection = ""
-    use_negative_prompt = True
-    seed = 0
-    width = cfg.get("width", 1024)
-    height = cfg.get("width", 768) 
-    inference_steps = cfg.get("inference_steps", 30)
-    randomize_seed = True
-    guidance_scale = cfg.get("guidance_scale", 7.5)
-    prompt_str = cfg.get("prompt", "{prompt}").replace("{prompt}", prompt)
-      
-    seed = int(randomize_seed_fn(seed, randomize_seed))
-    generator = torch.Generator(pipe.device).manual_seed(seed)
-        
-    images = pipe(
-        prompt=prompt_str,
-        negative_prompt=negative_prompt,
-        width=width,
-        height=height,
-        guidance_scale=guidance_scale,
-        num_inference_steps=inference_steps,
-        generator=generator,
-        num_images_per_prompt=NUM_IMAGES_PER_PROMPT,
-        output_type="pil",
-    ).images
-    images = [save_image(img) for img in images]
-    image_paths = [i[1] for i in images]
-    print(prompt_str, image_paths)
-    return [i[0] for i in images], prompt
+
 
 with gr.Blocks(css=css,head=js,fill_height=True) as demo:
     with gr.Row(equal_height=False):
@@ -265,7 +235,40 @@ with gr.Blocks(css=css,head=js,fill_height=True) as demo:
                 )
                 random_button = gr.Button("Surprise Me", scale=1, min_width=10)
             run_button = gr.Button( "GO!", scale=1, min_width=20, variant="primary",icon="https://huggingface.co/spaces/nsfwalex/sd_card/resolve/main/hot.svg")
+
+    @spaces.GPU(duration=60)
+    def generate(p, progress=gr.Progress(track_tqdm=True)):
+        negative_prompt = cfg.get("negative_prompt", "")
+        style_selection = ""
+        use_negative_prompt = True
+        seed = 0
+        width = cfg.get("width", 1024)
+        height = cfg.get("width", 768) 
+        inference_steps = cfg.get("inference_steps", 30)
+        randomize_seed = True
+        guidance_scale = cfg.get("guidance_scale", 7.5)
+        prompt_str = cfg.get("prompt", "{prompt}").replace("{prompt}", p)
+        if not prompt.value:
+            prompt.value = p
+        seed = int(randomize_seed_fn(seed, randomize_seed))
+        generator = torch.Generator(pipe.device).manual_seed(seed)
             
+        images = pipe(
+            prompt=prompt_str,
+            negative_prompt=negative_prompt,
+            width=width,
+            height=height,
+            guidance_scale=guidance_scale,
+            num_inference_steps=inference_steps,
+            generator=generator,
+            num_images_per_prompt=NUM_IMAGES_PER_PROMPT,
+            output_type="pil",
+        ).images
+        images = [save_image(img) for img in images]
+        image_paths = [i[1] for i in images]
+        print(prompt_str, image_paths)
+        return [i[0] for i in images]
+        
     def on_demo_load(request: gr.Request):
         current_domain = request.request.headers.get("Host", "")
     
@@ -306,7 +309,7 @@ with gr.Blocks(css=css,head=js,fill_height=True) as demo:
             
 
     result.change(fn=lambda x,y:x, inputs=[prompt,result], outputs=[], js=f'''(p,img)=>window.uploadImage(p, img,"process_finished","demo_hf_{cfg.get("name")}_card", "{cfg["model_id"]}")''')    
-    run_button.click(generate, inputs=[prompt], outputs=[result, prompt], js=f'''(p)=>window.postMessageToParent(p,"process_started","demo_hf_{cfg.get("name")}_card", "click_go")''')
+    run_button.click(generate, inputs=[prompt], outputs=[result], js=f'''(p)=>window.postMessageToParent(p,"process_started","demo_hf_{cfg.get("name")}_card", "click_go")''')
     random_button.click(fn=lambda x:x, inputs=[prompt], outputs=[prompt], js='''(p)=>window.g(p)''')
     demo.load(fn=on_demo_load, inputs=[], outputs=[result], js='''()=>onDemoLoad()''')
 if __name__ == "__main__":