Merge branch 'main' into feature/graph_recommandation

app.py

@@ -94,6 +94,21 @@ share_client = service.get_share_client(file_share_name)
 user_id = create_user_id()
 
 
+CITATION_LABEL = "BibTeX citation for ClimateQ&A"
+CITATION_TEXT = r"""@misc{climateqa,
+    author={Théo Alves Da Costa, Timothée Bohe},
+    title={ClimateQ&A, AI-powered conversational assistant for climate change and biodiversity loss},
+    year={2024},
+    howpublished= {\url{https://climateqa.com}},
+}
+@software{climateqa,
+    author = {Théo Alves Da Costa, Timothée Bohe},
+    publisher = {ClimateQ&A},
+    title = {ClimateQ&A, AI-powered conversational assistant for climate change and biodiversity loss},
+}
+"""
+
+
 
 # Create vectorstore and retriever
 vectorstore = get_pinecone_vectorstore(embeddings_function, index_name = os.getenv("PINECONE_API_INDEX"))
@@ -129,7 +144,7 @@ async def chat(query,history,audience,sources,reports,current_graphs):
     if reports is None or len(reports) == 0:
         reports = []
     
-    inputs = {"user_input": query,"audience": audience_prompt,"sources":sources}
+    inputs = {"user_input": query,"audience": audience_prompt,"sources_input":sources}
     result = agent.astream_events(inputs,version = "v1") 
 
 
@@ -638,9 +653,27 @@ with gr.Blocks(title="Climate Q&A", css_paths=os.getcwd()+ "/style.css", theme=t
     with gr.Tab("About",elem_classes = "max-height other-tabs"):
         with gr.Row():
             with gr.Column(scale=1):
-                gr.Markdown("See more info at [https://climateqa.com](https://climateqa.com/docs/intro/)")
-                
-                
+
+
+
+
+                gr.Markdown("""
+### More info
+- See more info at [https://climateqa.com](https://climateqa.com/docs/intro/)
+- Feedbacks on this [form](https://forms.office.com/e/1Yzgxm6jbp)
+                            
+### Citation
+""")
+                with gr.Accordion(CITATION_LABEL,elem_id="citation", open = False,):
+                    # # Display citation label and text)
+                    gr.Textbox(
+                        value=CITATION_TEXT,
+                        label="",
+                        interactive=False,
+                        show_copy_button=True,
+                        lines=len(CITATION_TEXT.split('\n')),
+                    )
+
 
 
     def start_chat(query,history):

climateqa/engine/chains/query_transformation.py

@@ -191,11 +191,11 @@ def make_query_transform_node(llm,k_final=15):
         # new_state["questions"] = new_questions
         # new_state["remaining_questions"] = new_questions
 
+
         new_state = {
             "remaining_questions":new_questions,
             "n_questions":len(new_questions),
         }
-        
         return new_state
     
     return transform_query

front/utils.py

@@ -219,7 +219,6 @@ def make_html_figure_sources(source,i,img_str):
             <img src="data:image/png;base64, { img_str }" alt="Alt text" />
             <p class='ai-generated'>AI-generated description</p>
 
-
             <p>{content}</p>
 
             {relevancy_score}

style.css

@@ -113,6 +113,8 @@ a {
     color:#dc2626!important;
     /* margin-right:1px; */
 }
+
+
 .card {
     background-color: white;
     border-radius: 10px;
@@ -326,21 +328,33 @@ footer {
     /* ... add other mobile-specific styles ... */
 }
 
+@media (prefers-color-scheme: dark) {
+    .card{
+        background-color: #374151;
+    }
+    .card-image > .card-content{
+        background-color: rgb(55, 65, 81) !important;
+    }
 
-body.dark .card{
-    background-color: #374151;
-}
-
-body.dark .card-content h2{
-    color:#f4dbd3 !important;
-}
-
-body.dark .card-footer {
-    background-color: #404652;
-}
+    .card-footer {
+        background-color: #404652;
+    }
 
-body.dark .card-footer span {
-    color:white !important;
+    .container > .wrap{
+        background-color: #374151 !important;
+        color:white !important;
+    }
+    .card-content h2{
+        color:#e7754f !important;
+    }
+    .doc-ref sup{
+        color:rgb(235 109 35)!important;
+        /* margin-right:1px; */
+    }
+    .card-footer span {
+        color:white !important;
+    }
+    
 }
 
 
@@ -386,7 +400,7 @@ span.chatbot > p > img{
 }
 
 .card-image > .card-content{
-    background-color:#f1f7fa !important;
+    background-color:#f1f7fa;
 }
 
 
@@ -497,7 +511,7 @@ span.chatbot > p > img{
     border-top: 1px solid #db3434 !important; /* Blue color */
     border-right: 1px solid #3498db !important; /* Blue color */
     border-radius: 50%;
-    width: 20px;
+    width: 20px;    
     height: 20px;
     animation: spin 2s linear infinite;
     display:inline-block;