WIP

app.py

@@ -472,7 +472,10 @@ def save_graph(saved_graphs_state, embedding, category):
 #     current_graphs = gr.State([])
 #     saved_graphs = gr.State({})
 with gr.Blocks(title="Climate Q&A", css_paths=os.getcwd()+ "/style.css", theme=theme,elem_id = "main-component") as demo:
-
+    chat_completed_state = gr.State(0)
+    current_graphs = gr.State([])
+    saved_graphs = gr.State({})
+    
     with gr.Tab("ClimateQ&A"):
 
         with gr.Row(elem_id="chatbot-row"):
@@ -496,7 +499,7 @@ with gr.Blocks(title="Climate Q&A", css_paths=os.getcwd()+ "/style.css", theme=t
                     textbox=gr.Textbox(placeholder="Ask me anything here!",show_label=False,scale=7,lines = 1,interactive = True,elem_id="input-textbox")
                  
 
-            with gr.Column(scale=1, variant="panel",elem_id = "right-panel"):
+            with gr.Column(scale=1.5, variant="panel",elem_id = "right-panel"):
 
 
                 with gr.Tabs() as tabs:
@@ -563,26 +566,26 @@ with gr.Blocks(title="Climate Q&A", css_paths=os.getcwd()+ "/style.css", theme=t
                         output_language = gr.Textbox(label="Language",show_label = True,elem_id = "language",lines = 1,interactive = False)
                     
                 
-                    # with gr.Tab("Recommended content", elem_id="tab-recommended_content", id=3) as recommended_content_tab:
-                        
-                        # @gr.render(inputs=[current_graphs])
-                        # def display_default_recommended(current_graphs):
-                        #     if len(current_graphs)==0:
-                        #         placeholder_message = gr.HTML("<h2>There are no graphs to be displayed at the moment. Try asking another question.</h2>")
-
-                        # @gr.render(inputs=[current_graphs],triggers=[chat_completed_state.change])
-                        # def render_graphs(current_graph_list):
-                        #     global saved_graphs
-                        #     with gr.Column():
-                        #         print(f"\ncurrent_graph_list:\n{current_graph_list}")
-                        #         for (embedding, category) in current_graph_list:
-                        #             graphs_placeholder = gr.HTML(embedding, elem_id="graphs-placeholder")
-                        #             save_btn = gr.Button("Save Graph")
-                        #             save_btn.click(
-                        #                 save_graph,
-                        #                 [saved_graphs, gr.State(embedding), gr.State(category)],
-                        #                 [saved_graphs, save_btn]
-                        #             )
+                    with gr.Tab("Recommended content", elem_id="tab-recommended_content", id=3) as recommended_content_tab:
+
+                        @gr.render(inputs=[current_graphs])
+                        def display_default_recommended(current_graphs):
+                            if len(current_graphs)==0:
+                                placeholder_message = gr.HTML("<h2>There are no graphs to be displayed at the moment. Try asking another question.</h2>")
+
+                        @gr.render(inputs=[current_graphs],triggers=[chat_completed_state.change])
+                        def render_graphs(current_graph_list):
+                            global saved_graphs
+                            with gr.Column():
+                                print(f"\ncurrent_graph_list:\n{current_graph_list}")
+                                for (embedding, category) in current_graph_list:
+                                    graphs_placeholder = gr.HTML(embedding, elem_id="graphs-placeholder")
+                                    save_btn = gr.Button("Save Graph")
+                                    save_btn.click(
+                                        save_graph,
+                                        [saved_graphs, gr.State(embedding), gr.State(category)],
+                                        [saved_graphs, save_btn]
+                                    )
 
 #---------------------------------------------------------------------------------------
 # OTHER TABS
@@ -679,11 +682,12 @@ with gr.Blocks(title="Climate Q&A", css_paths=os.getcwd()+ "/style.css", theme=t
         # history = history + [(query,None)]
         # history = [tuple(x) for x in history]
         history = history + [ChatMessage(role="user", content=query)]
-        return (gr.update(interactive = False),gr.update(selected=1),history)
+        return (gr.update(interactive = False),gr.update(selected=3),history)
     
     def finish_chat():
         return (gr.update(interactive = True,value = ""),gr.update(selected=3))
 
+
     def change_completion_status(current_state):
         current_state = 1 - current_state
         return current_state
@@ -697,10 +701,13 @@ with gr.Blocks(title="Climate Q&A", css_paths=os.getcwd()+ "/style.css", theme=t
     )
 
     (examples_hidden
+        # .change(start_chat, [examples_hidden,chatbot], [textbox,tabs,chatbot],queue = False,api_name = "start_chat_examples")
+        # .then(chat, [examples_hidden,chatbot,dropdown_audience, dropdown_sources,dropdown_reports,current_graphs], [chatbot,sources_textbox,output_query,output_language,gallery_component, current_graphs],concurrency_limit = 8,api_name = "chat_examples")
+        # .then(finish_chat, None, [textbox,tabs],api_name = "finish_chat_examples")
+        # .then(change_completion_status, [chat_completed_state], [chat_completed_state])
         .change(start_chat, [examples_hidden,chatbot], [textbox,tabs,chatbot],queue = False,api_name = "start_chat_examples")
-        .then(chat, [examples_hidden,chatbot,dropdown_audience, dropdown_sources,dropdown_reports,current_graphs], [chatbot,sources_textbox,output_query,output_language,gallery_component, current_graphs],concurrency_limit = 8,api_name = "chat_examples")
-        .then(finish_chat, None, [textbox,tabs],api_name = "finish_chat_examples")
-        .then(change_completion_status, [chat_completed_state], [chat_completed_state])
+        .then(chat, [examples_hidden,chatbot,dropdown_audience, dropdown_sources,dropdown_reports], [chatbot,sources_textbox,output_query,output_language,gallery_component],concurrency_limit = 8,api_name = "chat_examples")
+        .then(finish_chat, None, [textbox],api_name = "finish_chat_examples")
     )
 
 

climateqa/engine/chains/answer_chitchat.py

@@ -45,6 +45,8 @@ def make_chitchat_node(llm):
     chitchat_chain = make_chitchat_chain(llm)
 
     async def answer_chitchat(state,config):
+        print("---- Answer chitchat ----")
+
         answer = await chitchat_chain.ainvoke({"question":state["user_input"]},config)
         return {"answer":answer}
     

climateqa/engine/chains/answer_rag.py

@@ -60,6 +60,8 @@ def make_rag_node(llm,with_docs = True):
         rag_chain = make_rag_chain_without_docs(llm)
 
     async def answer_rag(state,config):
+        print("---- Answer RAG ----")
+
         answer = await rag_chain.ainvoke(state,config)
         print(f"\n\nAnswer:\n{answer}")
         return {"answer":answer}

climateqa/engine/chains/intent_categorization.py

@@ -84,6 +84,8 @@ def make_intent_categorization_node(llm):
     categorization_chain = make_intent_categorization_chain(llm)
 
     def categorize_message(state):
+        print("---- Categorize_message ----")
+
         output = categorization_chain.invoke({"input": state["user_input"]})
         print(f"\n\nOutput intent categorization: {output}\n")
         if "language" not in output: output["language"] = "English"

climateqa/engine/chains/query_transformation.py

@@ -138,6 +138,8 @@ def make_query_transform_node(llm,k_final=15):
     rewriter_chain = make_query_rewriter_chain(llm)
         
     def transform_query(state):
+        print("---- Transform query ----")
+
 
         if "sources_auto" not in state or state["sources_auto"] is None or state["sources_auto"] is False:
             auto_mode = False

climateqa/engine/chains/retrieve_documents.py

@@ -68,6 +68,8 @@ def make_retriever_node(vectorstore,reranker,llm,rerank_by_question=True, k_fina
     # The chain callback is not necessary, but it propagates the langchain callbacks to the astream_events logger to display intermediate results
     @chain
     async def retrieve_documents(state,config):
+        print("---- Retrieve documents ----")
+
 
         keywords_extraction = make_keywords_extraction_chain(llm)
         

climateqa/engine/chains/translation.py

@@ -30,6 +30,8 @@ def make_translation_chain(llm):
 
 
 def make_translation_node(llm):
+    print("---- Translate query ----")
+
 
     translation_chain = make_translation_chain(llm)
 

requirements.txt

@@ -1,4 +1,4 @@
-gradio==4.44
+gradio==5.0.2
 azure-storage-file-share==12.11.1
 azure-storage-blob
 python-dotenv==1.0.0