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

mesh_sandbox/__init__.py

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

mesh_sandbox/routers/inbox.py

@@ -35,8 +35,8 @@ router = APIRouter(
     responses={
         status.HTTP_200_OK: {
             "content": {
-                MESH_MEDIA_TYPES[2]: {"schema": InboxV2.schema()},
-                MESH_MEDIA_TYPES[1]: {"schema": InboxV1.schema()},
+                MESH_MEDIA_TYPES[2]: {"schema": InboxV2.model_json_schema()},
+                MESH_MEDIA_TYPES[1]: {"schema": InboxV1.model_json_schema()},
             }
         },
         status.HTTP_403_FORBIDDEN: {"description": "Authentication failed", "content": None},
@@ -149,7 +149,7 @@ async def head_message(
         status.HTTP_200_OK: {
             "content": {
                 MESH_MEDIA_TYPES[2]: {
-                    "schema": RichInboxView.schema(),
+                    "schema": RichInboxView.model_json_schema(),
                 }
             },
         }

mesh_sandbox/routers/inbox_count.py

@@ -24,10 +24,10 @@ router = APIRouter(
         200: {
             "content": {
                 MESH_MEDIA_TYPES[2]: {
-                    "schema": InboxCountV2.schema(),
+                    "schema": InboxCountV2.model_json_schema(),
                 },
                 MESH_MEDIA_TYPES[1]: {
-                    "schema": InboxCountV1.schema(),
+                    "schema": InboxCountV1.model_json_schema(),
                 },
             }
         }

mesh_sandbox/routers/lookup.py

@@ -19,10 +19,10 @@ router = APIRouter(
         status.HTTP_200_OK: {
             "content": {
                 MESH_MEDIA_TYPES[2]: {
-                    "schema": MailboxLookupV2.schema(),
+                    "schema": MailboxLookupV2.model_json_schema(),
                 },
                 MESH_MEDIA_TYPES[1]: {
-                    "schema": EndpointLookupV1.schema(),
+                    "schema": EndpointLookupV1.model_json_schema(),
                 },
             }
         }
@@ -45,7 +45,7 @@ async def lookup_by_ods_code_and_workflow_id(
         status.HTTP_200_OK: {
             "content": {
                 MESH_MEDIA_TYPES[2]: {
-                    "schema": MailboxLookupV2.schema(),
+                    "schema": MailboxLookupV2.model_json_schema(),
                 }
             }
         }

mesh_sandbox/routers/outbox.py

@@ -40,10 +40,10 @@ router = APIRouter(
         status.HTTP_202_ACCEPTED: {
             "content": {
                 MESH_MEDIA_TYPES[2]: {
-                    "schema": SendMessageV2.schema(),
+                    "schema": SendMessageV2.model_json_schema(),
                 },
                 MESH_MEDIA_TYPES[1]: {
-                    "schema": SendMessageV1.schema(),
+                    "schema": SendMessageV1.model_json_schema(),
                 },
             }
         },
@@ -111,7 +111,7 @@ async def send_chunk(
         200: {
             "content": {
                 MESH_MEDIA_TYPES[2]: {
-                    "schema": RichOutboxView.schema(),
+                    "schema": RichOutboxView.model_json_schema(),
                 }
             }
         }

mesh_sandbox/routers/tracking.py

@@ -27,10 +27,10 @@ router = APIRouter(
         200: {
             "content": {
                 MESH_MEDIA_TYPES[2]: {
-                    "schema": TrackingV2.schema(),
+                    "schema": TrackingV2.model_json_schema(),
                 },
                 MESH_MEDIA_TYPES[1]: {
-                    "schema": TrackingV1.schema(),
+                    "schema": TrackingV1.model_json_schema(),
                 },
             }
         }

mesh_sandbox/tests/mesh_client_tests.py

@@ -41,7 +41,7 @@ def _mesh_client_track_message_by_message_id(base_uri: str, sender_mailbox_id: s
     with MeshClient(
         url=base_uri, mailbox=sender_mailbox_id, password=_PASSWORD, shared_key=_SHARED_KEY, max_chunk_size=100
     ) as sender:
-        tracking = sender.track_by_message_id(message_id)
+        tracking = sender.track_message(message_id)
         assert tracking
         return tracking
 
@@ -62,6 +62,7 @@ def test_handshake_bad_password(base_uri: str):
     with MeshClient(url=base_uri, mailbox=_CANNED_MAILBOX1, password="BAD", shared_key=_SHARED_KEY) as client:
         with pytest.raises(HTTPError) as err:
             client.handshake()
+        assert err.value.response is not None
         assert err.value.response.status_code == status.HTTP_403_FORBIDDEN
 
 
@@ -91,9 +92,9 @@ def test_track_message_by_message_id(base_uri: str):
     assert _mesh_client_get_inbox_count(base_uri, _CANNED_MAILBOX2) == 1
 
     tracking = _mesh_client_track_message_by_message_id(base_uri, _CANNED_MAILBOX1, message_id)
-    assert tracking["messageId"] == message_id
-    assert tracking["status"] == "Accepted"
-    assert tracking["sender"] == _CANNED_MAILBOX1
+    assert tracking["message_id"] == message_id
+    assert tracking["status"] == "accepted"
+    # assert tracking["sender"] == _CANNED_MAILBOX1
     assert tracking["recipient"] == _CANNED_MAILBOX2
 
     with MeshClient(url=base_uri, mailbox=_CANNED_MAILBOX2, password=_PASSWORD, shared_key=_SHARED_KEY) as recipient:
@@ -101,5 +102,5 @@ def test_track_message_by_message_id(base_uri: str):
         message.acknowledge()
 
     tracking = _mesh_client_track_message_by_message_id(base_uri, _CANNED_MAILBOX1, message_id)
-    assert tracking["messageId"] == message_id
-    assert tracking["status"] == "Acknowledged"
+    assert tracking["message_id"] == message_id
+    assert tracking["status"] == "acknowledged"

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mesh-sandbox
-Version: 1.0.11
+Version: 1.0.12
 Summary: NHSDigital mesh sandbox, a locally testable version of the MESH api
 License: MIT
 Author: spinecore
@@ -51,22 +51,28 @@ services:
     build: 
       context: https://github.com/NHSDigital/mesh-sandbox.git#refs/tags/v1.0.4
     ports:
-      - "8700:80"
+      - "8700:443"
     deploy:
       restart_policy:
         condition: on-failure
         max_attempts: 3
     healthcheck:
-      test: curl -sf http://localhost:80/health || exit 1
+      test: curl -ksf https://localhost/health || exit 1
       interval: 3s
       timeout: 10s
     environment:
       - SHARED_KEY=TestKey
+      - SSL=yes
+#      - STORE_MODE=file  # store mode file will persist data to disk
     volumes:
       # mount a different mailboxes.jsonl to pre created mailboxes
       - ./src/mesh_sandbox/store/data/mailboxes.jsonl:/app/mesh_sandbox/store/data/mailboxes.jsonl:ro
-      # the mesh sandbox supports injecting a plugin to support test hooks 
-      # - ./my_test_plugin.py:/app/mesh_sandbox/plugin/my_test_plygin.py:ro
+      - ./src/mesh_sandbox/test_plugin:/app/mesh_sandbox/plugins:ro
+      # you can mount a directory if you want access the stored messages
+      #      - ./messages:/tmp/mesh_store
+      # you can also mount different server cert and key if using ssl and you need a trusted certificate
+#      - ./mycert.pem:/tmp/server-cert.pem:ro
+#      - ./mycert.key:/tmp/server-cert.key:ro
 
 ```
 

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

@@ -1,4 +1,4 @@
-mesh_sandbox/__init__.py,sha256=wygrEW3brUgbks4JvwNjcujOADEl2PWkdIF9d8vyM3c,23
+mesh_sandbox/__init__.py,sha256=bQ8TKIXU3qSGr-K-gVtWDgjDfBlCgBju76OGKtY9tS8,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
@@ -24,12 +24,12 @@ mesh_sandbox/plugins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 mesh_sandbox/routers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mesh_sandbox/routers/admin.py,sha256=ZMa6LfdUidHXkNMTtHsWnRvGYAoJ-ac0BKWYbA1AeFY,4560
 mesh_sandbox/routers/handshake.py,sha256=5TVyQ5OrHIe6W3UVpbap-hc5ia669Of6w6F1vgcYjm4,2693
-mesh_sandbox/routers/inbox.py,sha256=qg79kdpYaHfZqV8bUqezUfkMu7lib8Fa1GPEW3fKJGs,8943
-mesh_sandbox/routers/inbox_count.py,sha256=hY88h7dBa6asnvYEP9mmx6CEBw5ZyRO7gz6lHg4Yj3c,1521
-mesh_sandbox/routers/lookup.py,sha256=eI064yFdZxr4gpgoLbqRiDvsrLHurZcRZOUvVbSxDXY,2114
-mesh_sandbox/routers/outbox.py,sha256=TtPiPR1zlc3ydnAPTBrTpN_-BIkyr04Km6qkTbwyhsI,4956
+mesh_sandbox/routers/inbox.py,sha256=LEyNfXR41vFdIGMPmi9uVrQtQG0U-v0-YC3-so_Oh_M,8976
+mesh_sandbox/routers/inbox_count.py,sha256=OSIr3BbwDbTVt0nDpyUGCh1CD_1v9YQ-bBFGNuZr7jg,1543
+mesh_sandbox/routers/lookup.py,sha256=QnA5Tv5Ig6PGdywsccNhGpgdHw8djBDauZ0mulwuIFM,2147
+mesh_sandbox/routers/outbox.py,sha256=Vr8IIYMGtwrvZjZjCKnS1tkqZu_CznlAHdaxXQhuqew,4989
 mesh_sandbox/routers/request_logging.py,sha256=gZaOJ_Mp3QPsmrpxXQ0pOzVGNPKd_RAEjpT3Iz1ImVM,1439
-mesh_sandbox/routers/tracking.py,sha256=UVIRkMBGD5pI7vgp8l6cnP5VX8OFRDPNb2JHs9q5w58,2210
+mesh_sandbox/routers/tracking.py,sha256=xoqMUcKXMZ7KxsQb3JzFQzsDaogh-nTNDzbMzgGOfL8,2232
 mesh_sandbox/routers/update.py,sha256=a9ttmk3levdDcu-ZF7a5EniR35zRMhty8pG2EyzB1po,409
 mesh_sandbox/store/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mesh_sandbox/store/base.py,sha256=JvATpCJREAvsfLV5_lQBUK-th89M8YeeC08vm0YdUbM,1982
@@ -59,7 +59,7 @@ mesh_sandbox/tests/inbox.py,sha256=lK-T-XRACWUz073osdoJWrf-f4bHe5DSdMh4H7WXP5s,1
 mesh_sandbox/tests/java_client_tests.py,sha256=hpcZ4gaSS7wSmz2DVxCT5KVRqy-pPVhh-NbdVoqHlcg,6526
 mesh_sandbox/tests/lookup.py,sha256=rXNhnLDukZ5woxVB2Uu281hRaS2X1Hx6h0_d7cw_lxs,2780
 mesh_sandbox/tests/mesh_api_helpers.py,sha256=T2tvUJW5WaBytJXslJEek-rWFua3yKLz2_O3xh2ulx4,3887
-mesh_sandbox/tests/mesh_client_tests.py,sha256=KVu2QeF-6PlWH_i355fdnNt6Znwo2xrHBX4MbHRsSG4,3941
+mesh_sandbox/tests/mesh_client_tests.py,sha256=VoCZ21e2xiBH_IyEjnbwZvUXtjSC0HaL2EJoU7Y7wkk,3985
 mesh_sandbox/tests/messaging_tests.py,sha256=odEat8Zk_1imL3_l7YYuNOJKK_pCNVuNIBmjrNXoyrQ,5069
 mesh_sandbox/tests/outbox.py,sha256=TISvClWp8zHBnYNrc04_6dmLq8mNBdXdZzA-TXTS2Lk,21319
 mesh_sandbox/tests/serialisation.py,sha256=HplGgNvjzSYjm9ABMwu3GeiBOSJIchawb2OXKsfKnE4,662
@@ -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.11.dist-info/LICENSE,sha256=usgzIvDUpVX5pYZepJTRXQJqIaz0mdd32GuS5a3PFlY,1051
-mesh_sandbox-1.0.11.dist-info/METADATA,sha256=6RBnBYPBF-Jdx0gPDzNWo3AXrZwixp27w2lgDbqtEi8,2059
-mesh_sandbox-1.0.11.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-mesh_sandbox-1.0.11.dist-info/RECORD,,
+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,,