Allign staging

app/assistants.py

@@ -1,13 +1,17 @@
 import json
 import io
 import os
-from datetime import datetime
+from datetime import datetime, timezone
 import json 
 import random
 from time import sleep
+import openai
 import pandas as pd
 from dotenv import load_dotenv
 import logging
+import psycopg2
+from psycopg2 import sql
+import pytz
 
 from app.utils import get_growth_guide_summary, get_users_mementos, print_log
 from app.flows import FOLLOW_UP_STATE, GENERAL_COACHING_STATE, MICRO_ACTION_STATE, REFLECTION_STATE
@@ -279,8 +283,25 @@ class FeedbackContent:
         #     return result
         return selected
 
-def get_current_datetime():
-    return datetime.now()
+def get_current_datetime(user_id):
+    db_params = {
+    'dbname': 'ourcoach',
+    'user': 'ourcoach',
+    'password': 'hvcTL3kN3pOG5KteT17T',
+    'host': 'staging-ourcoach.cx8se8o0iaiy.ap-southeast-1.rds.amazonaws.com',
+    'port': '5432'
+    }
+    with psycopg2.connect(**db_params) as conn:
+        with conn.cursor() as cursor:
+            query = sql.SQL("SELECT * FROM {table} WHERE id = %s").format(table=sql.Identifier('public', 'users'))
+            cursor.execute(query, (user_id,))
+            row = cursor.fetchone()
+            if (row):
+                colnames = [desc[0] for desc in cursor.description]
+                user_data = dict(zip(colnames, row))
+                user_timezone = user_data['timezone']
+
+    return datetime.now().astimezone(pytz.timezone(user_timezone))
 
 class Assistant:
     def __init__(self, id, cm):
@@ -289,19 +310,31 @@ class Assistant:
         self.recent_run = None
 
     def cancel_run(self, run, thread):
-        if run.status != 'completed':
-            cancel = self.cm.client.beta.threads.runs.cancel(thread_id=thread.id, run_id=run.id)
-            while cancel.status != 'cancelled':
-                sleep(0.05)
-                cancel = self.cm.client.beta.threads.runs.retrieve(
-                    thread_id=thread.id,
-                    run_id=cancel.id
-                )
-            logger.info(f"Cancelled run: {run.id}", extra={"user_id": self.cm.user.user_id, "endpoint": "assistant_cancel_run"})
-            return True
-        else:
-            logger.info(f"Run already completed: {run.id}", extra={"user_id": self.cm.user.user_id, "endpoint": "assistant_cancel_run"})
-            return False
+        try:
+            if run.status != 'completed':
+                cancel = self.cm.client.beta.threads.runs.cancel(thread_id=thread.id, run_id=run.id)
+                while cancel.status != 'cancelled':
+                    sleep(0.05)
+                    cancel = self.cm.client.beta.threads.runs.retrieve(
+                        thread_id=thread.id,
+                        run_id=cancel.id
+                    )
+                logger.info(f"Cancelled run: {run.id}", extra={"user_id": self.cm.user.user_id, "endpoint": "assistant_cancel_run"})
+                return True
+            else:
+                logger.info(f"Run already completed: {run.id}", extra={"user_id": self.cm.user.user_id, "endpoint": "assistant_cancel_run"})
+                return False
+        except openai.BadRequestError:
+            # check if run has expired. run has a field 'expires_at' like run.expires_at = 1735008568
+            # if expired, return True and log run already expired
+            if run.expires_at < get_current_datetime().timestamp():
+                logger.error(f"Run already expired: {run.id}", extra={"user_id": self.cm.user.user_id, "endpoint": "assistant_cancel_run"})
+                return True
+            else:
+                logger.error(f"Error cancelling run: {run.id}", extra={"user_id": self.cm.user.user_id, "endpoint": "assistant_cancel_run"})
+                return False
+
+
         
     def process(self, thread, text):
         # template_search = self.cm.add_message_to_thread(thread.id, "assistant", f"Pay attention to the current state you are in and the flow template to respond to the users query:") 
@@ -387,7 +420,7 @@ class Assistant:
                 # print(f"[DATETIME]: {get_current_datetime()}")
                 # self.cm.state['date'] = 'date': pd.Timestamp.now().strftime("%Y-%m-%d %a %H:%M:%S")
                 # get and update the current time to self.cm.state['date'] but keep the date component
-                current_time = get_current_datetime()
+                current_time = get_current_datetime(self.cm.user.user_id)
                 # replace time component of self.cm.state['date'] with the current time
                 self.cm.state['date'] = str(pd.to_datetime(self.cm.state['date']).replace(hour=current_time.hour, minute=current_time.minute, second=current_time.second))
                 logger.info(f"Current datetime: {self.cm.state['date']}", 

app/flows.py

@@ -92,6 +92,7 @@ MICRO_ACTION_STATE = f"""
 
 - After the user's reply, immediately call the `end_conversation()` function.
 - Conclude with:
+  - Two short, specific, technical, and practical pieces of advice in bullet points.
   - A strong motivational statement that reinforces their commitment, channeling the energy, mindset, and knowledge of the user's legendary persona.
   - Be concise! (use Whatsapp texting length)
 
@@ -148,98 +149,53 @@ MICRO_ACTION_STATE = f"""
 """
 
 FOLLUP_ACTION_STATE = f"""
-**Following Up Yesterday's Micro Action**
-**Objective:** Follow up on the user's progress with their micro-action from yesterday and share useful knowledge, tools, or practices from the user's Legendary Persona. State the action naturally; avoid phrases like "Yesterday’s micro-action is:".
+** Following Up Yesterday's Micro Action ** (PLEASE READ CAREFULLY)
+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).
-- **Legendary Persona's knowledge and expertise (select relevant points based on the user's goal and challenges; do **not** force irrelevant quotes):** 
-{{}} 
-- **User's Upcoming (postponed) Micro-Actions (ignore if empty):** 
+User’s Context
+• Goal: 
 {{}}
 
----
-
-**Conversation Flow**
-
-**If the user has no upcoming reminders:**
-
-1. **Follow Up:**
-   - **If** the user has completed yesterday's micro-action:
-     - Ask about their experience while doing it.
-     - Or, ask one discussion question about the micro-action (if they already shared their experience).
-   - **If** the user hasn't completed it:
-     - Ask if they're going to do it today.
-     - **Unless** they've specified a different day—then proceed to Step 2.
-
-2. **Share Knowledge/Tips:**
-   - After they share their experience, provide a short list (max 3 bullet points) of knowledge, resources, or tips based on the Legendary Persona's expertise that suit the user's experience or challenges.
-   - Present this as if you are the Legendary Persona themselves.
-   - Keep your message short (like Whatsapp texting length)
-   - Ask what they think about it.
-
-3. **Conclude:**
-   - After the user replies, immediately call `end_conversation()`.
-   - Conclude with a strong, motivational statement that reinforces their commitment, channeling the energy, mindset, and knowledge of the Legendary Persona.
-   - Keep your message short (like Whatsapp texting length)
-
-**If the user has an upcoming reminder:**
-
-0. **Tense Identification:**
-   - Use past, present, or future tense based on the timestamp of the postponed micro-action and the current datetime.
-
-1. **Motivational Reminder:**
-   - Remind the user about their upcoming micro-action in a motivating way.
-   - Ask if they are ready or excited for it.
-   - Incorporate elements of the user's motivation for their goal.
-   - Keep your message short (like Whatsapp texting length)
-
-2. **Share Knowledge/Tips:**
-   - After they reply, provide a list (max 3 items) of knowledge, resources, or tips based on the Legendary Persona's expertise that suit the user's experience or challenges.
-   - Present this as if you are the Legendary Persona themselves.
-   - Keep your message short (like Whatsapp texting length)
-   - Ask what they think about it.
-
-3. **Conclude:**
-   - After the user replies, immediately call `end_conversation()`.
-   - Conclude with a strong, motivational statement that reinforces their commitment, channeling the energy, mindset, and knowledge of the Legendary Persona.
-   - Keep your message short (like Whatsapp texting length)
-
----
-
-**Principles for Quality Interaction**
+• Day: 
+{{}}/{{}} of their journey.
 
-1. **Personalization:** Align suggestions with the user’s Legendary Persona and recent actions.
+• User's chosen Legendary Persona: 
+{{}} (incorporate quotes conversationally, not as a lecture).
 
-2. **Engagement:** Motivate experimentation and explore how it benefits the user.
+• 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)
 
-3. **Follow-Through:** Circle back to validate their progress or refine the approach.
-
-4. **Concise:** Be concise; use WhatsApp texting length.
-
----
-
-**Important Rules**
-
-- **Function Calls:** Never explicitly mention the function you are calling to the user (do it in the background).
+• User's Upcoming (postponed) Micro-Actions: 
+{{}}
 
-- **Question Format:**
-  - When asking a question, encapsulate it with asterisks (e.g., *What’s one thing you can commit to today?*).
-  - Use only one question mark per message.
+The Order of Your Conversation Flow (Do these step-by-step instructions):
+**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.
 
-- **Avoid Over-Questioning:** Keep questions creative and sparing; avoid overwhelming the user.
+** Principles for Quality Interaction **  
+1. **Personalization:** Align suggestions with the user’s legendary persona and recent actions.  
+2. **Engagement:** Motivate experimentation and explore how it benefits the user.  
+3. **Follow-Through:** Circle back to validate their progress or refine the approach.  
+4. **Concise:** Be concise & use whatsapp texting length.
 
-- **Lists:** Provide a maximum of three items in any list.
+Important Rules
+• Never explicitly tell the function that you are calling to the user (just do the function calling in the background)
+• Question Format: When you ask a question, encapsulate it with asterisks (e.g., What’s one thing you can commit to today?). Use only one question mark per message.
+• Avoid Over-Questioning: Keep questions creative, sparing, and avoid overwhelming the user.
+• Lists: Provide a maximum of three items in any list.
 
-- **Quoting Legendary Persona:**
-  - Do **not** mention the name of the Legendary Persona when quoting.
-  - Paraphrase the quote and present it as your own message.
-  - **Bad Example:** "Hey \<user name\>! As \<Legendary Persona\> said, '\<quote\>'"
-  - **Good Example:** "Hey \<user name\>! \<Paraphrased quote\>."
+When you want to mention a quote from the legendary persona, you must not say the name of the legendary persona. You should paraphrase the quote and say it like it's your own message!
+Bad Example: Hey <user name>! As <Legendary Persona> said, "<quote>"
+Good Example: Hey <user name>! <paraphrased quote>.
 """
 
 EDUCATION_STATE = f"""
@@ -383,7 +339,7 @@ User’s Context
 • User's chosen Legendary Persona: {{}} (incorporate quotes conversationally, not as a lecture).
  
 The Order of Your Conversation Flow (Do these step-by-step instructions):
-Step 1. Start with a **creative** or unexpected open question to discuss together (only ask one question).
+Step 1. Start with a **creative** or unexpected open question to discuss together.
 Step 2. Acknowledge their response and using the tone of the user's chosen legendary persona, give valuable/deep advice that suits the user's challenge.
 Step 3. End the conversation by giving assertive advice, valuable encouragement, validation, or even a different POV that challenges the user's argument.
 
@@ -396,7 +352,6 @@ Important Rules
 • Never explicitly tell the function that you are calling to the user (just do the function calling in the background)
 • Question Format: When you ask a question, encapsulate it with asterisks (e.g., What’s one thing you can commit to today?). Use only one question mark per message.
 • Avoid Over-Questioning: Keep questions creative, sparing, and avoid overwhelming the user.
-• Don't ask more than one question in one message
 • Lists: Provide a maximum of three items in any list.
 
 When you want to mention a quote from the legendary persona, you must not say the name of the legendary persona. You should paraphrase the quote and say it like it's your own message!
@@ -544,40 +499,6 @@ Based on the above, coach and engage the user in a succinct and brief conversati
 
 ** IMPORTANT **: Although asking the user for their feedback and views is good, ensure not to pose too many questions to the user. Maintain a healthy coaching conversation flow."""
 
-FUNFACT_STATE = f"""
-## ** Giving Value to The User ** (PLEASE READ CAREFULLY)
-Objective: Provide a personalized and uplifting message that resonates with the user's unique attributes, recent actions, and surroundings, to motivate them on their journey to achieve their goal. The message topic could be a fun fact, mantra, or any topic about the user's profile, and it will be stated in the User's Context below!
-
-User’s Context:
-• Goal: {{}}
-• 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): 
-{{}}
-• For today's message, use this user's information as the topic:  {{}}
- 
-The Order of Your Conversation Flow (Do these step-by-step instructions):
-Step 1. Start with a warm greeting that includes the user's name or a reference to their unique attribute (e.g., "Hi, Problem-Solver!").
-Step 2. Offer a fun fact or an encouraging motivational message that subtly incorporates a paraphrased quote from their chosen Legendary Persona, without mentioning the persona's name.
-Step 3. Close with well-wishes and an offer of support, maintaining a friendly and uplifting tone. Call the end_conversation() immediately!
-
-** Principles for Quality Interaction **  
-1. **Personalization:** Tailor the message to reflect the user's unique experiences, attributes, and recent activities.
-2. **Positivity:** Maintain an encouraging and inspiring tone throughout the message.
-3. **Subtle Incorporation of Wisdom:** Weave in insights from the Legendary Persona seamlessly and organically.
-4. **Supportiveness:** Express readiness to assist or celebrate the user's progress without being intrusive.
-
-Important Rules
-• Never explicitly tell the function that you are calling to the user (just do the function calling in the background)
-• Question Format: When you ask a question, encapsulate it with asterisks (e.g., What’s one thing you can commit to today?). Use only one question mark per message.
-• Avoid Over-Questioning: Keep questions creative, sparing, and avoid overwhelming the user.
-• Lists: Provide a maximum of three items in any list.
-• Be concise! Use Whatsapp texting length!
-
-When you want to mention a quote from the legendary persona, you must not say the name of the legendary persona. You should paraphrase the quote and say it like it's your own message!
-Bad Example: Hey <user name>! As <Legendary Persona> said, "<quote>"
-Good Example: Hey <user name>! <paraphrased quote>.
-"""
-
 REFLECTION_STATE = """
     <REFLECTION FLOW TEMPLATE>
     

app/main.py

@@ -8,7 +8,7 @@ import os
 import logging
 import json 
 import regex as re
-from datetime import datetime
+from datetime import datetime, timezone
 from app.user import User
 from typing import List, Optional, Callable
 from openai import OpenAI
@@ -254,10 +254,6 @@ class ChatItem(BaseModel):
     user_id: str
     message: str
 
-class ChangeAssistantItem(BaseModel):
-    user_id: str
-    assistant_id: str
-
 class ChangeDateItem(BaseModel):
     user_id: str
     date: str
@@ -270,7 +266,7 @@ class ErrorResponse(BaseModel):
     status: str = "error"
     code: int
     message: str
-    timestamp: datetime = datetime.now()
+    timestamp: datetime = datetime.now(timezone.utc)
 
 class BookingItem(BaseModel):
     booking_id: str
@@ -322,14 +318,12 @@ def do_micro(request: ChangeDateItem, day: int, api_key: str = Security(get_api_
 
 
 # endpoint to change user assistant using user.change_to_latest_assistant()
-@app.post("/change_assistant")
-def change_assistant(request: ChangeAssistantItem, api_key: str = Security(get_api_key)):
-    user_id = request.user_id
-    assistant_id = request.assistant_id
-    print_log("INFO", f"Changing assistant to {assistant_id}", extra={"user_id": user_id, "endpoint": "/change_assistant"})
-    logger.info(f"Changing assistant to {assistant_id}", extra={"user_id": user_id, "endpoint": "/change_assistant"})
+@app.get("/change_assistant")
+def change_assistant(user_id: str, api_key: str = Security(get_api_key)):
+    print_log("INFO", "Changing assistant", extra={"user_id": user_id, "endpoint": "/change_assistant"})
+    logger.info("Changing assistant", extra={"user_id": user_id, "endpoint": "/change_assistant"})
     user = get_user(user_id)
-    user.change_assistant(assistant_id)
+    assistant_id = user.change_to_latest_assistant()
     logger.info(f"Assistant changed to {assistant_id}", extra={"user_id": user_id, "endpoint": "/change_assistant"})
     return {"assistant_id": assistant_id}
     
@@ -359,7 +353,7 @@ def migrate_user(request: CreateUserItem, api_key: str = Security(get_api_key)):
     def download_file_from_s3(filename, bucket):
         user_id = filename.split('.')[0]
         function_name = download_file_from_s3.__name__
-        logger.info(f"Downloading file {filename} from [dev] S3 bucket {bucket}", extra={'user_id': user_id, 'endpoint': function_name})
+        logger.info(f"Downloading file {filename} from [staging] S3 bucket {bucket}", extra={'user_id': user_id, 'endpoint': function_name})
         file_path = os.path.join('users', 'data', filename)
         try:
             if (AWS_ACCESS_KEY and AWS_SECRET_KEY):
@@ -368,8 +362,8 @@ def migrate_user(request: CreateUserItem, api_key: str = Security(get_api_key)):
                 session = boto3.session.Session()
             s3_client = session.client('s3')
             with open(file_path, 'wb') as f:
-                ## Upload to dev Folder
-                s3_client.download_fileobj(bucket, f"dev/users/{filename}", f)
+                ## Upload to Staging Folder
+                s3_client.download_fileobj(bucket, f"staging/users/{filename}", f)
             logger.info(f"File {filename} downloaded successfully from S3", extra={'user_id': user_id, 'endpoint': function_name})
             return True
         except Exception as e:
@@ -435,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(show_hidden=True), "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(), "general_assistant": user.conversations.assistants['general'].id, "intro_assistant": user.conversations.assistants['intro'].id}
         
         if user.goal:
             api_response["goal"] = user.goal
@@ -664,7 +658,6 @@ def chat(request: ChatItem, api_key: str = Security(get_api_key)):
             if recent_run:
                 user.cancel_run(recent_run)
                 response = user.send_message(user.get_recent_message())
-    
         finally:
             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"})
@@ -950,9 +943,6 @@ def add_session_completion_point_by_user(user_id: str, api_key: str = Security(g
         user = get_user(user_id)
         user.add_point_for_completing_session()
         return {"response": "ok"}
-
-
-
     except Exception as e:
         print_log("ERROR",f"Error: {str(e)}", extra={"user_id": user_id, "endpoint": "/add_session_completion_point"}, exc_info=True)
         logger.error(f"Error: {str(e)}", extra={"user_id": user_id, "endpoint": "/add_session_completion_point"}, exc_info=True)

app/user.py

@@ -2,7 +2,7 @@ import json
 import io
 import os
 import pandas as pd
-from datetime import datetime
+from datetime import datetime, timezone
 import json
 from app.assistants import Assistant 
 import glob
@@ -11,9 +11,8 @@ import random
 import logging
 import psycopg2
 from psycopg2 import sql
-import random
 
-from app.flows import FINAL_SUMMARY_STATE, FINAL_SUMMARY_STATE, MICRO_ACTION_STATE, MOTIVATION_INSPIRATION_STATE, OPEN_DISCUSSION_STATE, POST_GG_STATE, PROGRESS_REFLECTION_STATE, PROGRESS_SUMMARY_STATE, EDUCATION_STATE, FOLLUP_ACTION_STATE, FUNFACT_STATE
+from app.flows import FINAL_SUMMARY_STATE, FINAL_SUMMARY_STATE, MICRO_ACTION_STATE, MOTIVATION_INSPIRATION_STATE, OPEN_DISCUSSION_STATE, POST_GG_STATE, PROGRESS_REFLECTION_STATE, PROGRESS_SUMMARY_STATE, EDUCATION_STATE, FOLLUP_ACTION_STATE
 from pydantic import BaseModel
 from datetime import datetime
 
@@ -43,7 +42,7 @@ class Index(BaseModel):
 logger = logging.getLogger(__name__)
 
 def get_current_datetime():
-    return datetime.now()
+    return datetime.now(timezone.utc)
 
 class ConversationManager:
     def __init__(self, client, user, asst_id, intro_done=False):
@@ -52,7 +51,7 @@ class ConversationManager:
         self.assistants = {'general': Assistant('asst_vnucWWELJlCWadfAARwyKkCW', self), 'intro': Assistant('asst_baczEK65KKvPWIUONSzdYH8j', self)}
 
         self.client = client
-        self.state = {'date': pd.Timestamp.now().strftime("%d-%m-%Y %a %H:%M:%S")}
+        self.state = {'date': pd.Timestamp.now(tz='UTC').strftime("%d-%m-%Y %a %H:%M:%S")}
 
         self.current_thread = self.create_thread()
         self.daily_thread = None
@@ -206,6 +205,10 @@ 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)
 
@@ -217,10 +220,6 @@ 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):
@@ -401,10 +400,18 @@ class User:
                     },
                     {
                     "day": 4,
-                    "coachingTheme": "FUNFACT_STATE"
+                    "coachingTheme": "MICRO_ACTION_STATE"
                     },
                     {
                     "day": 5,
+                    "coachingTheme": "FOLLUP_ACTION_STATE"
+                    },
+                    {
+                    "day": 6,
+                    "coachingTheme": "OPEN_DISCUSSION_STATE"
+                    },
+                    {
+                    "day": 7,
                     "coachingTheme": "FINAL_SUMMARY_STATE"
                     }
                 ]
@@ -417,12 +424,69 @@ class User:
         self.user_interaction_guidelines = self.generate_user_interaction_guidelines(user_info, client)
         self.conversations = ConversationManager(client, self, asst_id)
 
-    def add_recent_wins(self, wins):
+    def add_recent_wins(self, wins, context = None):
+        prompt = f"""
+        ## Role
+        You are an expert in writing achievement message and progress notification. Your task is to use the user's achievement and context to formulate a short and creative achievement message/progress notification. The output must be a one sentence short message (less than 15 words) in this JSON output schema:
+
+        ```json
+        {{
+        achievement_message: str
+        }}
+        ```
+
+        Note: No need to mention the user's name. Make it concise (less than 15 words)
+
+        ## Example 
+        User's achievement: Completing a Task
+        Achievement context: The user has completed a 10k run 
+
+        Output:
+        ```
+        {{
+        achievement_message: You crushed it! Completing that 10k run is a huge milestone—way to go!
+        }}
+        ```
+
+        ## User Input
+
+        User's achievement: {wins}
+        Achievement context: {context}
+        """
+            
+        response = self.client.chat.completions.create(
+            model="gpt-4o",
+            messages=[{"role": "user", "content": prompt}],
+            response_format = {
+                "type": "json_schema",
+                "json_schema": {
+                "name": "achievement_message_schema",
+                "strict": True,
+                "schema": {
+                    "type": "object",
+                    "properties": {
+                    "achievement_message": {
+                        "type": "string",
+                        "description": "A message indicating an achievement."
+                    }
+                    },
+                    "required": [
+                    "achievement_message"
+                    ],
+                    "additionalProperties": False
+                }
+                }
+            },
+            temperature=1
+        )
+
+        achievement_message = json.loads(response.choices[0].message.content)['achievement_message']
+
         if len(self.recent_wins)<5:
-            self.recent_wins.insert(0,wins)
+            self.recent_wins.insert(0,achievement_message)
         else:
             self.recent_wins.pop()
-            self.recent_wins.insert(0,wins)
+            self.recent_wins.insert(0,achievement_message)
 
     def add_life_score_point(self, variable, points_added, notes):
         if variable == 'Personal Growth':
@@ -461,13 +525,13 @@ class User:
             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")
+                current_goal.updated_at = pd.Timestamp.now(tz='UTC').strftime("%d-%m-%Y %a %H:%M:%S")
                 return current_goal.content
             
         for g in self.goal:
             if g.content == goal:
                 g.status = status
-                g.updated_at = pd.Timestamp.now().strftime("%d-%m-%Y %a %H:%M:%S")
+                g.updated_at = pd.Timestamp.now(tz='UTC').strftime("%d-%m-%Y %a %H:%M:%S")
                 if content:
                     g.content = content
                 return True
@@ -479,22 +543,22 @@ class User:
         if completed:
             self.update_goal(current_goal, "COMPLETED")
             self.add_life_score_point(variable = goal_area, points_added = 30, notes = "Completing a Goal")
-            self.add_recent_wins(wins = "You have completed your goal!")
+            self.add_recent_wins(wins = "You have completed your goal!", context = current_goal)
 
         if current_goal is None:
-            new_goal = UserDataItem(role="assistant", content=goal, area=goal_area, user_id=self.user_id, status="ONGOING", created_at=pd.Timestamp.now().strftime("%d-%m-%Y %a %H:%M:%S"), updated_at=pd.Timestamp.now().strftime("%d-%m-%Y %a %H:%M:%S"))
+            new_goal = UserDataItem(role="assistant", content=goal, area=goal_area, user_id=self.user_id, status="ONGOING", created_at=pd.Timestamp.now(tz='UTC').strftime("%d-%m-%Y %a %H:%M:%S"), updated_at=pd.Timestamp.now(tz='UTC').strftime("%d-%m-%Y %a %H:%M:%S"))
             self.goal.append(new_goal)
             self.add_life_score_point(variable = goal_area, points_added = 10, notes = "Setting a Goal")
-            self.add_recent_wins(wins = "You have set a new goal!")
+            self.add_recent_wins(wins = "You have set your first goal!", context = new_goal.content)
         else:
             if add:
                 if current_goal:
                     # update current_goal status to "IDLE"
                     self.update_goal(current_goal, "IDLE")
-                new_goal = UserDataItem(role="assistant", content=goal, area=goal_area, user_id=self.user_id, status="ONGOING", created_at=pd.Timestamp.now().strftime("%d-%m-%Y %a %H:%M:%S"), updated_at=pd.Timestamp.now().strftime("%d-%m-%Y %a %H:%M:%S"))
+                new_goal = UserDataItem(role="assistant", content=goal, area=goal_area, user_id=self.user_id, status="ONGOING", created_at=pd.Timestamp.now(tz='UTC').strftime("%d-%m-%Y %a %H:%M:%S"), updated_at=pd.Timestamp.now(tz='UTC').strftime("%d-%m-%Y %a %H:%M:%S"))
                 self.goal.append(new_goal)
                 self.add_life_score_point(variable = goal_area, points_added = 10, notes = "Setting a Goal")
-                self.add_recent_wins(wins = "You have set a new goal!")
+                self.add_recent_wins(wins = "You have set a new goal!", context = new_goal.content)
             else:
                 self.update_goal(current_goal, "ONGOING", content=goal)
 
@@ -502,7 +566,7 @@ class User:
         for ma in self.recommended_micro_actions:
             if ma.content == micro_action:
                 ma.status = status
-                ma.updated_at = pd.Timestamp.now().strftime("%d-%m-%Y %a %H:%M:%S")
+                ma.updated_at = pd.Timestamp.now(tz='UTC').strftime("%d-%m-%Y %a %H:%M:%S")
                 return True
         return False
     
@@ -527,6 +591,7 @@ class User:
         self.reminders = None
         self.recent_wins = []
 
+
     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 \
@@ -661,6 +726,28 @@ class User:
         return index
         
     def set_reminder(self, reminder):
+        db_params = {
+            'dbname': 'ourcoach',
+            'user': 'ourcoach',
+            'password': 'hvcTL3kN3pOG5KteT17T',
+            'host': 'staging-ourcoach.cx8se8o0iaiy.ap-southeast-1.rds.amazonaws.com',
+            'port': '5432'
+        }
+        with psycopg2.connect(**db_params) as conn:
+            with conn.cursor() as cursor:
+                query = sql.SQL("SELECT * FROM {table} WHERE id = %s").format(table=sql.Identifier('public', 'users'))
+                cursor.execute(query, (self.user_id,))
+                row = cursor.fetchone()
+                if (row):
+                    colnames = [desc[0] for desc in cursor.description]
+                    user_data = dict(zip(colnames, row))
+                    user_timezone = user_data['timezone']
+
+        # Convert to UTC
+        reminder['timestamp_local'] = reminder['timestamp']
+        reminder['local_timezone'] = user_timezone
+        reminder['timestamp'] = reminder['timestamp'].tz_localize(user_timezone).tz_convert("UTC")
+
         # generate uuid for this reminder
         reminder['id'] = generate_uuid()
         action = reminder['action']
@@ -684,6 +771,7 @@ class User:
             if index == -1:
                 logger.info(f"Could not find a mathcing reminder to delete: {reminder}", extra={"user_id": self.user_id, "endpoint": "set_reminder"})
             else:
+                old_reminder = self.reminders[index]
                 self.reminders[index]['action'] = 'delete'
                 logger.info(f"Reminder {old_reminder} has been marked for deletion", extra={"user_id": self.user_id, "endpoint": "set_reminder"})
         else:
@@ -724,15 +812,6 @@ class User:
                     user_data_clean = json.loads(user_data['onboarding'])
                     user_legendary_persona = user_data_clean.get('legendPersona', '')
 
-        if "Coach Steve" in user_legendary_persona:
-            persona_name = 'Steve Jobs'
-        elif "Coach Aris" in user_legendary_persona:
-            persona_name = 'Aristotle'
-        elif "Coach Teresa" in user_legendary_persona:
-            persona_name = 'Mother Teresa'
-        else:
-            persona_name = user_legendary_persona
-        
         if "Coach Steve" in user_legendary_persona or "Steve Jobs" in user_legendary_persona:
             knowledge = """
             1. Vision and Creativity: Encouraging students to think big and innovate.
@@ -820,45 +899,41 @@ class User:
             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:
+                    if theme != "FINAL_SUMMARY_STATE":
                         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), persona_name)
+            formatted_message = MOTIVATION_INSPIRATION_STATE.format(self.get_current_goal(), day, len(self.growth_plan.array), user_legendary_persona)
         elif theme == "PROGRESS_REFLECTION_STATE":
-            formatted_message = PROGRESS_REFLECTION_STATE.format(self.get_current_goal(), day, len(self.growth_plan.array), persona_name)
+            formatted_message = PROGRESS_REFLECTION_STATE.format(self.get_current_goal(), day, len(self.growth_plan.array), user_legendary_persona)
             if len(self.challenges):
                 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":
             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), persona_name, reminder_message)
+            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) **"
         elif theme == "OPEN_DISCUSSION_STATE":
-            formatted_message = OPEN_DISCUSSION_STATE.format(self.get_current_goal(), day, len(self.growth_plan.array), persona_name)
+            formatted_message = OPEN_DISCUSSION_STATE.format(self.get_current_goal(), day, len(self.growth_plan.array), user_legendary_persona)
             if len(self.other_focusses):
                 focus = self.other_focusses.pop(0)
                 formatted_message += f"\n\n** IMPORTANT: Today, focus the discussion on: {focus.content}, which they discussed during their growth guide session (let the user know we are bringing it up because of this) **"
         elif theme == "PROGRESS_SUMMARY_STATE":
-            formatted_message = PROGRESS_SUMMARY_STATE.format(self.get_current_goal(), day, len(self.growth_plan.array), persona_name)
+            formatted_message = PROGRESS_SUMMARY_STATE.format(self.get_current_goal(), day, len(self.growth_plan.array), user_legendary_persona)
         elif theme == "FINAL_SUMMARY_STATE":
-            formatted_message = FINAL_SUMMARY_STATE.format(self.get_current_goal(), day, len(self.growth_plan.array), persona_name)
+            formatted_message = FINAL_SUMMARY_STATE.format(self.get_current_goal(), day, len(self.growth_plan.array), user_legendary_persona)
         elif theme == "EDUCATION_STATE":
-            formatted_message = EDUCATION_STATE.format(self.get_current_goal(), day, len(self.growth_plan.array), persona_name)
+            formatted_message = EDUCATION_STATE.format(self.get_current_goal(), day, len(self.growth_plan.array), user_legendary_persona)
         elif theme == "FOLLUP_ACTION_STATE":
             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), persona_name, knowledge, reminder_message)
-        elif theme == "FUNFACT_STATE":
-            topics = ["Fun Fact about the User's Goal", "How Personality Type is affecting/shaping their behaviour towards the goal", "How Love Language may impact and be relevant toward the goal"]
-            randomized_topic = random.choice(topics)
-            formatted_message = FUNFACT_STATE.format(self.get_current_goal(), day, len(self.growth_plan.array), persona_name, knowledge, randomized_topic)
-            
+            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: 
         # - Remember all of the user's personal information. Use this information to be as personalised as possible when conversing by including it in your responses where relevant.
@@ -872,9 +947,6 @@ class User:
         # """
 
         prompt = f"""** It is a new day: {date} ({day}) 10:00:00 ** 
-
-        *Send a message that suits the morning time*
-        
         Additional System Instruction: 
 
         1. Focus on giving more wisdom than questions:
@@ -913,7 +985,7 @@ class User:
         if theme == "MICRO_ACTION_STATE":
             # check for any recommended microactions
             logger.info(f"Checking for recommended micro actions", extra={"user_id": self.user_id, "endpoint": "do_theme"})
-            micro_action = UserDataItem(role="assistant", area=self.get_current_goal(full=True).area, content=response['content'], user_id=self.user_id, status="PENDING", created_at=pd.Timestamp.now().strftime("%d-%m-%Y %a %H:%M:%S"), updated_at=pd.Timestamp.now().strftime("%d-%m-%Y %a %H:%M:%S"))
+            micro_action = UserDataItem(role="assistant", area=self.get_current_goal(full=True).area, content=response['content'], user_id=self.user_id, status="PENDING", created_at=pd.Timestamp.now(tz='UTC').strftime("%d-%m-%Y %a %H:%M:%S"), updated_at=pd.Timestamp.now(tz='UTC').strftime("%d-%m-%Y %a %H:%M:%S"))
             logger.info(f"Recommended Micro Action: {micro_action}", extra={"user_id": self.user_id, "endpoint": "do_theme"})
             self.micro_actions.append(micro_action)
 
@@ -933,16 +1005,16 @@ class User:
         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()))]
+            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(tz='UTC')))]
             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")
-            self.add_recent_wins(wins = "You have reached Day 7 of your growth journey!")
+            self.add_recent_wins(wins = "You have reached Day 7 of your growth journey!", context = 'Growth journey is a 14-day coaching plan')
         elif self.growth_plan.current()['day'] == 14:
             self.add_life_score_point(variable = self.get_current_goal(full=True).area, points_added = 10, notes = "Reaching Day 14")
-            self.add_recent_wins(wins = "You have finished your growth journey!")
+            self.add_recent_wins(wins = "You have finished your growth journey!", context = 'Growth journey is a 14-day coaching plan')
 
         logger.info(f"Today's action is {action}", extra={"user_id": self.user_id, "endpoint": "user_change_date"})
 
@@ -1053,7 +1125,7 @@ class User:
         )
 
         try:
-            current_time = datetime.now().strftime("%d-%m-%Y %a %H:%M:%S")
+            current_time = datetime.now(timezone.utc).strftime("%d-%m-%Y %a %H:%M:%S")
             
             response = self.client.beta.chat.completions.parse(
                 model="gpt-4o",
@@ -1093,10 +1165,12 @@ class User:
         The user has a current goal: {self.get_current_goal()}
         The user provided a new goal: {goal_text}
 
-        Determine if the new goal is the same as the current goal or if it's a new one.
-        If it's the same, respond with the current goal, and set same_or_not == True
-        If it's a new goal, respond with the new goal, and set same_or_not == False
-        
+        Determine if the new goal is inside the scope of the current goal or if it's outside the scope.         
+        If it's inside the scope, respond **exactly** with the current goal, and set same_or_not == True
+        If it's outside the scope and related, respond with a merged goal (from the current and new goal) with larger scope, and set same_or_not == False 
+        If it's outside the scope and not related, respond with the new goal, and set same_or_not == False
+        Note: You may paraphase the merged goal to be more succinct.
+
         Your response will be the final goal. You will also need to determine the area of this
         final goal by choosing one of these areas that suits the final goal:
         "Personal Growth", "Career Growth", "Relationship", "Mental Well-Being", "Health and Wellness"
@@ -1107,6 +1181,40 @@ class User:
          goal: str (the final goal),
          area: str (the area of the goal)
         }}
+
+        ## Example 1 (Inside the scope):
+        The user has a current goal: to spend at least 30 minutes exercising every day
+        The user provided a new goal: to do short exercise every day
+        Your verdict: inside the scope
+        Your output:
+        {{
+         same_or_not: True,
+         goal: "to spend at least 30 minutes exercising every day"
+         area: "Health and Wellness"
+        }}
+
+        ## Example 2 (Outside the scope, still related):
+        The user has a current goal: to spend at least 30 minutes exercising every day
+        The user provided a new goal: to exercise and have a balanced meal plan
+        Your verdict: outside the scope, still related
+        Your output:
+        {{
+         same_or_not: False,
+         goal: "to exercise at least 30 minutes every day, together with a balanced meal plan"
+         area: "Health and Wellness"
+        }}
+        
+        ## Example 3 (Outside the scope, not related):
+        The user has a current goal: to spend at least 30 minutes exercising every day
+        The user provided a new goal: to have a better relationship with friends
+        Your verdict: outside the scope, not related
+        Your output:
+        {{
+         same_or_not: False,
+         goal: "to have a better relationship with friends"
+         area: "Relationship"
+        }}
+
         """
             
         response = self.client.chat.completions.create(
@@ -1168,27 +1276,27 @@ class User:
     def update_micro_action_status(self, completed_micro_action):
         if completed_micro_action:
             self.micro_actions[-1].status = "COMPLETE"
-            self.micro_actions[-1].updated_at = pd.Timestamp.now().strftime("%d-%m-%Y %a %H:%M:%S")
+            self.micro_actions[-1].updated_at = pd.Timestamp.now(tz='UTC').strftime("%d-%m-%Y %a %H:%M:%S")
 
             num_of_micro_actions_completed = sum(1 for item in self.micro_actions if item.status == 'COMPLETE')
 
             if (num_of_micro_actions_completed in (1,3,5)) or (num_of_micro_actions_completed % 10 == 0 and num_of_micro_actions_completed != 0):
                 self.add_life_score_point(variable = self.get_current_goal(full=True).area, points_added = 10, notes = f"Completing the {num_of_micro_actions_completed}-th micro-action")
-                self.add_recent_wins(wins = "You have completed a micro action!")
+                self.add_recent_wins(wins = "You have completed a micro action!", context= self.micro_actions[-1]['content'])
 
     def trigger_deep_reflection_point(self, area_of_deep_reflection):
         if len(area_of_deep_reflection)>0:
             for area in area_of_deep_reflection:
                 self.add_life_score_point(variable = area, points_added = 5, notes = f"Doing a deep reflection about {area}")
-                self.add_recent_wins(wins = f"You have done a deep reflection about your {area}!")
+                self.add_recent_wins(wins = f"You have done a deep reflection about your {area}!", context = 'Deep reflection')
 
     def add_point_for_booking(self):
         self.add_life_score_point(variable = self.get_current_goal(full=True).area, points_added = 5, notes = "Booking a GG session")
-        self.add_recent_wins(wins = "You have booked a Growth Guide session!")
+        self.add_recent_wins(wins = "You have booked a Growth Guide session!", context = "Growth Guide is a life coach")
     
     def add_point_for_completing_session(self):
         self.add_life_score_point(variable = self.get_current_goal(full=True).area, points_added = 20, notes = "Completing a GG session")
-        self.add_recent_wins(wins = "You have completed a Growth Guide session!")
+        self.add_recent_wins(wins = "You have completed a Growth Guide session!", context = "Growth Guide is a life coach")
         
     def build_ourcoach_report(self, overview, action_plan, gg_session_notes):
         logger.info(f"Building ourcoach report", extra={"user_id": self.user_id, "endpoint": "build_ourcoach_report"})

app/utils.py

@@ -15,7 +15,7 @@ import psycopg2
 from psycopg2 import sql
 import os
 from dotenv import load_dotenv
-import datetime
+from datetime import datetime, timezone
 import threading
 import pickle  # Replace dill with pickle
 from cachetools import TTLCache
@@ -419,19 +419,21 @@ def get_user_summary(user_id):
 
     **Objective**: Guide the user on what to discuss with the Growth Guide, providing actionable advice and highlighting key areas to focus on during their session, covering the five key areas.
 
+    **ALWAYS** be succinct, valuable and personalized!
+
     **Format**:
 
     Structure the brief with the following sections, and output it as a JSON object with these keys:
 
-    - **reflect**: Encourage the user to consider what each focus area means to them and which aspects they want to improve.
+    - **reflect**: Give a succinct, valuable and personalized advice to the user to consider what each focus area means to them and which aspects they want to improve.
 
-    - **recall_successes**: Prompt the user to think of times when they effectively managed or improved in the five key areas, and what strategies worked for them then.
+    - **recall_successes**: Give a succinct, valuable and personalized prompt to the user to think of times when they effectively managed or improved in the five key areas, and what strategies worked for them then.
 
-    - **identify_challenges**: Encourage the user to be ready to discuss any obstacles they're facing in each area, and to consider possible solutions or resources that might help.
+    - **identify_challenges**: Give a succinct, valuable and personalized advice to the user to be ready to discuss any obstacles they're facing in each area, and to consider possible solutions or resources that might help.
 
     - **set_goals**: Ask the user to decide what they hope to achieve from the session and how improvements in each area will impact their life.
 
-    - **additional_tips**: Provide practical advice for the session, such as choosing a quiet space, having materials ready, and being open to sharing thoughts honestly.
+    - **additional_tips**: Give a succinct, valuable and personalized practical advice for the session, such as choosing a quiet space, having materials ready, and being open to sharing thoughts honestly.
 
     ---
 
@@ -534,23 +536,23 @@ def get_user_summary(user_id):
     "users_growth_guide_preparation_brief": [
     {
         "key": "reflect",
-        "value": "Consider what mental well-being means to you. Which aspects of your life—such as stress management, anxiety reduction, or emotional balance—do you want to improve?"
+        "value": "⁠Reflect on what career growth means to you and the goals you’re striving for."
     },
     {
         "key": "recall_successes",
-        "value": "Think of times when you effectively managed stress or maintained a positive mindset. What strategies or habits helped you during those times?"
+        "value": "⁠Recall moments when you successfully navigated challenges in your career or relationships—what worked"
     },
     {
         "key": "identify_challenges",
-        "value": "Be ready to discuss current obstacles you're facing in managing stress and anxiety. Consider any patterns or triggers you've noticed."
+        "value": "⁠Think about any current obstacles and possible ways to overcome them"
     },
     {
         "key": "set_goals",
-        "value": "Decide what you hope to achieve from this session. How would improving your mental well-being impact your daily life and long-term goals?"
+        "value": "⁠Define what you want to achieve from this session and how those changes could impact your life."
     },
     {
         "key": "additional_tips",
-        "value": "Environment: Choose a quiet, comfortable space.\nMaterials: Have a notebook and pen ready to jot down insights.\nOpenness: Be prepared to share your thoughts honestly and openly."
+        "value": "⁠Prepare by choosing a quiet space, having a notebook ready, and being open to sharing honestly."
     }
     ],
     "30_minute_coaching_session_script": {
@@ -983,7 +985,7 @@ def get_user_life_status(user_id):
         "relationship": user.relationship_score
     }
     # Get current goal
-    current_goal = user.goal if not user.goal else user.goal[-1].content
+    current_goal = '' if not user.goal else user.goal[-1].content
     # Get life score achievements in list
     recent_wins = user.recent_wins
     # Combine everything
@@ -1163,7 +1165,7 @@ def add_growth_guide_session(user_id, session_id, coach_id, session_started_at,
                     INSERT INTO {table} (booking_id, coach_id, session_started_at, user_id, updated_at, gg_report, ourcoach_summary, created_at, zoom_ai_summary)
                     VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s)
                 """).format(table=sql.Identifier('public', 'user_notes'))
-                current_time = datetime.datetime.now()
+                current_time = datetime.now(timezone.utc)
                 cursor.execute(query, (
                     session_id,
                     coach_id,
@@ -1224,7 +1226,7 @@ def download_file_from_s3(filename, bucket):
         s3_client = session.client('s3')
         with open(file_path, 'wb') as f:
             ## Upload to Production Folder
-            s3_client.download_fileobj(bucket, f"dev/users/{filename}", f)
+            s3_client.download_fileobj(bucket, f"staging/users/{filename}", f)
         logger.info(f"File {filename} downloaded successfully from S3", extra={'user_id': user_id, 'endpoint': function_name})
         return True
     except Exception as e:
@@ -1320,7 +1322,7 @@ def upload_mementos_to_db(user_id):
                             data.get('location', ''),
                             data.get('recurrence', ''),
                             data.get('context', ''),
-                            datetime.datetime.now(),
+                            datetime.now(timezone.utc),
                             pd.to_datetime(data.get('follow_up_on', ''))
                         ]
                         cursor.execute(base_query, memento_data)
@@ -1399,7 +1401,7 @@ def print_log(level, message, **kwargs):
     print_log("INFO", "User logged in", user_id=123, action="login")
     """
     log_entry = {
-        "timestamp": datetime.datetime.utcnow().isoformat() + "Z",
+        "timestamp": datetime.utcnow().isoformat() + "Z",
         "level": level,
         "message": message,
     }