Merge branch 'new_followups' into pr/3

app/assistants.py

@@ -551,15 +551,10 @@ class Assistant:
                 logger.info(f"Completing user goal...", extra={"user_id": self.cm.user.user_id, "endpoint": "assistant_complete_goal"})
                 goal = self.cm.user.update_goal(None, 'COMPLETED')
                 logger.info(f"Marked users' goal: {goal} as COMPLETED", extra={"user_id": self.cm.user.user_id, "endpoint": "assistant_complete_goal"})
-                
                 tool_outputs.append({
                     "tool_call_id": tool.id,
-                    "output": f"true"
+                    "output": f"Marked users' goal: {goal} as COMPLETED"
                 })
-                # tool_outputs.append({
-                #     "tool_call_id": tool.id,
-                #     "output": f"Marked users' goal: {goal} as COMPLETED"
-                # })
             elif tool.function.name == "process_reminder":
                 reminder = json.loads(tool.function.arguments)["content"]
                 timestamp = json.loads(tool.function.arguments)["timestamp"]

app/flows.py

@@ -44,13 +44,23 @@ MICRO_ACTION_STATE = f"""
 Objective: Build momentum toward the user’s goal with small, actionable tasks that feel achievable immediately. Avoid saying “Today’s micro-action is:”—state the action naturally.
 
 User’s Context
-• Goal: {{}}
-• Day: {{}}/{{}} of their journey.
-• User's Legendary Persona: {{}} (incorporate quotes conversationally, not as a lecture).
+• Goal: 
+{{}}
+
+• Day: 
+{{}}/{{}} of their journey.
+
+• User's Legendary Persona: 
+{{}} (incorporate quotes conversationally, not as a lecture).
+
+• User's Upcoming (postponed) Micro-Actions: 
+{{}}
 
 The Order of Your Conversation Flow (Do these step-by-step instructions):
+Step 0. If the user has postponed micro-actions, remind them of the postponed micro-actions and ask if they are ready to do it today. If the user says yes, then do the following steps with the postponed micro-action. If the user says no, then proceed with proposing a new micro-action.
 Step 1. Micro-Action Suggestion: Propose one clear, actionable task for the day. Ensure it is relevant, easy to begin, and framed positively. Avoid repeating previous actions.
 Step 2. If the user has decided to try out the micro action, let the user **try** the micro action and get back when they have done it. Don't ask any question, yet
+Step 2.5. If the user says they can only do it on a later date, send the user an understanding yet encouraging message and create a reminder for them (by making a function call like: process_reminder('content': '⏰ **Reminder**: Hey <users' name>! 🌟 Just a friendly reminder to do <postponed microaction>', 'timestamp': '<relevant timestamp based on users' message>', 'recurrence': 'postponed', 'action': 'set'). Ensure that you set the 'recurrence' to 'postponed'.  Then, end the conversation (do step 4.)
 Step 3. After the user has said that they've done the micro action, you ask one **creative** and engaging follow-up question to ask their experience.
 Step 4. End Gracefully: After the user's reply, immediately call the end_conversation(). Conclude with a strong and motivational statement (by chanelling the energy, mindset, and knowledge of the user's legendary persona) that reinforces their commitment.
 
@@ -96,18 +106,33 @@ FOLLUP_ACTION_STATE = f"""
 Objective: Based on the micro-action that you gave yesterday, follow up the user's progress today & share some useful knowledge, tools, or practices from the user's Legendary Persona. Avoid saying “Yesterday’s micro-action is:”—state the action naturally.
 
 User’s Context
-• Goal: {{}}
-• Day: {{}}/{{}} of their journey.
-• User's chosen Legendary Persona: {{}} (incorporate quotes conversationally, not as a lecture).
-• User's chosen Legendary Persona's knowledge and expertise: {{}} (Pick one or more to be brought up in the conversation, based on relevance to the user's goal and challenges)
- 
+• Goal: 
+{{}}
+
+• Day: 
+{{}}/{{}} of their journey.
+
+• User's chosen Legendary Persona: 
+{{}} (incorporate quotes conversationally, not as a lecture).
+
+• User's chosen Legendary Persona's knowledge and expertise: 
+{{}} (Pick one or more to be brought up in the conversation, based on relevance to the user's goal and challenges)
+
+• User's Upcoming (postponed) Micro-Actions: 
+{{}}
+
 The Order of Your Conversation Flow (Do these step-by-step instructions):
-Step 1. Follow Up: 
-**IF** the user has completed yesterday's micro-action, ask the experience that the user had while doing the micro action.
-**IF** the user hasn't completed yesterday's micro-action, ask the user if they're going to do it today (**UNLESS** if the user has specified a day to do the action, then don't ask and go to step 2).
-**DO NOT** ask more than 1 question in 1 message!
-Step 2. After the user have shared their experience, share a list of Knowledge/Resource/Tips: Based on the user’s chosen legendary persona's knowledge and expertise, provide a useful knowledge, tools, or practices that suits the user’s experience or challenges! Give your knowledge as if you are the Legendary Persona themselves. Ask what do they think about it.
-Step 3. After the user replies, immediately call the end_conversation(). Conclude with a strong and motivational statement (by chanelling the energy, mindset, and knowledge of the user's legendary persona) that reinforces their commitment.
+**IF** THE USER HAS NO UPCOMING REMINDERS:
+  Step 1. Follow Up: 
+  **IF** the user has completed yesterday's micro-action, ask the experience that the user had while doing the micro action.
+  **IF** the user hasn't completed yesterday's micro-action, ask the user if they're going to do it today (**UNLESS** if the user has specified a day to do the action, then don't ask and go to step 2).
+  Step 2. After the user have shared their experience, share a list of Knowledge/Resource/Tips: Based on the user’s chosen legendary persona's knowledge and expertise, provide a useful knowledge, tools, or practices that suits the user’s experience or challenges! Give your knowledge as if you are the Legendary Persona themselves. Ask what do they think about it.
+  Step 3. After the user replies, immediately call the end_conversation(). Conclude with a strong and motivational statement (by chanelling the energy, mindset, and knowledge of the user's legendary persona) that reinforces their commitment.
+**IF** THE USER HAS AN UPCOMING REMINDER:
+  Step 0. Identify whether to use past/present or future tense in your messages based on the timestamp of the user's postponed micro-action and the current datetime.
+  Step 1. Remind the user about their upcoming micro-action in a motivating way and ask if they are ready/excited for it. Incorporate elements of the user's motivation for their goal in this message to further encourage the user.
+  Step 2. After the user replies, share a list of Knowledge/Resource/Tips OR Based on the user’s chosen legendary persona's knowledge and expertise, provide a useful knowledge, tools, or practices that suits the user’s experience or challenges! Give your knowledge as if you are the Legendary Persona themselves. Ask what do they think about it.
+  Step 3. After the user replies, immediately call the end_conversation(). Conclude with a strong and motivational statement (by chanelling the energy, mindset, and knowledge of the user's legendary persona) that reinforces their commitment.
 
 ** Principles for Quality Interaction **  
 1. **Personalization:** Align suggestions with the user’s legendary persona and recent actions.  
@@ -392,7 +417,7 @@ Meanwhile, let me know if you want to:
 
 Can’t wait to see what’s next for you! 🚀
 
- - **IF** the user answer with a No, you reply with this message:
+ - **IF** the user answer with a No, you reply with this message (could be something similar):
 
 No worries, growth doesn’t stop here 🚀 — what you’ve accomplished is just the beginning!
 

app/main.py

@@ -429,7 +429,7 @@ 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"})
-        api_response = {"user": user.user_info, "user_messages": user.get_messages(), "general_assistant": user.conversations.assistants['general'].id, "intro_assistant": user.conversations.assistants['intro'].id}
+        api_response = {"user": user.user_info, "user_messages": user.get_messages(show_hidden=True), "general_assistant": user.conversations.assistants['general'].id, "intro_assistant": user.conversations.assistants['intro'].id}
         
         if user.goal:
             api_response["goal"] = user.goal
@@ -460,31 +460,6 @@ def get_user_by_id(user_id: str, api_key: str = Security(get_api_key)):
             status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
             detail=str(e)
         )
-    
-# @app.get("/get_user_life_score")
-# def life_score_by_id(user_id: str, api_key: str = Security(get_api_key)):
-#     print_log("INFO", "Getting user life score", extra={"user_id": user_id, "endpoint": "/get_user_life_score"})
-#     logger.info("Getting user life score", extra={"user_id": user_id, "endpoint": "/get_user_life_score"})
-#     try:
-#         life_score = get_life_score(user_id)
-#         print_log("INFO", "Successfully retrieved user life score", extra={"user_id": user_id, "endpoint": "/get_user_life_score"})
-#         logger.info("Successfully retrieved user life score", extra={"user_id": user_id, "endpoint": "/get_user_life_score"})
-
-#         return life_score
-#     except LookupError:
-#         print_log("ERROR", "User not found", extra={"user_id": user_id, "endpoint": "/get_user_life_score"})
-#         logger.error("User not found", extra={"user_id": user_id, "endpoint": "/get_user_life_score"})
-#         raise HTTPException(
-#             status_code=status.HTTP_404_NOT_FOUND,
-#             detail=f"User with ID {user_id} not found"
-#         )
-#     except Exception as e:
-#         print_log("ERROR",f"Error getting user: {str(e)}", extra={"user_id": user_id, "endpoint": "/get_user_life_score"}, exc_info=True)
-#         logger.error(f"Error getting user: {str(e)}", extra={"user_id": user_id, "endpoint": "/get_user_life_score"}, exc_info=True)
-#         raise HTTPException(
-#             status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-#             detail=str(e)
-#         )
 
 @app.post("/add_ai_message")
 def add_ai_message(request: ChatItem, api_key: str = Security(get_api_key)):
@@ -796,7 +771,8 @@ def change_date(request: ChangeDateItem, api_key: str = Security(get_api_key)):
                 detail=f"Failed to update user pickle in S3 {user_id}"
             )
             
-        return {"response": response}          
+        return response
+        # return {"response": response}          
         
     except ValueError as e:
         print_log("ERROR",f"Invalid date format for user {request.user_id}: {str(e)}", extra={"user_id": request.user_id, "endpoint": "/change_date"})

app/user.py

@@ -205,10 +205,6 @@ class ConversationManager:
         
         temp_thread = self.client.beta.threads.create(messages=messages)
         logger.info(f"Created Temp Thread: {temp_thread}", extra={"user_id": self.user.user_id, "endpoint": "send_hidden_message"})
-        
-        if add_to_main:
-            logger.info(f"Adding message to main thread: {text}", extra={"user_id": self.user.user_id, "endpoint": "send_hidden_message"})
-            self.add_message_to_thread(self.current_thread.id, "assistant", text)
 
         self.add_message_to_thread(temp_thread.id, "user", text)
 
@@ -220,8 +216,31 @@ class ConversationManager:
         self.client.beta.threads.delete(temp_thread.id)
         logger.info(f"Deleted Temp Thread: {temp_thread}", extra={"user_id": self.user.user_id, "endpoint": "send_hidden_message"})
 
+        if add_to_main:
+            logger.info(f"Adding message to main thread: {text}", extra={"user_id": self.user.user_id, "endpoint": "send_hidden_message"})
+            self.add_message_to_thread(self.current_thread.id, "assistant", text)
+
         return response
     
+    def delete_hidden_messages(self, old_thread=None):
+        if old_thread is None:
+            old_thread = self.current_thread
+
+        # create a new thread
+        messages = [msg for msg in self._get_current_thread_history(remove_system_message=False) if not msg['content'].startswith("[hidden]")]
+        if len(messages) >= 29:
+            messages = messages[-29:]
+        logger.info(f"Current Thread Messages: {messages}", extra={"user_id": self.user.user_id, "endpoint": "delete_hidden_messages"})
+
+        new_thread = self.client.beta.threads.create(messages=messages)
+
+        # delete old thread
+        self.client.beta.threads.delete(old_thread.id)
+
+        # set current thread
+        self.current_thread = new_thread
+
+
     def do_first_reflection(self):
         question_format = random.choice(['[Option 1] Likert-Scale Objective Question','[Option 2] Multiple-Choice Question','[Option 3] Yes-No Question'])
 
@@ -433,13 +452,12 @@ class User:
 
     def update_goal(self, goal, status, content=None):
         if goal is None:
-            pass
-            # # complete the current goal
-            # current_goal = self.get_current_goal(full=True)
-            # if current_goal:
-            #     current_goal.status = "COMPLETED"
-            #     current_goal.updated_at = pd.Timestamp.now().strftime("%d-%m-%Y %a %H:%M:%S")
-            #     return current_goal.content
+            # complete the current goal
+            current_goal = self.get_current_goal(full=True)
+            if current_goal:
+                current_goal.status = "COMPLETED"
+                current_goal.updated_at = pd.Timestamp.now().strftime("%d-%m-%Y %a %H:%M:%S")
+                return current_goal.content
             
         for g in self.goal:
             if g.content == goal:
@@ -503,7 +521,6 @@ class User:
         self.health_and_wellness_score = 0
         self.reminders = None
 
-
     def generate_user_interaction_guidelines(self, user_info, client):
         logger.info(f"Generating user interaction guidelines for user: {self.user_id}", extra={"user_id": self.user_id, "endpoint": "generate_user_interaction_guidelines"})
         # prompt = f"A 'profile' is a document containing rich insights on users for the purpose of \
@@ -560,9 +577,10 @@ class User:
             # must do current plan now
             action = self.growth_plan.current()
             logger.info(f"Current Action: {action}", extra={"user_id": self.user_id, "endpoint": "user_send_message"})
-            response = self.do_theme(action['coachingTheme'], self.conversations.state['date'], action['day'])
+            response, prompt = self.do_theme(action['coachingTheme'], self.conversations.state['date'], action['day'])
 
             # add response to ai message
+            self.add_ai_message("[hidden]" + prompt)
             self.add_ai_message(response['content'])
 
             # Move to the next action
@@ -775,6 +793,24 @@ class User:
 
         logger.info(f"Doing theme: {theme}", extra={"user_id": self.user_id, "endpoint": "do_theme"})
         
+        if self.reminders is not None and len(self.reminders):
+            logger.info(f"ALL Upcoming Reminders: {self.reminders}", extra={"user_id": self.user_id, "endpoint": "do_theme"})
+            reminders = list(filter(lambda x : x['recurrence'] == 'postponed', self.reminders))
+            logger.info(f"ALL Postponed Reminders: {reminders}", extra={"user_id": self.user_id, "endpoint": "do_theme"})
+        else:
+            reminders = []
+
+        # check if any of the posponed reminders have the date == date if yes, change the theme to "MICRO_ACTION_STATE"
+        if reminders:
+            for reminder in reminders:
+                if reminder['timestamp'].date() == pd.to_datetime(date).date():
+                    logger.info(f"Reminder found for today ({pd.to_datetime(date).date()}): {reminder}", extra={"user_id": self.user_id, "endpoint": "do_theme"})
+                    if day != 4:
+                        theme = "MICRO_ACTION_STATE"
+                    break
+            else:
+                logger.info(f"No reminders found for today ({pd.to_datetime(date).date()})", extra={"user_id": self.user_id, "endpoint": "do_theme"})
+
         if theme == "MOTIVATION_INSPIRATION_STATE":
             formatted_message = MOTIVATION_INSPIRATION_STATE.format(self.get_current_goal(), day, len(self.growth_plan.array), user_legendary_persona)
         elif theme == "PROGRESS_REFLECTION_STATE":
@@ -783,7 +819,9 @@ class User:
                 challenge = self.challenges.pop(0)
                 formatted_message += f"\n\n** IMPORTANT: Today, reflect on the users' challenge of: {challenge.content}, which they brought up during their growth guide session (let the user know we are bringing it up because of this) **"
         elif theme == "MICRO_ACTION_STATE":
-            formatted_message = MICRO_ACTION_STATE.format(self.get_current_goal(), day, len(self.growth_plan.array), user_legendary_persona)
+            reminder_message = "\n".join([f"{i+1}. {reminder}" for i, reminder in enumerate(reminders)]) if reminders else "User has no postponed micro-actions"
+
+            formatted_message = MICRO_ACTION_STATE.format(self.get_current_goal(), day, len(self.growth_plan.array), user_legendary_persona, reminder_message)
             if len(self.recommended_micro_actions):
                 todays_micro_action = self.recommended_micro_actions.pop(0)
                 formatted_message += f"\n\n** IMPORTANT: Today's Micro Action is: {todays_micro_action.content}, which was recommended during their growth guide session (let the user know we are bringing it up because of this) **"
@@ -799,7 +837,8 @@ class User:
         elif theme == "EDUCATION_STATE":
             formatted_message = EDUCATION_STATE.format(self.get_current_goal(), day, len(self.growth_plan.array), user_legendary_persona)
         elif theme == "FOLLUP_ACTION_STATE":
-            formatted_message = FOLLUP_ACTION_STATE.format(self.get_current_goal(), day, len(self.growth_plan.array), user_legendary_persona, knowledge)
+            reminder_message = "\n".join([f"{i+1}. {reminder}" for i, reminder in enumerate(reminders)]) if reminders else "User has no postponed micro-actions"
+            formatted_message = FOLLUP_ACTION_STATE.format(self.get_current_goal(), day, len(self.growth_plan.array), user_legendary_persona, knowledge, reminder_message)
         
         # prompt = f"""** It is a new day: {date} ** 
         # Additional System Instruction: 
@@ -813,7 +852,7 @@ class User:
         # {formatted_message}
         # """
 
-        prompt = f"""** It is a new day: {date} ** 
+        prompt = f"""** It is a new day: {date} ({day}) 10:00:00 ** 
         Additional System Instruction: 
 
         To avoid a boring conversation, focus on giving more wisdom than questions by providing assertive guidance, valuable encouragement,
@@ -841,15 +880,25 @@ class User:
             logger.info(f"Recommended Micro Action: {micro_action}", extra={"user_id": self.user_id, "endpoint": "do_theme"})
             self.micro_actions.append(micro_action)
 
-        return response
+        return response, prompt
 
     def change_date(self, date):
         logger.info(f"Changing date from {self.conversations.state['date']} to {date}", 
                    extra={"user_id": self.user_id, "endpoint": "user_change_date"})
+        # delete all hidden messages prom previous day
+        self.conversations.delete_hidden_messages()
+        # update the date in the state
         self.conversations.state['date'] = date
 
         action = self.growth_plan.current()
 
+        # remove stale reminders
+        if self.reminders is not None and len(self.reminders):
+            # remove all reminders which 'recurrence' is 'once' or 'action' is 'delete' or the date is < today
+            # this is to ensure that only reminders with recurrence and future reminder are kept
+            self.reminders = [reminder for reminder in self.reminders if not (reminder['action'] == 'delete' or (reminder['recurrence'] in ['once', 'postponed'] and reminder['timestamp'] < pd.Timestamp.now()))]
+            logger.info(f"Active Reminders: {self.reminders}", extra={"user_id": self.user_id, "endpoint": "user_change_date"})
+
         ## ADD POINT FOR CHANGE DATE
         if self.growth_plan.current()['day'] == 7:
             self.add_life_score_point(variable = self.get_current_goal(full=True).area, points_added = 5, notes = "Reaching Day 7")
@@ -867,31 +916,23 @@ class User:
             
         # The coaching theme conditions are hardcoded for now
         theme = action['coachingTheme']
-        response = self.do_theme(theme, date, action['day'])        
+        response, prompt = self.do_theme(theme, date, action['day'])        
+
+        # add today's reminders to response to schedule
+        # response['reminders'] = all reminders which date is today (so all the reminders that BE has to queue today)
+        # convert date to YYYY-MM-DD format
+        date = pd.to_datetime(date).date()
+        response['reminders'] = self.get_reminders(date)
+        if response['reminders'] is None or len(response['reminders']) == 0:
+            response['reminders'] = None
+            logger.info(f"No reminders for today {date}", extra={"user_id": self.user_id, "endpoint": "user_change_date"})
+            logger.info(f"Reminders on {date}: {response['reminders']}", extra={"user_id": self.user_id, "endpoint": "user_change_date"})
 
         # Move to the next action
         self.growth_plan.next()
 
-        if self.reminders is not None and len(self.reminders):
-            # remove all reminders which 'recurrence' is 'once' or 'action' is 'delete' or the date is < today
-            # this is to ensure that only reminders with recurrence and future reminder are kept
-            self.reminders = [reminder for reminder in self.reminders if not (reminder['action'] == 'delete' or (reminder['recurrence'] == 'once' and reminder['timestamp'] < pd.Timestamp.now()))]
-            logger.info(f"Active Reminders: {self.reminders}", extra={"user_id": self.user_id, "endpoint": "user_change_date"})
-
-            # response['reminders'] = all reminders which date is today (so all the reminders that BE has to queue today)
-            # convert date to YYYY-MM-DD format
-            date = pd.to_datetime(date).date()
-            response['reminders'] = self.get_reminders(date)
-            if len(response['reminders']) == 0:
-                response['reminders'] = None
-                logger.info(f"No reminders for today {date}", extra={"user_id": self.user_id, "endpoint": "user_change_date"})
-            logger.info(f"Reminders on {date}: {response['reminders']}", extra={"user_id": self.user_id, "endpoint": "user_change_date"})
-        else:
-            response['reminders'] = None
-
-
         logger.info(f"Date Updated: {self.conversations.state['date']}", extra={"user_id": self.user_id, "endpoint": "user_change_date"})
-        return response
+        return {'response': response, 'theme_prompt': '[hidden]'+prompt}
     
     def update_user_info(self, new_info):
         logger.info(f"Updating user info: [{self.user_info}] with: [{new_info}]", extra={"user_id": self.user_id, "endpoint": "update_user_info"})

app/utils.py

@@ -1093,6 +1093,29 @@ def get_growth_guide_summary(user_id, session_id):
     except psycopg2.Error as e:
         logger.error(f"Database error while retrieving growth guide summary for user {user_id} and session {session_id}: {e}", extra={'user_id': user_id, 'endpoint': function_name})
         return None
+    
+def get_all_bookings():
+    function_name = get_all_bookings.__name__
+    logger.info(f"Retrieving all bookings", extra={'endpoint': function_name})
+    db_params = {
+        'dbname': 'ourcoach',
+        'user': 'ourcoach',
+        'password': 'hvcTL3kN3pOG5KteT17T',
+        'host': 'staging-ourcoach.cx8se8o0iaiy.ap-southeast-1.rds.amazonaws.com',
+        'port': '5432'
+    }
+    try:
+        with psycopg2.connect(**db_params) as conn:
+            with conn.cursor() as cursor:
+                query = sql.SQL("SELECT id, user_id FROM {table}").format(table=sql.Identifier('public', 'booking'))
+                cursor.execute(query)
+                rows = cursor.fetchall()
+                bookings = [{'booking_id': row[0], 'user_id': row[1]} for row in rows]
+                logger.info(f"Retrieved {len(bookings)} bookings", extra={'endpoint': function_name})
+                return bookings
+    except psycopg2.Error as e:
+        logger.error(f"Database error while retrieving bookings: {e}", extra={'endpoint': function_name})
+        return []
 
 def update_growth_guide_summary(user_id, session_id, ourcoach_summary):
     function_name = update_growth_guide_summary.__name__