Fixed post gg integration

app/gg_report.json

@@ -0,0 +1,26 @@
+[
+  {
+    "question": 1,
+    "answer": "Farant's action plan includes practicing presentations regularly, both alone and with a small group of friends, implementing and refining breathing techniques to manage his stuttering and reduce anxiety, incorporating stress management strategies such as mindfulness or relaxation exercises into his daily routine, and allocating specific times for preparation to avoid overthinking and excessive focus on details."
+  },
+  {
+    "question": 2,
+    "answer": "Yes, Farant is still facing the same challenges with stuttering during presentations and anxiety before speaking engagements, although he reports some improvement in his comfort level and a gradual decrease in anxiety."
+  },
+  {
+    "question": 3,
+    "answer": "Yes, Farant is facing a new challenge related to balancing his preparation for presentations. He tends to spend excessive time on details, which contributes to his stress levels, and is working on finding the right balance between thorough preparation and avoiding overthinking."
+  },
+  {
+    "question": 4,
+    "answer": "Yes, in addition to improving his communication skills, Farant is focusing on his mental well-being by managing stress, recognizing that this is crucial for both his personal health and achieving his communication objectives."
+  },
+  {
+    "question": 5,
+    "answer": "Based on today's session, Farant would like to continue pursuing his current goal of improving communication skills while also incorporating strategies to manage his stress, believing that addressing both areas simultaneously will lead to more effective and sustainable progress."
+  },
+  {
+    "question": 6,
+    "answer": ""
+  }
+]

app/main.py

@@ -366,7 +366,7 @@ def add_ai_message(request: ChatItem, api_key: str = Security(get_api_key)):
             detail=str(e)
         )  
 
-app.post("/process_gg_session")
+@app.post("/process_gg_session")
 def process_gg_session(request: GGItem, api_key: str = Security(get_api_key)):
     session_id = request.gg_session_id
     user_id = request.user_id
@@ -382,7 +382,7 @@ def process_gg_session(request: GGItem, api_key: str = Security(get_api_key)):
     # update user
     response = user.process_growth_guide_session(session_data)
     logger.info(f"GG session processed: {session_id}, response: {response}", extra={"user_id": user_id, "endpoint": "/process_gg_session"})
-
+    return {"response": response}
 
 @app.post("/batch_refresh_users")
 def refresh_multiple_users(user_ids: List[str], api_key: str = Security(get_api_key)):

app/user.py

@@ -11,6 +11,19 @@ import random
 import logging
 
 from app.flows import FINAL_SUMMARY_STATE, FINAL_SUMMARY_STATE, MICRO_ACTION_STATE, MOTIVATION_INSPIRATION_STATE, OPEN_DISCUSSION_STATE, PROGRESS_REFLECTION_STATE, PROGRESS_SUMMARY_STATE
+from pydantic import BaseModel
+from datetime import datetime
+
+class UserDataItem(BaseModel):
+        role: str 
+        content: str
+        user_id: str
+        status: str
+        created_at: str
+        updated_at: str
+
+class UserDataResponse(BaseModel):
+    data: list[UserDataItem]
 
 logger = logging.getLogger(__name__)
 
@@ -523,12 +536,8 @@ class User:
             temperature=0.2
         )
         return response.choices[0].message.content
-        
-    def _update_user_data(self, data_type, text_input, extra_text=""):
-        # data_type is a string indicating the type of data to update ('micro_actions', 'challenges', 'other_focusses')
-        # text_input is the text to process
-        # extra_text is any additional text to include in the prompt
 
+    def _update_user_data(self, data_type, text_input, extra_text=""):
         data_mapping = {
             'micro_actions': {
                 'prompt_description': 'micro actions',
@@ -537,7 +546,7 @@ class User:
                 'endpoint': f'update_{data_type}',
             },
             'challenges': {
-                'prompt_description': 'challenges',
+                'prompt_description': 'challenges', 
                 'status': 'ONGOING',
                 'attribute': 'challenges',
                 'endpoint': f'update_{data_type}',
@@ -545,7 +554,7 @@ class User:
             'other_focusses': {
                 'prompt_description': 'other focuses',
                 'status': 'ONGOING',
-                'attribute': 'other_focusses',
+                'attribute': 'other_focusses', 
                 'endpoint': f'update_{data_type}',
             },
         }
@@ -557,30 +566,41 @@ class User:
         mapping = data_mapping[data_type]
 
         prompt = (
-            f"Extract {mapping['prompt_description']} from the following text and format them into a JSON array. "
-            f"If there are no {mapping['prompt_description']}, return an empty array. "
-            f"Each item should include 'role' as 'assistant', 'content' as the extracted {mapping['prompt_description'][:-1]}, "
-            f"'user_id' as '{self.user_id}', 'status' as '{mapping['status']}', and 'created_at' and 'updated_at' as the current datetime "
-            "formatted as '%d-%m-%Y %a %H:%M:%S'. Only output the JSON array.\n\n"
+            f"Extract {mapping['prompt_description']} from the following text and return them in a structured format. "
+            f"If there are no {mapping['prompt_description']}, return an empty array for that field. "
+            f"Each item should include the extracted {mapping['prompt_description'][:-1]} as content.\n\n"
             f"{extra_text}"
             f"Text:\n{text_input}"
         )
 
-        response = self.client.chat.completions.create(
-            model="gpt-4o",
-            messages=[{"role": "user", "content": prompt}],
-            temperature=0.2
-        )
-
         try:
-            data = json.loads(response.choices[0].message.content)
+            current_time = datetime.now().strftime("%d-%m-%Y %a %H:%M:%S")
+            
+            response = self.client.beta.chat.completions.parse(
+                model="gpt-4o",
+                messages=[{"role": "user", "content": prompt}],
+                response_format=UserDataResponse,
+                temperature=0.2
+            )
+
+            data = getattr(response.choices[0].message.parsed, 'data')
+            
+            # Update the common fields for each item
+            for item in data:
+                item.role = "assistant"
+                item.user_id = self.user_id
+                item.status = mapping['status']
+                item.created_at = current_time
+                item.updated_at = current_time
+
             logger.info(f"Updated {data_type}: {data}", extra={"user_id": self.user_id, "endpoint": mapping['endpoint']})
-            getattr(self, mapping['attribute']).extend(data.get(data_type, []))
+            getattr(self, mapping['attribute']).extend(data)
+            
         except Exception as e:
             logger.error(f"Failed to update {data_type}: {e}", extra={"user_id": self.user_id})
 
     def update_user_data(self, gg_report):
-        self._update_user_data('micro_actions', gg_report[0]['answer'])
+        self.micro_actions = self._update_user_data('micro_actions', gg_report[0]['answer'])
 
         extra_text = f"User has new challenge:\n{gg_report[1]['answer']}\n\n"
         self._update_user_data('challenges', gg_report[2]['answer'], extra_text=extra_text)
@@ -729,12 +749,24 @@ Use bullet points or numbered lists where appropriate to enhance readability."""
         self.client = None
 
     def __str__(self):
-        return f"User(user_id={self.user_id}, user_info={self.user_info}, micro_actions={self.micro_actions}, done_first_reflection={self.done_first_reflection}, conversations={self.conversations})"
+        return f"""User(user_id={self.user_id}
+                micro_actions={self.micro_actions}
+                challenge={self.challenges}
+                other_focusses={self.other_focusses}
+                goals={self.goal}
+                done_first_reflection={self.done_first_reflection}
+                conversations={self.conversations})
+                user_info={self.user_info}"""
 
     def __repr__(self):
-        return (f"User(user_id={self.user_id}, user_info={self.user_info}, micro_actions={self.micro_actions}, "
-                f"done_first_reflection={self.done_first_reflection}, "
-                f"conversations={self.conversations})")
+        return f"""User(user_id={self.user_id}
+                micro_actions={self.micro_actions}
+                challenge={self.challenges}
+                other_focusses={self.other_focusses}
+                goals={self.goal}
+                done_first_reflection={self.done_first_reflection}
+                conversations={self.conversations})
+                user_info={self.user_info}"""
 
     def refresh(self, client):
         # copy user by creating new user object

app/utils.py

@@ -941,15 +941,15 @@ def get_user_info(user_id):
         logger.error(f"Database error while retrieving user info for {user_id}: {e}", extra={'user_id': user_id, 'endpoint': function_name})
         return None
 
-def add_growth_guide_session(user_id, session_id, zoom_ai_summary, gg_report):
+def add_growth_guide_session(user_id, session_id, coach_id, session_started_at, zoom_ai_summary, gg_report, ourcoach_summary):
     function_name = add_growth_guide_session.__name__
     logger.info(f"Adding growth guide session for user {user_id} and session {session_id}", extra={'user_id': user_id, 'endpoint': function_name})
 
     db_params = {
         'dbname': 'ourcoach',
         'user': 'ourcoach',
-        'password': 'hvcTL3kN3pOG5KteT17T',
-        'host': 'staging-ourcoach.cx8se8o0iaiy.ap-southeast-1.rds.amazonaws.com',
+        'password': 'tfPMEnYFWKGSQqZWVhQo',
+        'host': 'production-ourcoach.cx8se8o0iaiy.ap-southeast-1.rds.amazonaws.com',
         'port': '5432'
     }
 
@@ -957,19 +957,20 @@ def add_growth_guide_session(user_id, session_id, zoom_ai_summary, gg_report):
         with psycopg2.connect(**db_params) as conn:
             with conn.cursor() as cursor:
                 query = sql.SQL("""
-                    INSERT INTO {table} (user_id, session_id, zoom_ai_summary, gg_report, created_at, updated_at)
-                    VALUES (%s, %s, %s, %s, %s, %s)
-                    ON CONFLICT (user_id, session_id)
-                    DO UPDATE SET zoom_ai_summary = EXCLUDED.zoom_ai_summary, gg_report = EXCLUDED.gg_report, updated_at = EXCLUDED.updated_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()
                 cursor.execute(query, (
-                    user_id,
                     session_id,
-                    json.dumps(zoom_ai_summary),
+                    coach_id,
+                    session_started_at,
+                    user_id,
+                    current_time,
                     json.dumps(gg_report),
+                    json.dumps(ourcoach_summary),
                     current_time,
-                    current_time
+                    json.dumps(zoom_ai_summary)
                 ))
                 conn.commit()
                 logger.info(f"Growth guide session added successfully for user {user_id} and session {session_id}", extra={'user_id': user_id, 'endpoint': function_name})
@@ -984,14 +985,14 @@ def get_growth_guide_session(user_id, session_id):
     db_params = {
         'dbname': 'ourcoach',
         'user': 'ourcoach',
-        'password': 'hvcTL3kN3pOG5KteT17T',
-        'host': 'staging-ourcoach.cx8se8o0iaiy.ap-southeast-1.rds.amazonaws.com',
+        'password': 'tfPMEnYFWKGSQqZWVhQo',
+        'host': 'production-ourcoach.cx8se8o0iaiy.ap-southeast-1.rds.amazonaws.com',
         'port': '5432'
     }
     try:
         with psycopg2.connect(**db_params) as conn:
             with conn.cursor() as cursor:
-                query = sql.SQL("SELECT * FROM {table} WHERE user_id = %s AND session_id = %s").format(table=sql.Identifier('public', 'user_notes'))
+                query = sql.SQL("SELECT * FROM {table} WHERE user_id = %s AND booking_id = %s").format(table=sql.Identifier('public', 'user_notes'))
                 cursor.execute(query, (user_id, session_id))
                 row = cursor.fetchone()
                 if (row):

app/zoom_summary.txt

@@ -1,71 +1,32 @@
-Quick recap
-
-
-
-
-Andrea and Yew discussed Yew's work, health, and personal life, and also discussed the challenges in each area. They also explored Yew's motivation, priorities, and personal growth goals, including becoming a founder, being more consistent in health habits, and improving relationships. The conversation ended with a discussion on the potential effects of focusing on OurCoach on various aspects of his life, how he may be able to push forward with his goals, and the need for Yew Wai to find a balance between his career, health, and relationships.
-
-
-
-
-Next steps
-
-
-
-
-• Yew Wai to run user testing with Growth Guide sessions for Our Coach in the next 1-2 weeks.
-• Yew Wai to launch the new chat and web dashboard for Our Coach this week.
-• Yew Wai to try scheduling some exercise time, even if just a 10-minute walk.
-
-• Yew Wai to be more organised in day-to-day tasks, and to continue meeting up with the team.
-
-
-
-
+Quick Recap
 
+Farant and the Growth Guide discussed Farant's ongoing efforts to improve his communication skills, specifically addressing his stuttering and anxiety during presentations. They explored his current action plan, the challenges he's facing, and introduced the importance of focusing on his mental well-being to support his primary goal. The conversation also touched on balancing preparation for presentations and managing stress effectively.
 
+Next Steps
 
+Farant to continue practicing presentations regularly, both alone and with a small group of friends over the next 1-2 weeks.
+Implement and refine breathing techniques to manage stuttering and reduce anxiety before speaking.
+Incorporate stress management strategies, such as mindfulness or relaxation exercises, into his daily routine.
+Allocate specific times for preparation to avoid overthinking and excessive focus on details.
+Schedule a follow-up session with the Growth Guide to assess progress and adjust the action plan as needed.
 Summary
 
+Progress on Communication Skills
 
+In the meeting, Farant shared his dedication to improving his communication skills. He has been practicing his presentations more consistently, both individually and in front of friends, and has started using breathing techniques to help manage his stuttering. These efforts have led to a gradual decrease in his anxiety levels before speaking.
 
+Addressing Stuttering and Anxiety
 
-Work and Personal Life Balance
-In the meeting, Andrea and Yew Wai discussed Yew Wai's work and personal life. Yew Wai expressed that his life is not always balanced due to the demands of work, particularly the development of their coaching platform. Yew Wai also mentioned upcoming holiday plans to Phuket with his partner and her family. He looks forward to the completion of the coaching platform and the subsequent return to a more regular routine.
-
-
-
-
-Addressing Yew's Personal Habits Challenges
-Andrea and Yew Wai discussed Yew Wai's current challenges, primarily related to discipline in personal habits such as sleep, eating, and exercise. Yew Wai admitted to irregular sleep patterns, inconsistent eating times, and infrequent exercise, which he felt negatively impacted his mood and energy levels. He also revealed a reliance on coffee to compensate for his irregular habits. Yew Wai also shared that he and his fiancé, who lives in Jakarta, often face long-distance challenges.
-
-
-
-
-Yew's Motivation and Priorities Discussed
-In the meeting, Andrea and Yew Wai discussed his motivation and priorities. Yew Wai shared that seeing OurCoach come to fruition, and having a career growth are what keeps them going. He also expressed a desire to make a positive impact with the launch of their product as he hopes that the users will have a new-age experience. Yew Wai's priorities were identified as career, health, and relationships. He mentioned that career is currently in the forefront of his mind, and emphasised the importance of building this product and making it valuable to users.
-
-
-
-
-Yew's Exercise Routine and Marathon Goal
-Yew discussed his exercise routine, stating that he tries to exercise at least once or twice a week, usually involving a run, gym session, and tennis sessions. He mentioned that he used to be more into long-distance running but now does it less frequently, opting for tennis more often. Yew also shared his goal of running a 42 km marathon by the age of 42, which is still on his mind despite it being far away. 
-
-
-
-
-Personal Growth and Career Goals
-Yew Wai discussed his personal growth goals for the year, including becoming a founder and improving his relationships. He mentioned the possibility of helping his Indonesian partner, Karina, move to Malaysia by Q1 next year. Yew Wai's motivation for these goals is personal growth and not wanting to feel stale and stagnant. He sees these goals as interconnected, with self-discipline being a key factor in achieving them. He identified his career as the immediate priority.
-
-
-
+Farant continues to face challenges with stuttering during presentations, although he reports becoming more comfortable with it over time. His anxiety prior to speaking engagements is slowly diminishing, indicating positive progress. However, he still experiences nervousness, which he is actively working to mitigate through his current practices.
 
-Coach's Impact on Yew's Life Goals
-In the meeting, Yew and Andrea discussed the potential effects of focusing on their coach on various aspects of Yew Wai's life. Yew Wai suggested that putting a lot of focus on building OurCoach may negatively impact his health and relationships as he may not have as much time to invest in them. However, successfully building OurCoach could also positively increase his confidence because achieving this goal would be a significant accomplishment, as it would fulfill a long-held dream of building his own company. 
+New Challenges in Balancing Preparation
 
+Farant identified a new challenge related to balancing his preparation for presentations. He tends to spend excessive time on details, which contributes to his stress levels. Finding the right balance between thorough preparation and avoiding overthinking is an area he aims to improve.
 
+Focus on Mental Well-Being
 
+Beyond his primary goal of enhancing communication skills, Farant expressed a desire to focus on his mental well-being. He recognizes that managing stress is crucial not only for his personal health but also for achieving his communication objectives. Integrating stress management techniques into his routine is seen as complementary to his main goal.
 
-Yew's Progress and Development Plans
-In the meeting, Andrea and Yew Wai discussed his progress towards his goals, particularly focusing on building his OurCoach and being more hands-on. Yew expressed his desire to be more organized and meet with the team more often to push development faster. They also discussed the upcoming user testing and the growth guide. Andrea suggested that Yew Wai could benefit from finding a balance between his career, health, and relationships. They agreed to reconnect next week to reflect on his progress.
+Decision on Continuing Current Goals
 
+Based on the session, Farant has decided to continue pursuing his current goal of improving communication skills while also incorporating strategies to manage his stress. He believes that addressing both areas simultaneously will lead to more effective and sustainable progress in his presentations and overall well-being.