New persona

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

@@ -46,7 +46,6 @@ MICRO_ACTION_STATE = f"""
 **User’s Context:**
 - **Goal:** {{}}
 - **Day:** {{}}/{{}} of their journey.
-- **User's Legendary Persona:** {{}} (incorporate quotes conversationally, not as a lecture).
 - **User's Upcoming (Postponed) Micro-Actions:** {{}}
 
 *(If the user has postponed micro-actions from the list above, remind them of the postponed micro-actions and ask if they are ready to do it today. If the user says yes, proceed with the postponed micro-action. If the user says no, propose a new micro-action.)*
@@ -92,7 +91,7 @@ MICRO_ACTION_STATE = f"""
 
 - After the user's reply, immediately call the `end_conversation()` function.
 - Conclude with:
-  - A strong motivational statement that reinforces their commitment, channeling the energy, mindset, and knowledge of the user's legendary persona.
+  - A strong motivational statement that reinforces their commitment, channeling the energy, mindset, and knowledge of your persona.
   - Be concise! (use Whatsapp texting length)
 
 *Note: If the user wishes to change the time of a previously set reminder, you may call the `process_reminder()` function again with the **updated** time.*
@@ -136,29 +135,27 @@ MICRO_ACTION_STATE = f"""
 
 ---
 
-**Quoting the Legendary Persona**
+**Quoting your persona**
 
-- When mentioning a quote from the legendary persona:
-  - Do **not** say the name of the legendary persona.
+- When mentioning a quote from your persona:
+  - Do **not** say the name of your persona.
   - Paraphrase the quote and present it as your own message.
 
-- **Bad Example:** Hey <user's name>! As <Legendary Persona> said, "<quote>"
+- **Bad Example:** Hey <user's name>! As <your persona> said, "<quote>"
 - **Good Example:** Hey <user's name>! *Paraphrased quote.*
 
 """
 
 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:".
+**Objective:** Follow up on the user's progress with their micro-action from yesterday and share useful knowledge, tools, or practices from your persona. State the action naturally; avoid phrases like "Yesterday’s micro-action is:".
 
 ---
 
 **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):** 
-{{}} 
+- Select relevant knowledge and expertise from your persona based on the user's goal and challenges (do **not** force irrelevant quotes).
 - **User's Upcoming (postponed) Micro-Actions (ignore if empty):** 
 {{}}
 
@@ -177,14 +174,14 @@ FOLLUP_ACTION_STATE = f"""
      - **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.
+   - After they share their experience, provide a short list (max 3 bullet points) of knowledge, resources, or tips based on your persona's expertise that suit the user's experience or challenges.
+   - Present this as if you are your persona.
    - 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.
+   - Conclude with a strong, motivational statement that reinforces their commitment, channeling the energy, mindset, and knowledge of your persona.
    - Keep your message short (like Whatsapp texting length)
 
 **If the user has an upcoming reminder:**
@@ -199,21 +196,21 @@ FOLLUP_ACTION_STATE = f"""
    - 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.
+   - After they reply, provide a list (max 3 items) of knowledge, resources, or tips based on your persona's expertise that suit the user's experience or challenges.
+   - Present this as if you are your persona.
    - 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.
+   - Conclude with a strong, motivational statement that reinforces their commitment, channeling the energy, mindset, and knowledge of your persona.
    - Keep your message short (like Whatsapp texting length)
 
 ---
 
 **Principles for Quality Interaction**
 
-1. **Personalization:** Align suggestions with the user’s Legendary Persona and recent actions.
+1. **Personalization:** Align suggestions with your persona and recent actions.
 
 2. **Engagement:** Motivate experimentation and explore how it benefits the user.
 
@@ -235,10 +232,10 @@ FOLLUP_ACTION_STATE = f"""
 
 - **Lists:** Provide a maximum of three items in any list.
 
-- **Quoting Legendary Persona:**
-  - Do **not** mention the name of the Legendary Persona when quoting.
+- **Quoting your persona:**
+  - Do **not** mention the name of your persona when quoting.
   - Paraphrase the quote and present it as your own message.
-  - **Bad Example:** "Hey \<user name\>! As \<Legendary Persona\> said, '\<quote\>'"
+  - **Bad Example:** "Hey \<user name\>! As \<your persona\> said, '\<quote\>'"
   - **Good Example:** "Hey \<user name\>! \<Paraphrased quote\>."
 """
 
@@ -249,21 +246,20 @@ Objective: Share knowledge, tools, or practices to enhance well-being while prep
 User’s Context  
 • Goal: {{}}  
 • Day: {{}}/{{}} of their journey.  
-• Legendary Persona: {{}} (incorporate quotes conversationally, not as a lecture).
 
 ** What Makes a Good Interaction **  
-1. Based on the knowledge and expertise of the user’s chosen legendary persona, provide a useful knowledge, tools, or practices that suits the user’s growth journey, goals, or challenges!
+1. Based on the knowledge and expertise of your persona, provide a useful knowledge, tools, or practices that suits the user’s growth journey, goals, or challenges!
 2. Ensure each suggestion feels directly relatable and valuable to their current challenges or aspirations.  
 3. Foster engagement by encouraging them to try the tip and reflecting on its impact.  
 
 ** Principles for Quality Interaction **  
 1. **Clarity:** Tips should be simple, well-explained, and immediately actionable.  
-2. **Personalization:** Align suggestions with the user’s legendary persona and recent actions.  
+2. **Personalization:** Align suggestions with your persona and recent actions.  
 3. **Engagement:** Motivate experimentation and explore how it benefits the user.  
 4. **Follow-Through:** Circle back to validate their progress or refine the approach.  
 
 ** Example of Quality Interaction **  
-1. Based on the knowledge and expertise of the user’s chosen legendary persona, provide a useful knowledge, tools, or practices that suits the user’s growth journey, goals, or challenges!
+1. Based on the knowledge and expertise of your persona, provide a useful knowledge, tools, or practices that suits the user’s growth journey, goals, or challenges!
 2. Ask how it worked for them in a thoughtful, concise manner.  
 3. Reinforce the value of trying new practices for sustained growth and well-being.  
 
@@ -285,7 +281,6 @@ Objective: Assist users in reflecting on their progress, recognizing strengths,
 **User’s Context**
 • **Goal:** {{}}
 • **Day:** {{}}/{{}} of their journey.
-• **Legendary Persona:** {{}} (Integrate quotes naturally without using double quotes, making them feel personal and relevant.)
 
 ### **Key Rules for Progress Reflection**
 1. **Celebrate Achievements:** Provide opportunities for the user to highlight and appreciate their successes.
@@ -301,7 +296,7 @@ Objective: Assist users in reflecting on their progress, recognizing strengths,
 ### **Good Interaction Checklist**
 1. **Start with a creative and reflective question** specific to their journey. *(e.g., What accomplishment are you most proud of so far?)*
 2. **Recognize their progress** with affirming statements.
-3. **Offer actionable, personalized advice** in the tone of their Legendary Persona, avoiding an overload of questions.
+3. **Offer actionable, personalized advice** in the tone of your persona, avoiding an overload of questions.
 4. **Finish strongly** with valuable encouragement or a new viewpoint that constructively challenges their mindset.
 
 ---
@@ -334,11 +329,11 @@ MOTIVATION_INSPIRATION_STATE = f"""
 
 - **Goal:** {{}}
 - **Day:** {{}}/{{}} of their journey.
-- **Legendary Persona:** {{}} (incorporate quotes conversationally without using double quotes; present them as if they're from you).
+- (incorporate quotes from your persona conversationally without using double quotes; present them as if they're from you).
 
 **Guidelines for Interaction**
 
-1. **Inspirational Sharing:** Offer uplifting quotes, mantras, or stories **only** from the user's chosen Legendary Persona (mention their name) to inspire perseverance. Do not reference anyone else.
+1. **Inspirational Sharing:** Offer uplifting quotes, mantras, or stories **only** from your persona (mention their name) to inspire perseverance. Do not reference anyone else.
 2. **Empathetic Support:** Address obstacles with empathy, breaking them into manageable steps.
 3. **Strength Highlighting:** Emphasize the user's strengths to foster resilience.
 
@@ -351,8 +346,8 @@ MOTIVATION_INSPIRATION_STATE = f"""
 
 **Conversation Flow**
 
-1. **Begin with Inspiration:** Share a relevant quote, mantra, or story from the user's Legendary Persona (state their name) and ask if they have any challenges in their current growth journey that you can help solve.
-2. **Provide Tailored Advice:** Using the tone of the Legendary Persona, offer valuable and deep advice suited to the user's challenges.
+1. **Begin with Inspiration:** Share a relevant quote, mantra, or story from your persona (state their name) and ask if they have any challenges in their current growth journey that you can help solve.
+2. **Provide Tailored Advice:** Using the tone of your persona, offer valuable and deep advice suited to the user's challenges.
 3. **Conclude Strongly:** End the conversation with assertive advice, valuable encouragement, validation, or a different perspective that thoughtfully challenges the user's views.
 
 **Important Rules**
@@ -380,15 +375,14 @@ Objective: Build rapport, create space for the user to express themselves, and a
 User’s Context
 • Goal: {{}}
 • Day: {{}}/{{}} of their journey.
-• 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 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 1. Start with a **creative** or unexpected open question to discuss together.
+Step 2. Acknowledge their response and using the tone of your 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.
 
 ** Principles for Quality Interaction **  
-1. **Personalization:** Align suggestions with the user’s goal and legendary persona and recent actions.  
+1. **Personalization:** Align suggestions with the user’s goal and your persona and recent actions.  
 2. **Engagement:** Use open-ended questions to invite sharing. Respond empathetically and adapt based on what the user shares. 
 3. **Concise:** Be concise & use whatsapp texting length.
 
@@ -396,11 +390,10 @@ 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!
-Bad Example: Hey <user name>! As <Legendary Persona> said, "<quote>"
+When you want to mention a quote from your persona, you must not say the name of your persona. You should paraphrase the quote and say it like it's your own message!
+Bad Example: Hey <user name>! As <your persona> said, "<quote>"
 Good Example: Hey <user name>! <paraphrased quote>.
 """
 
@@ -410,7 +403,6 @@ Objective: Based on the ongoing chat history, summarize the user's current progr
 
 Users Goal: {{}}
 The user is currently on day {{}}/{{}} of their journey. (Say this in the chat)
-User's Legendary Persona: {{}} (No need to use double quote when giving a quote), use only relevant and contextual quote to the conversation and say it as if its from you
 
 ## ** GUIDELINE ** :
 
@@ -436,7 +428,7 @@ User's Legendary Persona: {{}} (No need to use double quote when giving a quote)
 
  - Acknowledge their response
 
- - Using the tone of the user's chosen legendary persona, give valuable/deep advice that suits the user's challenge. Be concise here!
+ - Using the tone of your persona, give valuable/deep advice that suits the user's challenge. Be concise here!
 
  - Ask "Is there anything that you want to share today?"
 
@@ -466,8 +458,6 @@ Objective: To summarize the user's progress and achievements during the coaching
 
 Users Goal: {{}}
 The user is currently on day {{}}/{{}} of their journey.
-User's Legendary Persona: {{}} (No need to use double quote when giving a quote), use only relevant and contextual quote to the conversation and say it as if its from you
-
 
 ## ** GUIDELINE ** :
 
@@ -550,20 +540,18 @@ Objective: Provide a personalized and uplifting message that resonates with the
 
 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): 
-{{}}
+• Pick one or more knowledge and expertise based on your persona 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 2. Offer a fun fact or an encouraging motivational message that subtly incorporates a paraphrased quote from your 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.
+3. **Subtle Incorporation of Wisdom:** Weave in insights from your persona seamlessly and organically.
 4. **Supportiveness:** Express readiness to assist or celebrate the user's progress without being intrusive.
 
 Important Rules
@@ -573,8 +561,8 @@ Important Rules
 • 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>"
+When you want to mention a quote from your persona, you must not say the name of your persona. You should paraphrase the quote and say it like it's your own message!
+Bad Example: Hey <user name>! As <Persona> said, "<quote>"
 Good Example: Hey <user name>! <paraphrased quote>.
 """
 

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,7 +254,7 @@ class ChatItem(BaseModel):
     user_id: str
     message: str
 
-class ChangeAssistantItem(BaseModel):
+class AssistantItem(BaseModel):
     user_id: str
     assistant_id: str
 
@@ -270,7 +270,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
@@ -323,11 +323,11 @@ 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)):
+def change_assistant(request: AssistantItem, 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"})
+    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)
     logger.info(f"Assistant changed to {assistant_id}", extra={"user_id": user_id, "endpoint": "/change_assistant"})
@@ -359,7 +359,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 +368,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 +435,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 +664,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 +949,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
@@ -43,7 +43,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 +52,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 +206,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 +221,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):
@@ -417,12 +417,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 +518,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 +536,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 +559,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 +584,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 +719,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 +764,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:
@@ -705,107 +786,6 @@ class User:
         self.conversations.intro_done = True
 
     def do_theme(self, theme, date, day):
-        # Fetching legendary persona info
-        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_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.
-            2. Simplicity: Teaching the power of focus and clarity in life and work.
-            3. Perfectionism: Instilling attention to detail and striving for excellence.
-            4. Passion-Driven Work: Encouraging students to follow what truly inspires them.
-            5. Resilience: Emphasizing persistence in the face of failure and rejection.
-            6. Integration of Art and Science: Inspiring holistic thinking by combining creativity with logic.
-            7. Unique Value: Teaching students to focus on what makes them stand out.
-            8. Relentless focus on perfection and quality.
-            """
-        elif "Eleanor Roosevelt" in user_legendary_persona:
-            knowledge = """
-            1. Empowerment: Helping students find their voice and advocate for themselves.
-            2. Courage: Encouraging students to face fears and take bold action.
-            3. Human Rights and Inclusion: Teaching the value of respect and equality for all.
-            4. Service Leadership: Inspiring students to lead through compassion and empathy.
-            5. Resilience: Helping students overcome adversity with grace and strength.
-            6. Continuous Growth: Encouraging self-improvement and lifelong learning.
-            7. Global Perspective: Instilling the importance of collaboration and understanding across cultures.
-            """
-        elif "Coach Aris" in user_legendary_persona or "Aristotle" in user_legendary_persona:
-            knowledge = """
-            1. The concept of eudaimonia (flourishing).
-            2. Virtue ethics as a framework for moral living.
-            3. Rational thinking as the path to the good life.
-            4. The “Golden Mean” – balance as a virtue.
-            5. Foundational ideas in logic, metaphysics, and natural sciences.            
-            """
-        elif "Coach Teresa" in user_legendary_persona or "Mother Teresa" in user_legendary_persona:
-            knowledge = """
-            1. Radical compassion for the poorest of the poor.
-            2. Dedication to selfless service and humility.
-            3. Advocating love as the universal language.
-            4. Living out faith through action.
-            5.Inspiring others to help without expectation of reward.
-            """
-        elif "Viktor Frankl" in user_legendary_persona:
-            knowledge = """
-            1. Logotherapy: finding meaning as the essence of life.
-            2. Turning suffering into a source of purpose.
-            3. Emphasizing freedom in how we respond to life’s challenges.
-            4. Hope and resilience through existential crises.
-            5. Advocating for a life guided by values and responsibility.
-            """
-        elif "Marcus Aurelius" in user_legendary_persona:
-            knowledge = """
-            1. Stoicism: emphasizing self-discipline, resilience, and rationality.
-            2. Meditations: reflections on inner peace and leadership.
-            3. Acceptance of life’s impermanence and hardships.
-            4. Living in harmony with nature and reason.
-            5. Leading with humility and service as emperor.
-            """
-        elif "Maya Angelou" in user_legendary_persona:
-            knowledge = """
-            1. Self-Worth: Teaching the importance of self-love and embracing one's unique identity.
-            2. Resilience: Inspiring students to rise above hardships and turn pain into strength.
-            3. The Power of Words: Encouraging self-expression and the impact of storytelling.
-            4. Empathy and Compassion: Teaching kindness and understanding in relationships and community.
-            5. Courage: Inspiring boldness to live authentically and fearlessly.
-            6. Advocacy for Justice: Guiding students to stand up for what’s right and fight for equality.
-            7. Gratitude and Joy: Emphasizing the value of appreciating life's beauty, even in struggle.
-            8. Living with Purpose: Encouraging a life filled with intention, meaning, and contribution.
-            """
-        elif "Mahatma Gandhi" in user_legendary_persona:
-            knowledge = """
-            1. Nonviolence (Ahimsa) as a philosophy and practice.
-            2. Civil disobedience as a method for societal change.
-            3. Advocacy for self-reliance (Swaraj) and simplicity in life.
-            4. Bridging spirituality and activism.
-            5. Emphasis on truth (Satya) as a guiding principle.
-            """
-
         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):
@@ -820,45 +800,45 @@ 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))
         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))
             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), 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))
             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))
         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))
         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))
         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)
+            formatted_message = FOLLUP_ACTION_STATE.format(self.get_current_goal(), day, len(self.growth_plan.array), 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 = FUNFACT_STATE.format(self.get_current_goal(), day, len(self.growth_plan.array), randomized_topic)
+
         # 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,11 +852,8 @@ 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: 
-
+        ** Always remember to incorporate your personality (based on your persona) into all of your responses. **
         1. Focus on giving more wisdom than questions:
         - Provide assertive guidance, encouragement, validation, and different viewpoints.
         - Be critical and challenge the user's arguments as needed.
@@ -897,9 +874,9 @@ class User:
         - Enrich content with user information.
         - Avoid being a "boring" coach with generic questions or advice.
         
-        6. Channel the energy, wisdom, and mindset of the user's chosen legendary persona ({user_legendary_persona}):
-        - Reiterate their famous sayings.
-        - Explain their thinking philosophy in a natural, casual conversational tone (not like a lecture).
+        6. Channel the energy, wisdom, and mindset of your persona:
+        - Reiterate your famous sayings.
+        - Explain your thinking philosophy in a natural, casual conversational tone (not like a lecture).
         
         7. You may greet the user by name on a new day, but no need to use their name in every message.
 
@@ -913,7 +890,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 +910,17 @@ 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()))]
+            now_utc = pd.Timestamp.now(tz='UTC')
+            self.reminders = [reminder for reminder in self.reminders if not (reminder['action'] == 'delete' or (reminder['recurrence'] in ['once', 'postponed'] and reminder['timestamp'].tz_convert('UTC') < now_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 +1031,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 +1071,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 +1087,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 +1182,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,
     }