Metadata fix

apps/ai_tutor/app.py

@@ -211,12 +211,10 @@ async def auth_google(request: Request):
 
         # add literalai user info to session store to be sent to chainlit
         literalai_user = await get_user_details(email)
-        print(f"Literalai user: {literalai_user}")
         session_store[session_token]["literalai_info"] = literalai_user.to_dict()
         session_store[session_token]["literalai_info"]["metadata"]["role"] = role
 
         user_info_json = json.dumps(session_store[session_token])
-        print(f"User info json: {user_info_json}")
         user_info_encoded = base64.b64encode(user_info_json.encode()).decode()
 
         # Set cookies
@@ -272,10 +270,10 @@ async def post_signin(request: Request):
     current_datetime = get_time()
     user_details.metadata["last_login"] = current_datetime
     # if new user, set the number of tries
+    if "role" not in user_details.metadata:
+        user_details.metadata["role"] = get_user_role(user_info["email"])
     if "tokens_left" not in user_details.metadata:
-        user_details.metadata["tokens_left"] = (
-            TOKENS_LEFT  # set the number of tokens left for the new user
-        )
+        user_details.metadata["tokens_left"] = TOKENS_LEFT
     if "last_message_time" not in user_details.metadata:
         user_details.metadata["last_message_time"] = current_datetime
     if "all_time_tokens_allocated" not in user_details.metadata:

apps/ai_tutor/chainlit_app.py

@@ -505,7 +505,7 @@ class Chatbot:
         await self.start()
 
     @cl.header_auth_callback
-    def header_auth_callback(headers: dict) -> Optional[cl.User]:
+    async def header_auth_callback(headers: dict) -> Optional[cl.User]:
         # try: # TODO: Add try-except block after testing
         # TODO: Implement to get the user information from the headers (not the cookie)
         cookie = headers.get("cookie")  # gets back a str
@@ -521,10 +521,14 @@ class Chatbot:
         ).decode()
         decoded_user_info = json.loads(decoded_user_info)
 
+        user_id = decoded_user_info["literalai_info"]["identifier"]
+        user_info = await get_user_details(user_id)
+        metadata = user_info.metadata
+
         return cl.User(
             id=decoded_user_info["literalai_info"]["id"],
             identifier=decoded_user_info["literalai_info"]["identifier"],
-            metadata=decoded_user_info["literalai_info"]["metadata"],
+            metadata=metadata,
         )
 
     async def on_follow_up(self, action: cl.Action):

apps/ai_tutor/helpers.py

@@ -46,10 +46,13 @@ async def check_user_cooldown(
 async def reset_tokens_for_user(user_info, TOKENS_LEFT, REGEN_TIME):
     user_info = convert_to_dict(user_info)
     last_message_time_str = user_info["metadata"].get("last_message_time")
+    try:
+        last_message_time = datetime.fromisoformat(last_message_time_str).replace(
+            tzinfo=timezone.utc
+        )
+    except Exception:  # this probably means the user has never sent a message before
+        last_message_time = datetime.min.replace(tzinfo=timezone.utc)
 
-    last_message_time = datetime.fromisoformat(last_message_time_str).replace(
-        tzinfo=timezone.utc
-    )
     current_time = datetime.fromisoformat(get_time()).replace(tzinfo=timezone.utc)
 
     # Calculate the elapsed time since the last message