omserv 0.0.0.dev237__py3-none-any.whl → 0.0.0.dev238__py3-none-any.whl

omserv/apps/markers.py

@@ -3,31 +3,34 @@ import typing as ta
 
 from omlish import lang
 from omlish.http.asgi import AsgiApp
+from omlish.metadata import ObjectMetadata
+from omlish.metadata import append_object_metadata
+from omlish.metadata import get_object_metadata
 
 
 T = ta.TypeVar('T')
 
 
-class AppMarker(lang.Abstract):
+##
+
+
+class AppMarker(ObjectMetadata, lang.Abstract):
     pass
 
 
-APP_MARKERS_ATTR = '__' + __name__.replace('.', '_') + '__'
+##
 
 
 def append_app_marker(obj: T, *markers: AppMarker) -> T:
-    tgt = lang.unwrap_func(obj)  # type: ignore
-    tgt.__dict__.setdefault(APP_MARKERS_ATTR, []).extend(markers)
+    append_object_metadata(obj, *markers)
     return obj
 
 
 def get_app_markers(obj: ta.Any) -> ta.Sequence[AppMarker]:
-    tgt = lang.unwrap_func(obj)
-    try:
-        dct = tgt.__dict__
-    except AttributeError:
-        return ()
-    return dct.get(APP_MARKERS_ATTR, ())
+    return [md for md in get_object_metadata(obj) if isinstance(md, AppMarker)]
+
+
+##
 
 
 class AppMarkerProcessor(lang.Abstract):

omserv/apps/routes.py

@@ -106,7 +106,7 @@ class RouteHandlerApp(AsgiApp_):
 
     async def __call__(self, scope: AsgiScope, recv: AsgiRecv, send: AsgiSend) -> None:
         with contextlib.ExitStack() as es:
-            es.enter_context(lang.context_var_setting(SCOPE, scope))
+            es.enter_context(lang.context_var_setting(SCOPE, scope))  # noqa
 
             match scope_ty := scope['type']:
                 case 'lifespan':

{omserv-0.0.0.dev237.dist-info → omserv-0.0.0.dev238.dist-info}/METADATA

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

{omserv-0.0.0.dev237.dist-info → omserv-0.0.0.dev238.dist-info}/RECORD

@@ -4,8 +4,8 @@ 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=CwBKrpNIDOyJXAx8BAtpKi1olPwzWtk5XMkmg2GzogE,905
-omserv/apps/routes.py,sha256=gMaOTHScgXm8yb6JindJeiRLX2xvWLMWvgZsCBR0SPE,3770
+omserv/apps/markers.py,sha256=JyVEXIaZC01bYObZ08TCwmQgiqZSvPfwNFJwpt9PU-c,870
+omserv/apps/routes.py,sha256=xWVgMwMeRr1QJiCCB_LCtxsb41ajdTmbDua4X71Djo0,3778
 omserv/apps/sessions.py,sha256=glruQSbOSbCYLPp6nDRNSHCyp5hj4oiOPhh3R0F9BTM,1537
 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.dev237.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omserv-0.0.0.dev237.dist-info/METADATA,sha256=gltaaW7xZgGuCuSGGK6pUVqHUg9eeDIG1XLiyDxy-XU,983
-omserv-0.0.0.dev237.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-omserv-0.0.0.dev237.dist-info/entry_points.txt,sha256=ivSrdA_ahEbI-eVMu-XZS-z4VrnQISvpecIkOqC9zFM,35
-omserv-0.0.0.dev237.dist-info/top_level.txt,sha256=HXehpnxeKscKNULzKNzZ27oNawBrsh1PaNAirbX-XNA,7
-omserv-0.0.0.dev237.dist-info/RECORD,,
+omserv-0.0.0.dev238.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omserv-0.0.0.dev238.dist-info/METADATA,sha256=LIe8cEMdsDFQgTmsr6SYS6-ibf3HEAzZ5PRvgB7HeSE,983
+omserv-0.0.0.dev238.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+omserv-0.0.0.dev238.dist-info/entry_points.txt,sha256=ivSrdA_ahEbI-eVMu-XZS-z4VrnQISvpecIkOqC9zFM,35
+omserv-0.0.0.dev238.dist-info/top_level.txt,sha256=HXehpnxeKscKNULzKNzZ27oNawBrsh1PaNAirbX-XNA,7
+omserv-0.0.0.dev238.dist-info/RECORD,,