Added logging

app.py

@@ -4,12 +4,7 @@ import numpy as np
 import os
 from datetime import datetime
 
-from utils import (
-    make_pairs,
-    set_openai_api_key,
-    create_user_id,
-    to_completion,
-)
+from utils import create_user_id
 
 from azure.storage.fileshare import ShareServiceClient
 
@@ -30,7 +25,7 @@ from climateqa.prompts import audience_prompts
 try:
     from dotenv import load_dotenv
     load_dotenv()
-except:
+except Exception as e:
     pass
 
 # Set up Gradio Theme
@@ -40,6 +35,8 @@ theme = gr.themes.Base(
     font=[gr.themes.GoogleFont("Poppins"), "ui-sans-serif", "system-ui", "sans-serif"],
 )
 
+
+
 init_prompt = ""
 
 system_template = {
@@ -47,19 +44,21 @@ system_template = {
     "content": init_prompt,
 }
 
+account_key = os.environ["BLOB_ACCOUNT_KEY"]
+if len(account_key) == 86:
+    account_key += "=="
 
-# credential = {
-#     "account_key": os.environ["account_key"],
-#     "account_name": os.environ["account_name"],
-# }
-
-# account_url = os.environ["account_url"]
-# file_share_name = "climategpt"
-# service = ShareServiceClient(account_url=account_url, credential=credential)
-# share_client = service.get_share_client(file_share_name)
+credential = {
+    "account_key": account_key,
+    "account_name": os.environ["BLOB_ACCOUNT_NAME"],
+}
 
-user_id = create_user_id(10)
+account_url = os.environ["BLOB_ACCOUNT_URL"]
+file_share_name = "climategpt"
+service = ShareServiceClient(account_url=account_url, credential=credential)
+share_client = service.get_share_client(file_share_name)
 
+user_id = create_user_id()
 
 #---------------------------------------------------------------------------
 # ClimateQ&A core functions
@@ -242,6 +241,24 @@ def answer_bot(query,history,docs,question,language,audience):
             else:
                 pass
         thread.join()
+
+        # Log answer on Azure Blob Storage
+        timestamp = str(datetime.now().timestamp())
+        file = timestamp + ".json"
+        prompt = history[-1][0]
+        logs = {
+            "user_id": str(user_id),
+            "prompt": prompt,
+            "query": prompt,
+            "question":question,
+            "docs":docs,
+            "answer": history[-1][1],
+            "time": timestamp,
+        }
+        log_on_azure(file, logs, share_client)
+
+
+
     else:
         complete_response = "**⚠️ No relevant passages found in the climate science reports (IPCC and IPBES), you may want to ask a more specific question (specifying your question on climate and biodiversity issues).**"
         history[-1][1] += complete_response
@@ -394,9 +411,9 @@ def make_html_source(source,i):
 
 #         messages.append({"role": "assistant", "content": complete_response})
 #         timestamp = str(datetime.now().timestamp())
-#         file = user_id[0] + timestamp + ".json"
+#         file = user_id + timestamp + ".json"
 #         logs = {
-#             "user_id": user_id[0],
+#             "user_id": user_id,
 #             "prompt": query,
 #             "retrived": sources,
 #             "report_type": report_type,
@@ -424,9 +441,9 @@ def make_html_source(source,i):
 def save_feedback(feed: str, user_id):
     if len(feed) > 1:
         timestamp = str(datetime.now().timestamp())
-        file = user_id[0] + timestamp + ".json"
+        file = user_id + timestamp + ".json"
         logs = {
-            "user_id": user_id[0],
+            "user_id": user_id,
             "feedback": feed,
             "time": timestamp,
         }
@@ -437,10 +454,18 @@ def save_feedback(feed: str, user_id):
 def reset_textbox():
     return gr.update(value="")
 
+import json
 
 def log_on_azure(file, logs, share_client):
+    logs = json.dumps(logs)
+    print(type(logs))
     file_client = share_client.get_file_client(file)
-    file_client.upload_file(str(logs))
+    print("Uploading logs to Azure Blob Storage")
+    print("----------------------------------")
+    print("")
+    print(logs)
+    file_client.upload_file(logs)
+    print("Logs uploaded to Azure Blob Storage")
 
 
 # def disable_component():

utils.py

@@ -1,69 +1,12 @@
 import numpy as np
-import openai
-import os
 import random
 import string
+import uuid
 
 
-def is_climate_change_related(sentence: str, classifier) -> bool:
-    """_summary_
-
-    Args:
-        sentence (str): your sentence to classify
-        classifier (_type_): zero shot hugging face pipeline classifier
-
-    Returns:
-        bool: is_climate_change_related or not
-    """
-    results = classifier(
-        sequences=sentence,
-        candidate_labels=["climate change related", "non climate change related"],
-    )
-    print(f" ## Result from is climate change related {results}")
-    return results["labels"][np.argmax(results["scores"])] == "climate change related"
-
-
-def make_pairs(lst):
-    """From a list of even lenght, make tupple pairs
-    Args:
-        lst (list): a list of even lenght
-    Returns:
-        list: the list as tupple pairs
-    """
-    assert not (l := len(lst) % 2), f"your list is of lenght {l} which is not even"
-    return [(lst[i], lst[i + 1]) for i in range(0, len(lst), 2)]
-
-
-def set_openai_api_key(text):
-    """Set the api key and return chain.If no api_key, then None is returned.
-    To do : add raise error & Warning message
-    Args:
-        text (str): openai api key
-    Returns:
-        str: Result of connection
-    """
-    openai.api_key = os.environ["api_key"]
-
-    if text.startswith("sk-") and len(text) > 10:
-        openai.api_key = text
-    return f"You're all set: this is your api key: {openai.api_key}"
-
-
-def create_user_id(length):
+def create_user_id():
     """Create user_id
-    Args:
-        length (int): length of user id
-    Returns:
         str: String to id user
     """
-    letters = string.ascii_lowercase
-    user_id = "".join(random.choice(letters) for i in range(length))
-    return user_id
-
-
-def to_completion(messages):
-    s = []
-    for message in messages:
-        s.append(f"<|im_start|>{message['role']}\n{message['content']}<|im_end|>")
-    s.append("<|im_start|>assistant\n")
-    return "\n".join(s)
+    user_id = str(uuid.uuid4())
+    return user_id