Update message logging to fix bugs

app.py

@@ -68,6 +68,7 @@ async def evaluate_user_message_with_nlu_api(request: Request):
 
     # Handles if a student answer is already an integer or a float (ie., 8)
     if type(message_text) == int or type(message_text) == float:
+        prepare_message_data_for_logging(message_data)
         return JSONResponse(content={'type': 'integer', 'data': message_text})
 
     # Removes whitespace and converts str to arr to handle multiple numbers
@@ -75,6 +76,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):
+        prepare_message_data_for_logging(message_data)
         return JSONResponse(content={'type': 'integer', 'data': ','.join(message_text_arr)})
 
     student_response_arr = []
@@ -99,6 +101,5 @@ async def evaluate_user_message_with_nlu_api(request: Request):
             response_object = {'type': 'integer', 'data': student_response_arr[0]}
 
     # Uncomment to enable logging to Supabase
-    # prepare_message_data_for_logging(message_data)
-
+    prepare_message_data_for_logging(message_data)
     return JSONResponse(content=response_object)

mathtext_fastapi/nlu.py

@@ -17,12 +17,42 @@ def format_datetime_in_isoformat(dt):
     return getattr(dt.now(), 'isoformat', lambda x: None)()
 
 
+def get_or_create_supabase_entry(table_name, insert_data, check_variable=None):
+    """ Checks whether a project or contact exists in the database and adds if one is not found
+
+    Input:
+    - table_name: str- the name of the table in Supabase that is being examined
+    - insert_data: json - the data to insert
+    - check_variable: str/None - the specific field to examine for existing matches
+
+    Result
+    - logged_data - an object with the Supabase data
+    
+    """
+    if table_name == 'contact':
+        resp = SUPA.table('contact').select("*").eq("original_contact_id", insert_data['original_contact_id']).eq("project", insert_data['project']).execute()
+    else:
+        resp = SUPA.table(table_name).select("*").eq(check_variable, insert_data[check_variable]).execute()
+
+    if len(resp.data) == 0:
+        logged_data = log_message_data_through_supabase_api(table_name, insert_data)
+    else:
+        logged_data = resp
+    return logged_data
+
+
+
 def prepare_message_data_for_logging(message_data):
+    """ Builds the message data for each table and ensures it's logged to the database
+
+    Input:
+    - message_data: an object with the full message data from Turn.io/Whatsapp
+    """
     project_data = {
-        'name': "turn.io",
+        'name': "Rori",
         # Autogenerated fields: id, created_at, modified_at   
     }
-    project_data_log = log_message_data_through_supabase_api('project', project_data)
+    project_data_log = get_or_create_supabase_entry('project', project_data, 'name')
 
     contact_data = {
         'project': project_data_log.data[0]['id'],  # FK
@@ -32,7 +62,7 @@ def prepare_message_data_for_logging(message_data):
         'contact_inserted_at': format_datetime_in_isoformat(datetime.now())
         # Autogenerated fields: id, created_at, modified_at
     }
-    contact_data_log = log_message_data_through_supabase_api('contact', contact_data)
+    contact_data_log = get_or_create_supabase_entry('contact', contact_data)
 
     message_data = {
         'contact': contact_data_log.data[0]['id'],  # FK

scripts/make_request.py

@@ -104,7 +104,7 @@ print(request)
 
 json = b'{"message_data": {"message":{"_vnd":{"v1":{"author":{"id":57787919091,"name":"GT","type":"OWNER"},"card_uuid":null,"chat":{"assigned_to":{"id":"jhk151kl-hj42-3752-3hjk-h4jk6hjkk2","name":"Greg Thompson","type":"OPERATOR"},"contact_uuid":"j43hk26-2hjl-43jk-hnk2-k4ljl46j0ds09","inserted_at":"2022-07-05T04:00:34.033522Z","owner":"+57787919091","permalink":"https://app.turn.io/c/4kl209sd0-a7b8-2hj3-8563-3hu4a89b32","state":"OPEN","state_reason":"Re-opened by inbound message.","unread_count":14,"updated_at":"2023-01-10T02:37:28.487319Z","uuid":"4kl209sd0-a7b8-2hj3-8563-3hu4a89b32"},"direction":"inbound","faq_uuid":null,"in_reply_to":null,"inserted_at":"2023-01-10T02:37:28.477940Z","labels":[{"confidence":0.506479332,"metadata":{"nlu":{"confidence":0.506479332,"intent":"question","model_name":"nlu-general-spacy-ngrams-20191014"}},"uuid":"ha7890s2k-hjk2-2476-s8d9-fh9779a8a9ds","value":"Unclassified"}],"last_status":null,"last_status_timestamp":null,"on_fallback_channel":false,"rendered_content":null,"uuid":"s8df79zhws-h89s-hj23-7s8d-thb248d9bh2qn"}},"from":57787919091,"id":"hsjkthzZGehkzs09sijWA3","text":{"body":"8, 9, 10"},"timestamp":1673318248,"type":"text"},"type":"message"}}\n'
 
-# 8, 9, 10 > 8,9,10
+# "8, 9, 10" > "8,9,10"
 request = requests.post(url=
                         'http://localhost:7860/nlu',
                         data=json