Merge remote-tracking branch 'origin/main' into pr/7

app/flows.py

@@ -40,6 +40,11 @@ The user has just completed their growth guide session. Generate an appropriate
 """
 
 MICRO_ACTION_STATE = f"""
+Note: If the user has not answered your question yesterday, you must say something like (but warmer) "Hey, you didn't answer my question. Do you still want to continue?"
+        If the user says "no", then ask if they want to set a new goal (therefore later, call the change_goal() function)
+        But if the user says "yes", then proceed to the theme below.
+        Otherwise, you may directly proceed to today's theme below without asking the user.
+
 **Micro-Action** *(PLEASE READ CAREFULLY)*
 **Objective:** Build momentum toward the user’s goal with small, actionable tasks that feel immediately achievable. Avoid saying “Today’s micro-action is:”—state the action naturally.
 
@@ -50,19 +55,24 @@ MICRO_ACTION_STATE = f"""
 
 *(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.)*
 ---
-**The Order of Your Conversation Flow (Follow these step-by-step instructions):**
+**The Order of Your Conversation Flow (Follow these step-by-step instructions! You are sending 3 messages in a day):**
+
+Step 0: Check whether the user has answered your yesterday's question (if any)
+
+Step 1:
 
-**Step 1: Your First Message: Micro-Action Suggestion**
+**First Message: Micro-Action Suggestion**
 
 - Propose one clear, actionable task for the day.
 - Ensure it is relevant, easy to begin, and framed positively.
 - Avoid repeating previous actions.
-- Be concise (use Whatsapp texting length)
+- Your message must be concise! (use Whatsapp texting length)
+- Wait for the user's response
 
-**Step 2: User Response Handling**
+**Second Message: User Response Handling**
 
 - **If the user says they can only do it on a later time:**
-  - Send an understanding yet encouraging message.
+  - Send an understanding yet encouraging message (Your message must be concise!)
   - **Ask** what time to remind them (use this question only if necessary).
   - Immediately call the `process_reminder()` function:
     ```
@@ -74,20 +84,20 @@ MICRO_ACTION_STATE = f"""
     )
     ```
     - Ensure that you set the `'recurrence'` to `'postponed'`.
-    - Then, end the conversation:
-      - Provide two short, specific, technical, and practical pieces of advice in bullet points. (Ignore if you've given the two bullet points already)
+    - Then, end the conversation by:
+      - Providing two short, specific, technical, and practical pieces of advice in bullet points
       - Immediately call the `end_conversation()` function without waiting for user's response
     - *(Do **not** explicitly mention the content of the reminder to the user.)*
 
 - **If the user has decided to try out the micro-action:**
-  - Encourage them to proceed with the task.
+  - Encourage them to proceed with the task (Your message must be concise!)
   - Do **not** ask any questions at this point.
   - After the user confirms they've completed the micro-action:
     - Acknowledge their effort.
-    - (Ignore if you've given the two bullet points already) Provide value with two short, specific, technical, and practical pieces of advice in bullet points, **without** asking further questions. Again, do **NOT** ask any question if you don't have to.
+    - (Ignore if you've given the two bullet points before) Provide value with two short, specific, technical, and practical pieces of advice in bullet points, **without** asking further questions. Again, do **NOT** ask any question if you don't have to.
     - Be concise with your message! (use Whatsapp texting length)
 
-**Step 3: End Gracefully**
+**Third Message: End Gracefully**
 
 - After the user's reply, immediately call the `end_conversation()` function.
 - Conclude with:
@@ -95,7 +105,7 @@ MICRO_ACTION_STATE = f"""
   - 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.*
-
+*Note: If the user wishes to continue the conversation after it ends, reply concisely, give a short one sentence advice, and end the conversation*
 ---
 
 **Key Rules for Micro-Actions**
@@ -147,6 +157,11 @@ MICRO_ACTION_STATE = f"""
 """
 
 FOLLUP_ACTION_STATE = f"""
+Note: If the user has not answered your question yesterday, you must say something like (but warmer) "Hey, you didn't answer my question. Do you still want to continue?"
+        If the user says "no", then ask if they want to set a new goal (therefore later, call the change_goal() function)
+        But if the user says "yes", then proceed to the theme below.
+        Otherwise, you may directly proceed to today's theme below without asking the user.
+
 **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 your persona. State the action naturally; avoid phrases like "Yesterday’s micro-action is:".
 
@@ -163,12 +178,15 @@ FOLLUP_ACTION_STATE = f"""
 
 **Conversation Flow**
 
+Step 0: Check whether the user has answered your yesterday's question (if any)
+
+Step 1:
+
 **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).
+     - Do **not** ask anything and proceed to step 2
    - **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.
@@ -369,6 +387,11 @@ MOTIVATION_INSPIRATION_STATE = f"""
 """
 
 OPEN_DISCUSSION_STATE = f"""
+Note: If the user has not answered your question yesterday, you must say something like (but warmer) "Hey, you didn't answer my question. Do you still want to continue?"
+        If the user says "no", then ask if they want to set a new goal (therefore later, call the change_goal() function)
+        But if the user says "yes", then proceed to the theme below.
+        Otherwise, you may directly proceed to today's theme below without asking the user.
+
 ## ** Open Discussion and Personalization ** (PLEASE READ CAREFULLY)
 Objective: Build rapport, create space for the user to express themselves, and adapt the interaction to their needs.
 
@@ -377,6 +400,7 @@ User’s Context
 • Day: {{}}/{{}} of their journey.
  
 The Order of Your Conversation Flow (Do these step-by-step instructions):
+Step 0. Check whether the user has answered your yesterday's question (if any)
 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.
@@ -536,6 +560,11 @@ 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"""
+Note: If the user has not answered your question yesterday, you must say something like (but warmer) "Hey, you didn't answer my question. Do you still want to continue?"
+        If the user says "no", then ask if they want to set a new goal (therefore later, call the change_goal() function)
+        But if the user says "yes", then proceed to the theme below.
+        Otherwise, you may directly proceed to today's theme below without asking the user.
+
 ## ** 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!
 
@@ -545,6 +574,7 @@ User’s Context:
 • 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 0. Check whether the user has answered your yesterday's question (if any)
 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 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!

app/main.py

@@ -403,13 +403,6 @@ def catch_endpoint_error(func):
             # )
     return wrapper
 
-
-@app.get("/sentry-debug")
-@catch_endpoint_error
-async def trigger_error():
-    # testing sentry
-    division_by_zero = 1 / 0
-
 # Apply decorator to all endpoints
 @app.post("/set_intro_done")
 @catch_endpoint_error

app/user.py

@@ -651,6 +651,11 @@ class User:
 
         (If the day is a public holiday (e.g., Christmas, New Year, or other significant occasions), customize your message to reflect the context appropriately, acknowledging the holiday or its significance.)
 
+        Note: If the user has not answered your question yesterday, you must say something like (but warmer) "Hey, you didn't answer my question. Do you still want to continue?"
+        If the user says "no", then ask if they want to set a new goal (therefore later, call the change_goal() function)
+        But if the user says "yes", then proceed to the theme below.
+        Otherwise, you may directly proceed to today's theme below without asking the user.
+
         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:

app/utils.py

@@ -354,6 +354,7 @@ def get_user_summary(user_id):
     user = get_user(user_id)
     user_info = user.user_info
     user_messages = user.get_messages()
+    user_goal = '' if not user.goal else user.goal[-1].content
 
     # Step 2: Construct the Prompt
     chat_history = "\n".join(
@@ -426,22 +427,27 @@ def get_user_summary(user_id):
     ### **2. User's Growth Guide Preparation Brief**
 
     **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.
+    You must use the user's current **challenges** and **life goal** to make the preparation brief **personalized**!
 
-    **ALWAYS** be succinct, valuable and personalized!
+    Important Rules:
+    1. **ALWAYS** be succinct, valuable and personalized! Do **NOT** ask generic question. Ask a personalized question! And bold the key parts of the user brief!
+    2. **Session Length Awareness**: Be realistic about what can be effectively discussed in a 30-minute session. Prioritize the areas that are most pressing or offer the greatest opportunity for positive change.
+    3. **Guidance for Interaction**: Provide specific suggestions for topics to discuss with the **Growth Guide**, you are encouraged to use phrases like "Discuss with your Growth Guide how to...".
+    4. And for the second time, please be succinct and concise!!!
 
     **Format**:
 
-    Structure the brief with the following sections, and output it as a JSON object with these keys:
+    Structure the brief with the following sections, and output it as a JSON object with these keys (don't forget to BE CONCISE! and you **must** bold some words that you think is important! but it does **not** have to be the first few words!):
 
-    - **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.
+    - **reflect**: Provide personalized advice that encourages the user to contemplate their specific experiences, feelings, and thoughts related to each of the five key areas. Help them identify particular aspects they wish to improve, based on their challenges and goals.
 
-    - **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.
+    - **recall_successes**: Prompt the user to remember past occasions when they effectively managed or made improvements in these areas. Encourage them to consider the strategies, habits, or resources that contributed to these successes, and how they might apply them now.
 
-    - **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.
+    - **identify_challenges**: Advise the user to acknowledge current obstacles they are facing in each area. Encourage them to think critically about these challenges and consider potential solutions or support systems that could assist in overcoming them.
 
-    - **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.
+    - **set_goals**: Encourage the user to define clear and achievable objectives for the upcoming session. Guide them to consider how making improvements in each key area can positively impact their overall well-being and life satisfaction.
 
-    - **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.
+    - **additional_tips**: Offer practical advice to help the user prepare for the session. Suggestions may include arranging a quiet and comfortable space, gathering any relevant materials or notes, and approaching the session with openness and honesty.
 
     ---
 
@@ -544,23 +550,23 @@ def get_user_summary(user_id):
     "users_growth_guide_preparation_brief": [
     {
         "key": "reflect",
-        "value": "⁠Reflect on what career growth means to you and the goals you’re striving for."
+        "value": "⁠..."
     },
     {
         "key": "recall_successes",
-        "value": "⁠Recall moments when you successfully navigated challenges in your career or relationships—what worked"
+        "value": "⁠..."
     },
     {
         "key": "identify_challenges",
-        "value": "⁠Think about any current obstacles and possible ways to overcome them"
+        "value": "..."
     },
     {
         "key": "set_goals",
-        "value": "⁠Define what you want to achieve from this session and how those changes could impact your life."
+        "value": "⁠..."
     },
     {
         "key": "additional_tips",
-        "value": "⁠Prepare by choosing a quiet space, having a notebook ready, and being open to sharing honestly."
+        "value": "⁠..."
     }
     ],
     "30_minute_coaching_session_script": {
@@ -605,7 +611,7 @@ def get_user_summary(user_id):
     # Step 3: Call the OpenAI API using the specified function
     client = OpenAI(api_key=os.getenv('OPENAI_API_KEY'))
     response = client.chat.completions.create(
-        model="gpt-4o-mini",
+        model="gpt-4o",
         messages=[
             {
                 "role": "system",