Update app.py

app.py

@@ -3,15 +3,8 @@ import openai
 import gradio as gr
 import json
 import plotly.graph_objects as go
-from typing import Dict, Any
-import os
-import openai
-import gradio as gr
-import json
-import plotly.graph_objects as go
 from variables import CONTEXTUAL_ZOOM_PROMPT, CONTEXTUAL_ZOOM_default_response
 
-
 class ArtExplorer:
   def __init__(self):
       self.client = openai.OpenAI(
@@ -122,9 +115,59 @@ class ArtExplorer:
               style_explanation = gr.Markdown()
               style_zoom = gr.Button("🔍 Zoom Styles")
 
-          # Set up event handlers
+          def initial_search(query):
+              """
+              Handle the initial search query and return properly formatted outputs for Gradio
+              Returns individual values instead of a dictionary for Gradio components
+              """
+              config = self.get_llm_response(query)
+              temporal_config = config["axis_configurations"]["temporal"]["current_zoom"]
+              geographical_config = config["axis_configurations"]["geographical"]["current_zoom"]
+              style_config = config["axis_configurations"]["style"]["current_zoom"]
+              
+              map_fig = self.create_map(geographical_config["locations"])
+              
+              # Return individual values in the order expected by Gradio
+              return (
+                  temporal_config["range"],  # time_slider
+                  map_fig,                   # map_plot
+                  style_config["options"],   # style_select
+                  temporal_config["explanation"],  # time_explanation
+                  geographical_config.get("explanation", ""),  # geo_explanation
+                  style_config["explanation"]  # style_explanation
+              )
+
+          def zoom_axis(query, axis_name, current_value):
+              """
+              Handle zoom events for any axis with proper return formatting
+              """
+              self.current_state["zoom_level"] += 1
+              config = self.get_llm_response(
+                  query,
+                  zoom_context={axis_name: current_value}
+              )
+              axis_config = config["axis_configurations"][axis_name]["current_zoom"]
+              
+              if axis_name == "temporal":
+                  return (
+                      axis_config["range"],
+                      axis_config["explanation"]
+                  )
+              elif axis_name == "geographical":
+                  map_fig = self.create_map(axis_config["locations"])
+                  return (
+                      map_fig,
+                      axis_config.get("explanation", "")
+                  )
+              else:  # style
+                  return (
+                      axis_config["options"],
+                      axis_config["explanation"]
+                  )
+
+          # Connect event handlers
           search_btn.click(
-              fn=self._handle_search,
+              fn=initial_search,
               inputs=[query],
               outputs=[
                   time_slider,
@@ -137,69 +180,25 @@ class ArtExplorer:
           )
 
           time_zoom.click(
-              fn=lambda q, v: self._handle_zoom("temporal", q, v),
+              fn=lambda q, v: zoom_axis(q, "temporal", v),
               inputs=[query, time_slider],
               outputs=[time_slider, time_explanation]
           )
 
           geo_zoom.click(
-              fn=lambda q, v: self._handle_zoom("geographical", q, v),
+              fn=lambda q, v: zoom_axis(q, "geographical", v),
               inputs=[query, map_plot],
               outputs=[map_plot, geo_explanation]
           )
 
           style_zoom.click(
-              fn=lambda q, v: self._handle_zoom("style", q, v),
+              fn=lambda q, v: zoom_axis(q, "style", v),
               inputs=[query, style_select],
               outputs=[style_select, style_explanation]
           )
 
           return demo
 
-  def _handle_search(self, query: str) -> Dict[str, Any]:
-      """Handle the initial search query"""
-      config = self.get_llm_response(query)
-      temporal_config = config["axis_configurations"]["temporal"]["current_zoom"]
-      geographical_config = config["axis_configurations"]["geographical"]["current_zoom"]
-      style_config = config["axis_configurations"]["style"]["current_zoom"]
-      
-      map_fig = self.create_map(geographical_config["locations"])
-      
-      return {
-          "time_slider": temporal_config["range"],
-          "map_plot": map_fig,
-          "style_select": gr.Dropdown(choices=style_config["options"]),
-          "time_explanation": temporal_config["explanation"],
-          "geo_explanation": geographical_config.get("explanation", ""),
-          "style_explanation": style_config["explanation"]
-      }
-
-  def _handle_zoom(self, axis_name: str, query: str, current_value: Any) -> Dict[str, Any]:
-      """Handle zoom events for any axis"""
-      self.current_state["zoom_level"] += 1
-      config = self.get_llm_response(
-          query,
-          zoom_context={axis_name: current_value}
-      )
-      axis_config = config["axis_configurations"][axis_name]["current_zoom"]
-      
-      if axis_name == "temporal":
-          return {
-              "time_slider": axis_config["range"],
-              "time_explanation": axis_config["explanation"]
-          }
-      elif axis_name == "geographical":
-          map_fig = self.create_map(axis_config["locations"])
-          return {
-              "map_plot": map_fig,
-              "geo_explanation": axis_config.get("explanation", "")
-          }
-      else:  # style
-          return {
-              "style_select": gr.Dropdown(choices=axis_config["options"]),
-              "style_explanation": axis_config["explanation"]
-          }
-
 def main():
   print("Starting initialization...")
   explorer = ArtExplorer()
@@ -209,7 +208,7 @@ def main():
   demo.launch(
       server_name="0.0.0.0",
       server_port=7860,
-      share=False
+      share=True  # Set to True to create a public link
   )
 
 if __name__ == "__main__":