strawberry-graphql 0.262.4__tar.gz → 0.262.6__tar.gz

{strawberry_graphql-0.262.4 → strawberry_graphql-0.262.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: strawberry-graphql
-Version: 0.262.4
+Version: 0.262.6
 Summary: A library for creating GraphQL APIs
 License: MIT
 Keywords: graphql,api,rest,starlette,async

{strawberry_graphql-0.262.4 → strawberry_graphql-0.262.6}/pyproject.toml

@@ -1,7 +1,7 @@
 [tool.poetry]
 name = "strawberry-graphql"
 packages = [ { include = "strawberry" } ]
-version = "0.262.4"
+version = "0.262.6"
 description = "A library for creating GraphQL APIs"
 authors = ["Patrick Arminio <patrick.arminio@gmail.com>"]
 license = "MIT"
@@ -56,6 +56,7 @@ rich = {version = ">=12.0.0", optional = true}
 pyinstrument = {version = ">=4.0.0", optional = true}
 
 [tool.poetry.group.dev.dependencies]
+ruff = "^0.11.1"
 asgiref = "^3.2"
 email-validator = {version = ">=1.1.3,<3.0.0", optional = false}
 freezegun = "^1.2.1"
@@ -96,7 +97,7 @@ inline-snapshot = "^0.10.1"
 types-deprecated = "^1.2.15.20241117"
 types-six = "^1.17.0.20241205"
 types-pyyaml = "^6.0.12.20240917"
-mypy = "^1.13.0"
+mypy = "^1.15.0"
 codeflash = ">=0.9.2"
 
 [tool.poetry.group.integrations]

{strawberry_graphql-0.262.4 → strawberry_graphql-0.262.6}/strawberry/channels/handlers/http_handler.py

@@ -293,7 +293,8 @@ class GraphQLHTTPConsumer(
 
     async def render_graphql_ide(self, request: ChannelsRequest) -> ChannelsResponse:
         return ChannelsResponse(
-            content=self.graphql_ide_html.encode(), content_type="text/html"
+            content=self.graphql_ide_html.encode(),
+            content_type="text/html; charset=utf-8",
         )
 
     def is_websocket_request(
@@ -348,7 +349,8 @@ class SyncGraphQLHTTPConsumer(
 
     def render_graphql_ide(self, request: ChannelsRequest) -> ChannelsResponse:
         return ChannelsResponse(
-            content=self.graphql_ide_html.encode(), content_type="text/html"
+            content=self.graphql_ide_html.encode(),
+            content_type="text/html; charset=utf-8",
         )
 
     # Sync channels is actually async, but it uses database_sync_to_async to call

{strawberry_graphql-0.262.4 → strawberry_graphql-0.262.6}/strawberry/experimental/pydantic/_compat.py

@@ -222,13 +222,13 @@ class PydanticV1Compat:
             ConstrainedStr = pydantic.v1.ConstrainedStr
             ConstrainedList = pydantic.v1.ConstrainedList
 
-        if lenient_issubclass(type_, ConstrainedInt):
+        if lenient_issubclass(type_, ConstrainedInt):  # type: ignore
             return int
-        if lenient_issubclass(type_, ConstrainedFloat):
+        if lenient_issubclass(type_, ConstrainedFloat):  # type: ignore
             return float
-        if lenient_issubclass(type_, ConstrainedStr):
+        if lenient_issubclass(type_, ConstrainedStr):  # type: ignore
             return str
-        if lenient_issubclass(type_, ConstrainedList):
+        if lenient_issubclass(type_, ConstrainedList):  # type: ignore
             return list[self.get_basic_type(type_.item_type)]  # type: ignore
 
         if type_ in self.fields_map:

{strawberry_graphql-0.262.4 → strawberry_graphql-0.262.6}/strawberry/flask/views.py

@@ -49,7 +49,7 @@ class FlaskHTTPRequestAdapter(SyncHTTPRequestAdapter):
 
     @property
     def headers(self) -> Mapping[str, str]:
-        return self.request.headers
+        return self.request.headers  # type: ignore
 
     @property
     def post_data(self) -> Mapping[str, Union[str, bytes]]:
@@ -147,7 +147,7 @@ class AsyncFlaskHTTPRequestAdapter(AsyncHTTPRequestAdapter):
 
     @property
     def headers(self) -> Mapping[str, str]:
-        return self.request.headers
+        return self.request.headers  # type: ignore
 
     async def get_body(self) -> str:
         return self.request.data.decode()

{strawberry_graphql-0.262.4 → strawberry_graphql-0.262.6}/strawberry/quart/views.py

@@ -35,7 +35,7 @@ class QuartHTTPRequestAdapter(AsyncHTTPRequestAdapter):
 
     @property
     def headers(self) -> Mapping[str, str]:
-        return self.request.headers
+        return self.request.headers  # type: ignore
 
     async def get_body(self) -> str:
         return (await self.request.data).decode()

{strawberry_graphql-0.262.4 → strawberry_graphql-0.262.6}/strawberry/sanic/views.py

@@ -179,7 +179,7 @@ class GraphQLView(
         except HTTPException as e:
             return HTTPResponse(e.reason, status=e.status_code)
 
-    async def get(self, request: Request) -> HTTPResponse:  # type: ignore[override]
+    async def get(self, request: Request) -> HTTPResponse:
         self.request = request
 
         try:

{strawberry_graphql-0.262.4 → strawberry_graphql-0.262.6}/strawberry/schema/base.py

@@ -12,6 +12,7 @@ if TYPE_CHECKING:
     from graphql import GraphQLError
 
     from strawberry.directive import StrawberryDirective
+    from strawberry.schema.schema import SubscriptionResult
     from strawberry.schema.schema_converter import GraphQLCoreConverter
     from strawberry.types import (
         ExecutionContext,
@@ -27,7 +28,6 @@ if TYPE_CHECKING:
     from strawberry.types.union import StrawberryUnion
 
     from .config import StrawberryConfig
-    from .subscribe import SubscriptionResult
 
 
 class BaseSchema(Protocol):

{strawberry_graphql-0.262.4 → strawberry_graphql-0.262.6}/strawberry/schema/schema.py

@@ -82,8 +82,8 @@ if TYPE_CHECKING:
     from strawberry.types.scalar import ScalarDefinition, ScalarWrapper
     from strawberry.types.union import StrawberryUnion
 
-SubscriptionResult: TypeAlias = Union[
-    PreExecutionError, AsyncGenerator[ExecutionResult, None]
+SubscriptionResult: TypeAlias = AsyncGenerator[
+    Union[PreExecutionError, ExecutionResult], None
 ]
 
 OriginSubscriptionResult = Union[
@@ -760,7 +760,7 @@ class Schema(BaseSchema):
         for extension in extensions:
             extension.execution_context = execution_context
 
-        asyncgen = self._subscribe(
+        return self._subscribe(
             execution_context,
             extensions_runner=self.create_extensions_runner(
                 execution_context, extensions
@@ -768,31 +768,6 @@ class Schema(BaseSchema):
             middleware_manager=self._get_middleware_manager(extensions),
             execution_context_class=self.execution_context_class,
         )
-        # GraphQL-core might return an initial error result instead of an async iterator.
-        # This happens when "there was an immediate error" i.e resolver is not an async iterator.
-        # To overcome this while maintaining the extension contexts we do this trick.
-        first = await asyncgen.__anext__()
-        if isinstance(first, PreExecutionError):
-            await asyncgen.aclose()
-            return first
-
-        async def _wrapper() -> AsyncGenerator[ExecutionResult, None]:
-            yield first
-            async for result in asyncgen:
-                yield result
-
-        return _wrapper()
-
-        return await subscribe(
-            self._schema,
-            execution_context=execution_context,
-            extensions_runner=self.create_extensions_runner(
-                execution_context, extensions
-            ),
-            process_errors=self._process_errors,
-            middleware_manager=self._get_middleware_manager(extensions),
-            execution_context_class=self.execution_context_class,
-        )
 
     def _resolve_node_ids(self) -> None:
         for concrete_type in self.schema_converter.type_map.values():

{strawberry_graphql-0.262.4 → strawberry_graphql-0.262.6}/strawberry/subscriptions/protocols/graphql_transport_ws/handlers.py

@@ -2,7 +2,6 @@ from __future__ import annotations
 
 import asyncio
 import logging
-from collections.abc import Awaitable
 from contextlib import suppress
 from typing import (
     TYPE_CHECKING,
@@ -38,12 +37,11 @@ from strawberry.utils.debug import pretty_print_graphql_operation
 from strawberry.utils.operation import get_operation_type
 
 if TYPE_CHECKING:
-    from collections.abc import Awaitable
     from datetime import timedelta
 
     from strawberry.http.async_base_view import AsyncBaseHTTPView, AsyncWebSocketAdapter
     from strawberry.schema import BaseSchema
-    from strawberry.schema.subscribe import SubscriptionResult
+    from strawberry.schema.schema import SubscriptionResult
 
 
 class BaseGraphQLTransportWSHandler(Generic[Context, RootValue]):
@@ -186,8 +184,6 @@ class BaseGraphQLTransportWSHandler(Generic[Context, RootValue]):
         elif hasattr(self.context, "connection_params"):
             self.context.connection_params = payload
 
-        self.context = cast(Context, self.context)
-
         try:
             connection_ack_payload = await self.view.on_ws_connect(self.context)
         except ConnectionRejectionError:
@@ -256,50 +252,61 @@ class BaseGraphQLTransportWSHandler(Generic[Context, RootValue]):
 
     async def run_operation(self, operation: Operation[Context, RootValue]) -> None:
         """The operation task's top level method. Cleans-up and de-registers the operation once it is done."""
-        # TODO: Handle errors in this method using self.handle_task_exception()
-
-        result_source: Awaitable[ExecutionResult] | Awaitable[SubscriptionResult]
-
-        # Get an AsyncGenerator yielding the results
-        if operation.operation_type == OperationType.SUBSCRIPTION:
-            result_source = self.schema.subscribe(
-                query=operation.query,
-                variable_values=operation.variables,
-                operation_name=operation.operation_name,
-                context_value=self.context,
-                root_value=self.root_value,
-            )
-        else:
-            result_source = self.schema.execute(
-                query=operation.query,
-                variable_values=operation.variables,
-                context_value=self.context,
-                root_value=self.root_value,
-                operation_name=operation.operation_name,
-            )
+        result_source: ExecutionResult | SubscriptionResult
 
         try:
-            first_res_or_agen = await result_source
-            # that's an immediate error we should end the operation
-            # without a COMPLETE message
-            if isinstance(first_res_or_agen, PreExecutionError):
-                assert first_res_or_agen.errors
-                await operation.send_initial_errors(first_res_or_agen.errors)
-            # that's a mutation / query result
-            elif isinstance(first_res_or_agen, ExecutionResult):
-                await operation.send_next(first_res_or_agen)
-                await operation.send_operation_message(
-                    {"id": operation.id, "type": "complete"}
+            # Get an AsyncGenerator yielding the results
+            if operation.operation_type == OperationType.SUBSCRIPTION:
+                result_source = await self.schema.subscribe(
+                    query=operation.query,
+                    variable_values=operation.variables,
+                    operation_name=operation.operation_name,
+                    context_value=self.context,
+                    root_value=self.root_value,
                 )
             else:
-                async for result in first_res_or_agen:
+                result_source = await self.schema.execute(
+                    query=operation.query,
+                    variable_values=operation.variables,
+                    context_value=self.context,
+                    root_value=self.root_value,
+                    operation_name=operation.operation_name,
+                )
+
+            # TODO: maybe change PreExecutionError to an exception that can be caught
+
+            if isinstance(result_source, ExecutionResult):
+                if isinstance(result_source, PreExecutionError):
+                    assert result_source.errors
+                    await operation.send_initial_errors(result_source.errors)
+                else:
+                    await operation.send_next(result_source)
+            else:
+                is_first_result = True
+
+                async for result in result_source:
+                    if is_first_result and isinstance(result, PreExecutionError):
+                        assert result.errors
+                        await operation.send_initial_errors(result.errors)
+                        break
+
                     await operation.send_next(result)
+                    is_first_result = False
+
+            await operation.send_operation_message(
+                CompleteMessage(id=operation.id, type="complete")
+            )
+
+        except Exception as error:  # pragma: no cover
+            await self.handle_task_exception(error)
+
+            with suppress(Exception):
                 await operation.send_operation_message(
                     {"id": operation.id, "type": "complete"}
                 )
 
-        except BaseException:  # pragma: no cover
             self.operations.pop(operation.id, None)
+
             raise
         finally:
             # add this task to a list to be reaped later

{strawberry_graphql-0.262.4 → strawberry_graphql-0.262.6}/strawberry/subscriptions/protocols/graphql_ws/handlers.py

@@ -15,9 +15,11 @@ from strawberry.exceptions import ConnectionRejectionError
 from strawberry.http.exceptions import NonTextMessageReceived, WebSocketDisconnected
 from strawberry.http.typevars import Context, RootValue
 from strawberry.subscriptions.protocols.graphql_ws.types import (
+    CompleteMessage,
     ConnectionInitMessage,
     ConnectionTerminateMessage,
     DataMessage,
+    ErrorMessage,
     OperationMessage,
     StartMessage,
     StopMessage,
@@ -103,8 +105,6 @@ class BaseGraphQLWSHandler(Generic[Context, RootValue]):
         elif hasattr(self.context, "connection_params"):
             self.context.connection_params = payload
 
-        self.context = cast(Context, self.context)
-
         try:
             connection_ack_payload = await self.view.on_ws_connect(self.context)
         except ConnectionRejectionError as e:
@@ -164,31 +164,37 @@ class BaseGraphQLWSHandler(Generic[Context, RootValue]):
         variables: Optional[dict[str, object]],
     ) -> None:
         try:
-            agen_or_err = await self.schema.subscribe(
+            result_source = await self.schema.subscribe(
                 query=query,
                 variable_values=variables,
                 operation_name=operation_name,
                 context_value=self.context,
                 root_value=self.root_value,
             )
-            if isinstance(agen_or_err, PreExecutionError):
-                assert agen_or_err.errors
-                await self.send_message(
-                    {
-                        "type": "error",
-                        "id": operation_id,
-                        "payload": agen_or_err.errors[0].formatted,
-                    }
-                )
-            else:
-                self.subscriptions[operation_id] = agen_or_err
+            self.subscriptions[operation_id] = result_source
+
+            is_first_result = True
+
+            async for result in result_source:
+                if is_first_result and isinstance(result, PreExecutionError):
+                    assert result.errors
+
+                    await self.send_message(
+                        ErrorMessage(
+                            type="error",
+                            id=operation_id,
+                            payload=result.errors[0].formatted,
+                        )
+                    )
+                    return
+
+                await self.send_data_message(result, operation_id)
+                is_first_result = False
 
-                async for result in agen_or_err:
-                    await self.send_data_message(result, operation_id)
+            await self.send_message(CompleteMessage(type="complete", id=operation_id))
 
-                await self.send_message({"type": "complete", "id": operation_id})
         except asyncio.CancelledError:
-            await self.send_message({"type": "complete", "id": operation_id})
+            await self.send_message(CompleteMessage(type="complete", id=operation_id))
 
     async def cleanup_operation(self, operation_id: str) -> None:
         if operation_id in self.subscriptions: