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

omserv/apps/inject.py

@@ -2,17 +2,15 @@ import typing as ta
 
 from omlish import inject as inj
 from omlish.http import sessions
-from omlish.http.asgi import AsgiApp
 from omlish.http.asgi import AsgiScope
 
 from .base import SCOPE
 from .markers import AppMarker
 from .markers import AppMarkerProcessor
 from .markers import NopAppMarkerProcessor
-from .markers import get_app_markers
-from .routes import Handler_
-from .routes import Route
+from .routes import RouteHandler_
 from .routes import _HandlesAppMarker
+from .routes import build_route_handler_map
 from .sessions import SESSION
 from .sessions import _WithSessionAppMarker
 from .sessions import _WithSessionAppMarkerProcessor
@@ -20,10 +18,10 @@ from .templates import JinjaNamespace
 from .templates import JinjaTemplates
 
 
-def bind_handler(hc: type[Handler_]) -> inj.Elemental:
+def bind_handler(hc: type[RouteHandler_]) -> inj.Elemental:
     return inj.as_elements(
         inj.bind(hc, singleton=True),
-        inj.set_binder[Handler_]().bind(hc),
+        inj.set_binder[RouteHandler_]().bind(hc),
     )
 
 
@@ -34,26 +32,9 @@ def bind_app_marker_processor(mc: type[AppMarker], pc: type[AppMarkerProcessor])
     )
 
 
-def _build_route_handler_map(
-        handlers: ta.AbstractSet[Handler_],
-        processors: ta.Mapping[type[AppMarker], AppMarkerProcessor],
-) -> ta.Mapping[Route, AsgiApp]:
-    route_handlers: dict[Route, AsgiApp] = {}
-    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
-
-
 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](),
     )
 
@@ -72,7 +53,7 @@ def bind() -> inj.Elemental:
 
         ##
 
-        inj.set_binder[Handler_](),
+        inj.set_binder[RouteHandler_](),
     )
 
 

omserv/apps/markers.py

@@ -42,3 +42,9 @@ class AppMarkerProcessor(lang.Abstract):
 class NopAppMarkerProcessor(AppMarkerProcessor, lang.Final):
     def __call__(self, app: AsgiApp) -> AsgiApp:
         return app
+
+
+##
+
+
+AppMarkerProcessorMap: ta.TypeAlias = ta.Mapping[type[AppMarker], AppMarkerProcessor]

omserv/apps/routes.py

@@ -17,6 +17,9 @@ from .base import BASE_SERVER_URL
 from .base import SCOPE
 from .base import BaseServerUrl
 from .markers import AppMarker
+from .markers import AppMarkerProcessor
+from .markers import AppMarkerProcessorMap
+from .markers import NopAppMarkerProcessor
 from .markers import append_app_marker
 from .markers import get_app_markers
 
@@ -67,15 +70,20 @@ def handles(*routes: Route):
     return inner
 
 
+HANDLES_APP_MARKER_PROCESSORS: AppMarkerProcessorMap = {
+    _HandlesAppMarker: NopAppMarkerProcessor(),
+}
+
+
 ##
 
 
-class Handler_(lang.Abstract):  # noqa
+class RouteHandler_(lang.Abstract):  # noqa
     def get_route_handlers(self) -> ta.Iterable[RouteHandler]:
         return get_marked_route_handlers(self)
 
 
-def get_marked_route_handlers(h: Handler_) -> ta.Sequence[RouteHandler]:
+def get_marked_route_handlers(h: RouteHandler_) -> ta.Sequence[RouteHandler]:
     ret: list[RouteHandler] = []
 
     cdct: dict[str, ta.Any] = {}
@@ -96,6 +104,23 @@ def get_marked_route_handlers(h: Handler_) -> ta.Sequence[RouteHandler]:
     return ret
 
 
+def build_route_handler_map(
+        handlers: ta.AbstractSet[RouteHandler_],
+        processors: ta.Mapping[type[AppMarker], AppMarkerProcessor],
+) -> ta.Mapping[Route, AsgiApp]:
+    route_handlers: dict[Route, AsgiApp] = {}
+    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
+
+
 ##
 
 

omserv/server/types.py

@@ -4,13 +4,13 @@ import typing as ta
 ##
 
 
-AsgiReceiveEvent: ta.TypeAlias = dict[str, ta.Any]
-AsgiSendEvent: ta.TypeAlias = dict[str, ta.Any]
+AsgiReceiveEvent: ta.TypeAlias = ta.Mapping[str, ta.Any]
+AsgiSendEvent: ta.TypeAlias = ta.Mapping[str, ta.Any]
 
 AsgiReceiveCallable: ta.TypeAlias = ta.Callable[[], ta.Awaitable[AsgiReceiveEvent]]
 AsgiSendCallable: ta.TypeAlias = ta.Callable[[AsgiSendEvent], ta.Awaitable[None]]
 
-Scope: ta.TypeAlias = dict[str, ta.Any]
+Scope: ta.TypeAlias = ta.Mapping[str, ta.Any]
 AsgiFramework: ta.TypeAlias = ta.Callable[
     [
         Scope,
@@ -22,13 +22,13 @@ AsgiFramework: ta.TypeAlias = ta.Callable[
 
 LifespanScope: ta.TypeAlias = Scope
 
-HttpResponseStartEvent: ta.TypeAlias = dict[str, ta.Any]
+HttpResponseStartEvent: ta.TypeAlias = ta.Mapping[str, ta.Any]
 HttpScope: ta.TypeAlias = Scope
 WebsocketScope: ta.TypeAlias = Scope
 
-WebsocketAcceptEvent: ta.TypeAlias = dict[str, ta.Any]
-WebsocketResponseBodyEvent: ta.TypeAlias = dict[str, ta.Any]
-WebsocketResponseStartEvent: ta.TypeAlias = dict[str, ta.Any]
+WebsocketAcceptEvent: ta.TypeAlias = ta.Mapping[str, ta.Any]
+WebsocketResponseBodyEvent: ta.TypeAlias = ta.Mapping[str, ta.Any]
+WebsocketResponseStartEvent: ta.TypeAlias = ta.Mapping[str, ta.Any]
 
 
 ##

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

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

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

@@ -3,9 +3,9 @@ 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=xtcn-C3A4yCdHfnAaejxrC_UGMVBYmWtSxeESIkorP0,2697
-omserv/apps/markers.py,sha256=JyVEXIaZC01bYObZ08TCwmQgiqZSvPfwNFJwpt9PU-c,870
-omserv/apps/routes.py,sha256=xWVgMwMeRr1QJiCCB_LCtxsb41ajdTmbDua4X71Djo0,3778
+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/templates.py,sha256=PBRZHIF9UbnFnq-4EC6RmPeRkeH8lCBbpJkSdseHs6A,2125
 omserv/nginx/__init__.py,sha256=2d63LCGFA2qS7gdl2nCvNPmQWXNICu19wZIihQJPHCs,48
@@ -33,7 +33,7 @@ omserv/server/server.py,sha256=hgUTfZAUwF7V-HdsdV98KbYmE1IRKmEO3B1LlKTiPWc,5223
 omserv/server/sockets.py,sha256=lwqNP7URlp605ibsjHzp0pc-lyjcyTu-hD-uyojLUYk,3389
 omserv/server/ssl.py,sha256=gmB5ecM8Mck-YtGYF8pb2dwFdjABVGzERFCDzM9lBck,1483
 omserv/server/taskspawner.py,sha256=ljzF26UPtnp7GLAY_BvjzuwCoCO9aL7TKLwRNTmUy1M,3008
-omserv/server/types.py,sha256=XXY5py8RYlEeD4FZrWNqSyX7DD-ffSlcG-T2s9BY9eI,2017
+omserv/server/types.py,sha256=02GcS_zDxBzkleaptwr7kT7viefNh7fhFJixPdDpL_M,2059
 omserv/server/workercontext.py,sha256=4rcLuGsyiU7URO7T_eHylOBPPNUS9C23QfEUVyJUtIY,1200
 omserv/server/protocols/__init__.py,sha256=Ryu2PDZ1TUI6F2l-HBEYgyzZ7wHqE6VmjqnS0tIvmQI,47
 omserv/server/protocols/h11.py,sha256=_q_paD-ff0AWJEPaNK-6MUsQVtYRiALnWGwFyM3D0KU,11976
@@ -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.dev280.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omserv-0.0.0.dev280.dist-info/METADATA,sha256=P1USQSjnjruJHdPBkuxjwBFgf8SDOwa95DhY9Qg4uik,1005
-omserv-0.0.0.dev280.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-omserv-0.0.0.dev280.dist-info/entry_points.txt,sha256=ivSrdA_ahEbI-eVMu-XZS-z4VrnQISvpecIkOqC9zFM,35
-omserv-0.0.0.dev280.dist-info/top_level.txt,sha256=HXehpnxeKscKNULzKNzZ27oNawBrsh1PaNAirbX-XNA,7
-omserv-0.0.0.dev280.dist-info/RECORD,,
+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,,