Add cumulative days & GG name to intro msg

app/assistants.py

@@ -617,7 +617,8 @@ class Assistant:
                 
                 # switch back to the intro assistant, so we set just_finish_intro to False again
                 just_finish_intro = False
-                
+                self.cm.user.reset_cumulative_plan_day()
+
                 # cancel current run
                 run = self.cancel_run(run, thread)
                 run = PseudoRun(status="cancelled", metadata={"message": "change_goal"})

app/flows.py

@@ -137,7 +137,7 @@ Step 1:
 - **One Micro-Action Only:** Suggest only one action per day.
 - **Minimal Questions:** Use questions only when absolutely necessary and limit to one question in total per day.
 - **Avoid Over-Questioning:** Keep questions minimal to prevent overwhelming the user.
-- **Lists:** Provide a maximum of three items in any list.
+- **Lists:** Provide a maximum of three items in any list. Use italic (single asterisk) instead of bold (double asterisk) in your list!
 
 ---
 
@@ -239,7 +239,7 @@ Step 1:
 
 - **Avoid Over-Questioning:** Keep questions creative and sparing; avoid overwhelming the user.
 
-- **Lists:** Provide a maximum of three items in any list.
+- **Lists:** Provide a maximum of three items in any list. Use italic (single asterisk) instead of bold (double asterisk) in your list!
 
 - **Quoting your persona:**
   - Do **not** mention the name of your persona when quoting.
@@ -279,7 +279,7 @@ User’s Context
 2. Ask no more than **three questions** per day. Limit to **one question per message** and encapsulate it with asterisks (*).  
 3. Avoid overwhelming the user; keep your suggestions conversational and focused.  
 4. Always guide the user with specific suggestions rather than seeking ideas from them.  
-5. Limit lists to a maximum of three items.  
+5. Limit lists to a maximum of three items. Use italic (single asterisk) instead of bold (double asterisk) in your list!
 6. Structure responses as if texting: short, friendly, and actionable.  
 """
 
@@ -318,7 +318,7 @@ Objective: Assist users in reflecting on their progress, recognizing strengths,
   - **Encapsulate questions with asterisks:** like this *question* (Replace "question" with the actual question.)
 
 - **Guided Coaching:** Provide suggestions assertively rather than asking for the user's ideas or plans. Remember, you are the coach!
-- **Lists:** When listing actions or insights, limit to no more than three items.
+- **Lists:** When listing actions or insights, limit to no more than three items. Use italic (single asterisk) instead of bold (double asterisk) in your list!
 
 ---
 
@@ -400,7 +400,7 @@ 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.
+• Lists: Provide a maximum of three items in any list. Use italic (single asterisk) instead of bold (double asterisk) in your list!
 
 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>"
@@ -573,7 +573,7 @@ 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.
+• Lists: Provide a maximum of three items in any list. Use italic (single asterisk) instead of bold (double asterisk) in your list!
 • Be concise! Use Whatsapp texting length!
 
 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!

app/main.py

@@ -512,6 +512,7 @@ async def migrate_user(
         if hasattr(old_user_object, "growth_plan"): setattr(user, "growth_plan", old_user_object.growth_plan)
         if hasattr(old_user_object, "user_interaction_guidelines"): setattr(user, "user_interaction_guidelines", old_user_object.user_interaction_guidelines)
         if hasattr(old_user_object, "score_history"): setattr(user, "score_history", old_user_object.score_history)
+        if hasattr(old_user_object, "cumulative_plan_day"): setattr(user, "cumulative_plan_day", old_user_object.cumulative_plan_day)
 
         api_response = {
             "user": user.user_info,
@@ -531,7 +532,8 @@ async def migrate_user(
             "recommended_gg_topics": user.recommended_gg_topics,
             "growth_plan": user.growth_plan,
             "user_interaction_guidelines": user.user_interaction_guidelines,
-            "score_history": user.score_history
+            "score_history": user.score_history,
+            "cumulative_plan_day": user.cumulative_plan_day
         }
 
         add_to_cache(user)

app/user.py

@@ -23,6 +23,7 @@ from app.utils import generate_uuid, get_booked_gg_sessions, get_growth_guide_su
 
 import dotenv
 import re
+import math
 dotenv.load_dotenv()
 
 OURCOACH_DASHBOARD_URL = os.getenv("OURCOACH_DASHBOARD_URL")
@@ -126,6 +127,7 @@ class User:
         self.conversations = ConversationManager(client, self, asst_id)
 
         self.score_history = []
+        self.cumulative_plan_day = 0
 
     @catch_error
     def extend_growth_plan(self):
@@ -195,6 +197,11 @@ class User:
         logger.info(f"Success.", extra={"user_id": self.user_id, "endpoint": "extend_growth_plan"})
         return True
     
+    @catch_error
+    def reset_cumulative_plan_day(self):
+        logger.info(f"Reseting cumulative_plan_day", extra={"user_id": self.user_id, "endpoint": "reset_cumulative_plan_day"})
+        self.cumulative_plan_day = 0
+
     @catch_error
     def add_recent_wins(self, wins, context = None):
         prompt = f"""
@@ -616,6 +623,10 @@ class User:
     def do_theme(self, theme, date, day, last_msg_is_answered = True):
         logger.info(f"Doing theme: {theme}", extra={"user_id": self.user_id, "endpoint": "do_theme"})
         
+        # Add 1 day to cumulative_plan_day
+        self.cumulative_plan_day += 1
+        final_day = (math.ceil((self.cumulative_plan_day+7)/14) * 14) - 7
+        
         if self.reminders is not None and len(self.reminders):
             logger.info(f"ALL Upcoming Reminders: {self.reminders}", extra={"user_id": self.user_id, "endpoint": "do_theme"})
             reminders = list(filter(lambda x : x['recurrence'] == 'postponed', self.reminders))
@@ -635,40 +646,40 @@ class User:
                 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))
+            formatted_message = MOTIVATION_INSPIRATION_STATE.format(self.get_current_goal(), self.cumulative_plan_day, final_day)
         elif theme == "PROGRESS_REFLECTION_STATE":
-            formatted_message = PROGRESS_REFLECTION_STATE.format(self.get_current_goal(), day, len(self.growth_plan.array))
+            formatted_message = PROGRESS_REFLECTION_STATE.format(self.get_current_goal(), self.cumulative_plan_day, final_day)
             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), reminder_message)
+            formatted_message = MICRO_ACTION_STATE.format(self.get_current_goal(), self.cumulative_plan_day, final_day, 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))
+            formatted_message = OPEN_DISCUSSION_STATE.format(self.get_current_goal(), self.cumulative_plan_day, final_day)
             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))
+            formatted_message = PROGRESS_SUMMARY_STATE.format(self.get_current_goal(), self.cumulative_plan_day, final_day)
         elif theme == "FINAL_SUMMARY_STATE":
             gg_summary = "<User has not had a Growth Guide session yet>"
             if self.last_gg_session:
                 gg_summary = get_growth_guide_summary(self.user_id, self.last_gg_session)
-            formatted_message = FINAL_SUMMARY_STATE.format(self.get_current_goal(), day, len(self.growth_plan.array), gg_summary)
+            formatted_message = FINAL_SUMMARY_STATE.format(self.get_current_goal(), self.cumulative_plan_day, final_day, gg_summary)
         elif theme == "EDUCATION_STATE":
-            formatted_message = EDUCATION_STATE.format(self.get_current_goal(), day, len(self.growth_plan.array))
+            formatted_message = EDUCATION_STATE.format(self.get_current_goal(), self.cumulative_plan_day, final_day)
         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), reminder_message)
+            formatted_message = FOLLUP_ACTION_STATE.format(self.get_current_goal(), self.cumulative_plan_day, final_day, 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), randomized_topic)
+            formatted_message = FUNFACT_STATE.format(self.get_current_goal(), self.cumulative_plan_day, final_day, randomized_topic)
 
         # prompt = f"""** It is a new day: {date} ** 
         # Additional System Instruction: 
@@ -709,6 +720,8 @@ class User:
         If the answer above is "False", you must immediately ask something like (but warmer) "Hey <user name>, I've noticed that you haven't answered my latest question. Do you still want to continue the growth plan?". 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 do the instruction below.
 
+        Today is day {self.cumulative_plan_day} of the user's growth journey (out of {final_day} days). You may (or may not) mention this occasionally in your first message of the day.
+        
         Today's Theme:
         {formatted_message}
         """

app/utils.py

@@ -1088,7 +1088,7 @@ def get_user_info(user_id):
     try:
         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'))
+                query = sql.SQL("SELECT left(onboarding,length(onboarding)-1)||',\"growth_guide_name\":\"'||coalesce(b.full_name,'')||'\"}}' onboarding FROM {table} a LEFT JOIN {coach_tbl} b ON a.assign_coach_id = b.id WHERE a.id = %s").format(table=sql.Identifier('public', 'users'), coach_tbl = sql.Identifier('public','coach'))
                 cursor.execute(query, (user_id,))
                 row = cursor.fetchone()
                 if (row):
@@ -1104,6 +1104,7 @@ def get_user_info(user_id):
                         ### USER PROFILE ###
                         
                         Name: {user_data_clean.get('firstName', '')}
+                        Growth Guide Name: {user_data_clean.get('growth_guide_name', '')}
                         {user_data_clean.get('firstName', '')}'s challenges (You **must** use this information for the PLANNING STATE):
                         {challenges}
                         Persona: