Caption and Img Sepa

app.py

@@ -83,48 +83,48 @@ def generate(prompt):
 ### First attempt, just captioning
 
 import gradio as gr 
-# with gr.Blocks() as demo:
-#     gr.Markdown("# Describe-and-Generate game 🖍️")
-#     image_upload = gr.Image(label="Your first image",type="pil")
-#     btn_caption = gr.Button("Generate caption")
-#     caption = gr.Textbox(label="Generated caption")
+with gr.Blocks() as demo:
+    gr.Markdown("# Describe-and-Generate game 🖍️")
+    image_upload = gr.Image(label="Your first image",type="pil")
+    btn_caption = gr.Button("Generate caption")
+    caption = gr.Textbox(label="Generated caption")
     
-#     btn_caption.click(fn=captioner, inputs=[image_upload], outputs=[caption])
+    btn_caption.click(fn=captioner, inputs=[image_upload], outputs=[caption])
 
 # gr.close_all()
 # demo.launch(share=True)
 
 # ### Let's add generation
 
-# with gr.Blocks() as demo:
-#     gr.Markdown("# Describe-and-Generate game 🖍️")
-#     image_upload = gr.Image(label="Your first image",type="pil")
-#     btn_caption = gr.Button("Generate caption")
-#     caption = gr.Textbox(label="Generated caption")
-#     btn_image = gr.Button("Generate image")
-#     image_output = gr.Image(label="Generated Image")
-#     btn_caption.click(fn=captioner, inputs=[image_upload], outputs=[caption])
-#     btn_image.click(fn=generate, inputs=[caption], outputs=[image_output])
-
-# gr.close_all()
-# demo.launch(share=True)
-
-### Doing it all at once
-
-def caption_and_generate(image):
-    caption = captioner(image)
-    image = generate(caption)
-    return [caption, image]
-
 with gr.Blocks() as demo:
     gr.Markdown("# Describe-and-Generate game 🖍️")
     image_upload = gr.Image(label="Your first image",type="pil")
-    btn_all = gr.Button("Caption and generate")
+    btn_caption = gr.Button("Generate caption")
     caption = gr.Textbox(label="Generated caption")
+    btn_image = gr.Button("Generate image")
     image_output = gr.Image(label="Generated Image")
-    btn_all.click(fn=caption_and_generate, inputs=[image_upload], outputs=[caption, image_output])
+    btn_caption.click(fn=captioner, inputs=[image_upload], outputs=[caption])
+    btn_image.click(fn=generate, inputs=[caption], outputs=[image_output])
 
 # gr.close_all()
 demo.launch(share=True)
 
-gr.close_all()
+### Doing it all at once
+
+# def caption_and_generate(image):
+#     caption = captioner(image)
+#     image = generate(caption)
+#     return [caption, image]
+
+# with gr.Blocks() as demo:
+#     gr.Markdown("# Describe-and-Generate game 🖍️")
+#     image_upload = gr.Image(label="Your first image",type="pil")
+#     btn_all = gr.Button("Caption and generate")
+#     caption = gr.Textbox(label="Generated caption")
+#     image_output = gr.Image(label="Generated Image")
+#     btn_all.click(fn=caption_and_generate, inputs=[image_upload], outputs=[caption, image_output])
+
+# gr.close_all()
+# demo.launch(share=True)
+
+# gr.close_all()