omserv 0.0.0.dev295__py3-none-any.whl → 0.0.0.dev296__py3-none-any.whl

omserv/apps/routes.py

@@ -6,6 +6,7 @@ TODO:
 import contextlib
 import dataclasses as dc
 import logging
+import re
 import typing as ta
 
 from omlish import check
@@ -23,6 +24,9 @@ from .markers import append_app_marker
 from .markers import get_app_markers
 
 
+PatOrStr: ta.TypeAlias = re.Pattern | str
+
+
 log = logging.getLogger(__name__)
 
 
@@ -31,22 +35,22 @@ log = logging.getLogger(__name__)
 
 class Route(ta.NamedTuple):
     method: str
-    path: str
+    path: PatOrStr
 
     @classmethod
-    def get(cls, path: str) -> 'Route':
+    def get(cls, path: PatOrStr) -> 'Route':
         return cls('GET', path)
 
     @classmethod
-    def post(cls, path: str) -> 'Route':
+    def post(cls, path: PatOrStr) -> 'Route':
         return cls('POST', path)
 
     @classmethod
-    def put(cls, path: str) -> 'Route':
+    def put(cls, path: PatOrStr) -> 'Route':
         return cls('PUT', path)
 
     @classmethod
-    def delete(cls, path: str) -> 'Route':
+    def delete(cls, path: PatOrStr) -> 'Route':
         return cls('DELETE', path)
 
 
@@ -147,10 +151,40 @@ def build_route_handler_map(
 ##
 
 
-@dc.dataclass(frozen=True)
 class RouteHandlerApp(asgi.App_):
-    route_handlers: ta.Mapping[Route, asgi.App]
-    base_server_url: BaseServerUrl | None = None
+    def __init__(
+            self,
+            route_handlers: ta.Mapping[Route, asgi.App],
+            base_server_url: BaseServerUrl | None = None,
+    ) -> None:
+        super().__init__()
+
+        self._route_handlers = route_handlers
+        self._base_server_url = base_server_url
+
+        pat_dct: dict[str, list[tuple[Route, asgi.App]]] = {}
+        for r, a in route_handlers.items():
+            if not isinstance(r.path, re.Pattern):
+                continue
+            pat_dct.setdefault(r.method, []).append((r, a))
+        self._pat_route_handlers_by_method = pat_dct
+
+    def _get_route_app(self, *, method: str, path: str) -> asgi.App | None:
+        try:
+            return self._route_handlers[Route(method, path)]
+        except KeyError:
+            pass
+
+        if (pat_rts := self._pat_route_handlers_by_method.get(method)) is not None:
+            pat_apps = [
+                a
+                for r, a in pat_rts
+                if check.isinstance(r, re.Pattern).fullmatch(path)
+            ]
+            if pat_apps:
+                return check.single(pat_apps)
+
+        return None
 
     URL_SCHEME_PORT_PAIRS: ta.ClassVar[ta.Collection[tuple[str, int]]] = (
         ('http', 80),
@@ -167,8 +201,8 @@ class RouteHandlerApp(asgi.App_):
                     return
 
                 case 'http':
-                    if self.base_server_url is not None:
-                        bsu = self.base_server_url
+                    if self._base_server_url is not None:
+                        bsu = self._base_server_url
                     else:
                         sch = scope['scheme']
                         h, p = scope['server']
@@ -179,11 +213,13 @@ class RouteHandlerApp(asgi.App_):
                         bsu = BaseServerUrl(f'{sch}://{h}{ps}/')
                     es.enter_context(lang.context_var_setting(BASE_SERVER_URL, bsu))  # noqa
 
-                    route = Route(scope['method'], scope['raw_path'].decode())
-                    handler = self.route_handlers.get(route)
+                    app = self._get_route_app(
+                        method=scope['method'],
+                        path=scope['raw_path'].decode(),
+                    )
 
-                    if handler is not None:
-                        await handler(scope, recv, send)
+                    if app is not None:
+                        await app(scope, recv, send)
 
                     else:
                         await asgi.send_response(send, 404)

{omserv-0.0.0.dev295.dist-info → omserv-0.0.0.dev296.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omserv
-Version: 0.0.0.dev295
+Version: 0.0.0.dev296
 Summary: omserv
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev295
+Requires-Dist: omlish==0.0.0.dev296
 Provides-Extra: all
 Requires-Dist: h11~=0.14; extra == "all"
 Requires-Dist: h2~=4.2; extra == "all"

{omserv-0.0.0.dev295.dist-info → omserv-0.0.0.dev296.dist-info}/RECORD

@@ -5,7 +5,7 @@ omserv/apps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omserv/apps/base.py,sha256=HYsWbDot7zOnsdSL8dF_ANrNXEYgWIGzlnBdCU7n8v8,376
 omserv/apps/inject.py,sha256=GxM-TT3Ln8YrYBedJF__wY-zs4G3ow7RlxT2afr0FDs,2416
 omserv/apps/markers.py,sha256=JE_px0vsJqoDIDRFu9xtXsKjtxYAshUsFB0aRsoeIcg,965
-omserv/apps/routes.py,sha256=GeP1fk-tdd8LQ2no_FO2bFi48gSqjmTXpLTtcpsvSa0,5096
+omserv/apps/routes.py,sha256=2YAWnfC0XOsxud2LLDwC-s9raORe2ZCMLV-Iznj5UjY,6193
 omserv/apps/sessions.py,sha256=4HFHra43S0TaM2OcWUZ06eQwAqEaXuhjK5X5jlI0_44,1423
 omserv/apps/templates.py,sha256=PBRZHIF9UbnFnq-4EC6RmPeRkeH8lCBbpJkSdseHs6A,2125
 omserv/nginx/__init__.py,sha256=2d63LCGFA2qS7gdl2nCvNPmQWXNICu19wZIihQJPHCs,48
@@ -46,9 +46,9 @@ omserv/server/streams/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 omserv/server/streams/httpstream.py,sha256=0DeiAPLGbEGNa0fHTs8lUpi_CFZs4M5_QB-TiS8mobQ,8015
 omserv/server/streams/utils.py,sha256=aMOrqWIg_Hht5W4kLg3y7oR5AEkVvMrZhyjzo6U5owE,1527
 omserv/server/streams/wsstream.py,sha256=3Vyzox7dCE1tDSXjb6xBubWo41ZF9d38Hrsrlj6h1J8,15482
-omserv-0.0.0.dev295.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omserv-0.0.0.dev295.dist-info/METADATA,sha256=3YlWW1f54794ixMeaMlCEqiYaaEhF5_XtqeRvNz6DNw,1005
-omserv-0.0.0.dev295.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
-omserv-0.0.0.dev295.dist-info/entry_points.txt,sha256=ivSrdA_ahEbI-eVMu-XZS-z4VrnQISvpecIkOqC9zFM,35
-omserv-0.0.0.dev295.dist-info/top_level.txt,sha256=HXehpnxeKscKNULzKNzZ27oNawBrsh1PaNAirbX-XNA,7
-omserv-0.0.0.dev295.dist-info/RECORD,,
+omserv-0.0.0.dev296.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omserv-0.0.0.dev296.dist-info/METADATA,sha256=hIZqw1NS89uvk8-k_0Zt702K7CZvrssxll4rlIOcXRM,1005
+omserv-0.0.0.dev296.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
+omserv-0.0.0.dev296.dist-info/entry_points.txt,sha256=ivSrdA_ahEbI-eVMu-XZS-z4VrnQISvpecIkOqC9zFM,35
+omserv-0.0.0.dev296.dist-info/top_level.txt,sha256=HXehpnxeKscKNULzKNzZ27oNawBrsh1PaNAirbX-XNA,7
+omserv-0.0.0.dev296.dist-info/RECORD,,