Merge branch 'vlad' of https://gitlab.com/tangibleai/community/mathtext-fastapi into vlad

mathtext_fastapi/conversation_manager.py

@@ -10,9 +10,13 @@ import requests
 from dotenv import load_dotenv
 from mathtext_fastapi.nlu import evaluate_message_with_nlu
 from mathtext_fastapi.math_quiz_fsm import MathQuizFSM
+from mathtext_fastapi.math_subtraction_fsm import MathSubtractionFSM
 from supabase import create_client
 from transitions import Machine
 
+from scripts.quiz.generators import start_interactive_math
+from scripts.quiz.hints import generate_hint
+
 load_dotenv()
 
 SUPA = create_client(
@@ -106,6 +110,90 @@ def pickle_and_encode_state_machine(state_machine):
     return dump_encoded
 
 
+def manage_math_quiz_fsm(user_message, contact_uuid, type):
+    fsm_check = SUPA.table('state_machines').select("*").eq(
+        "contact_uuid",
+        contact_uuid
+    ).execute()
+
+    if fsm_check.data == []:
+        if type == 'addition':
+            math_quiz_state_machine = MathQuizFSM()
+        else:
+            math_quiz_state_machine = MathSubtractionFSM()
+        messages = [math_quiz_state_machine.response_text]
+        dump_encoded = pickle_and_encode_state_machine(math_quiz_state_machine)
+
+        SUPA.table('state_machines').insert({
+            'contact_uuid': contact_uuid,
+            f'{type}': dump_encoded
+        }).execute()
+    else:
+        undump_encoded = base64.b64decode(
+            fsm_check.data[0][type].encode('utf-8')
+        )
+        math_quiz_state_machine = pickle.loads(undump_encoded)
+
+        math_quiz_state_machine.student_answer = user_message
+        math_quiz_state_machine.correct_answer = str(math_quiz_state_machine.correct_answer)
+        messages = math_quiz_state_machine.validate_answer()
+        dump_encoded = pickle_and_encode_state_machine(math_quiz_state_machine)          
+        SUPA.table('state_machines').update({
+            f'{type}': dump_encoded
+        }).eq(
+            "contact_uuid", contact_uuid
+        ).execute()
+    return messages
+
+
+def use_quiz_module_approach(user_message, context_data):
+    print("USER MESSAGE")
+    print(user_message)
+    print("=======================")
+    if user_message == 'add':
+        context_result = start_interactive_math()
+        message_package = {
+            'messages': [
+                "Great, let's do some addition",
+                "First, we'll start with single digits.",
+                "Type your response as a number.  For example, for '1 + 1', you'd write 2."
+            ],
+            'input_prompt': context_result['text'],
+            'state': "addition-question-sequence"
+        }
+
+    elif user_message == context_data.get('right_answer'):
+        context_result = start_interactive_math(
+            context_data['number_correct'],
+            context_data['number_incorrect'],
+            context_data['level']
+        )
+        message_package = {
+            'messages': [
+                "That's right, great!",
+            ],
+            'input_prompt': context_result['text'],
+            'state': "addition-question-sequence"
+        }
+    else:
+        context_result = generate_hint(
+            context_data['question_numbers'],
+            context_data['right_answer'],
+            context_data['number_correct'],
+            context_data['number_incorrect'],
+            context_data['level'],
+            context_data['hints_used']
+        )
+        message_package = {
+            'messages': [
+                context_result['text'],
+            ],
+            'input_prompt': context_data['text'],
+            'state': "addition-question-sequence"
+        }
+    return message_package, context_result
+
+
 def return_next_conversational_state(context_data, user_message, contact_uuid):
     """ Evaluates the conversation's current state to determine the next state
 
@@ -126,45 +214,36 @@ def return_next_conversational_state(context_data, user_message, contact_uuid):
     elif context_data['state'] == 'addition-question-sequence' or \
         user_message == 'add':
 
-        fsm_check = SUPA.table('state_machines').select("*").eq(
-            "contact_uuid",
-            contact_uuid
-        ).execute()
+        # Used in FSM
+        # messages = manage_math_quiz_fsm(user_message, contact_uuid)
 
-        if fsm_check.data == []:
-            math_quiz_state_machine = MathQuizFSM()
-            messages = [math_quiz_state_machine.response_text]
-            dump_encoded = pickle_and_encode_state_machine(math_quiz_state_machine)
+        message_package, context_result = use_quiz_module_approach(user_message, context_data)
 
-            SUPA.table('state_machines').insert({
-                'contact_uuid': contact_uuid,
-                'addition3': dump_encoded
-            }).execute()
+        if user_message == 'exit':
+            state_label = 'exit'
         else:
-            undump_encoded = base64.b64decode(
-                fsm_check.data[0]['addition3'].encode('utf-8')
-            )
-            math_quiz_state_machine = pickle.loads(undump_encoded)
-
-            print("student answer")
-            print(math_quiz_state_machine.student_answer)
-            print("user_message")
-            print(user_message)
-
-            math_quiz_state_machine.student_answer = user_message
-            math_quiz_state_machine.correct_answer = str(math_quiz_state_machine.correct_answer)
-            messages = math_quiz_state_machine.validate_answer()
-            dump_encoded = pickle_and_encode_state_machine(math_quiz_state_machine)          
-            SUPA.table('state_machines').update({
-                'addition3': dump_encoded
-            }).eq(
-                "contact_uuid", contact_uuid
-            ).execute()
+            state_label = 'addition-question-sequence'
+        # Used in FSM
+        # input_prompt = messages.pop()
+        # message_package = {
+        #     'messages': messages,
+        #     'input_prompt': input_prompt,
+        #     'state': state_label
+        # }
+
+        print("MESSAGE PACKAGE")
+        print(message_package)
+        context_data = context_result
+        message_package['state'] = state_label
+
+    elif context_data['state'] == 'subtraction-question-sequence' or \
+        user_message == 'subtract':
+        messages = manage_math_quiz_fsm(user_message, contact_uuid, 'subtraction')
 
         if user_message == 'exit':
             state_label = 'exit'
         else:
-            state_label = 'addition-question-sequence'
+            state_label = 'subtraction-question-sequence'
 
         input_prompt = messages.pop()
 
@@ -173,15 +252,15 @@ def return_next_conversational_state(context_data, user_message, contact_uuid):
             'input_prompt': input_prompt,
             'state': state_label
         }
-    elif user_message == 'subtract':
-        message_package = {
-            'messages': [
-                "Time for some subtraction!",
-                "Type your response as a number.  For example, for '1 - 1', you'd write 0."
-            ],
-            'input_prompt': "Here's the first one... What's 3-1?",
-            'state': "subtract-question-sequence"
-        }
+
+        # message_package = {
+        #     'messages': [
+        #         "Time for some subtraction!",
+        #         "Type your response as a number.  For example, for '1 - 1', you'd write 0."
+        #     ],
+        #     'input_prompt': "Here's the first one... What's 3-1?",
+        #     'state': "subtract-question-sequence"
+        # }
     elif context_data['state'] == 'exit' or user_message == 'exit':
         message_package = {
             'messages': [
@@ -198,8 +277,12 @@ def return_next_conversational_state(context_data, user_message, contact_uuid):
             'input_prompt': "Please type add or subtract to start a math activity.",
             'state': "reprompt-menu-options"
         }
+    # Used in FSM
     return message_package
 
+    # Used in quiz folder approach
+    # return context_result, message_package
+
 
 def manage_conversation_response(data_json):
     """ Calls functions necessary to determine message and context data to send
@@ -227,11 +310,18 @@ def manage_conversation_response(data_json):
     # TODO: Need to incorporate nlu_response into wormhole by checking answers against database (spreadsheet?)
     nlu_response = evaluate_message_with_nlu(message_data)
 
-    message_package = return_next_conversational_state(
-        context_data,
-        user_message,
-        contact_uuid
-    )
+    if context_data['state'] == 'addition':
+        context_result, message_package = return_next_conversational_state(
+            context_data,
+            user_message,
+            contact_uuid
+        )
+    else:
+        message_package = return_next_conversational_state(
+            context_data,
+            user_message,
+            contact_uuid
+        )
 
     print("MESSAGE PACKAGE")
     print(message_package)
@@ -255,15 +345,32 @@ def manage_conversation_response(data_json):
         )
 
     # Update the context object with the new state of the conversation
-    context = {
-        "context":{
-            "user": whatsapp_id,
-            "state": message_package['state'],
-            "bot_message": message_package['input_prompt'],
-            "user_message": user_message,
-            "type": 'ask'
+    if context_data['state'] == 'addition':
+        context = {
+            "context": {
+                "user": whatsapp_id,
+                "state": message_package['state'],
+                "bot_message": message_package['input_prompt'],
+                "user_message": user_message,
+                "type": 'ask',
+                # Necessary for quiz folder approach
+                "text": context_result.get('text'),
+                "question_numbers": context_result.get('question_numbers'),
+                "right_answer": context_result.get('right_answer'),
+                "number_correct": context_result.get('number_correct'),
+                "hints_used": context_result.get('hints_used'),
+            }
+        }
+    else:
+        context = {
+            "context": {
+                "user": whatsapp_id,
+                "state": message_package['state'],
+                "bot_message": message_package['input_prompt'],
+                "user_message": user_message,
+                "type": 'ask',
+            }
         }
-    }
 
     return context
 

mathtext_fastapi/math_quiz_fsm.py

@@ -16,21 +16,26 @@ class MathQuizFSM(object):
         ['exit', 'quiz_question', 'quiz_end'],
     ]
 
-    def __init__(self):
+    def __init__(
+        self,
+        initial_state='quiz_start',
+        question_nums=[2, 3],
+        initial_student_answer=0,
+    ):
         # Instantiate the FSM
         self.machine = Machine(
-            model=self, 
-            states=MathQuizFSM.states, 
+            model=self,
+            states=MathQuizFSM.states,
             transitions=MathQuizFSM.transitions,
-            initial='quiz_start'
+            initial=initial_state
         )
 
         # Instantiate variables necessary for tracking activity
-        self.question_nums = [2, 3]
-        self.correct_answer = 5
-        self.student_answer = 0
+        self.question_nums = question_nums
+        self.correct_answer = self.question_nums[0] + self.question_nums[1]
+        self.student_answer = initial_student_answer
         self.is_correct_answer = False
-        self.response_text = "What is 2 + 3?"
+        self.response_text = f"What is {self.question_nums[0]} + {self.question_nums[1]}?"
 
         # Define functions to run on transitions
         self.machine.on_enter_quiz_question('generate_math_problem')

mathtext_fastapi/math_subtraction_fsm.py

@@ -0,0 +1,58 @@
+import random
+from transitions import Machine
+
+
+class MathSubtractionFSM(object):
+    states = [
+        'quiz_start',
+        'quiz_question',
+        'quiz_end'
+    ]
+
+    transitions = [
+        ['ask_second_question', 'quiz_start', 'quiz_question'],
+        ['ask_next_question', 'quiz_question', 'quiz_question'],
+        ['exit', 'quiz_start', 'quiz_end'],
+        ['exit', 'quiz_question', 'quiz_end'],
+    ]
+
+    def __init__(
+        self,
+        initial_state='quiz_start',
+        question_nums=[4, 3],
+        initial_student_answer=0,
+    ):
+        # Instantiate the FSM
+        self.machine = Machine(
+            model=self,
+            states=MathSubtractionFSM.states,
+            transitions=MathSubtractionFSM.transitions,
+            initial=initial_state
+        )
+
+        # Instantiate variables necessary for tracking activity
+        self.question_nums = question_nums
+        self.correct_answer = self.question_nums[0] - self.question_nums[1]
+        self.student_answer = initial_student_answer
+        self.is_correct_answer = False
+        self.response_text = f"What is {self.question_nums[0]} - {self.question_nums[1]}?"
+
+        # Define functions to run on transitions
+        self.machine.on_enter_quiz_question('generate_math_problem')
+        self.machine.on_exit_quiz_question('validate_answer')
+
+    def validate_answer(self):
+        if self.student_answer == 'exit':
+            self.machine.set_state('quiz_end')
+            return ["Come back any time!"]
+        elif self.correct_answer == self.student_answer:
+            self.machine.set_state('quiz_question')
+            self.generate_math_problem()
+            return ['Great job!', self.response_text]
+        else:
+            return ["That's not quite right.  Try again.", self.response_text]
+    
+    def generate_math_problem(self):
+        self.question_nums = random.sample(range(1, 100), 2)
+        self.response_text = f"What is {self.question_nums[0]} - {self.question_nums[1]}"
+        self.correct_answer = self.question_nums[0] - self.question_nums[1]

scripts/make_request.py

@@ -20,13 +20,25 @@ def add_message_text_to_sample_object(message_text):
     
     """
     message_data = '{' + f'"author_id": "+57787919091", "author_type": "OWNER", "contact_uuid": "j43hk26-2hjl-43jk-hnk2-k4ljl46j0ds09", "message_body": "{message_text}", "message_direction": "inbound", "message_id": "4kl209sd0-a7b8-2hj3-8563-3hu4a89b32", "message_inserted_at": "2023-01-10T02:37:28.477940Z", "message_updated_at": "2023-01-10T02:37:28.487319Z"' + '}'
+    # context_data = '{' + '"user":"", "state":"addition-question-sequence", "bot_message":"", "user_message":"{message_text}"' + '}'
+
     context_data = '{' + '"user":"", "state":"start-conversation", "bot_message":"", "user_message":"{message_text}"' + '}'
 
+    # context_data = '{' + '"user":"", "state":"addition-question-sequence", "bot_message":"", "user_message":"{message_text}","text": "What is 2+3?","question_numbers": [4,3],"right_answer": 7,"number_correct": 2, "number_incorrect": 0, "hints_used": 0, "level": "easy"' + '}'
+
     json_string = '{' + f'"context_data": {context_data}, "message_data": {message_data}' + '}'
     b_string = json_string.encode("utf-8")
 
     return b_string
 
+# """
+#     "text": "What is 2+3?",
+#     "question_numbers": [2,3],
+#     "right_answer": 5,
+#     "number_correct": 2,
+#     "hints_used": 0,
+# """
+
 
 def run_simulated_request(endpoint, sample_answer, context=None):
     print(f"Case: {sample_answer}")
@@ -57,42 +69,36 @@ def run_simulated_request(endpoint, sample_answer, context=None):
 # run_simulated_request('nlu', 'Today is a wonderful day')
 # run_simulated_request('nlu', 'IDK 5?')
 # run_simulated_request('manager', '')
-# run_simulated_request('manager', 'add')
-# run_simulated_request("question", {
-#     'number_correct': 0,
-#     'number_incorrect': 0,
-#     'level': 'easy'
-# })
-# run_simulated_request("hint", {
-#     'question_numbers': [1,2,3],
-#     'right_answer': 3,
-#     'number_correct': 0,
-#     'number_incorrect': 0,
-#     'level': 'easy',
-#     'hints_used': 0
-# })
-# run_simulated_request("generate_question", {
-#     'level': 'medium'
-# })
-# run_simulated_request("numbers_by_level", {
-#     'level': 'medium'
-# })
-# run_simulated_request("number_sequence", {
-#     "current_number": 10,
-#     "ordinal_number": 2,
-#     "times": 1
-# })
-# run_simulated_request("level", {
-#     "current_level": "hard",
-#     "level_up": False
-# })
-run_simulated_request("question_new", {
-    "start": 10,
-    "step": 1,
-    "sequence": "8... 9... 10...",
-    "question_num": 1
+run_simulated_request('manager', 'add')
+run_simulated_request('manager', 'subtract')
+run_simulated_request("question", {
+    'number_correct': 0,
+    'number_incorrect': 0,
+    'level': 'easy'
+})
+run_simulated_request("hint", {
+    'question_numbers': [1, 2, 3],
+    'right_answer': 3,
+    'number_correct': 0,
+    'number_incorrect': 0,
+    'level': 'easy',
+    'hints_used': 0
+})
+run_simulated_request("generate_question", {
+    'level': 'medium'
+})
+run_simulated_request("numbers_by_level", {
+    'level': 'medium'
+})
+run_simulated_request("number_sequence", {
+    "current_number": 10,
+    "ordinal_number": 2,
+    "times": 1
+})
+run_simulated_request("level", {
+    "current_level": "hard",
+    "level_up": False
 })
-# run_simulated_request('manager', 'subtract')
 # run_simulated_request('manager', 'exit')