mesh-sandbox 1.0.12__py3-none-any.whl → 1.0.14__py3-none-any.whl

mesh_sandbox/__init__.py

@@ -1 +1 @@
-__version__ = "1.0.12"
+__version__ = "1.0.14"

mesh_sandbox/common/constants.py

@@ -28,6 +28,7 @@ class Headers:
     Mex_Content_Encrypted: Final[str] = "mex-Content-Encrypted"
     Mex_Content_Compressed: Final[str] = "mex-Content-Compressed"
     Mex_Content_Checksum: Final[str] = "mex-Content-Checksum"
+    Mex_Content_Type: Final[str] = "mex-Content-Type"
     Mex_MessageType: Final[str] = "mex-MessageType"
     Mex_MessageID: Final[str] = "mex-MessageID"
     Mex_LocalID: Final[str] = "mex-LocalID"

mesh_sandbox/common/mex_headers.py

@@ -37,6 +37,7 @@ class MexHeaders(NamedTuple):
     mex_content_encrypted: bool
     mex_content_compressed: bool
     mex_content_checksum: Optional[str]
+    mex_content_type: Optional[str]
 
     def update(self, **kwargs):
         if not kwargs:
@@ -58,6 +59,7 @@ class MexHeaders(NamedTuple):
             "mex_content_encrypted": message.metadata.encrypted,
             "mex_content_compressed": message.metadata.compressed,
             "mex_content_checksum": message.metadata.checksum,
+            "mex_content_type": message.metadata.content_type,
         }
 
         if kwargs:
@@ -151,6 +153,17 @@ def send_message_mex_headers(
         example="b10a8db164e0754105b7a99be72e3fe5",
         max_length=100,
     ),
+    mex_content_type: str = Header(
+        title=Headers.Mex_Content_Type,
+        default="",
+        description=(
+            "Content Type of the overall message, overrides Content-Type and "
+            "is passed through to recipient, for chunked messages Content-Type will "
+            "always be application/octet-stream but Mex-Content-Type will be preserved"
+        ),
+        example="application/json",
+        max_length=100,
+    ),
 ) -> MexHeaders:
     mex_headers = MexHeaders(
         mex_to=(mex_to or "").upper().strip(),
@@ -163,6 +176,7 @@ def send_message_mex_headers(
         mex_content_encrypted=strtobool(mex_content_encrypted) or False,
         mex_content_compressed=strtobool(mex_content_compressed) or False,
         mex_content_checksum=mex_content_checksum,
+        mex_content_type=mex_content_type,
     )
     _validate_headers(mex_headers=mex_headers)
     return mex_headers

mesh_sandbox/handlers/inbox.py

@@ -93,6 +93,7 @@ class InboxHandler:
             Headers.Mex_Content_Compressed: "Y" if message.metadata.compressed else None,
             Headers.Mex_Content_Encrypted: "Y" if message.metadata.encrypted else None,
             Headers.Mex_Content_Checksum: message.metadata.checksum,
+            Headers.Mex_Content_Type: message.metadata.content_type,
         }
 
         if message.message_type == MessageType.REPORT:
@@ -197,11 +198,15 @@ class InboxHandler:
         if headers.get(Headers.Content_Encoding) == "gzip":
             headers[Headers.Mex_Content_Compressed] = "Y"
 
+        media_type = "application/octet-stream"
+        if accepts_api_version > 1 and message.total_chunks < 2 and message.metadata.content_type:
+            media_type = message.metadata.content_type
+
         return Response(
             status_code=status_code,
             content=chunk,
             headers=headers,
-            media_type="application/octet-stream",
+            media_type=media_type,
         )
 
     async def acknowledge_message(

mesh_sandbox/handlers/outbox.py

@@ -127,7 +127,7 @@ class OutboxHandler:
             workflow_id=mex_headers.mex_workflow_id,
             metadata=MessageMetadata(
                 subject=mex_headers.mex_subject,
-                content_type=content_type,
+                content_type=mex_headers.mex_content_type or content_type,
                 content_encoding=content_encoding,
                 file_name=mex_headers.mex_filename or f"{message_id}.dat",
                 local_id=mex_headers.mex_localid,

{mesh_sandbox-1.0.12.dist-info → mesh_sandbox-1.0.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mesh-sandbox
-Version: 1.0.12
+Version: 1.0.14
 Summary: NHSDigital mesh sandbox, a locally testable version of the MESH api
 License: MIT
 Author: spinecore
@@ -11,7 +11,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Requires-Dist: cryptography (>=41.0.4,<42.0.0)
-Requires-Dist: fastapi (>=0.103.1,<0.104.0)
+Requires-Dist: fastapi (>=0.104.1,<0.105.0)
 Requires-Dist: gunicorn (>=21.2.0,<22.0.0)
 Requires-Dist: python-dateutil (>=2.8.2,<3.0.0)
 Requires-Dist: types-python-dateutil (>=2.8.9,<3.0.0)

{mesh_sandbox-1.0.12.dist-info → mesh_sandbox-1.0.14.dist-info}/RECORD

@@ -1,20 +1,20 @@
-mesh_sandbox/__init__.py,sha256=bQ8TKIXU3qSGr-K-gVtWDgjDfBlCgBju76OGKtY9tS8,23
+mesh_sandbox/__init__.py,sha256=tmJFcbWnlgNwXFCrgJHkNSJZmxR67rAjso_lz91m_vc,23
 mesh_sandbox/api.py,sha256=N6k5RH6C9nXkVU4VqK9Cb4Zm0y0btCkzY7vgf4aM-Vg,3924
 mesh_sandbox/common/__init__.py,sha256=r_QcbsmkiCFrE04QVputqAF2TPIlixiXBcGKgWR4SvE,3430
-mesh_sandbox/common/constants.py,sha256=dakVgzHaYnUDCQmmssIUqdzIqIbpua2-Zh2qAJiojm4,6558
+mesh_sandbox/common/constants.py,sha256=ADa23j-2FL-u4618N5s9IjerXVoGHSVav4S4k-UTpCs,6612
 mesh_sandbox/common/exceptions.py,sha256=YQII8w6DQQoKuW0cukEr6PIE9j0rwrqDpCn5lapgmkQ,1481
 mesh_sandbox/common/fernet.py,sha256=f8yygkVnK1cmQLBgcPifoB4PwGpgiOrG8Yk-6OMDy8o,551
 mesh_sandbox/common/handler_helpers.py,sha256=Eg00Tide2mL87EoMFw83fDuxiTL5DgIwxHs2RaJasgE,392
 mesh_sandbox/common/messaging.py,sha256=XY7yd7C-DubKsTfmBMmYVppPfmiycswC43oxywNR-Yo,14756
-mesh_sandbox/common/mex_headers.py,sha256=nrnl0u2cpNexVNtJPjSlaRNe8ZzbXwXUTM9P88p322w,6087
+mesh_sandbox/common/mex_headers.py,sha256=DGtbS2Xd010JKLw4W3f1qAhKfXBJ2BsauStleGV8BjE,6678
 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=uATzpRCnEW4_FEsF1kV0HJ-Ukb1-lUkzyqxY_YcX_8U,4141
 mesh_sandbox/handlers/handshake.py,sha256=XSSWLfjs2lCVQCaEou8k3yMUI1X_YmsesF-WECYJUls,603
-mesh_sandbox/handlers/inbox.py,sha256=QkLiMrKQRQASi2uWtwIEnSMSwo3WGCMo78f3EKFm0tQ,15657
+mesh_sandbox/handlers/inbox.py,sha256=KFEo3E-y66CErwxxw8W1DYbBJdCQp9psVbQo7be4vek,15913
 mesh_sandbox/handlers/lookup.py,sha256=wDbcI_uKFPNE6udkAvWYOVyR7FOMfLwTh8It924PcqQ,1390
-mesh_sandbox/handlers/outbox.py,sha256=KlNe1lVTRzbrqTJgSOtiCACkNpNdeGJINPTXHJRGft4,10003
+mesh_sandbox/handlers/outbox.py,sha256=DRWkZR5FOJJo_xYea4kig5CED2naIxH6jn8xtnaonF0,10035
 mesh_sandbox/handlers/tracking.py,sha256=HGBbO9-RczN6uD7QO7eZtadCJz8y_45sK4aLaOm0wJc,2354
 mesh_sandbox/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mesh_sandbox/models/mailbox.py,sha256=2mfKro7zBaVx1DpsgnU5Y8_CnnEbq3epHjMR_G9Jhuk,1030
@@ -70,7 +70,7 @@ mesh_sandbox/views/inbox.py,sha256=zdKB2ulJaDRVnhnagyBYF2nFmN88wslAx3bq7d7feLo,5
 mesh_sandbox/views/lookup.py,sha256=c_UtaJMCfBacsV692FQs4_AyDKjPNxIQKu2wgluDSGw,2815
 mesh_sandbox/views/outbox.py,sha256=JrJk-R3fTjjcfVFW5Q_Fvxj8oasNRuH7HNJiMiTiD80,4907
 mesh_sandbox/views/tracking.py,sha256=WEswJT_wLJPieN5CgJ-CGXjDSRF5BdUzVy5XHqzGHAE,8914
-mesh_sandbox-1.0.12.dist-info/LICENSE,sha256=usgzIvDUpVX5pYZepJTRXQJqIaz0mdd32GuS5a3PFlY,1051
-mesh_sandbox-1.0.12.dist-info/METADATA,sha256=qBE-S78StjVdNScsE04pSwrj4dWus192qHIsOdGJh7k,2373
-mesh_sandbox-1.0.12.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-mesh_sandbox-1.0.12.dist-info/RECORD,,
+mesh_sandbox-1.0.14.dist-info/LICENSE,sha256=usgzIvDUpVX5pYZepJTRXQJqIaz0mdd32GuS5a3PFlY,1051
+mesh_sandbox-1.0.14.dist-info/METADATA,sha256=jR76s9cq3DoJPeCZGa0Mjmh-76PM37JmbZmjT_vDpMQ,2373
+mesh_sandbox-1.0.14.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+mesh_sandbox-1.0.14.dist-info/RECORD,,