Refactor route_intent and whatsapp_webhook functions for improved error handling and logging; streamline JSON parsing and payload validation

app.py

@@ -408,13 +408,11 @@ def route_intent(user_input: str, chat_id: str, sender: str):
     try:
         raw = generate_llm(prompt)
     except LLMBadRequestError:
-        # Clear history on HTTP 400 from the LLM
         clear_history(chat_id, sender)
         return SendTextIntent(action="send_text", message="Oops, I lost my train of thought—let’s start fresh!")
 
     logger.debug(f"LLM raw response: {raw}")
 
-    # 1) Strict: try each Pydantic model
     try:
         parsed = json.loads(raw)
         logger.debug(f"Parsed JSON: {parsed}")
@@ -431,7 +429,6 @@ def route_intent(user_input: str, chat_id: str, sender: str):
 
     logger.warning("Strict parse failed for all models, falling back to lenient")
 
-    # 2) Lenient JSON get
     action = parsed.get("action")
     if action in ACTION_HANDLERS:
         data = parsed
@@ -459,7 +456,6 @@ def route_intent(user_input: str, chat_id: str, sender: str):
             kwargs["voter"] = sender
             kwargs["choice"] = int(data.get("choice",0))
         try:
-            # coerce into Pydantic for uniform interface
             model = next(
                 m for m in INTENT_MODELS
                 if getattr(m, "__fields__", {}).get("action").default == action
@@ -493,19 +489,31 @@ help_text = (
 @app.post("/whatsapp")
 async def whatsapp_webhook(request: Request):
     data = await request.json()
+    logger.debug(f"Incoming webhook payload: {json.dumps(data)}")
+
     if request.headers.get("Authorization") != f"Bearer {BotConfig.WEBHOOK_AUTH_TOKEN}":
         raise HTTPException(403, "Unauthorized")
 
-    chat_id = data["senderData"]["chatId"]
-    sender  = data["senderData"]["sender"]
-    mid     = data["idMessage"]
+    try:
+        chat_id = data["senderData"]["chatId"]
+        sender  = data["senderData"]["sender"]
+        mid     = data["idMessage"]
+    except KeyError:
+        try:
+            chat_id = data["chatId"]
+            sender  = data["sender"]
+            mid     = data["messageId"]
+        except KeyError:
+            logger.error("Cannot find chat_id/sender/message_id in payload")
+            return {"success": False, "error": "bad payload"}
+
     set_thread_context(chat_id, sender, mid)
     logger.debug(f"Received webhook for message {mid} from {sender}")
 
-    if chat_id != BotConfig.BOT_GROUP_CHAT or data["typeWebhook"] != "incomingMessageReceived":
+    if chat_id != BotConfig.BOT_GROUP_CHAT or data.get("typeWebhook") != "incomingMessageReceived":
         return {"success": True}
 
-    md  = data["messageData"]
+    md  = data.get("messageData", {})
     tmd = md.get("textMessageData") or md.get("extendedTextMessageData")
     if not tmd:
         return {"success": True}
@@ -515,7 +523,6 @@ async def whatsapp_webhook(request: Request):
     logger.debug(f"User message: {body}")
 
     low = body.lower()
-    # Slash commands...
     if low == "/help":
         _fn_send_text(mid, chat_id, help_text)
         return {"success": True}
@@ -569,11 +576,9 @@ async def whatsapp_webhook(request: Request):
         })
         return {"success": True}
 
-    # Skip mentions
     if tmd.get("contextInfo", {}).get("mentionedJidList"):
         return {"success": True}
 
-    # Handle quoted replies to the bot
     if md.get("typeMessage") == "quotedMessage":
         ext    = md["extendedTextMessageData"]
         quoted = md["quotedMessage"]
@@ -587,7 +592,6 @@ async def whatsapp_webhook(request: Request):
     else:
         effective = body
 
-    # Route intent & dispatch
     intent = route_intent(effective, chat_id, sender)
     logger.debug(f"Final intent: {intent}")
     handler = ACTION_HANDLERS.get(intent.action)