i messed up, lmao

routes/api/whatsapp_webhook.py

@@ -24,9 +24,68 @@ router = APIRouter()
 classifier = ZeroShotClassifier()
 
 def _extract_from_number_and_text(payload: dict) -> Tuple[Optional[str], Optional[str]]:
-    ...
-    # (same as before – unchanged)
-    ...
+    """
+    Extracts (from_number, message_text) from a WhatsApp webhook payload.
+    Returns (None, None) if not a user message (e.g., statuses, billing-event).
+    """
+    try:
+        entries = payload.get("entry", [])
+        for entry in entries:
+            changes = entry.get("changes", [])
+            for change in changes:
+                field = change.get("field")
+                # Only process message-type changes
+                if field != "messages":
+                    continue
+
+                value = change.get("value", {}) or {}
+                # Ignore pure status/billing updates that don't have 'messages'
+                messages_list = value.get("messages", [])
+                if not messages_list:
+                    # Helpful debug so you can see why it was ignored
+                    statuses = value.get("statuses", [])
+                    if statuses:
+                        # it's a status webhook, not a user message
+                        pass
+                    continue
+
+                # Only look at the first message in the list
+                msg = messages_list[0]
+                from_number = msg.get("from")
+                mtype = msg.get("type")
+
+                # 1) Plain text
+                if mtype == "text":
+                    text_body = (msg.get("text", {}) or {}).get("body")
+                    if from_number and text_body:
+                        return from_number, text_body
+
+                # 2) Template reply button (older/simple schema)
+                if mtype == "button":
+                    b = msg.get("button", {}) or {}
+                    intent = b.get("payload") or b.get("text")
+                    if from_number and intent:
+                        return from_number, intent
+
+                # 3) Newer interactive replies (buttons or list)
+                if mtype == "interactive":
+                    i = msg.get("interactive", {}) or {}
+                    if "button_reply" in i:
+                        intent = i["button_reply"].get("id") or i["button_reply"].get("title")
+                        if from_number and intent:
+                            return from_number, intent
+                    if "list_reply" in i:
+                        intent = i["list_reply"].get("id") or i["list_reply"].get("title")
+                        if from_number and intent:
+                            return from_number, intent
+
+        # No usable user message found
+        return None, None
+
+    except Exception as e:
+        # Always return a tuple on error
+        logging.exception(f"_extract_from_number_and_text error: {e}")
+        return None, None
 
 @router.post("/message-received")
 async def whatsapp_webhook_receiver(request: Request):