Merge branch 'development' into staging

app/main.py

@@ -15,7 +15,7 @@ from openai import OpenAI
 import psycopg2
 from psycopg2 import sql
 import os
-from app.utils import get_api_key, get_user_info, print_log, update_user, upload_file_to_s3, get_user, upload_mementos_to_db, get_user_summary, get_user_life_status
+from app.utils import get_api_key, get_user_info, pop_cache, print_log, update_user, upload_file_to_s3, get_user, upload_mementos_to_db, get_user_summary, get_user_life_status
 from dotenv import load_dotenv
 import logging.config
 import time
@@ -250,6 +250,45 @@ def ok_endpoint():
     logger.info("Health check endpoint called", extra={"endpoint": "/ok"})
     return {"message": "ok"}
 
+@app.post("/set_intro_done")
+def set_intro_done(user_id: str, api_key: str = Security(get_api_key)):
+    user = get_user(user_id)
+    user.set_intro_done()
+    logger.info("Intro done", extra={"user_id": user_id, "endpoint": "/set_intro_done"})
+    return {"response": "ok"}
+
+@app.post("/set_goal")
+def set_goal(user_id: str, goal: str, api_key: str = Security(get_api_key)):
+    user = get_user(user_id)
+    user.set_goal(goal)
+    logger.info(f"Goal set: {goal}", extra={"user_id": user_id, "endpoint": "/set_goal"})
+    return {"response": "ok"}
+
+@app.post("/do_micro")
+def do_micro(request: ChangeDateItem, day: int, api_key: str = Security(get_api_key)):
+    print_log("INFO", "do_micro endpoint")
+    logger.info("do_micro endpoint called", extra={"endpoint": "/do_micro"})
+    
+    # get user
+    user = get_user(request.user_id)
+
+    try:
+        response = user.do_micro(request.date, day)
+    except openai.BadRequestError:
+        # Check if there is an active run for the thread id
+        recent_run = user.get_recent_run()
+        print_log("INFO",f"Recent run: {recent_run}", extra={"user_id": request.user_id, "endpoint": "/chat"})
+        logger.info(f"Recent run: {recent_run}", extra={"user_id": request.user_id, "endpoint": "/chat"})
+        # If there is an active run, cancel it and resubmit the previous message
+        if recent_run:
+            user.cancel_run(recent_run)
+            response = user.send_message(user.get_recent_message())
+    
+    print_log("INFO",f"Assistant: {response['content']}", extra={"user_id": request.user_id, "endpoint": "/chat"})
+    logger.info(f"Assistant: {response['content']}", extra={"user_id": request.user_id, "endpoint": "/chat"})
+    return {"response": response}
+
+
 # endpoint to change user assistant using user.change_to_latest_assistant()
 @app.get("/change_assistant")
 def change_assistant(user_id: str, api_key: str = Security(get_api_key)):
@@ -269,7 +308,14 @@ def get_user_by_id(user_id: str, api_key: str = Security(get_api_key)):
         user = get_user(user_id)
         print_log("INFO", "Successfully retrieved user", extra={"user_id": user_id, "endpoint": "/get_user"})
         logger.info("Successfully retrieved user", extra={"user_id": user_id, "endpoint": "/get_user"})
-        return {"user": str(user), "user_messages": user.get_messages(), "assistant": user.conversations.assistants['general'].id}
+        api_response = {"user": str(user), "user_messages": user.get_messages(), "general_assistant": user.conversations.assistants['general'].id, "intro_assistant": user.conversations.assistants['intro'].id}
+        
+        if user.goal:
+            api_response["goal"] = user.goal
+        else:
+            api_response["goal"] = "Goal is not set yet"
+
+        return api_response
     except LookupError:
         print_log("ERROR", "User not found", extra={"user_id": user_id, "endpoint": "/get_user"})
         logger.error("User not found", extra={"user_id": user_id, "endpoint": "/get_user"})
@@ -392,8 +438,13 @@ def create_user(request: CreateUserItem, api_key: str = Security(get_api_key)):
 
 
         # upload user pickle file to s3 bucket 
-        # filename = f'{user.user_id}.pkl'
-        upload = update_user(user)
+        filename = f'{user.user_id}.pkl'
+        try:
+            # value.save_user()
+            upload_file_to_s3(filename)
+            upload = True
+        except:
+            upload = False
 
         if upload == True:
             print_log("INFO",f"Successfully created user", extra={"user_id": request.user_id, "endpoint": "/create_user"})

app/utils.py

@@ -978,14 +978,21 @@ def download_file_from_s3(filename, bucket):
             os.remove(file_path)
         return False
 
+def pop_cache(user_id):
+    try:
+        user_cache.pop(user_id, None)
+        logger.info(f"User {user_id} has been removed from the cache", extra={'user_id': user_id, 'endpoint': 'pop_cache'})
+        return True
+    except:
+        return False
+
 def update_user(user):
     user_id = user.user_id
     function_name = update_user.__name__
     logger.info(f"Updating user {user_id}", extra={'user_id': user_id, 'endpoint': function_name})
-    user.save_user()
 
     # remove from cache, which will also upload the file 
-    user_cache.pop(user_id, None)  # Safely remove if exists
+    pop_cache(user_id)
     logger.info(f"User {user_id} has been removed from the cache", extra={'user_id': user_id, 'endpoint': function_name})
         
     logger.info(f"User {user.user_id} updated successfully in S3", extra={'user_id': user_id, 'endpoint': function_name})