Clean configs

app.py

@@ -15,7 +15,8 @@ from climateqa.chat import start_chat, chat_stream, finish_chat
 from climateqa.engine.talk_to_data.main import ask_vanna
 from climateqa.engine.talk_to_data.myVanna import MyVanna
 
-from front.tabs import (create_config_modal, create_examples_tab, create_papers_tab, create_figures_tab, create_chat_interface, create_about_tab)
+from front.tabs import (create_config_modal, cqa_tab, create_about_tab)
+from front.tabs import (MainTabPanel, ConfigPanel)
 from front.utils import process_figures
 from gradio_modal import Modal
 
@@ -136,74 +137,7 @@ def create_drias_tab():
 
         vanna_display = gr.Plot()
         vanna_direct_question.submit(ask_vanna_query, [vanna_direct_question], [vanna_sql_query ,vanna_table, vanna_display])
-    
-# # UI Layout Components
-def cqa_tab(tab_name):
-    # State variables
-    current_graphs = gr.State([])
-    with gr.Tab(tab_name):
-        with gr.Row(elem_id="chatbot-row"):
-            # Left column - Chat interface
-            with gr.Column(scale=2):
-                chatbot, textbox, config_button = create_chat_interface(tab_name)
-
-            # Right column - Content panels
-            with gr.Column(scale=2, variant="panel", elem_id="right-panel"):
-                with gr.Tabs(elem_id="right_panel_tab") as tabs:
-                    # Examples tab
-                    with gr.TabItem("Examples", elem_id="tab-examples", id=0):
-                        examples_hidden = create_examples_tab(tab_name)
-
-                    # Sources tab
-                    with gr.Tab("Sources", elem_id="tab-sources", id=1) as tab_sources:
-                        sources_textbox = gr.HTML(show_label=False, elem_id="sources-textbox")
-
-
-                    # Recommended content tab
-                    with gr.Tab("Recommended content", elem_id="tab-recommended_content", id=2) as tab_recommended_content:
-                        with gr.Tabs(elem_id="group-subtabs") as tabs_recommended_content:
-                            # Figures subtab
-                            with gr.Tab("Figures", elem_id="tab-figures", id=3) as tab_figures:
-                                sources_raw, new_figures, used_figures, gallery_component, figures_cards, figure_modal = create_figures_tab()
-
-                            # Papers subtab
-                            with gr.Tab("Papers", elem_id="tab-citations", id=4) as tab_papers:
-                                papers_direct_search, papers_summary, papers_html, citations_network, papers_modal = create_papers_tab()
-
-                            # Graphs subtab
-                            with gr.Tab("Graphs", elem_id="tab-graphs", id=5) as tab_graphs:
-                                graphs_container = gr.HTML(
-                                    "<h2>There are no graphs to be displayed at the moment. Try asking another question.</h2>",
-                                    elem_id="graphs-container"
-                                )
-
-                                
-    return {
-        "chatbot": chatbot,
-        "textbox": textbox,
-        "tabs": tabs,
-        "sources_raw": sources_raw,
-        "new_figures": new_figures,
-        "current_graphs": current_graphs,
-        "examples_hidden": examples_hidden,
-        "sources_textbox": sources_textbox,
-        "figures_cards": figures_cards,
-        "gallery_component": gallery_component,
-        "config_button": config_button,
-        "papers_direct_search" : papers_direct_search,
-        "papers_html": papers_html,
-        "citations_network": citations_network,
-        "papers_summary": papers_summary,
-        "tab_recommended_content": tab_recommended_content,
-        "tab_sources": tab_sources,
-        "tab_figures": tab_figures,
-        "tab_graphs": tab_graphs,
-        "tab_papers": tab_papers,
-        "graph_container": graphs_container,
-        # "vanna_sql_query": vanna_sql_query,
-        # "vanna_table" : vanna_table,
-        # "vanna_display": vanna_display
-    }
+  
                                 
 def config_event_handling(main_tabs_components : list[dict], config_componenets : dict):
     config_open = config_componenets["config_open"]
@@ -218,58 +152,43 @@ def config_event_handling(main_tabs_components : list[dict], config_componenets
         ) 
     
 def event_handling(
-    main_tab_components,
-    config_components,
+    main_tab_components : MainTabPanel,
+    config_components : ConfigPanel,
     tab_name="ClimateQ&A"
 ):
-    chatbot = main_tab_components["chatbot"]
-    textbox = main_tab_components["textbox"]
-    tabs = main_tab_components["tabs"]
-    sources_raw = main_tab_components["sources_raw"]
-    new_figures = main_tab_components["new_figures"]
-    current_graphs = main_tab_components["current_graphs"]
-    examples_hidden = main_tab_components["examples_hidden"]
-    sources_textbox = main_tab_components["sources_textbox"]
-    figures_cards = main_tab_components["figures_cards"]
-    gallery_component = main_tab_components["gallery_component"]
-    # config_button = main_tab_components["config_button"]
-    papers_direct_search = main_tab_components["papers_direct_search"]
-    papers_html = main_tab_components["papers_html"]
-    citations_network = main_tab_components["citations_network"]
-    papers_summary = main_tab_components["papers_summary"]
-    tab_recommended_content = main_tab_components["tab_recommended_content"]
-    tab_sources = main_tab_components["tab_sources"]
-    tab_figures = main_tab_components["tab_figures"]
-    tab_graphs = main_tab_components["tab_graphs"]
-    tab_papers = main_tab_components["tab_papers"]
-    graphs_container = main_tab_components["graph_container"]
-    # vanna_sql_query = main_tab_components["vanna_sql_query"]
-    # vanna_table = main_tab_components["vanna_table"]
-    # vanna_display = main_tab_components["vanna_display"]
-    
+    chatbot = main_tab_components.chatbot
+    textbox = main_tab_components.textbox
+    tabs = main_tab_components.tabs
+    sources_raw = main_tab_components.sources_raw
+    new_figures = main_tab_components.new_figures
+    current_graphs = main_tab_components.current_graphs
+    examples_hidden = main_tab_components.examples_hidden
+    sources_textbox = main_tab_components.sources_textbox
+    figures_cards = main_tab_components.figures_cards
+    gallery_component = main_tab_components.gallery_component
+    papers_direct_search = main_tab_components.papers_direct_search
+    papers_html = main_tab_components.papers_html
+    citations_network = main_tab_components.citations_network
+    papers_summary = main_tab_components.papers_summary
+    tab_recommended_content = main_tab_components.tab_recommended_content
+    tab_sources = main_tab_components.tab_sources
+    tab_figures = main_tab_components.tab_figures
+    tab_graphs = main_tab_components.tab_graphs
+    tab_papers = main_tab_components.tab_papers
+    graphs_container = main_tab_components.graph_container
     
-    # config_open = config_components["config_open"]
-    # config_modal = config_components["config_modal"]
-    dropdown_sources = config_components["dropdown_sources"]
-    dropdown_reports = config_components["dropdown_reports"]
-    dropdown_external_sources = config_components["dropdown_external_sources"]
-    search_only = config_components["search_only"]
-    dropdown_audience = config_components["dropdown_audience"]
-    after = config_components["after"]
-    output_query = config_components["output_query"]
-    output_language = config_components["output_language"]
-    # close_config_modal = config_components["close_config_modal_button"]
+    dropdown_sources = config_components.dropdown_sources
+    dropdown_reports = config_components.dropdown_reports
+    dropdown_external_sources = config_components.dropdown_external_sources
+    search_only = config_components.search_only
+    dropdown_audience = config_components.dropdown_audience
+    after = config_components.after
+    output_query = config_components.output_query
+    output_language = config_components.output_language
     
     new_sources_hmtl = gr.State([])
     ttd_data = gr.State([])
 
-     
-    # for button in [config_button, close_config_modal]:
-    #     button.click(
-    #         fn=update_config_modal_visibility,
-    #         inputs=[config_open],
-    #         outputs=[config_modal, config_open]
-    #     )
     
     if tab_name == "ClimateQ&A":
         print("chat cqa - message sent")

front/tabs/__init__.py

@@ -3,4 +3,7 @@ from .tab_examples import create_examples_tab
 from .tab_papers import create_papers_tab
 from .tab_figures import create_figures_tab
 from .chat_interface import create_chat_interface
-from .tab_about import create_about_tab
+from .tab_about import create_about_tab
+from .main_tab import MainTabPanel
+from .tab_config import ConfigPanel
+from .main_tab import cqa_tab

front/tabs/main_tab.py

@@ -1,8 +1,34 @@
 import gradio as gr
+from typing import TypedDict
 from .chat_interface import create_chat_interface
 from .tab_examples import create_examples_tab
 from .tab_papers import create_papers_tab
 from .tab_figures import create_figures_tab
+from dataclasses import dataclass
+
+@dataclass
+class MainTabPanel:
+    chatbot: gr.Chatbot
+    textbox: gr.Textbox
+    tabs: gr.Tabs
+    sources_raw: gr.State
+    new_figures: gr.State
+    current_graphs: gr.State
+    examples_hidden: gr.State
+    sources_textbox: gr.HTML
+    figures_cards: gr.HTML
+    gallery_component: gr.Gallery
+    config_button: gr.Button
+    papers_direct_search: gr.TextArea
+    papers_html: gr.HTML
+    citations_network: gr.Plot
+    papers_summary: gr.Textbox
+    tab_recommended_content: gr.Tab
+    tab_sources: gr.Tab
+    tab_figures: gr.Tab
+    tab_graphs: gr.Tab
+    tab_papers: gr.Tab
+    graph_container: gr.HTML
 
 def cqa_tab(tab_name):
     # State variables
@@ -18,7 +44,7 @@ def cqa_tab(tab_name):
                 with gr.Tabs(elem_id="right_panel_tab") as tabs:
                     # Examples tab
                     with gr.TabItem("Examples", elem_id="tab-examples", id=0):
-                        examples_hidden, dropdown_samples, samples = create_examples_tab()
+                        examples_hidden = create_examples_tab(tab_name)
 
                     # Sources tab
                     with gr.Tab("Sources", elem_id="tab-sources", id=1) as tab_sources:
@@ -34,7 +60,7 @@ def cqa_tab(tab_name):
 
                             # Papers subtab
                             with gr.Tab("Papers", elem_id="tab-citations", id=4) as tab_papers:
-                                papers_summary, papers_html, citations_network, papers_modal = create_papers_tab()
+                                papers_direct_search, papers_summary, papers_html, citations_network, papers_modal = create_papers_tab()
 
                             # Graphs subtab
                             with gr.Tab("Graphs", elem_id="tab-graphs", id=5) as tab_graphs:
@@ -42,27 +68,28 @@ def cqa_tab(tab_name):
                                     "<h2>There are no graphs to be displayed at the moment. Try asking another question.</h2>",
                                     elem_id="graphs-container"
                                 )
-    return {
-        "chatbot": chatbot,
-        "textbox": textbox,
-        "tabs": tabs,
-        "sources_raw": sources_raw,
-        "new_figures": new_figures,
-        "current_graphs": current_graphs,
-        "examples_hidden": examples_hidden,
-        "dropdown_samples": dropdown_samples,
-        "samples": samples,
-        "sources_textbox": sources_textbox,
-        "figures_cards": figures_cards,
-        "gallery_component": gallery_component,
-        "config_button": config_button,
-        "papers_html": papers_html,
-        "citations_network": citations_network,
-        "papers_summary": papers_summary,
-        "tab_recommended_content": tab_recommended_content,
-        "tab_sources": tab_sources,
-        "tab_figures": tab_figures,
-        "tab_graphs": tab_graphs,
-        "tab_papers": tab_papers,
-        "graph_container": graphs_container
-    }
+
+                                
+    return MainTabPanel(
+        chatbot=chatbot,
+        textbox=textbox,
+        tabs=tabs,
+        sources_raw=sources_raw,
+        new_figures=new_figures,
+        current_graphs=current_graphs,
+        examples_hidden=examples_hidden,
+        sources_textbox=sources_textbox,
+        figures_cards=figures_cards,
+        gallery_component=gallery_component,
+        config_button=config_button,
+        papers_direct_search=papers_direct_search,
+        papers_html=papers_html,
+        citations_network=citations_network,
+        papers_summary=papers_summary,
+        tab_recommended_content=tab_recommended_content,
+        tab_sources=tab_sources,
+        tab_figures=tab_figures,
+        tab_graphs=tab_graphs,
+        tab_papers=tab_papers,
+        graph_container=graphs_container
+    )

front/tabs/tab_config.py

@@ -2,8 +2,10 @@ import gradio as gr
 from gradio_modal import Modal
 from climateqa.constants import POSSIBLE_REPORTS
 from typing import TypedDict
+from dataclasses import dataclass
 
-class ConfigPanel(TypedDict):
+@dataclass
+class ConfigPanel:
     config_open: gr.State
     config_modal: Modal
     dropdown_sources: gr.CheckboxGroup
@@ -95,29 +97,15 @@ def create_config_modal():
 
         close_config_modal_button = gr.Button("Validate and Close", elem_id="close-config-modal")
 
-        
-        # return ConfigPanel(
-        #     config_open=config_open,
-        #     config_modal=config_modal,
-        #     dropdown_sources=dropdown_sources,
-        #     dropdown_reports=dropdown_reports,
-        #     dropdown_external_sources=dropdown_external_sources,
-        #     search_only=search_only,
-        #     dropdown_audience=dropdown_audience,
-        #     after=after,
-        #     output_query=output_query,
-        #     output_language=output_language
-        # )
-        return {
-            "config_open" : config_open,
-            "config_modal": config_modal,
-            "dropdown_sources": dropdown_sources,
-            "dropdown_reports": dropdown_reports,
-            "dropdown_external_sources": dropdown_external_sources,
-            "search_only": search_only,
-            "dropdown_audience": dropdown_audience,
-            "after": after,
-            "output_query": output_query,
-            "output_language": output_language,
-            "close_config_modal_button": close_config_modal_button
-        }
+        return ConfigPanel(
+            config_open=config_open,
+            config_modal=config_modal,
+            dropdown_sources=dropdown_sources,
+            dropdown_reports=dropdown_reports,
+            dropdown_external_sources=dropdown_external_sources,
+            search_only=search_only,
+            dropdown_audience=dropdown_audience,
+            after=after,
+            output_query=output_query,
+            output_language=output_language
+        )