Merge branch 'main' into 'vlad'

mathtext_fastapi/conversation_manager.py

@@ -116,6 +116,25 @@ def manage_math_quiz_fsm(user_message, contact_uuid, type):
         contact_uuid
     ).execute()
 
+    # This doesn't allow for when one FSM is present and the other is empty
+    """
+    1
+    data=[] count=None
+    
+    2
+    data=[{'id': 29, 'contact_uuid': 'j43hk26-2hjl-43jk-hnk2-k4ljl46j0ds09', 'addition3': None, 'subtraction': None, 'addition': 
+
+    - but problem is there is no subtraction , but it's assuming there's a subtration
+
+
+    Cases
+    - make a completely new record
+    - update an existing record with an existing FSM
+    - update an existing record without an existing FSM
+    """
+
+
+    # Make a completely new entry
     if fsm_check.data == []:
         if type == 'addition':
             math_quiz_state_machine = MathQuizFSM()
@@ -128,7 +147,22 @@ def manage_math_quiz_fsm(user_message, contact_uuid, type):
             'contact_uuid': contact_uuid,
             f'{type}': dump_encoded
         }).execute()
-    else:
+    # Update an existing record with a new state machine
+    elif not fsm_check.data[0][type]:
+        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').update({
+            f'{type}': dump_encoded
+        }).eq(
+            "contact_uuid", contact_uuid
+        ).execute()      
+    # Update an existing record with an existing state machine
+    elif fsm_check.data[0][type]:
         undump_encoded = base64.b64decode(
             fsm_check.data[0][type].encode('utf-8')
         )
@@ -217,24 +251,24 @@ def return_next_conversational_state(context_data, user_message, contact_uuid):
         # Used in FSM
         # messages = manage_math_quiz_fsm(user_message, contact_uuid)
 
-        message_package, context_result = use_quiz_module_approach(user_message, context_data)
+        # message_package, context_result = use_quiz_module_approach(user_message, context_data)
+        messages = manage_math_quiz_fsm(user_message, contact_uuid, 'addition')
 
         if user_message == 'exit':
             state_label = 'exit'
         else:
             state_label = 'addition-question-sequence'
         # Used in FSM
-        # input_prompt = messages.pop()
-        # message_package = {
-        #     'messages': messages,
-        #     'input_prompt': input_prompt,
-        #     'state': state_label
-        # }
+        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
+        # Used in quiz w/ hints
+        # context_data = context_result
+        # message_package['state'] = state_label
 
     elif context_data['state'] == 'subtraction-question-sequence' or \
         user_message == 'subtract':
@@ -323,9 +357,6 @@ def manage_conversation_response(data_json):
             contact_uuid
         )
 
-    print("MESSAGE PACKAGE")
-    print(message_package)
-
     headers = {
         'Authorization': f"Bearer {os.environ.get('TURN_AUTHENTICATION_TOKEN')}",
         'Content-Type': 'application/json'

mathtext_fastapi/nlu.py

@@ -57,26 +57,25 @@ def run_sentiment_analysis(message_text):
 
 
 def evaluate_message_with_nlu(message_data):
-    message_text = message_data['message_body']
-    message_text_arr = re.split(", |,| ", message_text.strip())
-
-    # TODO: Replace this with appropriate utility function (is_int, is_float, render_int_or_float)
-    nlu_response = test_for_float_or_int(message_data, message_text)
-    if len(nlu_response) > 0:
-        return nlu_response
-
-    # TODO: Replace this with appropriate utility function
-    nlu_response = test_for_number_sequence(message_text_arr, message_data, message_text)
-    if len(nlu_response) > 0:
-        return nlu_response
-
-    student_response_arr = run_text2int_on_each_list_item(message_text_arr)
-
-    # '32202' is text2int's error code for non-integer student answers (ie., "I don't know")
-    # If any part of the list is 32202, sentiment analysis will run
-    # TODO: Need to replace this with logic that recognizes multiple intents (Maybe 36 = "sentiment analysis" & "integer")
-    student_response_arr = run_text2int_on_each_list_item(message_text_arr)
-    if 32202 in student_response_arr:
+    # Keeps system working with two different inputs - full and filtered @event object
+    try:
+        message_text = message_data['message_body']
+    except KeyError:
+        message_data = {
+            'author_id': message_data['message']['_vnd']['v1']['chat']['owner'],
+            'author_type': message_data['message']['_vnd']['v1']['author']['type'],
+            'contact_uuid': message_data['message']['_vnd']['v1']['chat']['contact_uuid'],
+            'message_body': message_data['message']['text']['body'],
+            'message_direction': message_data['message']['_vnd']['v1']['direction'],
+            'message_id': message_data['message']['id'],
+            'message_inserted_at': message_data['message']['_vnd']['v1']['chat']['inserted_at'],
+            'message_updated_at': message_data['message']['_vnd']['v1']['chat']['updated_at'],
+        }
+        message_text = message_data['message_body']
+
+    number_api_resp = text2int(message_text.lower())
+
+    if number_api_resp == 32202:
         sentiment_api_resp = sentiment(message_text)
         nlu_response = build_nlu_response_object(
             'sentiment',
@@ -84,18 +83,11 @@ def evaluate_message_with_nlu(message_data):
             sentiment_api_resp[0]['score']
         )
     else:
-        if len(student_response_arr) > 1:
-            nlu_response = build_nlu_response_object(
-                'integer',
-                ','.join(str(num) for num in student_response_arr),
-                ''
-            )
-        else:
-            nlu_response = build_nlu_response_object(
-                'integer',
-                student_response_arr[0],
-                ''
-            )
+        nlu_response = build_nlu_response_object(
+            'integer',
+            number_api_resp,
+            ''
+        )
 
     prepare_message_data_for_logging(message_data, nlu_response)
     return nlu_response

requirements.txt

@@ -1,4 +1,5 @@
 dill
+en-core-web-sm @ https://github.com/explosion/spacy-models/releases/download/en_core_web_sm-3.4.1/en_core_web_sm-3.4.1-py3-none-any.whl  
 jsonpickle
 mathtext @ git+https://gitlab.com/tangibleai/community/mathtext@main
 fastapi==0.74.*

scripts/make_request.py

@@ -60,14 +60,19 @@ def run_simulated_request(endpoint, sample_answer, context=None):
 
 # run_simulated_request('sentiment-analysis', 'I reject it')
 # run_simulated_request('text2int', 'seven thousand nine hundred fifty seven')
-# run_simulated_request('nlu', 'test message')
-# run_simulated_request('nlu', 'eight')
-# run_simulated_request('nlu', 'eight, nine, ten')
-# run_simulated_request('nlu', '8, 9, 10')
-# run_simulated_request('nlu', '8')
-# run_simulated_request('nlu', "I don't know")
-# run_simulated_request('nlu', 'Today is a wonderful day')
-# run_simulated_request('nlu', 'IDK 5?')
+run_simulated_request('nlu', 'test message')
+run_simulated_request('nlu', 'eight')
+run_simulated_request('nlu', 'is it 8')
+run_simulated_request('nlu', 'can I know how its 0.5')
+run_simulated_request('nlu', 'eight, nine, ten')
+run_simulated_request('nlu', '8, 9, 10')
+run_simulated_request('nlu', '8')
+run_simulated_request('nlu', "I don't know")
+run_simulated_request('nlu', "I don't know eight")
+run_simulated_request('nlu', "I don't 9")
+run_simulated_request('nlu', "0.2")
+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('manager', 'subtract')