fix merge

app.py

@@ -142,6 +142,7 @@ async def chat(query,history,audience,sources,reports,current_graphs):
 
     docs = []
     used_figures=[]
+    related_contents = []
     docs_html = ""
     output_query = ""
     output_language = ""
@@ -164,7 +165,7 @@ async def chat(query,history,audience,sources,reports,current_graphs):
                 node = event["metadata"]["langgraph_node"]
 
                 if event["event"] == "on_chain_end" and event["name"] == "retrieve_documents" :# when documents are retrieved
-                    docs, docs_html, history, used_documents = handle_retrieved_documents(event, history, used_documents)    
+                    docs, docs_html, history, used_documents, related_contents = handle_retrieved_documents(event, history, used_documents)    
                 
  
                 elif event["name"] in steps_display.keys() and event["event"] == "on_chain_start": #display steps
@@ -186,7 +187,7 @@ async def chat(query,history,audience,sources,reports,current_graphs):
                 if event["name"] == "categorize_intent" and event["event"] == "on_chain_start":
                     print("X")
             
-            yield history, docs_html, output_query, output_language, docs , graphs_html #,output_query,output_keywords
+            yield history, docs_html, output_query, output_language, related_contents , graphs_html,  #,output_query,output_keywords
  
     except Exception as e:
         print(event, "has failed")
@@ -214,7 +215,7 @@ async def chat(query,history,audience,sources,reports,current_graphs):
         print(f"Error logging on Azure Blob Storage: {e}")
         raise gr.Error(f"ClimateQ&A Error: {str(e)[:100]} - The error has been noted, try another question and if the error remains, you can contact us :)")
 
-    yield history, docs_html, output_query, output_language, docs, graphs_html 
+    yield history, docs_html, output_query, output_language, related_contents, graphs_html 
 
 
 def save_feedback(feed: str, user_id):
@@ -416,7 +417,7 @@ with gr.Blocks(title="Climate Q&A", css_paths=os.getcwd()+ "/style.css", theme=t
                             samples.append(group_examples)
 
 
-                    with gr.Tab("Sources",elem_id = "tab-sources",id = 1):
+                    with gr.Tab("Sources",elem_id = "tab-sources",id = 1) as tab_sources:
                         sources_textbox = gr.HTML(show_label=False, elem_id="sources-textbox")
                         docs_textbox = gr.State("")
                         
@@ -435,7 +436,7 @@ with gr.Blocks(title="Climate Q&A", css_paths=os.getcwd()+ "/style.css", theme=t
 
 
 
-                    with gr.Tab("Papers",elem_id = "tab-citations",id = 5):
+                    with gr.Tab("Papers",elem_id = "tab-citations",id = 5) as tab_papers:
                         btn_summary = gr.Button("Summary")
                          # Fenêtre simulée pour le Summary
                         with gr.Group(visible=False, elem_id="papers-summary-popup") as summary_popup:
@@ -698,28 +699,30 @@ with gr.Blocks(title="Climate Q&A", css_paths=os.getcwd()+ "/style.css", theme=t
         current_state = 1 - current_state
         return current_state
     
-    def update_sources_number_display(sources_textbox, figures_cards, current_graphs):
+    def update_sources_number_display(sources_textbox, figures_cards, current_graphs, papers_html):
         sources_number = sources_textbox.count("<h2>")
         figures_number = figures_cards.count("<h2>")
         graphs_number = current_graphs.count("<iframe")
+        papers_number = papers_html.count("<h2>")
         sources_notif_label = f"Sources ({sources_number})"
         figures_notif_label = f"Figures ({figures_number})"
         graphs_notif_label = f"Recommended content ({graphs_number})"
+        papers_notif_label = f"Papers ({papers_number})"
 
-        return gr.update(label = sources_notif_label), gr.update(label = figures_notif_label), gr.update(label = graphs_notif_label)
+        return gr.update(label = sources_notif_label), gr.update(label = figures_notif_label), gr.update(label = graphs_notif_label), gr.update(label = papers_notif_label)
     
     (textbox
         .submit(start_chat, [textbox,chatbot], [textbox,tabs,chatbot],queue = False,api_name = "start_chat_textbox")
         .then(chat, [textbox,chatbot,dropdown_audience, dropdown_sources,dropdown_reports, current_graphs] ,[chatbot,sources_textbox,output_query,output_language, sources_raw, current_graphs],concurrency_limit = 8,api_name = "chat_textbox")
         .then(finish_chat, None, [textbox],api_name = "finish_chat_textbox")
-        .then(update_sources_number_display, [sources_textbox, figures_cards, current_graphs],[tab_sources, tab_figures, tab_recommended_content] )
+        # .then(update_sources_number_display, [sources_textbox, figures_cards, current_graphs,papers_html],[tab_sources, tab_figures, tab_recommended_content, tab_papers] )
     )
 
     (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, sources_raw, current_graphs],concurrency_limit = 8,api_name = "chat_textbox")
         .then(finish_chat, None, [textbox],api_name = "finish_chat_examples")
-        .then(update_sources_number_display, [sources_textbox, figures_cards, current_graphs],[tab_sources, tab_figures, tab_recommended_content] )
+        # .then(update_sources_number_display, [sources_textbox, figures_cards, current_graphs,papers_html],[tab_sources, tab_figures, tab_recommended_content, tab_papers] )
     )
 
 
@@ -733,9 +736,10 @@ with gr.Blocks(title="Climate Q&A", css_paths=os.getcwd()+ "/style.css", theme=t
     sources_raw.change(process_figures, inputs=[sources_raw], outputs=[figures_cards, gallery_component])
     
     
-    sources_textbox.change(update_sources_number_display, [sources_textbox, figures_cards, current_graphs],[tab_sources, tab_figures, tab_recommended_content])
-    figures_cards.change(update_sources_number_display, [sources_textbox, figures_cards, current_graphs],[tab_sources, tab_figures, tab_recommended_content])
-    current_graphs.change(update_sources_number_display, [sources_textbox, figures_cards, current_graphs],[tab_sources, tab_figures, tab_recommended_content])
+    sources_textbox.change(update_sources_number_display, [sources_textbox, figures_cards, current_graphs,papers_html],[tab_sources, tab_figures, tab_recommended_content, tab_papers])
+    figures_cards.change(update_sources_number_display, [sources_textbox, figures_cards, current_graphs,papers_html],[tab_sources, tab_figures, tab_recommended_content, tab_papers])
+    current_graphs.change(update_sources_number_display, [sources_textbox, figures_cards, current_graphs,papers_html],[tab_sources, tab_figures, tab_recommended_content, tab_papers])
+    papers_html.change(update_sources_number_display, [sources_textbox, figures_cards, current_graphs,papers_html],[tab_sources, tab_figures, tab_recommended_content, tab_papers])
 
     dropdown_samples.change(change_sample_questions,dropdown_samples,samples)
 

climateqa/event_handler.py

@@ -40,10 +40,12 @@ def handle_retrieved_documents(event: StreamEvent, history : list[ChatMessage],
             
         docs_html = "".join(docs_html)
         
+        related_contents = event["data"]["output"]["related_contents"]
+         
     except Exception as e:
         print(f"Error getting documents: {e}")
         print(event)
-    return docs, docs_html, history, used_documents
+    return docs, docs_html, history, used_documents, related_contents
 
 def stream_answer(history: list[ChatMessage], event : StreamEvent, start_streaming : bool, answer_message_content : str)-> tuple[list[ChatMessage], bool, str]:
     """ 

style.css

@@ -242,6 +242,11 @@ label.selected{
 
     } */
 
+    div#tab-citations{
+        height:calc(100vh - 190px) !important;
+        overflow-y: auto !important;
+    }
+    
     div#tab-examples{
         height:calc(100vh - 190px) !important;
         overflow-y: scroll !important;