Merge branch 'main' into vlad

mathtext_fastapi/conversation_manager.py

@@ -106,6 +106,39 @@ def pickle_and_encode_state_machine(state_machine):
     return dump_encoded
 
 
+def manage_math_quiz_fsm(user_message, contact_uuid):
+    fsm_check = SUPA.table('state_machines').select("*").eq(
+        "contact_uuid",
+        contact_uuid
+    ).execute()
+
+    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)
+
+        SUPA.table('state_machines').insert({
+            'contact_uuid': contact_uuid,
+            'addition3': dump_encoded
+        }).execute()
+    else:
+        undump_encoded = base64.b64decode(
+            fsm_check.data[0]['addition3'].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({
+            'addition3': dump_encoded
+        }).eq(
+            "contact_uuid", contact_uuid
+        ).execute()
+    return messages
+
+
 def return_next_conversational_state(context_data, user_message, contact_uuid):
     """ Evaluates the conversation's current state to determine the next state
 
@@ -126,40 +159,7 @@ 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()
-
-        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)
-
-            SUPA.table('state_machines').insert({
-                'contact_uuid': contact_uuid,
-                'addition3': dump_encoded
-            }).execute()
-        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()
+        messages = manage_math_quiz_fsm(user_message, contact_uuid)
 
         if user_message == 'exit':
             state_label = 'exit'

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')