Update nlu with to work with simplified event data object

app.py

@@ -81,6 +81,7 @@ async def programmatic_message_manager(request: Request):
     context = manage_conversational_response(data_dict)
     return JSONResponse(context)
 
+
 @app.post("/nlu")
 async def evaluate_user_message_with_nlu_api(request: Request):
     """ Calls NLU APIs on the most recent user message from Turn.io message data and logs the message data
@@ -96,12 +97,12 @@ async def evaluate_user_message_with_nlu_api(request: Request):
     data_dict = await request.json()
 
     message_data = data_dict.get('message_data', '')
-    message_text = message_data['message']['text']['body']
+    message_text = message_data['message_body']
 
     # Handles if a student answer is already an integer or a float (ie., 8)
     if type(message_text) == int or type(message_text) == float:
         nlu_response = {'type': 'integer', 'data': message_text, 'confidence': ''}
-        prepare_message_data_for_logging(message_data, nlu_response, message_data)
+        prepare_message_data_for_logging(message_data, nlu_response)
         return JSONResponse(content=nlu_response)
 
     # Removes whitespace and converts str to arr to handle multiple numbers
@@ -110,7 +111,7 @@ async def evaluate_user_message_with_nlu_api(request: Request):
     # Handle if a student answer is a string of numbers (ie., "8,9, 10")
     if all(ele.isdigit() for ele in message_text_arr):
         nlu_response = {'type': 'integer', 'data': ','.join(message_text_arr), 'confidence': ''}
-        prepare_message_data_for_logging(message_data, nlu_response, message_data)
+        prepare_message_data_for_logging(message_data, nlu_response)
         return JSONResponse(content=nlu_response)
 
     student_response_arr = []
@@ -134,6 +135,5 @@ async def evaluate_user_message_with_nlu_api(request: Request):
         else:
             nlu_response = {'type': 'integer', 'data': student_response_arr[0], 'confidence': ''}
 
-    # Uncomment to enable logging to Supabase
-    prepare_message_data_for_logging(message_data, nlu_response, message_data)
+    prepare_message_data_for_logging(message_data, nlu_response)
     return JSONResponse(content=nlu_response)

mathtext_fastapi/nlu.py

@@ -42,7 +42,7 @@ def get_or_create_supabase_entry(table_name, insert_data, check_variable=None):
 
 
 
-def prepare_message_data_for_logging(message_data, nlu_response, request_object):
+def prepare_message_data_for_logging(message_data, nlu_response):
     """ Builds the message data for each table and ensures it's logged to the database
 
     Input:
@@ -56,7 +56,7 @@ def prepare_message_data_for_logging(message_data, nlu_response, request_object)
 
     contact_data = {
         'project': project_data_log.data[0]['id'],  # FK
-        'original_contact_id': message_data['message']['_vnd']['v1']['chat']['contact_uuid'],
+        'original_contact_id': message_data['contact_uuid'],
         'urn': "",
         'language_code': "en",
         'contact_inserted_at': format_datetime_in_isoformat(datetime.now())
@@ -66,16 +66,16 @@ def prepare_message_data_for_logging(message_data, nlu_response, request_object)
 
     message_data = {
         'contact': contact_data_log.data[0]['id'],  # FK
-        'original_message_id': message_data['message']['id'],
-        'text': message_data['message']['text']['body'],
-        'direction': message_data['message']['_vnd']['v1']['direction'],
-        'sender_type': message_data['message']['_vnd']['v1']['author']['type'],
+        'original_message_id': message_data['message_id'],
+        'text': message_data['message_body'],
+        'direction': message_data['message_direction'],
+        'sender_type': message_data['author_type'],
         'channel_type': "whatsapp / turn.io",
-        'message_inserted_at': message_data['message']['_vnd']['v1']['chat']['inserted_at'],
-        'message_modified_at': message_data['message']['_vnd']['v1']['chat']['updated_at'],
+        'message_inserted_at': message_data['message_inserted_at'],
+        'message_modified_at': message_data['message_updated_at'],
         'message_sent_at': format_datetime_in_isoformat(datetime.now()),
         'nlu_response': nlu_response,
-        'request_object': request_object
+        'request_object': message_data
         # Autogenerated fields: created_at, modified_at
     }
     message_data_log = log_message_data_through_supabase_api('message', message_data)