Merged in dev (pull request #16)

climateqa/chat.py

@@ -14,7 +14,7 @@ from .handle_stream_events import (
     handle_retrieved_owid_graphs,
 )
 from .logging import (
-    log_interaction_to_huggingface
+    log_interaction
 )
         
 # Chat functions
@@ -189,6 +189,6 @@ async def chat_stream(
         raise gr.Error(str(e))
 
     # Call the function to log interaction
-    log_interaction_to_huggingface(history, output_query, sources, docs, share_client, user_id)
+    log_interaction(history, output_query, sources, docs, share_client, user_id)
 
     yield history, docs_html, output_query, output_language, related_contents, graphs_html, follow_up_examples#, vanna_data

climateqa/logging.py

@@ -47,80 +47,80 @@ def serialize_docs(docs:list[Document])->list:
 
 ## AZURE LOGGING - DEPRECATED
 
-# def log_on_azure(file, logs, share_client):
-#     """Log data to Azure Blob Storage.
+def log_on_azure(file, logs, share_client):
+    """Log data to Azure Blob Storage.
     
-#     Args:
-#         file (str): Name of the file to store logs
-#         logs (dict): Log data to store
-#         share_client: Azure share client instance
-#     """
-#     logs = json.dumps(logs)
-#     file_client = share_client.get_file_client(file)
-#     file_client.upload_file(logs)
+    Args:
+        file (str): Name of the file to store logs
+        logs (dict): Log data to store
+        share_client: Azure share client instance
+    """
+    logs = json.dumps(logs)
+    file_client = share_client.get_file_client(file)
+    file_client.upload_file(logs)
 
 
-# def log_interaction_to_azure(history, output_query, sources, docs, share_client, user_id):
-#     """Log chat interaction to Azure and Hugging Face.
+def log_interaction_to_azure(history, output_query, sources, docs, share_client, user_id):
+    """Log chat interaction to Azure and Hugging Face.
     
-#     Args:
-#         history (list): Chat message history
-#         output_query (str): Processed query
-#         sources (list): Knowledge base sources used
-#         docs (list): Retrieved documents
-#         share_client: Azure share client instance
-#         user_id (str): User identifier
-#     """
-#     try:
-#         # Log interaction to Azure if not in local environment
-#         if os.getenv("GRADIO_ENV") != "local":
-#             timestamp = str(datetime.now().timestamp())
-#             prompt = history[1]["content"]
-#             logs = {
-#                 "user_id": str(user_id),
-#                 "prompt": prompt,
-#                 "query": prompt,
-#                 "question": output_query,
-#                 "sources": sources,
-#                 "docs": serialize_docs(docs),
-#                 "answer": history[-1].content,
-#                 "time": timestamp,
-#             }
-#             # Log to Azure
-#             log_on_azure(f"{timestamp}.json", logs, share_client)
-#     except Exception as e:
-#         print(f"Error logging on Azure Blob Storage: {e}")
-#         error_msg = f"ClimateQ&A Error: {str(e)[:100]} - The error has been noted, try another question and if the error remains, you can contact us :)"
-#         raise gr.Error(error_msg)
+    Args:
+        history (list): Chat message history
+        output_query (str): Processed query
+        sources (list): Knowledge base sources used
+        docs (list): Retrieved documents
+        share_client: Azure share client instance
+        user_id (str): User identifier
+    """
+    try:
+        # Log interaction to Azure if not in local environment
+        if os.getenv("GRADIO_ENV") != "local":
+            timestamp = str(datetime.now().timestamp())
+            prompt = history[1]["content"]
+            logs = {
+                "user_id": str(user_id),
+                "prompt": prompt,
+                "query": prompt,
+                "question": output_query,
+                "sources": sources,
+                "docs": serialize_docs(docs),
+                "answer": history[-1].content,
+                "time": timestamp,
+            }
+            # Log to Azure
+            log_on_azure(f"{timestamp}.json", logs, share_client)
+    except Exception as e:
+        print(f"Error logging on Azure Blob Storage: {e}")
+        error_msg = f"ClimateQ&A Error: {str(e)[:100]} - The error has been noted, try another question and if the error remains, you can contact us :)"
+        raise gr.Error(error_msg)
     
-# def log_drias_interaction_to_azure(query, sql_query, data, share_client, user_id):
-#     """Log Drias data interaction to Azure and Hugging Face.
+def log_drias_interaction_to_azure(query, sql_query, data, share_client, user_id):
+    """Log Drias data interaction to Azure and Hugging Face.
     
-#     Args:
-#         query (str): User query
-#         sql_query (str): SQL query used
-#         data: Retrieved data
-#         share_client: Azure share client instance
-#         user_id (str): User identifier
-#     """
-#     try:
-#         # Log interaction to Azure if not in local environment
-#         if os.getenv("GRADIO_ENV") != "local":
-#             timestamp = str(datetime.now().timestamp())
-#             logs = {
-#                 "user_id": str(user_id),
-#                 "query": query,
-#                 "sql_query": sql_query,
-#                 "time": timestamp,
-#             }
-#             log_on_azure(f"drias_{timestamp}.json", logs, share_client)
-#             print(f"Logged Drias interaction to Azure Blob Storage: {logs}")
-#         else:
-#             print("share_client or user_id is None, or GRADIO_ENV is local")
-#     except Exception as e:
-#         print(f"Error logging Drias interaction on Azure Blob Storage: {e}")
-#         error_msg = f"Drias Error: {str(e)[:100]} - The error has been noted, try another question and if the error remains, you can contact us :)"
-#         raise gr.Error(error_msg)    
+    Args:
+        query (str): User query
+        sql_query (str): SQL query used
+        data: Retrieved data
+        share_client: Azure share client instance
+        user_id (str): User identifier
+    """
+    try:
+        # Log interaction to Azure if not in local environment
+        if os.getenv("GRADIO_ENV") != "local":
+            timestamp = str(datetime.now().timestamp())
+            logs = {
+                "user_id": str(user_id),
+                "query": query,
+                "sql_query": sql_query,
+                "time": timestamp,
+            }
+            log_on_azure(f"drias_{timestamp}.json", logs, share_client)
+            print(f"Logged Drias interaction to Azure Blob Storage: {logs}")
+        else:
+            print("share_client or user_id is None, or GRADIO_ENV is local")
+    except Exception as e:
+        print(f"Error logging Drias interaction on Azure Blob Storage: {e}")
+        error_msg = f"Drias Error: {str(e)[:100]} - The error has been noted, try another question and if the error remains, you can contact us :)"
+        raise gr.Error(error_msg)    
     
 ## HUGGING FACE LOGGING
 
@@ -240,4 +240,44 @@ def log_drias_interaction_to_huggingface(query, sql_query, user_id):
         error_msg = f"Drias Error: {str(e)[:100]} - The error has been noted, try another question and if the error remains, you can contact us :)"
         raise gr.Error(error_msg)
 
+def log_interaction(history, output_query, sources, docs, share_client, user_id):
+    """Log chat interaction to Hugging Face, and fall back to Azure if that fails.
+    
+    Args:
+        history (list): Chat message history
+        output_query (str): Processed query
+        sources (list): Knowledge base sources used
+        docs (list): Retrieved documents
+        share_client: Azure share client instance
+        user_id (str): User identifier
+    """
+    try:
+        # First try to log to Hugging Face
+        log_interaction_to_huggingface(history, output_query, sources, docs, share_client, user_id)
+    except Exception as e:
+        print(f"Failed to log to Hugging Face, falling back to Azure: {e}")
+        try:
+            # Fall back to Azure logging
+            if os.getenv("GRADIO_ENV") != "local":
+                timestamp = str(datetime.now().timestamp())
+                prompt = history[1]["content"]
+                logs = {
+                    "user_id": str(user_id),
+                    "prompt": prompt,
+                    "query": prompt,
+                    "question": output_query,
+                    "sources": sources,
+                    "docs": serialize_docs(docs),
+                    "answer": history[-1].content,
+                    "time": timestamp,
+                }
+                # Log to Azure
+                log_on_azure(f"{timestamp}.json", logs, share_client)
+                print("Successfully logged to Azure as fallback")
+        except Exception as azure_error:
+            print(f"Error in Azure fallback logging: {azure_error}")
+            error_msg = f"ClimateQ&A Logging Error: {str(azure_error)[:100]})"
+            # Don't raise error to avoid disrupting user experience
+            print(error_msg)
+