omserv 0.0.0.dev315__py3-none-any.whl → 0.0.0.dev317__py3-none-any.whl

omserv/apps/__init__.py

@@ -0,0 +1,44 @@
+from .base import (  # noqa
+    SCOPE,
+
+    BaseServerUrl,
+    BASE_SERVER_URL,
+
+    url_for,
+)
+
+from .markers import (  # noqa
+    AppMarker,
+
+    append_app_marker,
+    get_app_markers,
+
+    AppMarkerProcessor,
+    NopAppMarkerProcessor,
+
+    AppMarkerProcessorMap,
+)
+
+from .routes import (  # noqa
+    KnownMethod,
+    KNOWN_METHODS,
+
+    Route,
+    RouteHandler,
+
+    handles,
+    HANDLES_APP_MARKER_PROCESSORS,
+
+    RouteHandlerHolder,
+    get_marked_route_handlers,
+
+    DuplicateRouteError,
+    build_route_handler_map,
+
+    RouteHandlerApp,
+)
+
+from .sessions import (  # noqa
+    SESSION,
+    with_session,
+)

omserv/apps/routes.py

@@ -24,6 +24,28 @@ from .markers import append_app_marker
 from .markers import get_app_markers
 
 
+CallableT = ta.TypeVar('CallableT', bound=ta.Callable)
+
+
+KnownMethod: ta.TypeAlias = ta.Literal[
+    'DELETE',
+    'GET',
+    'HEAD',
+    'PATCH',
+    'POST',
+    'PUT',
+]
+
+KNOWN_METHODS: tuple[str, ...] = (
+    'DELETE',
+    'GET',
+    'HEAD',
+    'PATCH',
+    'POST',
+    'PUT',
+)
+
+
 PatOrStr: ta.TypeAlias = re.Pattern | str
 
 
@@ -33,14 +55,37 @@ log = logging.getLogger(__name__)
 ##
 
 
-class Route(ta.NamedTuple):
+@dc.dataclass(frozen=True)
+class Route(lang.Final):
     method: str
     path: PatOrStr
 
+    def __post_init__(self) -> None:
+        check.non_empty_str(self.method)
+        check.equal(self.method, self.method.upper())
+        if isinstance(self.path, str):
+            check.arg(self.path.startswith('/'))
+        else:
+            check.isinstance(self.path, re.Pattern)
+
+    #
+
+    @classmethod
+    def delete(cls, path: PatOrStr) -> 'Route':
+        return cls('DELETE', path)
+
     @classmethod
     def get(cls, path: PatOrStr) -> 'Route':
         return cls('GET', path)
 
+    @classmethod
+    def head(cls, path: PatOrStr) -> 'Route':
+        return cls('HEAD', path)
+
+    @classmethod
+    def patch(cls, path: PatOrStr) -> 'Route':
+        return cls('PATCH', path)
+
     @classmethod
     def post(cls, path: PatOrStr) -> 'Route':
         return cls('POST', path)
@@ -49,27 +94,44 @@ class Route(ta.NamedTuple):
     def put(cls, path: PatOrStr) -> 'Route':
         return cls('PUT', path)
 
-    @classmethod
-    def delete(cls, path: PatOrStr) -> 'Route':
-        return cls('DELETE', path)
-
 
 class RouteHandler(ta.NamedTuple):
     route: Route
     handler: asgi.App
 
 
+##
+
+
 @dc.dataclass(frozen=True)
 class _HandlesAppMarker(AppMarker, lang.Final):
     routes: ta.Sequence[Route]
 
 
-def handles(*routes: Route):
+@ta.overload
+def handles(method: KnownMethod, path: PatOrStr) -> ta.Callable[[CallableT], CallableT]:
+    ...
+
+
+@ta.overload
+def handles(*routes: Route) -> ta.Callable[[CallableT], CallableT]:
+    ...
+
+
+def handles(*args):
+    routes: list[Route]
+    if any(isinstance(a, Route) for a in args):
+        routes = [check.isinstance(a, Route) for a in args]
+    elif args:
+        method, path = args
+        routes = [Route(check.in_(method, KNOWN_METHODS), path)]
+    else:
+        routes = []
+
     def inner(fn):
         append_app_marker(fn, _HandlesAppMarker(routes))
         return fn
 
-    routes = tuple(map(check.of_isinstance(Route), routes))
     return inner
 
 
@@ -107,6 +169,9 @@ def get_marked_route_handlers(h: RouteHandlerHolder) -> ta.Sequence[RouteHandler
     return ret
 
 
+##
+
+
 @dc.dataclass()
 class DuplicateRouteError(Exception):
     route_handlers: ta.Sequence[RouteHandler]
@@ -179,7 +244,7 @@ class RouteHandlerApp(asgi.App_):
             pat_apps = [
                 a
                 for r, a in pat_rts
-                if check.isinstance(r, re.Pattern).fullmatch(path)
+                if check.isinstance(r.path, re.Pattern).fullmatch(path)
             ]
             if pat_apps:
                 return check.single(pat_apps)

omserv/server/__init__.py

@@ -14,5 +14,14 @@ See:
  - https://github.com/encode/starlette
  - https://github.com/tiangolo/fastapi
 """
-from .config import Config  # noqa
-from .default import serve  # noqa
+from .config import (  # noqa
+    Config,
+)
+
+from .default import (  # noqa
+    serve,
+)
+
+from .types import (  # noqa
+    AsgiWrapper,
+)

{omserv-0.0.0.dev315.dist-info → omserv-0.0.0.dev317.dist-info}/METADATA

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

{omserv-0.0.0.dev315.dist-info → omserv-0.0.0.dev317.dist-info}/RECORD

@@ -1,11 +1,11 @@
 omserv/.manifests.json,sha256=qn9Vc6VXiVo9RzpJdLzQi_x2DPZIP3cq4S2bkqvJqjY,260
 omserv/__about__.py,sha256=uf--5HCe4fnc_IJQyQO03TUR2jiyuzOGu3s9UnbidhM,765
 omserv/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omserv/apps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+omserv/apps/__init__.py,sha256=buRI0lsNdbR08TjRKLhGsFHWETS2Br_mb6mm-8u9FII,617
 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=2YAWnfC0XOsxud2LLDwC-s9raORe2ZCMLV-Iznj5UjY,6193
+omserv/apps/routes.py,sha256=dYhLtfN8jWJNWDz4t3cOJd0DDAQuTFG3FTmFP8QEUw0,7412
 omserv/apps/sessions.py,sha256=4HFHra43S0TaM2OcWUZ06eQwAqEaXuhjK5X5jlI0_44,1423
 omserv/apps/templates.py,sha256=PBRZHIF9UbnFnq-4EC6RmPeRkeH8lCBbpJkSdseHs6A,2125
 omserv/nginx/__init__.py,sha256=2d63LCGFA2qS7gdl2nCvNPmQWXNICu19wZIihQJPHCs,48
@@ -19,7 +19,7 @@ omserv/nodes/models.py,sha256=EOaq-aW1rbGOzHTmTULhbVwV5j_burL07qh2QO9smdM,1273
 omserv/nodes/registry.py,sha256=y67VMowll9IuLiTVgauAcbP8-evFJNqpwocwwt7kZL4,3478
 omserv/nodes/sql.py,sha256=vy7RP50JiH3jQHMVa7Hxk0pFJK3QcbGeTvyNppB1W4I,2826
 omserv/server/LICENSE,sha256=VKPNmbyrS9wcwcx20hBlVtLP01brb2dByHrWHeNLPag,1050
-omserv/server/__init__.py,sha256=jrFdrxfnQwjK5DW5y9w0alw6IKToGn2IQyZDhsuGHv4,372
+omserv/server/__init__.py,sha256=YnPjrvhQAAqyNSv_hMJOID7JaP1CXXE7c7rSrsBEJtU,440
 omserv/server/config.py,sha256=oGWL1kuk45bJ6sVr8n3ow5Q-1nz9EqByjoykU2iOHIY,1189
 omserv/server/debug.py,sha256=N7RI0Jj-ttmys3DJD0RREmGG5XZpTCp6y9Yu0x98Agg,299
 omserv/server/default.py,sha256=hmfy--Q35QFMU8oTf4uHwVM2qBFG8mQDR9Wik2f1yZk,970
@@ -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.dev315.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omserv-0.0.0.dev315.dist-info/METADATA,sha256=XpnsJgXh-peq65Xm_E99bbdI7NyE9r3nViRe4RKEDhs,1005
-omserv-0.0.0.dev315.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-omserv-0.0.0.dev315.dist-info/entry_points.txt,sha256=ivSrdA_ahEbI-eVMu-XZS-z4VrnQISvpecIkOqC9zFM,35
-omserv-0.0.0.dev315.dist-info/top_level.txt,sha256=HXehpnxeKscKNULzKNzZ27oNawBrsh1PaNAirbX-XNA,7
-omserv-0.0.0.dev315.dist-info/RECORD,,
+omserv-0.0.0.dev317.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omserv-0.0.0.dev317.dist-info/METADATA,sha256=8APUYPHLIJOgNG-7JKspxb__V19jSL9y_-lWAzMh-uc,1005
+omserv-0.0.0.dev317.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+omserv-0.0.0.dev317.dist-info/entry_points.txt,sha256=ivSrdA_ahEbI-eVMu-XZS-z4VrnQISvpecIkOqC9zFM,35
+omserv-0.0.0.dev317.dist-info/top_level.txt,sha256=HXehpnxeKscKNULzKNzZ27oNawBrsh1PaNAirbX-XNA,7
+omserv-0.0.0.dev317.dist-info/RECORD,,

{omserv-0.0.0.dev315.dist-info → omserv-0.0.0.dev317.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.7.1)
+Generator: setuptools (80.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any