Merge pull request #41 from praekeltfoundation/updates-for-mcxp

Fix web app loading the model and ignore statuses from turn payload

Author: erikh360

src/application.py

@@ -6,7 +6,7 @@
 from pydantic import ValidationError
 
 from src.config import load_config
-from src.tasks import build_classify_and_update_chain
+from src.queueing import build_classify_and_update_chain
 from src.turn_webhook import TurnWebhook
 from src.utils import validate_turn_signature
 

src/queueing.py

@@ -0,0 +1,19 @@
+"""Celery task submission helpers for producer processes."""
+
+from celery import chain
+
+from src.celery_app import celery_app
+
+CLASSIFY_TURN_MESSAGE_TASK = "src.tasks.classify_turn_message"
+UPDATE_TURN_MESSAGE_LABEL_TASK = "src.tasks.update_turn_message_label"
+
+
+def build_classify_and_update_chain(message_id: str, message_text: str):
+    """Build a Celery chain without importing worker-only task modules."""
+    return chain(
+        celery_app.signature(
+            CLASSIFY_TURN_MESSAGE_TASK,
+            args=(message_id, message_text),
+        ),
+        celery_app.signature(UPDATE_TURN_MESSAGE_LABEL_TASK),
+    )

src/tasks.py

@@ -1,10 +1,8 @@
-"""Celery tasks for async processing."""
+"""Celery task implementations for worker processes."""
 
 import logging
 from pathlib import Path
 
-from celery import chain
-
 from src.celery_app import celery_app
 from src.intent_classifier import IntentClassifier
 from src.turn_client import TurnAPIClient, TurnAPIServerError
@@ -140,11 +138,3 @@ def update_turn_message_label(classification: dict) -> dict:
             exc_info=True,
         )
         raise
-
-
-def build_classify_and_update_chain(message_id: str, message_text: str):
-    """Build a Celery chain that classifies then updates the Turn label."""
-    return chain(
-        classify_turn_message.s(message_id, message_text),
-        update_turn_message_label.s(),
-    )

src/turn_webhook.py

@@ -1,4 +1,4 @@
-from pydantic import BaseModel, ConfigDict
+from pydantic import BaseModel, ConfigDict, Field
 
 
 class TurnBaseModel(BaseModel):
@@ -16,4 +16,5 @@ class TurnMessage(TurnBaseModel):
 
 
 class TurnWebhook(TurnBaseModel):
-    messages: list[TurnMessage]
+    messages: list[TurnMessage] = Field(default_factory=list)
+    statuses: list[dict] = Field(default_factory=list)

tests/test_application.py

@@ -105,7 +105,7 @@ def test_nlu_invalid_payload(client):
     """"""
 
     body = json.dumps(
-        {"not_messages": []}, separators=(",", ":"), sort_keys=True
+        {"messages": "not-a-list"}, separators=(",", ":"), sort_keys=True
     ).encode()
     signature = _sign_payload(body, app.config["TURN_HMAC_SECRET"])
 
@@ -117,3 +117,31 @@ def test_nlu_invalid_payload(client):
     )
     assert response.status_code == 400
     assert response.json["error"] == "invalid payload"
+
+
+def test_nlu_status_only_payload_is_ignored(client, mocker):
+    """Status webhooks should be accepted and ignored."""
+
+    mock_build_chain = mocker.patch("src.application.build_classify_and_update_chain")
+
+    payload = {
+        "statuses": [
+            {
+                "id": "wamid.HBgLMjc4MzYzNzg1MzEVAgARGBI2QTBBOTM1MDdFNUEwRDJDOEMA",
+                "status": "delivered",
+                "timestamp": "1773842339",
+            }
+        ]
+    }
+    body = json.dumps(payload, separators=(",", ":"), sort_keys=True).encode()
+    signature = _sign_payload(body, app.config["TURN_HMAC_SECRET"])
+
+    response = client.post(
+        "/nlu/",
+        data=body,
+        content_type="application/json",
+        headers={"X-Turn-Hook-Signature": signature},
+    )
+    assert response.status_code == 200
+    assert response.json == {"status": "ignored", "count": 0}
+    mock_build_chain.assert_not_called()

tests/test_tasks.py

@@ -3,11 +3,8 @@
 import pytest
 
 from src.celery_app import celery_app
-from src.tasks import (
-    build_classify_and_update_chain,
-    classify_turn_message,
-    update_turn_message_label,
-)
+from src.queueing import build_classify_and_update_chain
+from src.tasks import classify_turn_message, update_turn_message_label
 from src.turn_client import TurnAPIClientError, TurnAPIServerError
 
 # Enable eager mode for all tests in this module (run tasks synchronously)