tigrbl 0.3.10.dev1__tar.gz → 0.3.11.dev1__tar.gz

{tigrbl-0.3.10.dev1 → tigrbl-0.3.11.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tigrbl
-Version: 0.3.10.dev1
+Version: 0.3.11.dev1
 Summary: A modern pure ASGI/WSGI Python framework for building schema-first REST and JSON-RPC APIs with SQLAlchemy models, typed validation, lifecycle hooks, and engine extension support.
 License-Expression: Apache-2.0
 License-File: LICENSE

{tigrbl-0.3.10.dev1 → tigrbl-0.3.11.dev1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "tigrbl"
-version = "0.3.10.dev1"
+version = "0.3.11.dev1"
 description = "A modern pure ASGI/WSGI Python framework for building schema-first REST and JSON-RPC APIs with SQLAlchemy models, typed validation, lifecycle hooks, and engine extension support."
 license = "Apache-2.0"
 readme = "README.md"

{tigrbl-0.3.10.dev1 → tigrbl-0.3.11.dev1}/tigrbl/middlewares/__init__.py

@@ -2,6 +2,7 @@ from .spec import (
     ASGIApp,
     ASGIReceive,
     ASGISend,
+    Message,
     MiddlewareSpec,
     WSGIApp,
     WSGIStartResponse,
@@ -16,6 +17,7 @@ __all__ = [
     "ASGIApp",
     "ASGIReceive",
     "ASGISend",
+    "Message",
     "WSGIApp",
     "WSGIStartResponse",
     "MiddlewareSpec",

{tigrbl-0.3.10.dev1 → tigrbl-0.3.11.dev1}/tigrbl/middlewares/base.py

@@ -11,7 +11,7 @@ from tigrbl.responses import Response
 from tigrbl.responses._transport import finalize_transport_response
 
 from .middleware import Middleware
-from .spec import ASGIReceive, ASGISend
+from .spec import ASGIReceive, ASGISend, Message
 
 
 class BaseHTTPMiddleware(Middleware):
@@ -71,10 +71,10 @@ class BaseHTTPMiddleware(Middleware):
             target_request = forward_request or request
             target_scope = self._scope_from_request(scope, target_request)
 
-            messages: list[dict[str, Any]] = []
+            messages: list[Message] = []
             body_sent = False
 
-            async def receive_for_app() -> dict[str, Any]:
+            async def receive_for_app() -> Message:
                 nonlocal body_sent
                 if body_sent:
                     return {"type": "http.request", "body": b"", "more_body": False}
@@ -85,7 +85,7 @@ class BaseHTTPMiddleware(Middleware):
                     "more_body": False,
                 }
 
-            async def send_from_app(message: dict[str, Any]) -> None:
+            async def send_from_app(message: Message) -> None:
                 messages.append(message)
 
             await self.app(target_scope, receive_for_app, send_from_app)

{tigrbl-0.3.10.dev1 → tigrbl-0.3.11.dev1}/tigrbl/middlewares/cors.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 from typing import Any
+import re
 
 from tigrbl.headers import Headers
 from tigrbl.requests import Request
@@ -27,29 +28,58 @@ class CORSMiddleware(BaseHTTPMiddleware):
         app,
         *,
         allow_origin: str = "*",
-        allow_methods: str = "GET,POST,PUT,PATCH,DELETE,OPTIONS",
-        allow_headers: str = "*",
+        allow_origins: list[str] | tuple[str, ...] | None = None,
+        allow_origin_regex: str | None = None,
+        allow_methods: str
+        | list[str]
+        | tuple[str, ...] = "GET,POST,PUT,PATCH,DELETE,OPTIONS",
+        allow_headers: str | list[str] | tuple[str, ...] = "*",
         allow_credentials: bool = False,
         max_age: int = 600,
     ) -> None:
         super().__init__(
             app,
             allow_origin=allow_origin,
+            allow_origins=allow_origins,
+            allow_origin_regex=allow_origin_regex,
             allow_methods=allow_methods,
             allow_headers=allow_headers,
             allow_credentials=allow_credentials,
             max_age=max_age,
         )
         self.allow_origin = allow_origin
-        self.allow_methods = allow_methods
-        self.allow_headers = allow_headers
+        self.allow_origins = list(allow_origins or [])
+        self.allow_origin_regex = allow_origin_regex
+        self._allow_origin_pattern = (
+            re.compile(allow_origin_regex) if allow_origin_regex else None
+        )
+        self.allow_methods = self._normalize_listish(allow_methods)
+        self.allow_headers = self._normalize_listish(allow_headers)
         self.allow_credentials = allow_credentials
         self.max_age = max_age
 
+    @staticmethod
+    def _normalize_listish(value: str | list[str] | tuple[str, ...]) -> str:
+        if isinstance(value, str):
+            return value
+        return ",".join(item.strip() for item in value)
+
     def _resolve_allow_origin(self, request_headers: Headers) -> str:
         origin = request_headers.get("origin")
-        if self.allow_origin == "*" or not origin:
+        if not origin:
+            return self.allow_origin
+
+        if self._allow_origin_pattern and self._allow_origin_pattern.match(origin):
+            return origin
+
+        if self.allow_origins:
+            if origin in self.allow_origins:
+                return origin
+            return "null"
+
+        if self.allow_origin == "*":
             return self.allow_origin
+
         allowed = [candidate.strip() for candidate in self.allow_origin.split(",")]
         if origin in allowed:
             return origin

{tigrbl-0.3.10.dev1 → tigrbl-0.3.11.dev1}/tigrbl/middlewares/middleware.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from typing import Any
 
-from .spec import ASGIApp, ASGIReceive, ASGISend, WSGIApp, WSGIStartResponse
+from .spec import ASGIApp, ASGIReceive, ASGISend, Message, WSGIApp, WSGIStartResponse
 
 
 class Middleware:
@@ -16,7 +16,7 @@ class Middleware:
 
     async def asgi(
         self,
-        scope: dict[str, Any],
+        scope: Message,
         receive: ASGIReceive,
         send: ASGISend,
     ) -> None:

{tigrbl-0.3.10.dev1 → tigrbl-0.3.11.dev1}/tigrbl/middlewares/spec.py

@@ -5,8 +5,9 @@ from __future__ import annotations
 from collections.abc import Awaitable, Callable
 from typing import Any, Protocol
 
-ASGIReceive = Callable[[], Awaitable[dict[str, Any]]]
-ASGISend = Callable[[dict[str, Any]], Awaitable[None]]
+Message = dict[str, Any]
+ASGIReceive = Callable[[], Awaitable[Message]]
+ASGISend = Callable[[Message], Awaitable[None]]
 ASGIApp = Callable[[dict[str, Any], ASGIReceive, ASGISend], Awaitable[None]]
 WSGIStartResponse = Callable[..., Any]
 WSGIApp = Callable[[dict[str, Any], WSGIStartResponse], list[bytes]]

{tigrbl-0.3.10.dev1 → tigrbl-0.3.11.dev1}/tigrbl/system/docs/lens.py

@@ -6,7 +6,7 @@ from urllib.parse import quote
 from ...responses import Response
 
 
-TIGRBL_LENS_VERSION = "0.0.14"
+TIGRBL_LENS_VERSION = "latest"
 
 
 def _with_leading_slash(path: str) -> str: