Add release notes

Author: patrick91

RELEASE.md

@@ -0,0 +1,4 @@
+Release type: patch
+
+This release removes some internal code in favour of using an external dependency,
+this will help us with maintaining the codebase in the future 😊

strawberry/aiohttp/views.py

@@ -39,9 +39,6 @@
     from strawberry.schema import BaseSchema
 
 
-# Aiohttp adapter is now imported from lia
-
-
 class AiohttpWebSocketAdapter(AsyncWebSocketAdapter):
     def __init__(
         self, view: AsyncBaseHTTPView, request: web.Request, ws: web.WebSocketResponse

strawberry/asgi/__init__.py

@@ -11,8 +11,7 @@
 )
 from typing_extensions import TypeGuard
 
-from lia import HTTPException
-from lia import StarletteRequestAdapter as LiaStarletteRequestAdapter
+from lia import HTTPException, StarletteRequestAdapter
 from starlette import status
 from starlette.requests import Request
 from starlette.responses import (
@@ -48,10 +47,6 @@
     from strawberry.schema import BaseSchema
 
 
-# Use lia's StarletteRequestAdapter directly
-ASGIRequestAdapter = LiaStarletteRequestAdapter
-
-
 class ASGIWebSocketAdapter(AsyncWebSocketAdapter):
     def __init__(
         self, view: AsyncBaseHTTPView, request: WebSocket, response: WebSocket
@@ -97,7 +92,7 @@ class GraphQL(
     ]
 ):
     allow_queries_via_get = True
-    request_adapter_class = ASGIRequestAdapter
+    request_adapter_class = StarletteRequestAdapter
     websocket_adapter_class = ASGIWebSocketAdapter
 
     def __init__(

strawberry/chalice/views.py

@@ -17,9 +17,6 @@
     from strawberry.schema import BaseSchema
 
 
-# Chalice adapter is now imported from lia
-
-
 class GraphQLView(
     SyncBaseHTTPView[Request, Response, TemporalResponse, Context, RootValue]
 ):

strawberry/channels/handlers/http_handler.py

@@ -133,7 +133,35 @@ async def get_body(self) -> bytes:
         return self.request.body
 
     async def get_form_data(self) -> FormData:
-        return self.request.form_data
+        form_data = self.request.form_data
+        # Handle legacy case where form_data might be a dict
+        if isinstance(form_data, dict):
+            return FormData(
+                files=form_data.get("files", {}), form=form_data.get("form", {})
+            )
+        return form_data
+
+    @property
+    def url(self) -> str:
+        scheme = self.request.consumer.scope["scheme"]
+        host = self.headers.get("host", "localhost")
+        path = self.request.consumer.scope["path"]
+        query_string = self.request.consumer.scope["query_string"]
+        url = f"{scheme}://{host}{path}"
+        if query_string:
+            url += f"?{query_string.decode()}"
+        return url
+
+    @property
+    def cookies(self) -> Mapping[str, str]:
+        cookie_header = self.headers.get("cookie", "")
+        cookies = {}
+        if cookie_header:
+            for cookie in cookie_header.split(";"):
+                if "=" in cookie:
+                    key, value = cookie.split("=", 1)
+                    cookies[key.strip()] = value.strip()
+        return cookies
 
 
 class SyncChannelsRequestAdapter(BaseChannelsRequestAdapter, SyncHTTPRequestAdapter):
@@ -143,11 +171,50 @@ def body(self) -> bytes:
 
     @property
     def post_data(self) -> Mapping[str, Union[str, bytes]]:
-        return self.request.form_data["form"]
+        form_data = self.request.form_data
+        # Handle legacy case where form_data might be a dict
+        if isinstance(form_data, dict):
+            return form_data.get("form", {})
+        return form_data.form
 
     @property
     def files(self) -> Mapping[str, Any]:
-        return self.request.form_data["files"]
+        form_data = self.request.form_data
+        # Handle legacy case where form_data might be a dict
+        if isinstance(form_data, dict):
+            return form_data.get("files", {})
+        return form_data.files
+
+    def get_form_data(self) -> FormData:
+        form_data = self.request.form_data
+        # Handle legacy case where form_data might be a dict
+        if isinstance(form_data, dict):
+            return FormData(
+                files=form_data.get("files", {}), form=form_data.get("form", {})
+            )
+        return form_data
+
+    @property
+    def url(self) -> str:
+        scheme = self.request.consumer.scope["scheme"]
+        host = self.headers.get("host", "localhost")
+        path = self.request.consumer.scope["path"]
+        query_string = self.request.consumer.scope["query_string"]
+        url = f"{scheme}://{host}{path}"
+        if query_string:
+            url += f"?{query_string.decode()}"
+        return url
+
+    @property
+    def cookies(self) -> Mapping[str, str]:
+        cookie_header = self.headers.get("cookie", "")
+        cookies = {}
+        if cookie_header:
+            for cookie in cookie_header.split(";"):
+                if "=" in cookie:
+                    key, value = cookie.split("=", 1)
+                    cookies[key.strip()] = value.strip()
+        return cookies
 
 
 class BaseGraphQLHTTPConsumer(ChannelsConsumer, AsyncHttpConsumer):

strawberry/django/views.py

@@ -66,9 +66,6 @@ def __repr__(self) -> str:
         )
 
 
-# Django adapters are now imported from lia
-
-
 class BaseView:
     graphql_ide_html: str
 

strawberry/flask/views.py

@@ -25,9 +25,6 @@
     from strawberry.schema.base import BaseSchema
 
 
-# Flask adapters are now imported from lia
-
-
 class BaseGraphQLView:
     graphql_ide: Optional[GraphQL_IDE]
 
@@ -95,9 +92,6 @@ def render_graphql_ide(self, request: Request) -> Response:
         return render_template_string(self.graphql_ide_html)  # type: ignore
 
 
-# Async Flask adapter is now imported from lia
-
-
 class AsyncGraphQLView(
     BaseGraphQLView,
     AsyncBaseHTTPView[

strawberry/http/async_base_view.py

@@ -17,8 +17,7 @@
 from typing_extensions import TypeGuard
 
 from graphql import GraphQLError
-from lia import AsyncHTTPRequestAdapter as LiaAsyncHTTPRequestAdapter
-from lia import HTTPException
+from lia import AsyncHTTPRequestAdapter, HTTPException
 
 from strawberry.exceptions import MissingQueryError
 from strawberry.file_uploads.utils import replace_placeholders_with_files
@@ -57,9 +56,6 @@
     WebSocketResponse,
 )
 
-# Re-export the adapter from lia for backward compatibility
-AsyncHTTPRequestAdapter = LiaAsyncHTTPRequestAdapter
-
 
 class AsyncWebSocketAdapter(abc.ABC):
     def __init__(self, view: "AsyncBaseHTTPView") -> None:
@@ -96,7 +92,7 @@ class AsyncBaseHTTPView(
     keep_alive = False
     keep_alive_interval: Optional[float] = None
     connection_init_wait_timeout: timedelta = timedelta(minutes=1)
-    request_adapter_class: Callable[[Request], LiaAsyncHTTPRequestAdapter]
+    request_adapter_class: Callable[[Request], AsyncHTTPRequestAdapter]
     websocket_adapter_class: Callable[
         [
             "AsyncBaseHTTPView[Any, Any, Any, Any, Any, Context, RootValue]",
@@ -263,8 +259,15 @@ async def parse_multipart(self, request: AsyncHTTPRequestAdapter) -> dict[str, s
         except ValueError as e:
             raise HTTPException(400, "Unable to parse the multipart body") from e
 
-        operations = form_data["form"].get("operations", "{}")
-        files_map = form_data["form"].get("map", "{}")
+        # Handle legacy case where form_data might be a dict
+        if isinstance(form_data, dict):
+            operations = form_data.get("form", {}).get("operations", "{}")
+            files_map = form_data.get("form", {}).get("map", "{}")
+            files = form_data.get("files", {})
+        else:
+            operations = form_data.form.get("operations", "{}")
+            files_map = form_data.form.get("map", "{}")
+            files = form_data.files
 
         if isinstance(operations, (bytes, str)):
             operations = self.parse_json(operations)
@@ -273,9 +276,7 @@ async def parse_multipart(self, request: AsyncHTTPRequestAdapter) -> dict[str, s
             files_map = self.parse_json(files_map)
 
         try:
-            return replace_placeholders_with_files(
-                operations, files_map, form_data["files"]
-            )
+            return replace_placeholders_with_files(operations, files_map, files)
         except KeyError as e:
             raise HTTPException(400, "File(s) missing in form data") from e
 

strawberry/http/sync_base_view.py

@@ -9,8 +9,7 @@
 )
 
 from graphql import GraphQLError
-from lia import HTTPException
-from lia import SyncHTTPRequestAdapter as LiaSyncHTTPRequestAdapter
+from lia import HTTPException, SyncHTTPRequestAdapter
 
 from strawberry.exceptions import MissingQueryError
 from strawberry.file_uploads.utils import replace_placeholders_with_files
@@ -33,9 +32,6 @@
 from .parse_content_type import parse_content_type
 from .typevars import Context, Request, Response, RootValue, SubResponse
 
-# Re-export the adapter from lia for backward compatibility
-SyncHTTPRequestAdapter = LiaSyncHTTPRequestAdapter
-
 
 class SyncBaseHTTPView(
     abc.ABC,
@@ -45,7 +41,7 @@ class SyncBaseHTTPView(
     schema: BaseSchema
     graphiql: Optional[bool]
     graphql_ide: Optional[GraphQL_IDE]
-    request_adapter_class: Callable[[Request], LiaSyncHTTPRequestAdapter]
+    request_adapter_class: Callable[[Request], SyncHTTPRequestAdapter]
 
     # Methods that need to be implemented by individual frameworks
 

strawberry/litestar/controller.py

@@ -151,9 +151,6 @@ class GraphQLResource(Struct):
     extensions: Optional[dict[str, object]]
 
 
-# Litestar adapter is now imported from lia
-
-
 class LitestarWebSocketAdapter(AsyncWebSocketAdapter):
     def __init__(
         self, view: AsyncBaseHTTPView, request: WebSocket, response: WebSocket