mesh-sandbox 1.0.26__py3-none-any.whl → 1.0.28__py3-none-any.whl

mesh_sandbox/__init__.py

@@ -1 +1 @@
-__version__ = "1.0.26"
+__version__ = "1.0.28"

mesh_sandbox/common/constants.py

@@ -45,6 +45,8 @@ class Headers:
     Mex_AddressType = "mex-AddressType"
 
 
+MESSAGE_IN_INBOX_EXPIRY_IN_DAYS = 5
+
 # Error codes
 ERROR_INVALID_FROM_ADDRESS: Final = "Invalid From Address"
 ERROR_MISSING_TO_ADDRESS: Final = "TO_DTS missing"

mesh_sandbox/common/exceptions.py

@@ -1,5 +1,8 @@
 from typing import Any, Optional, Union
 
+from mesh_sandbox.views.admin import CreateReportRequest
+
+from ..models.message import MessageEvent, MessageMetadata, MessageStatus
 from . import constants
 
 
@@ -44,3 +47,38 @@ def try_parse_error(detail: Union[str, dict, None] = None, message_id: Optional[
     if isinstance(detail, dict):
         return detail
     return {"errorDescription": str(detail)}
+
+
+def get_ndr_error() -> dict:
+    expiry_period = constants.MESSAGE_IN_INBOX_EXPIRY_IN_DAYS
+    error_description = parse_error(
+        detail=constants.ERROR_UNDELIVERED_MESSAGE,
+        format_params=(expiry_period,),
+    )
+
+    return error_description
+
+
+def create_ndr_event(request: CreateReportRequest) -> MessageEvent:
+    error_description = get_ndr_error()
+
+    error_code = error_description.get("errorCode")
+    error_event = error_description.get("errorEvent")
+    error_message = error_description.get("errorDescription")
+
+    return MessageEvent(
+        status=MessageStatus.ERROR,
+        code=error_code,
+        event=error_event,
+        description=error_message,
+        linked_message_id=request.linked_message_id,
+    )
+
+
+def create_ndr_metadata(request: CreateReportRequest) -> MessageMetadata:
+    subject = "NDR" if not request.subject else f"NDR: {request.subject}"
+
+    return MessageMetadata(
+        subject=subject,
+        local_id=request.local_id,
+    )

mesh_sandbox/handlers/admin.py

@@ -3,6 +3,8 @@ from uuid import uuid4
 
 from fastapi import BackgroundTasks, Depends, HTTPException, status
 
+from mesh_sandbox.common.exceptions import create_ndr_event, create_ndr_metadata
+
 from ..common.messaging import Messaging
 from ..dependencies import get_messaging
 from ..models.mailbox import Mailbox
@@ -50,16 +52,27 @@ class AdminHandler:
 
         assert request.status in (MessageStatus.UNDELIVERABLE, MessageStatus.ERROR)
 
+        if request.status == MessageStatus.UNDELIVERABLE:
+            message_event = create_ndr_event(request)
+            message_metadata = create_ndr_metadata(request)
+        else:
+            message_event = MessageEvent(
+                status=request.status,
+                event="TRANSFER",
+                code=request.code,
+                description=request.description,
+                linked_message_id=request.linked_message_id,
+            )
+            message_metadata = MessageMetadata(
+                subject=request.subject,
+                local_id=request.local_id,
+                file_name=request.file_name,
+            )
+
         message = Message(
             events=[
                 MessageEvent(status=MessageStatus.ACCEPTED),
-                MessageEvent(
-                    status=request.status,
-                    event="TRANSFER",
-                    code=request.code,
-                    description=request.description,
-                    linked_message_id=request.linked_message_id,
-                ),
+                message_event,
             ],
             message_id=uuid4().hex.upper(),
             sender=MessageParty(
@@ -81,11 +94,7 @@ class AdminHandler:
             total_chunks=0,
             message_type=MessageType.REPORT,
             workflow_id=request.workflow_id,
-            metadata=MessageMetadata(
-                subject=request.subject,
-                local_id=request.local_id,
-                file_name=request.file_name,
-            ),
+            metadata=message_metadata,
         )
 
         await self.messaging.send_message(message=message, body=b"", background_tasks=background_tasks)

mesh_sandbox/store/serialisation.py

@@ -85,7 +85,7 @@ def _deserialise_value(field_type, value):
         return value
 
     if is_dataclass(field_type):
-        return deserialise_model(value, field_type)
+        return deserialise_model(value, field_type)  # type: ignore
 
     if field_type in (int, float):
         return field_type(value)

mesh_sandbox/tests/admin.py

@@ -447,3 +447,39 @@ def test_get_message_report_type(app: TestClient, root_path: str):
 def test_get_message_not_found(app: TestClient, root_path: str):
     res = app.get(f"{root_path}/notfound")
     assert res.status_code == status.HTTP_404_NOT_FOUND
+
+
+@pytest.mark.parametrize("root_path", ["/messageexchange/admin/message"])
+def test_generate_ndr(app: TestClient, root_path: str):
+
+    expected_response = {
+        "status": MessageStatus.UNDELIVERABLE,
+        "workflow_id": uuid4().hex,
+        "code": "21",
+        "description": "non delivery reason",
+        "subject": f"my subject {uuid4().hex}",
+        "local_id": f"my local id {uuid4().hex}",
+        "file_name": f"my filename {uuid4().hex}",
+        "linked_message_id": uuid4().hex,
+    }
+
+    request = CreateReportRequest(
+        mailbox_id=_CANNED_MAILBOX1,
+        code=expected_response["code"],
+        description=expected_response["description"],
+        workflow_id=expected_response["workflow_id"],
+        subject=expected_response["subject"],
+        local_id=expected_response["local_id"],
+        status=expected_response["status"],
+        file_name=expected_response["file_name"],
+        linked_message_id=expected_response["linked_message_id"],
+    )
+
+    res = app.post("/messageexchange/admin/report", json=request.model_dump())
+    assert res.status_code == status.HTTP_200_OK
+    msg_id = res.json()["message_id"]
+
+    res = app.get(f"{root_path}/{msg_id}")
+    non_delivery_report = res.json()
+    assert non_delivery_report["status"] == "Accepted"
+    assert non_delivery_report["status_description"] == "Message not collected by recipient after 5 days"

mesh_sandbox/tests/helpers.py

@@ -74,6 +74,7 @@ def ensure_client_installed(java_path: str, base_dir: str, version: str):  # pyl
 
         with httpx.Client() as client:
             res = client.get(installer_uri)
+            res.raise_for_status()
             with open(installer_rar, "wb+") as f:
                 f.write(res.read())
 

mesh_sandbox/views/outbox.py

@@ -26,8 +26,8 @@ class SendMessageV2(BaseModel):
 
 
 class UploadChunkV1(BaseModel):
-    messageID: str = Field(default=None, description="message identifier, as supplied in the request url")
-    blockID: int = Field(default=None, description="chunk number, as supplied in the request url")
+    messageID: Union[str, None] = Field(default=None, description="message identifier, as supplied in the request url")
+    blockID: Union[int, None] = Field(default=None, description="chunk number, as supplied in the request url")
 
     class Config:
         title = "upload_chunk"

{mesh_sandbox-1.0.26.dist-info → mesh_sandbox-1.0.28.dist-info}/METADATA

@@ -1,19 +1,17 @@
 Metadata-Version: 2.1
 Name: mesh-sandbox
-Version: 1.0.26
+Version: 1.0.28
 Summary: NHSDigital mesh sandbox, a locally testable version of the MESH api
 License: MIT
 Author: spinecore
-Requires-Python: >=3.9,<4.0
+Requires-Python: >=3.11,<3.14.0
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Requires-Dist: cryptography (>=42.0.0,<43.0.0)
-Requires-Dist: fastapi (>=0.104.1,<0.112.0)
-Requires-Dist: gunicorn (>=21.2,<23.0)
-Requires-Dist: mesh-client (>=3.2.3,<4.0.0)
+Requires-Dist: cryptography (>=42,<44)
+Requires-Dist: fastapi (>=0.104.1,<0.116.0)
+Requires-Dist: gunicorn (>=21.2,<24.0)
+Requires-Dist: mesh-client (>=4.0.1,<5.0.0)
 Requires-Dist: python-dateutil (>=2.8.2,<3.0.0)
 Requires-Dist: types-python-dateutil (>=2.8.9,<3.0.0)
 Requires-Dist: uvicorn (>=0.23.2,<0.31.0)
@@ -43,8 +41,6 @@ docker compose
 --------------
 
 ```yaml
-version: '3.9'
-
 
 services:
 

{mesh_sandbox-1.0.26.dist-info → mesh_sandbox-1.0.28.dist-info}/RECORD

@@ -1,8 +1,8 @@
-mesh_sandbox/__init__.py,sha256=qsWFNiLm8PRshbacOTrlIH_bB-tODfzJKwdZTTLVp20,23
+mesh_sandbox/__init__.py,sha256=pC0eKGXF1PH-qw7ZFRVVeFacCzuUE-x6jPc3T4w6jNc,23
 mesh_sandbox/api.py,sha256=N6k5RH6C9nXkVU4VqK9Cb4Zm0y0btCkzY7vgf4aM-Vg,3924
 mesh_sandbox/common/__init__.py,sha256=r_QcbsmkiCFrE04QVputqAF2TPIlixiXBcGKgWR4SvE,3430
-mesh_sandbox/common/constants.py,sha256=ADa23j-2FL-u4618N5s9IjerXVoGHSVav4S4k-UTpCs,6612
-mesh_sandbox/common/exceptions.py,sha256=YQII8w6DQQoKuW0cukEr6PIE9j0rwrqDpCn5lapgmkQ,1481
+mesh_sandbox/common/constants.py,sha256=5D2YKE74r0NkA-gACblg_uws02VlokuqPGGXe-eBdAA,6649
+mesh_sandbox/common/exceptions.py,sha256=8A1zDPDSQN3lIHs7rukuQrPv8hf9zV9-oZOaCj2O6Ls,2603
 mesh_sandbox/common/fernet.py,sha256=f8yygkVnK1cmQLBgcPifoB4PwGpgiOrG8Yk-6OMDy8o,551
 mesh_sandbox/common/handler_helpers.py,sha256=Eg00Tide2mL87EoMFw83fDuxiTL5DgIwxHs2RaJasgE,392
 mesh_sandbox/common/messaging.py,sha256=g0IxoHfgs6EKpKUnMq3WKouFW_N2FXQrf7hPhICmhuQ,14772
@@ -10,7 +10,7 @@ mesh_sandbox/common/mex_headers.py,sha256=DGtbS2Xd010JKLw4W3f1qAhKfXBJ2BsauStleG
 mesh_sandbox/conftest.py,sha256=nNCRnGABKSByhUVmozHOUE_pRM8Ay30drxsehljGdbw,2193
 mesh_sandbox/dependencies.py,sha256=GXbb9DMaHcbgGg8v-XCTEQU8wxIaXEDmo1o-xvMPoBE,4078
 mesh_sandbox/handlers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mesh_sandbox/handlers/admin.py,sha256=icZsZG1_JKrOU2e2IG6DrOuSzIVBG9P6eZX79zOjrd4,4485
+mesh_sandbox/handlers/admin.py,sha256=Pi2OWkvhyGfSwy7ybDWeuEGqx8gHF09kNz7_ysWkSWY,4820
 mesh_sandbox/handlers/handshake.py,sha256=XSSWLfjs2lCVQCaEou8k3yMUI1X_YmsesF-WECYJUls,603
 mesh_sandbox/handlers/inbox.py,sha256=KFEo3E-y66CErwxxw8W1DYbBJdCQp9psVbQo7be4vek,15913
 mesh_sandbox/handlers/lookup.py,sha256=wDbcI_uKFPNE6udkAvWYOVyR7FOMfLwTh8It924PcqQ,1390
@@ -45,16 +45,16 @@ mesh_sandbox/store/data/mailboxes.jsonl,sha256=ADXpImNo9UH6rY6T9bqgI-BvnbziFaGwc
 mesh_sandbox/store/data/workflows.jsonl,sha256=RFvycuqVmEkImeXlFD2wjuJFjt6dw581D_raPWstxpU,292
 mesh_sandbox/store/file_store.py,sha256=FcgqeHQI0fFySIl9NUFSjQ3MdXBDYk_SwcOUf8P8Mak,2398
 mesh_sandbox/store/memory_store.py,sha256=VJTsPAnwvPAVFTEo-mO2A__lcc7jMnyqiq0JerYmrKY,1643
-mesh_sandbox/store/serialisation.py,sha256=SsiZwblvTteIha1T4BIiuqrRo3SVF7sVuoURjSGDYyY,3608
+mesh_sandbox/store/serialisation.py,sha256=EoohT56auv6cZRZoYlnrZUUmassXu76kq8rpHnymh8U,3624
 mesh_sandbox/test_plugin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mesh_sandbox/test_plugin/example_plugin.py,sha256=807XB2_u6Kin8fEuk8PLLDnIzt32YHoKQcI-LIpZNKM,987
 mesh_sandbox/test_plugin/example_plugin.txt,sha256=aUePU6UUVhpxeP37Pdz5Zxyn_nxI6HCY3qtQBo1iUEI,24
 mesh_sandbox/tests/__init__.py,sha256=wPjH0Ka1334a0OR9VMUfeYxsr03JqWjHTBnAH_1SB7I,106
-mesh_sandbox/tests/admin.py,sha256=f1PhADciDivIs-6rTbMNC2ifW2HAG1CyeOe7P_ve0ws,19234
+mesh_sandbox/tests/admin.py,sha256=vwLFnqCDIaRnYrYc96eBt5cZs_yu9wZqyshjh-_KWsE,20631
 mesh_sandbox/tests/docker_tests.py,sha256=LTV_N4m6uAtn2Ygol0OVWz81tdO2FgK4vqD7PKtsZbA,1596
 mesh_sandbox/tests/exceptions.py,sha256=tXRYe0s1AM1HPDKO8obdQZOX63NkkhpgohjkPBYF2Vk,739
 mesh_sandbox/tests/handshake.py,sha256=DMz8KFNJVd8A9sR9J4-aQWY-eIK5FAiJJwv0UPZcNGY,6263
-mesh_sandbox/tests/helpers.py,sha256=8XWurm72Vpykc6dv9v4T1p9qkfboPq7T3j4d9ed3u2o,6882
+mesh_sandbox/tests/helpers.py,sha256=AytRIzf93NLLa6KHvXrBVOkBmz8wagJdhAwMOqhLFT8,6917
 mesh_sandbox/tests/inbox.py,sha256=lK-T-XRACWUz073osdoJWrf-f4bHe5DSdMh4H7WXP5s,11670
 mesh_sandbox/tests/java_client_tests.py,sha256=hpcZ4gaSS7wSmz2DVxCT5KVRqy-pPVhh-NbdVoqHlcg,6526
 mesh_sandbox/tests/lookup.py,sha256=rXNhnLDukZ5woxVB2Uu281hRaS2X1Hx6h0_d7cw_lxs,2780
@@ -68,9 +68,9 @@ mesh_sandbox/views/admin.py,sha256=IUiYp_nb1JZbFVa9k2Bts4a8XvuJsCvgxsvizcJopQ8,8
 mesh_sandbox/views/error.py,sha256=NC-EgfbirqFa7JxSwOlPvtLzTYrpvBY8gvKtJ-KhnxA,3901
 mesh_sandbox/views/inbox.py,sha256=zdKB2ulJaDRVnhnagyBYF2nFmN88wslAx3bq7d7feLo,5775
 mesh_sandbox/views/lookup.py,sha256=c_UtaJMCfBacsV692FQs4_AyDKjPNxIQKu2wgluDSGw,2815
-mesh_sandbox/views/outbox.py,sha256=JrJk-R3fTjjcfVFW5Q_Fvxj8oasNRuH7HNJiMiTiD80,4907
+mesh_sandbox/views/outbox.py,sha256=tVDH3yctLGOuJiN0LRjwatxXxsvph5LBZuhFyRrxtp4,4933
 mesh_sandbox/views/tracking.py,sha256=WEswJT_wLJPieN5CgJ-CGXjDSRF5BdUzVy5XHqzGHAE,8914
-mesh_sandbox-1.0.26.dist-info/LICENSE,sha256=usgzIvDUpVX5pYZepJTRXQJqIaz0mdd32GuS5a3PFlY,1051
-mesh_sandbox-1.0.26.dist-info/METADATA,sha256=Q5CKOr-drWCqnkFT0EM7AYXM6dOEQIfPEKXNYGoVceE,2413
-mesh_sandbox-1.0.26.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-mesh_sandbox-1.0.26.dist-info/RECORD,,
+mesh_sandbox-1.0.28.dist-info/LICENSE,sha256=usgzIvDUpVX5pYZepJTRXQJqIaz0mdd32GuS5a3PFlY,1051
+mesh_sandbox-1.0.28.dist-info/METADATA,sha256=VSoC3iG2y1BPBn4cP_zzvF-VrZJWzcljgii5ElevM_s,2292
+mesh_sandbox-1.0.28.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+mesh_sandbox-1.0.28.dist-info/RECORD,,