omserv 0.0.0.dev281__py3-none-any.whl → 0.0.0.dev283__py3-none-any.whl

omserv/apps/base.py

@@ -1,13 +1,13 @@
 import contextvars
 import typing as ta
 
-from omlish.http.asgi import AsgiScope
+from omlish.http import asgi
 
 
 ##
 
 
-SCOPE: contextvars.ContextVar[AsgiScope] = contextvars.ContextVar('scope')
+SCOPE: contextvars.ContextVar[asgi.Scope] = contextvars.ContextVar('scope')
 
 
 ##

omserv/apps/inject.py

@@ -1,14 +1,15 @@
 import typing as ta
 
 from omlish import inject as inj
+from omlish.http import asgi
 from omlish.http import sessions
-from omlish.http.asgi import AsgiScope
 
 from .base import SCOPE
 from .markers import AppMarker
 from .markers import AppMarkerProcessor
 from .markers import NopAppMarkerProcessor
-from .routes import RouteHandler_
+from .routes import Route
+from .routes import RouteHandlerHolder
 from .routes import _HandlesAppMarker
 from .routes import build_route_handler_map
 from .sessions import SESSION
@@ -18,10 +19,10 @@ from .templates import JinjaNamespace
 from .templates import JinjaTemplates
 
 
-def bind_handler(hc: type[RouteHandler_]) -> inj.Elemental:
+def bind_route_handler_class(hc: type[RouteHandlerHolder]) -> inj.Elemental:
     return inj.as_elements(
         inj.bind(hc, singleton=True),
-        inj.set_binder[RouteHandler_]().bind(hc),
+        inj.set_binder[RouteHandlerHolder]().bind(hc),
     )
 
 
@@ -32,16 +33,26 @@ def bind_app_marker_processor(mc: type[AppMarker], pc: type[AppMarkerProcessor])
     )
 
 
+def _build_route_handler_map(
+        handler_holders: ta.AbstractSet[RouteHandlerHolder],
+        processors: ta.Mapping[type[AppMarker], AppMarkerProcessor],
+) -> ta.Mapping[Route, asgi.App]:
+    return build_route_handler_map(
+        handler_holders,
+        processors,
+    )
+
+
 def bind_route_handler_map() -> inj.Elemental:
     return inj.as_elements(
-        inj.bind(build_route_handler_map, singleton=True),
+        inj.bind(_build_route_handler_map, singleton=True),
         inj.map_binder[type[AppMarker], AppMarkerProcessor](),
     )
 
 
 def bind() -> inj.Elemental:
     return inj.as_elements(
-        inj.bind(ta.Callable[[], AsgiScope], to_const=SCOPE.get),
+        inj.bind(ta.Callable[[], asgi.Scope], to_const=SCOPE.get),
         inj.bind(ta.Callable[[], sessions.Session], to_const=SESSION.get),
 
         ##
@@ -53,7 +64,7 @@ def bind() -> inj.Elemental:
 
         ##
 
-        inj.set_binder[RouteHandler_](),
+        inj.set_binder[RouteHandlerHolder](),
     )
 
 

omserv/apps/markers.py

@@ -2,7 +2,7 @@ import abc
 import typing as ta
 
 from omlish import lang
-from omlish.http.asgi import AsgiApp
+from omlish.http import asgi
 from omlish.metadata import ObjectMetadata
 from omlish.metadata import append_object_metadata
 from omlish.metadata import get_object_metadata
@@ -35,12 +35,12 @@ def get_app_markers(obj: ta.Any) -> ta.Sequence[AppMarker]:
 
 class AppMarkerProcessor(lang.Abstract):
     @abc.abstractmethod
-    def __call__(self, app: AsgiApp) -> AsgiApp:
+    def process_app(self, app: asgi.App) -> asgi.App:
         raise NotImplementedError
 
 
 class NopAppMarkerProcessor(AppMarkerProcessor, lang.Final):
-    def __call__(self, app: AsgiApp) -> AsgiApp:
+    def process_app(self, app: asgi.App) -> asgi.App:
         return app
 
 

omserv/apps/routes.py

@@ -1,3 +1,8 @@
+"""
+TODO:
+ - include route in process_app?
+  - or, deduplicate handlers and only process apps once?
+"""
 import contextlib
 import dataclasses as dc
 import logging
@@ -5,13 +10,7 @@ import typing as ta
 
 from omlish import check
 from omlish import lang
-from omlish.http.asgi import AsgiApp
-from omlish.http.asgi import AsgiApp_
-from omlish.http.asgi import AsgiRecv
-from omlish.http.asgi import AsgiScope
-from omlish.http.asgi import AsgiSend
-from omlish.http.asgi import send_response
-from omlish.http.asgi import stub_lifespan
+from omlish.http import asgi
 
 from .base import BASE_SERVER_URL
 from .base import SCOPE
@@ -53,7 +52,7 @@ class Route(ta.NamedTuple):
 
 class RouteHandler(ta.NamedTuple):
     route: Route
-    handler: AsgiApp
+    handler: asgi.App
 
 
 @dc.dataclass(frozen=True)
@@ -78,12 +77,12 @@ HANDLES_APP_MARKER_PROCESSORS: AppMarkerProcessorMap = {
 ##
 
 
-class RouteHandler_(lang.Abstract):  # noqa
+class RouteHandlerHolder(lang.Abstract):  # noqa
     def get_route_handlers(self) -> ta.Iterable[RouteHandler]:
         return get_marked_route_handlers(self)
 
 
-def get_marked_route_handlers(h: RouteHandler_) -> ta.Sequence[RouteHandler]:
+def get_marked_route_handlers(h: RouteHandlerHolder) -> ta.Sequence[RouteHandler]:
     ret: list[RouteHandler] = []
 
     cdct: dict[str, ta.Any] = {}
@@ -104,38 +103,67 @@ def get_marked_route_handlers(h: RouteHandler_) -> ta.Sequence[RouteHandler]:
     return ret
 
 
+@dc.dataclass()
+class DuplicateRouteError(Exception):
+    route_handlers: ta.Sequence[RouteHandler]
+
+
 def build_route_handler_map(
-        handlers: ta.AbstractSet[RouteHandler_],
+        handlers: ta.Iterable[RouteHandler | RouteHandlerHolder],
         processors: ta.Mapping[type[AppMarker], AppMarkerProcessor],
-) -> ta.Mapping[Route, AsgiApp]:
-    route_handlers: dict[Route, AsgiApp] = {}
+) -> ta.Mapping[Route, asgi.App]:
+    rh_by_r: dict[Route, RouteHandler] = {}
     for h in handlers:
-        for rh in h.get_route_handlers():
-            app = rh.handler
-            markers = get_app_markers(rh.handler)
-            for m in markers:
-                mp = processors[type(m)]
-                if mp is not None:
-                    app = mp(app)
-            route_handlers[rh.route] = app
-    return route_handlers
+        if isinstance(h, RouteHandlerHolder):
+            rhs = list(h.get_route_handlers())
+        else:
+            rhs = [h]
+
+        for rh in rhs:
+            try:
+                ex = rh_by_r[rh.route]
+            except KeyError:
+                pass
+            else:
+                raise DuplicateRouteError([rh, ex])
+
+            rh_by_r[rh.route] = rh
+
+    app_by_r: dict[Route, asgi.App] = {}
+    for r, rh in rh_by_r.items():
+        app = rh.handler
+
+        markers = get_app_markers(rh.handler)
+        for m in markers:
+            mp = processors[type(m)]
+            if mp is not None:
+                app = mp.process_app(app)
+
+        app_by_r[r] = app
+
+    return app_by_r
 
 
 ##
 
 
 @dc.dataclass(frozen=True)
-class RouteHandlerApp(AsgiApp_):
-    route_handlers: ta.Mapping[Route, AsgiApp]
+class RouteHandlerApp(asgi.App_):
+    route_handlers: ta.Mapping[Route, asgi.App]
     base_server_url: BaseServerUrl | None = None
 
-    async def __call__(self, scope: AsgiScope, recv: AsgiRecv, send: AsgiSend) -> None:
+    URL_SCHEME_PORT_PAIRS: ta.ClassVar[ta.Collection[tuple[str, int]]] = (
+        ('http', 80),
+        ('https', 443),
+    )
+
+    async def __call__(self, scope: asgi.Scope, recv: asgi.Recv, send: asgi.Send) -> None:
         with contextlib.ExitStack() as es:
             es.enter_context(lang.context_var_setting(SCOPE, scope))  # noqa
 
             match scope_ty := scope['type']:
                 case 'lifespan':
-                    await stub_lifespan(scope, recv, send)
+                    await asgi.stub_lifespan(scope, recv, send)
                     return
 
                 case 'http':
@@ -144,7 +172,7 @@ class RouteHandlerApp(AsgiApp_):
                     else:
                         sch = scope['scheme']
                         h, p = scope['server']
-                        if (sch, p) not in (('http', 80), ('https', 443)):
+                        if (sch, p) not in self.URL_SCHEME_PORT_PAIRS:
                             ps = f':{p}'
                         else:
                             ps = ''
@@ -158,7 +186,7 @@ class RouteHandlerApp(AsgiApp_):
                         await handler(scope, recv, send)
 
                     else:
-                        await send_response(send, 404)
+                        await asgi.send_response(send, 404)
 
                 case _:
                     raise ValueError(f'Unhandled scope type: {scope_ty!r}')

omserv/apps/sessions.py

@@ -3,11 +3,8 @@ import dataclasses as dc
 import logging
 
 from omlish import lang
+from omlish.http import asgi
 from omlish.http import sessions
-from omlish.http.asgi import AsgiApp
-from omlish.http.asgi import AsgiRecv
-from omlish.http.asgi import AsgiScope
-from omlish.http.asgi import AsgiSend
 
 from .markers import AppMarker
 from .markers import AppMarkerProcessor
@@ -35,7 +32,7 @@ def with_session(fn):
 class _WithSessionAppMarkerProcessor(AppMarkerProcessor):
     _ss: sessions.CookieSessionStore
 
-    async def _wrap(self, fn: AsgiApp, scope: AsgiScope, recv: AsgiRecv, send: AsgiSend) -> None:
+    async def _wrap(self, fn: asgi.App, scope: asgi.Scope, recv: asgi.Recv, send: asgi.Send) -> None:
         async def _send(obj):
             if obj['type'] == 'http.response.start':
                 out_session = SESSION.get()
@@ -53,5 +50,5 @@ class _WithSessionAppMarkerProcessor(AppMarkerProcessor):
         with lang.context_var_setting(SESSION, in_session):
             await fn(scope, recv, _send)
 
-    def __call__(self, app: AsgiApp) -> AsgiApp:
+    def process_app(self, app: asgi.App) -> asgi.App:
         return lang.decorator(self._wrap)(app)  # noqa

{omserv-0.0.0.dev281.dist-info → omserv-0.0.0.dev283.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omserv
-Version: 0.0.0.dev281
+Version: 0.0.0.dev283
 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.dev281
+Requires-Dist: omlish==0.0.0.dev283
 Provides-Extra: all
 Requires-Dist: h11~=0.14; extra == "all"
 Requires-Dist: h2~=4.2; extra == "all"

{omserv-0.0.0.dev281.dist-info → omserv-0.0.0.dev283.dist-info}/RECORD

@@ -2,11 +2,11 @@ omserv/.manifests.json,sha256=qn9Vc6VXiVo9RzpJdLzQi_x2DPZIP3cq4S2bkqvJqjY,260
 omserv/__about__.py,sha256=w4jEBHhEVT7VZlwqMAh-4SecngU8xM6rehzWqi5ULZM,765
 omserv/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omserv/apps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omserv/apps/base.py,sha256=KSwxbC0_fY87_DucvpEOHG6gZ2wL78D-N3We8RTEU4Q,385
-omserv/apps/inject.py,sha256=ora2yPGl8vz1vdLNKQYa_NuUHyMUo9JRHkMNbvN6joA,2083
-omserv/apps/markers.py,sha256=sLTd6d2HYH_lc37nDtDQK_ej10G9qeg4m_TC_v0IW6k,963
-omserv/apps/routes.py,sha256=n7LBAzkclUlWfhk2e2cv0GR5EkMDUpjqhyXWMWwTeVY,4604
-omserv/apps/sessions.py,sha256=glruQSbOSbCYLPp6nDRNSHCyp5hj4oiOPhh3R0F9BTM,1537
+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/sessions.py,sha256=4HFHra43S0TaM2OcWUZ06eQwAqEaXuhjK5X5jlI0_44,1423
 omserv/apps/templates.py,sha256=PBRZHIF9UbnFnq-4EC6RmPeRkeH8lCBbpJkSdseHs6A,2125
 omserv/nginx/__init__.py,sha256=2d63LCGFA2qS7gdl2nCvNPmQWXNICu19wZIihQJPHCs,48
 omserv/nginx/build.py,sha256=87o2IahwUC-xriDpqc3OLKwwx4DacrDtUTplNQe_36k,3203
@@ -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.dev281.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omserv-0.0.0.dev281.dist-info/METADATA,sha256=6kaceg5VdEC213N0KXR4OlC9d5GxYFXD56bg3bB74yk,1005
-omserv-0.0.0.dev281.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-omserv-0.0.0.dev281.dist-info/entry_points.txt,sha256=ivSrdA_ahEbI-eVMu-XZS-z4VrnQISvpecIkOqC9zFM,35
-omserv-0.0.0.dev281.dist-info/top_level.txt,sha256=HXehpnxeKscKNULzKNzZ27oNawBrsh1PaNAirbX-XNA,7
-omserv-0.0.0.dev281.dist-info/RECORD,,
+omserv-0.0.0.dev283.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omserv-0.0.0.dev283.dist-info/METADATA,sha256=DXvfjW99UQEHijbV6UzEkFzjW4JOYEsCgx7hmpYZnxI,1005
+omserv-0.0.0.dev283.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+omserv-0.0.0.dev283.dist-info/entry_points.txt,sha256=ivSrdA_ahEbI-eVMu-XZS-z4VrnQISvpecIkOqC9zFM,35
+omserv-0.0.0.dev283.dist-info/top_level.txt,sha256=HXehpnxeKscKNULzKNzZ27oNawBrsh1PaNAirbX-XNA,7
+omserv-0.0.0.dev283.dist-info/RECORD,,