Add error handling for additional payload types

app.py

@@ -4,7 +4,9 @@ or
 `python -m uvicorn app:app --reload --host localhost --port 7860`
 """
 import ast
+from json import JSONDecodeError
 import mathactive.microlessons.num_one as num_one_quiz
+import os
 import sentry_sdk
 
 from fastapi import FastAPI, Request
@@ -13,17 +15,15 @@ from fastapi.staticfiles import StaticFiles
 from fastapi.templating import Jinja2Templates
 # from mathtext.sentiment import sentiment
 from mathtext.text2int import text2int
-from pydantic import BaseModel
-
 from mathtext_fastapi.logging import prepare_message_data_for_logging
 from mathtext_fastapi.conversation_manager import manage_conversation_response
 from mathtext_fastapi.v2_conversation_manager import manage_conversation_response
 from mathtext_fastapi.nlu import evaluate_message_with_nlu
 from mathtext_fastapi.nlu import run_intent_classification
+from pydantic import BaseModel
 
-import os
-from dotenv import load_dotenv
 
+from dotenv import load_dotenv
 load_dotenv()
 
 sentry_sdk.init(
@@ -161,8 +161,11 @@ async def evaluate_user_message_with_nlu_api(request: Request):
       {'type':'integer', 'data': '8', 'confidence': 0}
       {'type':'sentiment', 'data': 'negative', 'confidence': 0.99}
     """
-    data_dict = await request.json()
-    message_data = data_dict.get('message_data', '')
+    try:
+        data_dict = await request.json()
+    except JSONDecodeError:
+        data_dict = {}
+    message_data = data_dict.get('message_data', {})
     nlu_response = evaluate_message_with_nlu(message_data)
     return JSONResponse(content=nlu_response)
 
@@ -183,12 +186,10 @@ async def num_one(request: Request):
         'state': 'question'
     }
     """
-    print("STEP 1")
     data_dict = await request.json()
     message_data = ast.literal_eval(data_dict.get('message_data', '').get('message_body', ''))
     user_id = message_data['user_id']
     message_text = message_data['message_text']
-    print("STEP 2")
     return num_one_quiz.process_user_message(user_id, message_text)
     
 

mathtext_fastapi/nlu.py

@@ -4,10 +4,10 @@ import datetime as dt
 from dateutil.parser import isoparse
 
 from fuzzywuzzy import fuzz
+from mathtext_fastapi.intent_classification import predict_message_intent
 from mathtext_fastapi.logging import prepare_message_data_for_logging
 from mathtext.sentiment import sentiment
 from mathtext.text2int import text2int, TOKENS2INT_ERROR_INT
-from mathtext_fastapi.intent_classification import predict_message_intent
 
 log = getLogger(__name__)
 
@@ -163,16 +163,15 @@ def payload_is_valid(payload_object):
     """
     try:
         isinstance(
-            isoparse(payload_object.get('message_inserted_at')),
+            isoparse(payload_object.get('message_inserted_at','')),
             dt.datetime
         )
         isinstance(
-            isoparse(payload_object.get('message_updated_at')),
+            isoparse(payload_object.get('message_updated_at','')),
             dt.datetime
         )
     except ValueError:
         return False
-
     return (
         isinstance(payload_object, Mapping) and
         isinstance(payload_object.get('author_id'), str) and

scripts/make_request.py

@@ -71,9 +71,19 @@ def run_full_nlu_endpoint_payload_test(sample_payload):
     print(request)
 
 
+# Case: Wrong key
+run_full_nlu_endpoint_payload_test(b'{"message": {"author_id": "@event.message._vnd.v1.chat.owner", "author_type": "@event.message._vnd.v1.author.type", "contact_uuid": "@event.message._vnd.v1.chat.contact_uuid", "message_body": "@event.message.text.body", "message_direction": "@event.message._vnd.v1.direction", "message_id": "@event.message.id", "message_inserted_at": "@event.message._vnd.v1.chat.inserted_at", "message_updated_at": "@event.message._vnd.v1.chat.updated_at"}}')
+
+# Case: Correct payload
 run_full_nlu_endpoint_payload_test(b'{"message_data": {"author_id": "57787919091", "author_type": "OWNER", "contact_uuid": "df78gsdf78df", "message_body": "8", "message_direction": "inbound", "message_id": "dfgha789789ag9ga", "message_inserted_at": "2023-01-10T02:37:28.487319Z", "message_updated_at": "2023-01-10T02:37:28.487319Z"}}')
+
+# Case: Incorrect payload values
 run_full_nlu_endpoint_payload_test(b'{"message_data": {"author_id": "@event.message._vnd.v1.chat.owner", "author_type": "@event.message._vnd.v1.author.type", "contact_uuid": "@event.message._vnd.v1.chat.contact_uuid", "message_body": "@event.message.text.body", "message_direction": "@event.message._vnd.v1.direction", "message_id": "@event.message.id", "message_inserted_at": "@event.message._vnd.v1.chat.inserted_at", "message_updated_at": "@event.message._vnd.v1.chat.updated_at"}}')
 
+# Case: Wrong payload object
+run_full_nlu_endpoint_payload_test(b'{"message_data": {"_vnd": {"v1": {"author": {"id": 54327547257, "name": "Jin", "type": "OWNER"}, "card_uuid": None, "chat": {"assigned_to": None, "contact_uuid": "f7889-f78dfgb798-f786ah89g7-f78f9a", "inserted_at": "2023-03-28T13:21:47.581221Z", "owner": "+43789789146", "permalink": "", "state": "OPEN", "state_reason": "Re-opened by inbound message.", "unread_count": 97, "updated_at": "2023-04-07T21:05:27.389948Z", "uuid": "dfg9a78-d76a786dghas-78d9fga789g-a78d69a9"}, "direction": "inbound", "faq_uuid": None, "in_reply_to": None, "inserted_at": "2023-04-07T21:05:27.368580Z", "labels": [], "last_status": None, "last_status_timestamp": None, "on_fallback_channel": False, "rendered_content": None, "uuid": "hf78s7s89b-789fb68d9fg-789fb789dfb-f79sfb789"}}, "from": 5475248689, "id": "SBDE4zgAAy7887sfdT35SHFS", "text": {"body": 1000}, "timestamp": 1680901527, "type": "text"}, "type": "message"}')
+
+
 # run_simulated_request('intent-classification', 'exit')
 # run_simulated_request('intent-classification', "I'm not sure")
 # run_simulated_request('intent-classification', "easier")