use gr.on for more components

app_dialogue.py

@@ -842,19 +842,7 @@ with gr.Blocks(title="AI Meme Generator", theme=gr.themes.Base(), css=css) as de
             generation_args["do_sample"] = True
             generation_args["top_p"] = top_p
 
-        if image is None:
-            # Case where there is no image OR the image is passed as `<fake_token_around_image><image:IMAGE_URL><fake_token_around_image>`
-            chat_history.append([prompt_list_to_markdown(user_prompt_list), ""])
-        else:
-            # Case where the image is passed through the Image Box.
-            # Convert the image into base64 for both passing it through the chat history and
-            # displaying the image inside the same bubble as the text.
-            chat_history.append(
-                [
-                    f"{prompt_list_to_markdown([image] + user_prompt_list)}",
-                    "",
-                ]
-            )
+        chat_history.append([prompt_list_to_markdown(user_prompt_list), ""])
 
         query = prompt_list_to_tgi_input(formated_prompt_list)
         all_meme_images = []
@@ -881,7 +869,13 @@ with gr.Blocks(title="AI Meme Generator", theme=gr.themes.Base(), css=css) as de
         return user_prompt_str, all_meme_images, chat_history
 
     gr.on(
-        triggers=[textbox.submit, imagebox.upload, submit_btn.click],
+        triggers=[
+            textbox.submit,
+            imagebox.upload,
+            submit_btn.click,
+            template_gallery.select,
+            regenerate_btn.click,
+        ],
         fn=expand_layout,
         outputs=[upload_area, generated_memes_gallery],
         queue=False,
@@ -912,7 +906,6 @@ with gr.Blocks(title="AI Meme Generator", theme=gr.themes.Base(), css=css) as de
             return chat_history, "", ""
         last_interaction = chat_history[-1]
         chat_history = chat_history[:-1]
-        last_interaction[0] = re.sub(r"!\[]\(/file=.*?\)", "", last_interaction[0])
         chat_update = chat_history
         text_update = last_interaction[0]
         return chat_update, text_update, ""
@@ -922,36 +915,6 @@ with gr.Blocks(title="AI Meme Generator", theme=gr.themes.Base(), css=css) as de
         inputs=chatbot,
         outputs=[chatbot, textbox, generated_memes_gallery],
         queue=False,
-    ).then(
-        fn=lambda: regenerate_btn.update(interactive=False),
-        inputs=[],
-        outputs=[],
-    ).then(
-        fn=model_inference,
-        inputs=[
-            model_selector,
-            system_prompt,
-            textbox,
-            chatbot,
-            imagebox,
-            decoding_strategy,
-            temperature,
-            max_new_tokens,
-            repetition_penalty,
-            top_p,
-            all_caps_meme_text,
-            text_at_the_top,
-            font_meme_text,
-        ],
-        outputs=[
-            textbox,
-            generated_memes_gallery,
-            chatbot,
-        ],
-    ).then(
-        fn=lambda: regenerate_btn.update(interactive=True),
-        inputs=[],
-        outputs=[],
     )
 
     gallery_type_choice.change(
@@ -965,30 +928,6 @@ with gr.Blocks(title="AI Meme Generator", theme=gr.themes.Base(), css=css) as de
         inputs=[template_gallery],
         outputs=[textbox, imagebox, generated_memes_gallery],
         queue=False,
-    ).success(
-        fn=expand_layout, outputs=[upload_area, generated_memes_gallery], queue=False
-    ).success(
-        fn=model_inference,
-        inputs=[
-            model_selector,
-            system_prompt,
-            textbox,
-            chatbot,
-            imagebox,
-            decoding_strategy,
-            temperature,
-            max_new_tokens,
-            repetition_penalty,
-            top_p,
-            all_caps_meme_text,
-            text_at_the_top,
-            font_meme_text,
-        ],
-        outputs=[
-            textbox,
-            generated_memes_gallery,
-            chatbot,
-        ],
     )
     demo.load(
         fn=choose_gallery,