fix merge

app.py

@@ -89,13 +89,14 @@ share_client = service.get_share_client(file_share_name)
 
 user_id = create_user_id()
 
+vectorstore_graphs = Chroma(persist_directory="/home/tim/ai4s/climate_qa/climate-question-answering/data/vectorstore_owid", embedding_function=embeddings_function) # TODO make it api call
 
 
 # Create vectorstore and retriever
 vectorstore = get_pinecone_vectorstore(embeddings_function)
 llm = get_llm(provider="openai",max_tokens = 1024,temperature = 0.0)
-reranker = get_reranker("large")
-agent = make_graph_agent(llm,vectorstore,reranker)
+reranker = get_reranker("nano")
+# agent = make_graph_agent(llm,vectorstore,reranker)
 
 # agent = make_graph_agent(llm,vectorstore,reranker)
 agent = make_graph_agent(llm=llm, vectorstore_ipcc=vectorstore, vectorstore_graphs=vectorstore_graphs, reranker=reranker)
@@ -134,7 +135,6 @@ async def chat(query,history,audience,sources,reports,current_graphs):
     docs = []
     docs_used = True
     docs_html = ""
-    current_graphs = []
     output_query = ""
     output_language = ""
     output_keywords = ""
@@ -142,7 +142,7 @@ async def chat(query,history,audience,sources,reports,current_graphs):
     updates = []
     start_streaming = False
     figures = '<div class="figures-container"> <p> Go to the "Figures" tab at the top of the page to see full size images </p> </div>'
-
+    graphs_html = ""    
     steps_display = {
         "categorize_intent":("🔄️ Analyzing user message",True),
         "transform_query":("🔄️ Thinking step by step to answer the question",True),
@@ -227,13 +227,11 @@ async def chat(query,history,audience,sources,reports,current_graphs):
                                 categories[category] = []
                             categories[category].append(graph['embedding'])
 
-                        # graphs_html = ""
+                        
                         for category, embeddings in categories.items():
-                            # graphs_html += f"<h3>{category}</h3>"
-                            # current_graphs.append(f"<h3>{category}</h3>")
+                            graphs_html += f"<h3>{category}</h3>"
                             for embedding in embeddings:
-                                current_graphs.append([embedding, category])
-                                # graphs_html += f"<div>{embedding}</div>"
+                                graphs_html += f"<div>{embedding}</div>"
                                 
                                 
                     except Exception as e:
@@ -248,7 +246,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,gallery, figures, current_graphs #,output_query,output_keywords
+            yield history, docs_html, output_query, output_language, gallery, figures, graphs_html #,output_query,output_keywords
  
     except Exception as e:
         print(event, "has failed")
@@ -337,7 +335,7 @@ async def chat(query,history,audience,sources,reports,current_graphs):
         
     
 
-    yield history,docs_html,output_query,output_language,gallery, figures#,output_query,output_keywords
+    yield history, docs_html, output_query, output_language, gallery, figures, graphs_html#,output_query,output_keywords
 
 
 def save_feedback(feed: str, user_id):
@@ -423,11 +421,7 @@ def save_graph(saved_graphs_state, embedding, category):
     return saved_graphs_state, gr.Button("Graph Saved")
 
 
-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.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([])
@@ -527,10 +521,11 @@ 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:
+                    with gr.Tab("Recommended content", elem_id="tab-recommended_content", id=4) as recommended_content_tab:
                         # placeholder_message = gr.HTML("<h2>There are no graphs to be displayed at the moment. Try asking another question.</h2>")
                         graphs_container = gr.HTML("<h2>There are no graphs to be displayed at the moment. Try asking another question.</h2>")
                         current_graphs.change(lambda x : x, inputs=[current_graphs], outputs=[graphs_container])
+                        gr.Textbox(current_graphs.value)
 
                         # @gr.render(inputs=[current_graphs])
                         # def display_default_recommended(current_graphs):