Merge feature-wormhole into main

README.md

@@ -1,5 +1,5 @@
 ---
-title: Mathtext Wormhole
+title: Mathtext Wormhole Staging
 emoji: 🐨
 colorFrom: blue
 colorTo: red

mathtext_fastapi/data/text2int_results.csv

@@ -20,17 +20,10 @@ eight oh,80.0,8.0,False
 eighty,80.0,80.0,True
 ate,8.0,1.0,False
 double eight,88.0,8.0,False
-<<<<<<< HEAD
-eight three seven five three O nine,8375309.0,8375329.0,False
-eight three seven five three oh nine,8375309.0,8375309.0,True
-eight three seven five three zero nine,8375309.0,8375309.0,True
-eight three seven five three oh ni-ee-ine,8375309.0,837530619.0,False
-=======
 eight three seven five three O nine,8375309.0,8375319.0,False
 eight three seven five three oh nine,8375309.0,8375309.0,True
 eight three seven five three zero nine,8375309.0,8375309.0,True
 eight three seven five three oh ni-ee-ine,8375309.0,837530111.0,False
->>>>>>> feature-wormhole
 two eight,28.0,16.0,False
 seven oh eleven,7011.0,77.0,False
 seven elevens,77.0,77.0,True
@@ -38,17 +31,10 @@ seven eleven,711.0,77.0,False
 ninety nine oh five,9905.0,149.0,False
 seven 0 seven 0 seven 0 seven,7070707.0,7070707.0,True
 123 hundred,123000.0,223.0,False
-<<<<<<< HEAD
-5 o 5,505.0,525.0,False
-15 o 5,1505.0,22.0,False
-15-o 5,1505.0,22.0,False
-15 o-5,1505.0,22.0,False
-=======
 5 o 5,505.0,515.0,False
 15 o 5,1505.0,21.0,False
 15-o 5,1505.0,21.0,False
 15 o-5,1505.0,21.0,False
->>>>>>> feature-wormhole
 911-thousand,911000.0,911000.0,True
 twenty-two twenty-two,2222.0,44.0,False
 twenty-two twenty-twos,484.0,44.0,False

mathtext_fastapi/v2_conversation_manager.py

@@ -120,8 +120,13 @@ def retrieve_microlesson_content(context_data, user_message, microlesson, contac
             'input_prompt': input_prompt,
             'state': state_label
         }
-    elif microlesson == 'addition2':
+    elif context_data['local_state'] == 'addition2' or microlesson == 'addition2':
+        if user_message == 'harder' or user_message == 'easier':
+            user_message = ''
         message_package = num_one.process_user_message(contact_uuid, user_message)
+        message_package['state'] = 'addition2'
+        message_package['input_prompt'] = '?'
+
     elif context_data['local_state'] == 'subtraction-question-sequence' or \
         user_message == 'subtract' or \
         microlesson == 'subtraction':
@@ -239,8 +244,8 @@ def manage_conversation_response(data_json):
     for message in microlesson_content['messages']:
         data = create_text_message(message, whatsapp_id)
 
-        print("data")
-        print(data)
+        # print("data")
+        # print(data)
 
         r = requests.post(
             f'https://whatsapp.turn.io/v1/messages',

scripts/make_request.py

@@ -105,14 +105,14 @@ def run_simulated_request(endpoint, sample_answer, context=None):
 # })
 # Need to start with this command to populate users.json
 # If users.json is not already made
-# run_simulated_request("num_one", {
-#     "user_id": "1",
-#     "message_text": "",
-# })
 run_simulated_request("num_one", {
     "user_id": "1",
-    "message_text": "61",
+    "message_text": "",
 })
+# run_simulated_request("num_one", {
+#     "user_id": "1",
+#     "message_text": "61",
+# })
 # run_simulated_request("sequence", {
 #     'start': 2,
 #     'step': 1,

users.json

@@ -1 +1 @@
-{"1": {"skill_score": 0.04, "state": "question", "start": 3, "stop": 3, "step": 1, "answer": 4}}
+{"1": {"skill_score": 0.03, "state": "question", "start": 3, "stop": 3, "step": 1, "answer": 4}}