Build a fresh asgi scope dict per request (#2977)

Author: Kludex

uvicorn/protocols/http/h11_impl.py

@@ -16,7 +16,6 @@
     ASGI3Application,
     ASGIReceiveEvent,
     ASGISendEvent,
-    ASGIVersions,
     HTTPRequestEvent,
     HTTPResponseBodyEvent,
     HTTPResponseStartEvent,
@@ -64,7 +63,7 @@ def __init__(
         )
         self.ws_protocol_class = config.ws_protocol_class
         self.root_path = config.root_path
-        self.scope_asgi: ASGIVersions = {"version": config.asgi_version, "spec_version": "2.3"}
+        self.asgi_version = config.asgi_version
         self.limit_concurrency = config.limit_concurrency
         self.app_state = app_state
 
@@ -205,7 +204,7 @@ def handle_events(self) -> None:
                 full_raw_path = self.root_path.encode("ascii") + raw_path
                 self.scope = {
                     "type": "http",
-                    "asgi": self.scope_asgi,
+                    "asgi": {"version": self.asgi_version, "spec_version": "2.3"},
                     "http_version": event.http_version.decode("ascii"),
                     "server": self.server,
                     "client": self.client,

uvicorn/protocols/http/httptools_impl.py

@@ -18,7 +18,6 @@
     ASGI3Application,
     ASGIReceiveEvent,
     ASGISendEvent,
-    ASGIVersions,
     HTTPRequestEvent,
     HTTPScope,
 )
@@ -71,7 +70,7 @@ def __init__(
 
         self.ws_protocol_class = config.ws_protocol_class
         self.root_path = config.root_path
-        self.scope_asgi: ASGIVersions = {"version": config.asgi_version, "spec_version": "2.3"}
+        self.asgi_version = config.asgi_version
         self.limit_concurrency = config.limit_concurrency
         self.app_state = app_state
 
@@ -226,7 +225,7 @@ def on_message_begin(self) -> None:
         self.headers = []
         self.scope = {  # type: ignore[typeddict-item]
             "type": "http",
-            "asgi": self.scope_asgi,
+            "asgi": {"version": self.asgi_version, "spec_version": "2.3"},
             "http_version": "1.1",
             "server": self.server,
             "client": self.client,

uvicorn/protocols/websockets/websockets_impl.py

@@ -20,7 +20,6 @@
 from uvicorn._types import (
     ASGI3Application,
     ASGISendEvent,
-    ASGIVersions,
     WebSocketConnectEvent,
     WebSocketDisconnectEvent,
     WebSocketReceiveEvent,
@@ -70,7 +69,7 @@ def __init__(
         self.app = cast(ASGI3Application, config.loaded_app)
         self.loop = _loop or asyncio.get_event_loop()
         self.root_path = config.root_path
-        self.scope_asgi: ASGIVersions = {"version": config.asgi_version, "spec_version": "2.4"}
+        self.asgi_version = config.asgi_version
         self.app_state = app_state
 
         # Shared server state
@@ -180,7 +179,7 @@ async def process_request(self, path: str, request_headers: Headers) -> HTTPResp
 
         self.scope = {
             "type": "websocket",
-            "asgi": self.scope_asgi,
+            "asgi": {"version": self.asgi_version, "spec_version": "2.4"},
             "http_version": "1.1",
             "scheme": self.scheme,
             "server": self.server,

uvicorn/protocols/websockets/websockets_sansio_impl.py

@@ -20,7 +20,6 @@
 from uvicorn._types import (
     ASGIReceiveEvent,
     ASGISendEvent,
-    ASGIVersions,
     WebSocketScope,
 )
 from uvicorn.config import Config
@@ -57,7 +56,7 @@ def __init__(
         self.loop = _loop or asyncio.get_event_loop()
         self.logger = logging.getLogger("uvicorn.error")
         self.root_path = config.root_path
-        self.scope_asgi: ASGIVersions = {"version": config.asgi_version, "spec_version": "2.4"}
+        self.asgi_version = config.asgi_version
         self.app_state = app_state
 
         # Shared server state
@@ -199,7 +198,7 @@ def handle_connect(self, event: Request) -> None:
         raw_path, _, query_string = event.path.partition("?")
         self.scope: WebSocketScope = {
             "type": "websocket",
-            "asgi": self.scope_asgi,
+            "asgi": {"version": self.asgi_version, "spec_version": "2.4"},
             "http_version": "1.1",
             "scheme": self.scheme,
             "server": self.server,

uvicorn/protocols/websockets/wsproto_impl.py

@@ -18,7 +18,6 @@
 from uvicorn._types import (
     ASGI3Application,
     ASGISendEvent,
-    ASGIVersions,
     WebSocketEvent,
     WebSocketReceiveEvent,
     WebSocketScope,
@@ -82,7 +81,7 @@ def __init__(
         self.loop = _loop or asyncio.get_event_loop()
         self.logger = logging.getLogger("uvicorn.error")
         self.root_path = config.root_path
-        self.scope_asgi: ASGIVersions = {"version": config.asgi_version, "spec_version": "2.4"}
+        self.asgi_version = config.asgi_version
         self.app_state = app_state
 
         # Shared server state
@@ -213,7 +212,7 @@ def handle_connect(self, event: events.Request) -> None:
         full_raw_path = self.root_path.encode("ascii") + raw_path.encode("ascii")
         self.scope: WebSocketScope = {
             "type": "websocket",
-            "asgi": self.scope_asgi,
+            "asgi": {"version": self.asgi_version, "spec_version": "2.4"},
             "http_version": "1.1",
             "scheme": self.scheme,
             "server": self.server,