Tidy up event listeners

Separated returning button states from functions that were more meant for their own thing

app.py

@@ -78,25 +78,42 @@ def detect_objects(img: Image.Image):
     return box_images
 
 
-def gallery_selected(evt: gr.SelectData) -> tuple[int, gr.Button]:
+def get_selected_index(evt: gr.SelectData) -> int:
     """
     Listener for the gallery selection event.
 
     :return: index of the currently selected image
     """
-    print(f"Index: {evt.index}, Value: {evt.value}, Selected: {evt.selected}")
-    return evt.index, gr.Button(interactive=evt.selected)
+    return evt.index
 
 
-def to_moondream(images: list[tuple[Image.Image, str | None]], index: int) -> tuple[gr.Tabs, Image.Image, gr.Button]:
+def to_moondream(images: list[tuple[Image.Image, str | None]], index: int) -> tuple[gr.Tabs, Image.Image]:
     """
     Listener that sends selected gallery image to the moondream model.
 
     :param images: list of images from yolos_gallery
     :param index: index of selected gallery image
-    :return: selected tab, selected image (no caption), and an enabled button
+    :return: selected tab and selected image (no caption)
     """
-    return gr.Tabs(selected='moondream'), images[index][0], gr.Button(interactive=True)
+    return gr.Tabs(selected='moondream'), images[index][0]
+
+
+def enable_button() -> gr.Button:
+    """
+    Helper function for Gradio event listeners.
+
+    :return: a button with ``interactive=True`` and ``variant="primary"``
+    """
+    return gr.Button(interactive=True, variant="primary")
+
+
+def disable_button() -> gr.Button:
+    """
+    Helper function for Gradio event listeners.
+
+    :return: a button with ``interactive=False`` and ``variant="secondary"``
+    """
+    return gr.Button(interactive=False, variant="secondary")
 
 
 if __name__ == "__main__":
@@ -130,23 +147,22 @@ if __name__ == "__main__":
                         with gr.Group():
                             moon_prompt = gr.Textbox(label="Ask a question about the image:",
                                                      value="What is this food item? Include any text on labels.")
-                            moon_submit = gr.Button("Submit", interactive=False, variant="primary")
+                            moon_submit = gr.Button("Submit", interactive=False)
                     moon_output = gr.TextArea(label="Answer", interactive=False)
 
         # --- YOLOS --- #
-        yolos_input.upload(lambda: gr.Button(interactive=True), None, yolos_submit)
-        yolos_input.clear(lambda: gr.Button(interactive=False), None, yolos_submit)
-
+        yolos_input.upload(enable_button, None, yolos_submit)
+        yolos_input.clear(disable_button, None, yolos_submit)
         yolos_submit.click(detect_objects, yolos_input, yolos_gallery)
-        yolos_submit.click(lambda: (gr.Button(variant="secondary"), gr.Button(variant="primary")), None,
-                           [yolos_submit, proceed_button])
 
-        yolos_gallery.select(gallery_selected, None, [selected_image, proceed_button])
-        proceed_button.click(to_moondream, [yolos_gallery, selected_image], [tabs, moon_img, moon_submit])
+        yolos_gallery.select(get_selected_index, None, selected_image)
+        yolos_gallery.select(enable_button, None, proceed_button)
+        proceed_button.click(to_moondream, [yolos_gallery, selected_image], [tabs, moon_img])
+        proceed_button.click(enable_button, None, moon_submit)
 
         # --- Moondream --- #
-        moon_img.upload(lambda: gr.Button(interactive=True), None, moon_submit)
-        moon_img.clear(lambda: gr.Button(interactive=False), None, moon_submit)
+        moon_img.upload(enable_button, None, moon_submit)
+        moon_img.clear(disable_button, None, moon_submit)
         moon_submit.click(answer_question, [moon_img, moon_prompt], moon_output)
 
     app.queue().launch()