canvas 0.29.0__py3-none-any.whl → 0.29.1__py3-none-any.whl

{canvas-0.29.0.dist-info → canvas-0.29.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: canvas
-Version: 0.29.0
+Version: 0.29.1
 Summary: SDK to customize event-driven actions in your Canvas instance
 Author-email: Canvas Team <engineering@canvasmedical.com>
 License-Expression: MIT

{canvas-0.29.0.dist-info → canvas-0.29.1.dist-info}/RECORD

@@ -195,7 +195,7 @@ canvas_sdk/handlers/application.py,sha256=6Y18g65ae1ws7-llyKzyWipOg9Y8zVEoV7Y_0E
 canvas_sdk/handlers/base.py,sha256=CpUIDtnZJCJTHytXuz_x43NU8Zy1ejorqfGf0e2H2oY,1422
 canvas_sdk/handlers/cron_task.py,sha256=zShv4qGUmpUjG3HrXVqzMir9kZyqo4nDT3ETqNP13sk,954
 canvas_sdk/handlers/simple_api/__init__.py,sha256=4_GLVafEsgdIBGyxJ6lpl2V0d--MHPsBQrdOeun7o98,431
-canvas_sdk/handlers/simple_api/api.py,sha256=-HYep9FKR9vEqm1eSPq7ukUO5eefoeqqQA3wo6uBsmA,19868
+canvas_sdk/handlers/simple_api/api.py,sha256=5xEZCw54-RM4kRwhXRVlNtA5fALckJtqAi6PH-rdqT0,19876
 canvas_sdk/handlers/simple_api/exceptions.py,sha256=qSm_TnN3fdHZf5wz8BS3ueWpjyCDDY2yik0wx2HhGrc,1245
 canvas_sdk/handlers/simple_api/security.py,sha256=_jWcJv9xTIeCz8B5vYPm3U8rwhDmFtjSaa5jKpM4VQw,5601
 canvas_sdk/handlers/simple_api/tools.py,sha256=o5Dtwj2i7A-W7owxqhl1Yn8tBtnKB_fsJ9aMiouNYeU,3961
@@ -213,7 +213,7 @@ canvas_sdk/templates/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 canvas_sdk/templates/tests/test_utils.py,sha256=VRahmmVwXKcp1NMLoA3BZL4cFFXzFnD-i5IUpcEeXTg,1832
 canvas_sdk/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 canvas_sdk/tests/handlers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-canvas_sdk/tests/handlers/test_simple_api.py,sha256=v4A131xjJsgzmrmRuMtsSTBZw8ZIdJqex11CgfFk-hk,84084
+canvas_sdk/tests/handlers/test_simple_api.py,sha256=PQLZwQBSPpFH9b2Swgx3zeoTnAcHyDVDuz1cyDrgi18,84324
 canvas_sdk/utils/__init__.py,sha256=nZEfYeU-qNZBOh39b8zAuEh0Wzh2PgXxs0NRKKe66Pg,184
 canvas_sdk/utils/http.py,sha256=LB0njXF5evJymXMfaHCwxa6dlJKdYfBCFJSLvcnIQ20,8029
 canvas_sdk/utils/plugins.py,sha256=853MW2fiLpyG3o9ISEawAthQeRiZP73cai5Tngwu4MY,767
@@ -281,7 +281,7 @@ plugin_runner/authentication.py,sha256=UyyhXajokVFH866dpDhoTlXS9Cg7y0sQltn0_LcwX
 plugin_runner/aws_headers.py,sha256=DenX_nAMVhXMJZw88PLZbqJsi5_XriNtr3jE-eJqHY4,2773
 plugin_runner/exceptions.py,sha256=YnRZiQVzbU3HrVlmEXLje_np99009YnhTRVHHyBCtqc,433
 plugin_runner/installation.py,sha256=-TntCAveju5vWrKRLnIxy9xn3pnU3goo5dT4tGs-85s,7537
-plugin_runner/plugin_runner.py,sha256=O0rfs8cnoG-Ni7-AlVYTcStEu5wgWoAzWvtJKqPRaYI,19680
+plugin_runner/plugin_runner.py,sha256=CIgomNpCXqEXoY4qV2rPl3pkQ-96efNXkq5ne1nRmMw,19915
 plugin_runner/sandbox.py,sha256=Y-idLdjjt0i45tlhKDqCA34WgXe4gLDfc3QdEpxW0Ls,14548
 plugin_runner/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 plugin_runner/tests/test_application.py,sha256=e1R2YagMRD96gZALx-Zra-e-sR3SiP7cIpI6pheZnUc,2427
@@ -358,7 +358,7 @@ protobufs/canvas_generated/messages/plugins.proto,sha256=oNainUPWFYQjgCX7bJEPI9_
 protobufs/canvas_generated/services/plugin_runner.proto,sha256=doadBKn5k4xAtOgR-q_pEvW4yzxpUaHNOowMG6CL5GY,304
 pubsub/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pubsub/pubsub.py,sha256=pyTW0JU8mtaqiAV6g6xjZwel1CVy2EonPMU-_vkmhUM,1044
-canvas-0.29.0.dist-info/METADATA,sha256=R5_6vIXwPjpbZGZsWMqs7q8k3t13EF7txQfHSDI-P18,4375
-canvas-0.29.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-canvas-0.29.0.dist-info/entry_points.txt,sha256=0Vs_9GmTVUNniH6eDBlRPgofmADMV4BES6Ao26M4AbM,47
-canvas-0.29.0.dist-info/RECORD,,
+canvas-0.29.1.dist-info/METADATA,sha256=btAtREswURUt0soOc28Mrx7xoonZ2qxdVmxq6-mTx1g,4375
+canvas-0.29.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+canvas-0.29.1.dist-info/entry_points.txt,sha256=0Vs_9GmTVUNniH6eDBlRPgofmADMV4BES6Ao26M4AbM,47
+canvas-0.29.1.dist-info/RECORD,,

canvas_sdk/handlers/simple_api/api.py

@@ -162,7 +162,7 @@ class Request:
         self._body = event.context["body"]
         self.headers = CaseInsensitiveMultiDict(separate_headers(event.context["headers"]))
 
-        match = path_pattern.match(event.context["path"])
+        match = path_pattern.fullmatch(event.context["path"])
         self.path_params = match.groupdict() if match else {}
 
         self.query_params = MultiDict(parse_qsl(self.query_string))
@@ -296,7 +296,7 @@ class SimpleAPIBase(BaseHandler, ABC):
         self._path_pattern = None
         self._handler = None
         for path_pattern, handler in self._ROUTES.get(self.event.context["method"], ()):
-            if path_pattern.match(self.event.context["path"]):
+            if path_pattern.fullmatch(self.event.context["path"]):
                 self._path_pattern = path_pattern
                 self._handler = handler
                 break

canvas_sdk/tests/handlers/test_simple_api.py

@@ -514,12 +514,19 @@ def test_request_routing_path_pattern(
         ("/path/<value>", "/path/test", "/prefix/path/test", {"handler_method": "first"}),
         ("/path/test", "/path/<value>", "/prefix/path/test", {"handler_method": "first"}),
         ("/path/test", "/path/<value>", "/prefix/path/value", {"handler_method": "second"}),
+        (
+            "/path/<value>",
+            "/path/<value>/test",
+            "/prefix/path/value/test",
+            {"handler_method": "second"},
+        ),
     ],
     ids=[
         "pattern registered first, path matches only pattern",
         "pattern registered first, path matches both pattern and fixed",
         "fixed registered first, path matches both pattern and fixed",
         "fixed registered first, path matches only pattern",
+        "two patterns share the same first two segments and then diverge",
     ],
 )
 def test_request_routing_path_pattern_multiple_matches(

plugin_runner/plugin_runner.py

@@ -555,7 +555,10 @@ async def serve(specified_plugin_paths: list[str] | None = None) -> None:
 
     log.info(f"Starting server, listening on port {port}")
 
-    install_plugins()
+    # Only install plugins if the plugin runner was not started from the CLI
+    if specified_plugin_paths is None:
+        install_plugins()
+
     load_plugins(specified_plugin_paths)
 
     await server.start()
@@ -577,12 +580,13 @@ def run_server(specified_plugin_paths: list[str] | None = None) -> None:
     asyncio.set_event_loop(loop)
 
     try:
-        loop.run_until_complete(
-            asyncio.gather(
-                serve(specified_plugin_paths),
-                synchronize_plugins_and_report_errors(),
-            )
-        )
+        coros = [serve(specified_plugin_paths)]
+
+        # Only start the synchronizer if the plugin runner was not started from the CLI
+        if specified_plugin_paths is None:
+            coros.append(synchronize_plugins_and_report_errors())
+
+        loop.run_until_complete(asyncio.gather(*coros))
     except KeyboardInterrupt:
         pass
     finally: