latch-asgi 1.0.6.dev3__tar.gz → 1.1.0__tar.gz

{latch_asgi-1.0.6.dev3 → latch_asgi-1.1.0}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.1
 Name: latch-asgi
-Version: 1.0.6.dev3
+Version: 1.1.0
 Summary: ASGI python server
 Author-Email: Max Smolin <max@latch.bio>
 License: CC0-1.0
 Requires-Python: <4.0,>=3.11
 Requires-Dist: hypercorn[uvloop]<1.0.0,>=0.14.3
 Requires-Dist: latch-data-validation<1.0.0,>=0.1.3
-Requires-Dist: latch-o11y<1.0.0,>=0.1.4
+Requires-Dist: latch-o11y<2.0.0,>=1.2.0
 Requires-Dist: latch-config<1.0.0,>=0.1.6
 Requires-Dist: PyJWT[crypto]<3.0.0,>=2.6.0
 Requires-Dist: orjson<4.0.0,>=3.8.5

latch_asgi-1.1.0/latch_asgi/context/websocket.py

@@ -0,0 +1,49 @@
+from collections.abc import Awaitable, Callable
+from dataclasses import dataclass
+from typing import Any, Self, TypeAlias, TypeVar
+
+from hypercorn.typing import WebsocketScope
+from latch_o11y.o11y import dict_to_attrs, trace_app_function
+from opentelemetry.trace import get_current_span
+
+from ..asgi_iface import WebsocketReceiveCallable, WebsocketSendCallable
+from ..framework.common import Headers
+from ..framework.websocket import (
+    accept_connection,
+    receive_class_ext,
+    send_websocket_auto,
+    websocket_session_span_key,
+)
+from . import common
+
+T = TypeVar("T")
+
+
+@dataclass
+class Context(
+    common.Context[WebsocketScope, WebsocketReceiveCallable, WebsocketSendCallable]
+):
+    _request_span_key = websocket_session_span_key
+
+    @trace_app_function
+    async def accept_connection(
+        self: Self, *, subprotocol: str | None = None, headers: Headers | None = None
+    ) -> None:
+        await accept_connection(self.send, subprotocol=subprotocol, headers=headers)
+
+    @trace_app_function
+    async def receive_message(self: Self, cls: type[T]) -> T:
+        json, res = await receive_class_ext(self.receive, cls)
+
+        get_current_span().set_attributes(dict_to_attrs(json, "payload"))
+
+        return res
+
+    @trace_app_function
+    async def send_message(self: Self, data: Any) -> None:
+        await send_websocket_auto(self.send, data)
+
+
+HandlerResult = str
+Handler: TypeAlias = Callable[[Context], Awaitable[HandlerResult]]
+Route: TypeAlias = Handler

{latch_asgi-1.0.6.dev3 → latch_asgi-1.1.0}/latch_asgi/framework/common.py

@@ -22,7 +22,6 @@ otel_header_whitelist = {
     "sec-gpc",
     "te",
     "upgrade-insecure-requests",
-    "sec-websocket-extensions",
     "device-memory",
     "downlink",
     "dpr",

{latch_asgi-1.0.6.dev3 → latch_asgi-1.1.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "latch-asgi"
-version = "1.0.6.dev3"
+version = "1.1.0"
 description = "ASGI python server"
 authors = [
     { name = "Max Smolin", email = "max@latch.bio" },
@@ -8,7 +8,7 @@ authors = [
 dependencies = [
     "hypercorn[uvloop]<1.0.0,>=0.14.3",
     "latch-data-validation<1.0.0,>=0.1.3",
-    "latch-o11y<1.0.0,>=0.1.4",
+    "latch-o11y<2.0.0,>=1.2.0",
     "latch-config<1.0.0,>=0.1.6",
     "PyJWT[crypto]<3.0.0,>=2.6.0",
     "orjson<4.0.0,>=3.8.5",

latch_asgi-1.0.6.dev3/latch_asgi/context/websocket.py

@@ -1,93 +0,0 @@
-from collections.abc import Awaitable, Callable
-from dataclasses import dataclass
-from typing import Any, Self, TypeAlias, TypeVar
-
-from hypercorn.typing import WebsocketScope
-from latch_o11y.o11y import dict_to_attrs, trace_app_function
-from opentelemetry.trace import get_current_span
-
-from ..asgi_iface import WebsocketReceiveCallable, WebsocketSendCallable
-from ..framework.common import Headers
-from ..framework.websocket import (
-    accept_connection,
-    receive_class_ext,
-    send_websocket_auto,
-    websocket_session_span_key,
-)
-from . import common
-
-T = TypeVar("T")
-
-
-@dataclass
-class Context(
-    common.Context[WebsocketScope, WebsocketReceiveCallable, WebsocketSendCallable]
-):
-    _request_span_key = websocket_session_span_key
-
-    @trace_app_function
-    async def accept_connection(
-        self: Self,
-        *,
-        subprotocol: str | None = None,
-        headers: Headers | None = None,
-        negotiate_permessage_deflate: bool = False,
-    ) -> None:
-        if not negotiate_permessage_deflate:
-            await accept_connection(self.send, subprotocol=subprotocol, headers=headers)
-            return
-
-        offer = self.header_str("sec-websocket-extensions")
-
-        headers_out: Headers = {}
-        if headers is not None:
-            headers_out = dict(headers)
-
-        def _has_extensions_header(h: Headers) -> bool:
-            for k in h.keys():
-                if isinstance(k, bytes):
-                    if k.decode("latin-1").lower() == "sec-websocket-extensions":
-                        return True
-                else:
-                    if k.lower() == "sec-websocket-extensions":
-                        return True
-            return False
-
-        if (
-            offer is not None
-            and "permessage-deflate" in offer.replace(" ", "").lower()
-            and not _has_extensions_header(headers_out)
-        ):
-            # Minimal negotiation: if the client offered client_max_window_bits without a value,
-            # reply with a concrete value to satisfy browsers like Chrome.
-            offer_no_space = offer.replace(" ", "").lower()
-            if (
-                "client_max_window_bits" in offer_no_space
-                and "client_max_window_bits=" not in offer_no_space
-            ):
-                headers_out["Sec-WebSocket-Extensions"] = (
-                    "permessage-deflate; client_max_window_bits=15"
-                )
-            else:
-                headers_out["Sec-WebSocket-Extensions"] = "permessage-deflate"
-
-        await accept_connection(
-            self.send, subprotocol=subprotocol, headers=headers_out or headers
-        )
-
-    @trace_app_function
-    async def receive_message(self: Self, cls: type[T]) -> T:
-        json, res = await receive_class_ext(self.receive, cls)
-
-        get_current_span().set_attributes(dict_to_attrs(json, "payload"))
-
-        return res
-
-    @trace_app_function
-    async def send_message(self: Self, data: Any) -> None:
-        await send_websocket_auto(self.send, data)
-
-
-HandlerResult = str
-Handler: TypeAlias = Callable[[Context], Awaitable[HandlerResult]]
-Route: TypeAlias = Handler