Separate card rendering from card image generation.

app.py

@@ -356,28 +356,25 @@ with gr.Blocks(title='MagicGen') as demo:
     with gr.Row():
         with gr.Column():
             in_text = gr.TextArea(label="Card Text (Shift+Enter to submit)", value=starting_text)
+            gen_image_button = gr.Button('🖼️ Generate Card Image')
             in_image = gr.Image(label="Card Image (400px x 550px)", type='filepath', value='placeholder.png')
-            run_button = gr.Button('🔄 Regenerate Card', variant="primary")
+            render_button = gr.Button('🎴 Render Card', variant="primary")
             gr.ClearButton([audio_in, prompt_in, in_text, in_image])
         with gr.Column():
             out_image = gr.Image(label="Rendered Card", value=get_initial_card())
 
+    transcribe_params = {'fn': transcribe, 'inputs': [audio_in], 'outputs': [prompt_in, audio_in]}
+    generate_text_params = {'fn': generate_text, 'inputs': [in_text, prompt_in],
+                            'outputs': [bot_text, in_text, audio_in]}
+    generate_image_params = {'fn': generate_image, 'inputs': [in_text], 'outputs': [in_image]}
+    generate_card_params = {'fn': generate_card, 'inputs': [in_image, in_text], 'outputs': [out_image]}
     # Shift + Enter to submit text in TextAreas
-    audio_in.stop_recording(transcribe, [audio_in], [prompt_in, audio_in], None).then(generate_text,
-                                                                                      [in_text, prompt_in],
-                                                                                      [bot_text, in_text,
-                                                                                       audio_in]).then(generate_image,
-                                                                                                       [in_text],
-                                                                                                       [in_image],
-                                                                                                       None).then(
-        generate_card, [in_image, in_text], [out_image], None)
-    prompt_in.submit(generate_text, [in_text, prompt_in], [bot_text, in_text, audio_in]).then(generate_image, [in_text],
-                                                                                              [in_image], None).then(
-        generate_card, [in_image, in_text], [out_image], None)
-    in_text.submit(generate_image, [in_text], [in_image], None).then(generate_card, [in_image, in_text], [out_image],
-                                                                     None)
-    run_button.click(generate_image, [in_text], [in_image], None).then(generate_card, [in_image, in_text], [out_image],
-                                                                       None)
+    audio_in.stop_recording(**transcribe_params).then(**generate_text_params).then(**generate_image_params).then(
+        **generate_card_params)
+    prompt_in.submit(**generate_text_params).then(**generate_image_params).then(**generate_card_params)
+    in_text.submit(**generate_card_params)
+    render_button.click(**generate_card_params)
+    gen_image_button.click(**generate_image_params).then(**generate_card_params)
     demo.load(None, None, None, js=add_hotkeys())
 
 if __name__ == "__main__":