strawberry-graphql 0.263.0.dev1743582446__py3-none-any.whl → 0.263.2__py3-none-any.whl

strawberry/__init__.py

@@ -11,7 +11,6 @@ from .permission import BasePermission
 from .scalars import ID
 from .schema import Schema
 from .schema_directive import schema_directive
-from .streamable import Streamable
 from .types.arguments import argument
 from .types.auto import auto
 from .types.cast import cast
@@ -35,7 +34,6 @@ __all__ = [
     "Parent",
     "Private",
     "Schema",
-    "Streamable",
     "argument",
     "asdict",
     "auto",

strawberry/aiohttp/views.py

@@ -56,7 +56,7 @@ class AioHTTPRequestAdapter(AsyncHTTPRequestAdapter):
 
     @property
     def method(self) -> HTTPMethod:
-        return cast(HTTPMethod, self.request.method.upper())
+        return cast("HTTPMethod", self.request.method.upper())
 
     @property
     def headers(self) -> Mapping[str, str]:

strawberry/annotation.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 
-import logging
 import sys
 import typing
+import warnings
 from collections import abc
 from enum import Enum
 from typing import (
@@ -17,7 +17,6 @@ from typing import (
 )
 from typing_extensions import Self, get_args, get_origin
 
-from strawberry.streamable import StrawberryStreamable
 from strawberry.types.base import (
     StrawberryList,
     StrawberryObjectDefinition,
@@ -131,7 +130,7 @@ class StrawberryAnnotation:
         return self.__resolve_cache__
 
     def _resolve(self) -> Union[StrawberryType, type]:
-        evaled_type = cast(Any, self.evaluate())
+        evaled_type = cast("Any", self.evaluate())
 
         if is_private(evaled_type):
             return evaled_type
@@ -142,8 +141,6 @@ class StrawberryAnnotation:
 
         if self._is_lazy_type(evaled_type):
             return evaled_type
-        if self._is_streamable(evaled_type, args):
-            return self.create_list(list[evaled_type])
         if self._is_list(evaled_type):
             return self.create_list(evaled_type)
 
@@ -161,7 +158,7 @@ class StrawberryAnnotation:
         if self._is_union(evaled_type, args):
             return self.create_union(evaled_type, args)
         if is_type_var(evaled_type) or evaled_type is Self:
-            return self.create_type_var(cast(TypeVar, evaled_type))
+            return self.create_type_var(cast("TypeVar", evaled_type))
         if self._is_strawberry_type(evaled_type):
             # Simply return objects that are already StrawberryTypes
             return evaled_type
@@ -245,9 +242,12 @@ class StrawberryAnnotation:
 
         union_args = [arg for arg in args if isinstance(arg, StrawberryUnion)]
         if len(union_args) > 1:
-            logging.warning(
-                "Duplicate union definition detected. "
-                "Only the first definition will be considered"
+            warnings.warn(
+                (
+                    "Duplicate union definition detected. "
+                    "Only the first definition will be considered"
+                ),
+                stacklevel=2,
             )
 
         if union_args:
@@ -313,10 +313,6 @@ class StrawberryAnnotation:
             or is_list
         )
 
-    @classmethod
-    def _is_streamable(cls, annotation: Any, args: list[Any]) -> bool:
-        return any(isinstance(arg, StrawberryStreamable) for arg in args)
-
     @classmethod
     def _is_strawberry_type(cls, evaled_type: Any) -> bool:
         # Prevent import cycles

strawberry/asgi/__init__.py

@@ -60,7 +60,7 @@ class ASGIRequestAdapter(AsyncHTTPRequestAdapter):
 
     @property
     def method(self) -> HTTPMethod:
-        return cast(HTTPMethod, self.request.method.upper())
+        return cast("HTTPMethod", self.request.method.upper())
 
     @property
     def headers(self) -> Mapping[str, str]:

strawberry/chalice/views.py

@@ -7,7 +7,6 @@ from chalice.app import Request, Response
 from strawberry.http.exceptions import HTTPException
 from strawberry.http.sync_base_view import SyncBaseHTTPView, SyncHTTPRequestAdapter
 from strawberry.http.temporal_response import TemporalResponse
-from strawberry.http.types import HTTPMethod, QueryParams
 from strawberry.http.typevars import Context, RootValue
 
 if TYPE_CHECKING:
@@ -15,6 +14,7 @@ if TYPE_CHECKING:
 
     from strawberry.http import GraphQLHTTPResponse
     from strawberry.http.ides import GraphQL_IDE
+    from strawberry.http.types import HTTPMethod, QueryParams
     from strawberry.schema import BaseSchema
 
 
@@ -32,7 +32,7 @@ class ChaliceHTTPRequestAdapter(SyncHTTPRequestAdapter):
 
     @property
     def method(self) -> HTTPMethod:
-        return cast(HTTPMethod, self.request.method.upper())
+        return cast("HTTPMethod", self.request.method.upper())
 
     @property
     def headers(self) -> Mapping[str, str]:

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/cli/commands/codegen.py

@@ -133,7 +133,7 @@ def codegen(
     console_plugin.before_any_start()
 
     for q in query:
-        plugins = cast(list[QueryCodegenPlugin], _load_plugins(selected_plugins, q))
+        plugins = cast("list[QueryCodegenPlugin]", _load_plugins(selected_plugins, q))
 
         code_generator = QueryCodegen(
             schema_symbol, plugins=plugins, console_plugin=console_plugin

strawberry/codegen/query_codegen.py

@@ -362,7 +362,7 @@ class QueryCodegen:
                 # The FragmentDefinitionNode has a non-Optional `SelectionSetNode` but
                 # the Protocol wants an `Optional[SelectionSetNode]` so this doesn't
                 # quite conform.
-                cast(HasSelectionSet, fd),
+                cast("HasSelectionSet", fd),
                 parent_type=query_type,
                 class_name=fd.name.value,
                 graph_ql_object_type_factory=graph_ql_object_type_factory,
@@ -468,13 +468,13 @@ class QueryCodegen:
         result_class_name = f"{operation_name}Result"
 
         operation_type = self._collect_types(
-            cast(HasSelectionSet, operation_definition),
+            cast("HasSelectionSet", operation_definition),
             parent_type=query_type,
             class_name=result_class_name,
         )
 
         operation_kind = cast(
-            Literal["query", "mutation", "subscription"],
+            "Literal['query', 'mutation', 'subscription']",
             operation_definition.operation.value,
         )
 
@@ -801,7 +801,7 @@ class QueryCodegen:
         # `GraphQLField` or `GraphQLFragmentSpread`
         # and the suite above will cause this statement to be
         # skipped if there are any `GraphQLFragmentSpread`.
-        current_type.fields = cast(list[GraphQLField], fields)
+        current_type.fields = cast("list[GraphQLField]", fields)
 
         self._collect_type(current_type)
 
@@ -854,7 +854,7 @@ class QueryCodegen:
                 assert isinstance(sub_selection, FieldNode)
 
                 parent_type = cast(
-                    StrawberryObjectDefinition,
+                    "StrawberryObjectDefinition",
                     self.schema.get_type_by_name(type_condition_name),
                 )
 
@@ -889,7 +889,7 @@ class QueryCodegen:
             # `GraphQLField` or `GraphQLFragmentSpread`
             # and the suite above will cause this statement to be
             # skipped if there are any `GraphQLFragmentSpread`.
-            current_type.fields.extend(cast(list[GraphQLField], fields))
+            current_type.fields.extend(cast("list[GraphQLField]", fields))
 
             sub_types.append(current_type)
 

strawberry/django/views.py

@@ -83,7 +83,7 @@ class DjangoHTTPRequestAdapter(SyncHTTPRequestAdapter):
     def method(self) -> HTTPMethod:
         assert self.request.method is not None
 
-        return cast(HTTPMethod, self.request.method.upper())
+        return cast("HTTPMethod", self.request.method.upper())
 
     @property
     def headers(self) -> Mapping[str, str]:
@@ -114,7 +114,7 @@ class AsyncDjangoHTTPRequestAdapter(AsyncHTTPRequestAdapter):
     def method(self) -> HTTPMethod:
         assert self.request.method is not None
 
-        return cast(HTTPMethod, self.request.method.upper())
+        return cast("HTTPMethod", self.request.method.upper())
 
     @property
     def headers(self) -> Mapping[str, str]:

strawberry/exceptions/handler.py

@@ -70,7 +70,7 @@ def strawberry_threading_exception_handler(
         # (we'd need to do type ignore for python 3.8 and above, but mypy
         # doesn't seem to be able to handle that and will complain in python 3.7)
 
-        cast(Any, original_threading_exception_hook)(args)
+        cast("Any", original_threading_exception_hook)(args)
 
         return
 

strawberry/experimental/pydantic/_compat.py

@@ -12,7 +12,7 @@ from pydantic.version import VERSION as PYDANTIC_VERSION
 from strawberry.experimental.pydantic.exceptions import UnsupportedTypeError
 
 if TYPE_CHECKING:
-    from pydantic.fields import FieldInfo
+    from pydantic.fields import ComputedFieldInfo, FieldInfo
 
 IS_PYDANTIC_V2: bool = PYDANTIC_VERSION.startswith("2.")
 IS_PYDANTIC_V1: bool = not IS_PYDANTIC_V2
@@ -128,7 +128,33 @@ class PydanticV2Compat:
 
         return PydanticUndefined
 
-    def get_model_fields(self, model: type[BaseModel]) -> dict[str, CompatModelField]:
+    def get_model_computed_fields(
+        self, model: type[BaseModel]
+    ) -> dict[str, CompatModelField]:
+        computed_field_info: dict[str, ComputedFieldInfo] = model.model_computed_fields
+        new_fields = {}
+        # Convert it into CompatModelField
+        for name, field in computed_field_info.items():
+            new_fields[name] = CompatModelField(
+                name=name,
+                type_=field.return_type,
+                outer_type_=field.return_type,
+                default=None,
+                default_factory=None,
+                required=False,
+                alias=field.alias,
+                # v2 doesn't have allow_none
+                allow_none=False,
+                has_alias=field is not None,
+                description=field.description,
+                _missing_type=self.PYDANTIC_MISSING_TYPE,
+                is_v1=False,
+            )
+        return new_fields
+
+    def get_model_fields(
+        self, model: type[BaseModel], include_computed: bool = False
+    ) -> dict[str, CompatModelField]:
         field_info: dict[str, FieldInfo] = model.model_fields
         new_fields = {}
         # Convert it into CompatModelField
@@ -148,6 +174,8 @@ class PydanticV2Compat:
                 _missing_type=self.PYDANTIC_MISSING_TYPE,
                 is_v1=False,
             )
+        if include_computed:
+            new_fields |= self.get_model_computed_fields(model)
         return new_fields
 
     @cached_property
@@ -175,7 +203,10 @@ class PydanticV1Compat:
     def PYDANTIC_MISSING_TYPE(self) -> Any:  # noqa: N802
         return dataclasses.MISSING
 
-    def get_model_fields(self, model: type[BaseModel]) -> dict[str, CompatModelField]:
+    def get_model_fields(
+        self, model: type[BaseModel], include_computed: bool = False
+    ) -> dict[str, CompatModelField]:
+        """`include_computed` is a noop for PydanticV1Compat."""
         new_fields = {}
         # Convert it into CompatModelField
         for name, field in model.__fields__.items():  # type: ignore[attr-defined]
@@ -284,7 +315,6 @@ else:
         smart_deepcopy,
     )
 
-
 __all__ = [
     "PydanticCompat",
     "get_args",

strawberry/experimental/pydantic/conversion.py

@@ -35,7 +35,7 @@ def _convert_from_pydantic_to_strawberry_type(
             if hasattr(option_type, "_pydantic_type"):
                 source_type = option_type._pydantic_type
             else:
-                source_type = cast(type, option_type)
+                source_type = cast("type", option_type)
             if isinstance(data, source_type):
                 return _convert_from_pydantic_to_strawberry_type(
                     option_type, data_from_model=data, extra=extra

strawberry/experimental/pydantic/error_type.py

@@ -116,7 +116,7 @@ def error_type(
         ]
 
         wrapped: type[WithStrawberryObjectDefinition] = _wrap_dataclass(cls)
-        extra_fields = cast(list[dataclasses.Field], _get_fields(wrapped, {}))
+        extra_fields = cast("list[dataclasses.Field]", _get_fields(wrapped, {}))
         private_fields = get_private_fields(wrapped)
 
         all_model_fields.extend(

strawberry/experimental/pydantic/object_type.py

@@ -126,11 +126,12 @@ def type(  # noqa: PLR0915
     description: Optional[str] = None,
     directives: Optional[Sequence[object]] = (),
     all_fields: bool = False,
+    include_computed: bool = False,
     use_pydantic_alias: bool = True,
 ) -> Callable[..., builtins.type[StrawberryTypeFromPydantic[PydanticModel]]]:
     def wrap(cls: Any) -> builtins.type[StrawberryTypeFromPydantic[PydanticModel]]:  # noqa: PLR0915
         compat = PydanticCompat.from_model(model)
-        model_fields = compat.get_model_fields(model)
+        model_fields = compat.get_model_fields(model, include_computed=include_computed)
         original_fields_set = set(fields) if fields else set()
 
         if fields:
@@ -171,12 +172,15 @@ def type(  # noqa: PLR0915
             raise MissingFieldsListError(cls)
 
         ensure_all_auto_fields_in_pydantic(
-            model=model, auto_fields=auto_fields_set, cls_name=cls.__name__
+            model=model,
+            auto_fields=auto_fields_set,
+            cls_name=cls.__name__,
+            include_computed=include_computed,
         )
 
         wrapped = _wrap_dataclass(cls)
         extra_strawberry_fields = _get_fields(wrapped, {})
-        extra_fields = cast(list[dataclasses.Field], extra_strawberry_fields)
+        extra_fields = cast("list[dataclasses.Field]", extra_strawberry_fields)
         private_fields = get_private_fields(wrapped)
 
         extra_fields_dict = {field.name: field for field in extra_strawberry_fields}

strawberry/experimental/pydantic/utils.py

@@ -117,11 +117,17 @@ def get_default_factory_for_field(
 
 
 def ensure_all_auto_fields_in_pydantic(
-    model: type[BaseModel], auto_fields: set[str], cls_name: str
+    model: type[BaseModel],
+    auto_fields: set[str],
+    cls_name: str,
+    include_computed: bool = False,
 ) -> None:
     compat = PydanticCompat.from_model(model)
     # Raise error if user defined a strawberry.auto field not present in the model
-    non_existing_fields = list(auto_fields - compat.get_model_fields(model).keys())
+    non_existing_fields = list(
+        auto_fields
+        - compat.get_model_fields(model, include_computed=include_computed).keys()
+    )
 
     if non_existing_fields:
         raise AutoFieldsNotInBaseModelError(

strawberry/ext/mypy_plugin.py

@@ -65,7 +65,7 @@ try:
     from pydantic.mypy import METADATA_KEY as PYDANTIC_METADATA_KEY
     from pydantic.mypy import PydanticModelField
 
-    PYDANTIC_VERSION = tuple(map(int, pydantic.__version__.split(".")))
+    PYDANTIC_VERSION = tuple(map(int, pydantic.__version__.split(".")))  # noqa: RUF048
 
     from strawberry.experimental.pydantic._compat import IS_PYDANTIC_V1
 except ImportError:
@@ -397,7 +397,7 @@ def strawberry_pydantic_class_callback(ctx: ClassDefContext) -> None:
         ]
         add_method(ctx, "__init__", init_args, NoneType())
 
-        model_type = cast(Instance, _get_type_for_expr(model_expression, ctx.api))
+        model_type = cast("Instance", _get_type_for_expr(model_expression, ctx.api))
 
         # these are the fields that the user added to the strawberry type
         new_strawberry_fields: set[str] = set()
@@ -405,7 +405,7 @@ def strawberry_pydantic_class_callback(ctx: ClassDefContext) -> None:
         # TODO: think about inheritance for strawberry?
         for stmt in ctx.cls.defs.body:
             if isinstance(stmt, AssignmentStmt):
-                lhs = cast(NameExpr, stmt.lvalues[0])
+                lhs = cast("NameExpr", stmt.lvalues[0])
                 new_strawberry_fields.add(lhs.name)
 
         pydantic_fields: set[PydanticModelField] = set()

strawberry/extensions/tracing/opentelemetry.py

@@ -42,9 +42,10 @@ class OpenTelemetryExtension(SchemaExtension):
         *,
         execution_context: Optional[ExecutionContext] = None,
         arg_filter: Optional[ArgFilter] = None,
+        tracer_provider: Optional[trace.TracerProvider] = None,
     ) -> None:
         self._arg_filter = arg_filter
-        self._tracer = trace.get_tracer("strawberry")
+        self._tracer = trace.get_tracer("strawberry", tracer_provider=tracer_provider)
         self._span_holder = {}
         if execution_context:
             self.execution_context = execution_context

strawberry/fastapi/router.py

@@ -76,7 +76,7 @@ class GraphQLRouter(
             connection: HTTPConnection,
             response: Response = None,  # type: ignore
         ) -> MergedContext:
-            request = cast(Union[Request, WebSocket], connection)
+            request = cast("Union[Request, WebSocket]", connection)
             if isinstance(custom_context, BaseContext):
                 custom_context.request = request
                 custom_context.background_tasks = background_tasks

strawberry/federation/schema.py

@@ -158,7 +158,7 @@ class Schema(BaseSchema):
             type_name = representation.pop("__typename")
             type_ = self.schema_converter.type_map[type_name]
 
-            definition = cast(StrawberryObjectDefinition, type_.definition)
+            definition = cast("StrawberryObjectDefinition", type_.definition)
 
             if hasattr(definition.origin, "resolve_reference"):
                 resolve_reference = definition.origin.resolve_reference

strawberry/flask/views.py

@@ -45,7 +45,7 @@ class FlaskHTTPRequestAdapter(SyncHTTPRequestAdapter):
 
     @property
     def method(self) -> HTTPMethod:
-        return cast(HTTPMethod, self.request.method.upper())
+        return cast("HTTPMethod", self.request.method.upper())
 
     @property
     def headers(self) -> Mapping[str, str]:
@@ -139,7 +139,7 @@ class AsyncFlaskHTTPRequestAdapter(AsyncHTTPRequestAdapter):
 
     @property
     def method(self) -> HTTPMethod:
-        return cast(HTTPMethod, self.request.method.upper())
+        return cast("HTTPMethod", self.request.method.upper())
 
     @property
     def content_type(self) -> Optional[str]:

strawberry/http/__init__.py

@@ -1,13 +1,11 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from typing import Any, Optional
+from typing import TYPE_CHECKING, Any, Optional
 from typing_extensions import Literal, TypedDict
 
-from strawberry.schema._graphql_core import (
-    GraphQLIncrementalExecutionResults,
-    ResultType,
-)
+if TYPE_CHECKING:
+    from strawberry.types import ExecutionResult
 
 
 class GraphQLHTTPResponse(TypedDict, total=False):
@@ -16,10 +14,7 @@ class GraphQLHTTPResponse(TypedDict, total=False):
     extensions: Optional[dict[str, object]]
 
 
-def process_result(result: ResultType) -> GraphQLHTTPResponse:
-    if isinstance(result, GraphQLIncrementalExecutionResults):
-        return result
-
+def process_result(result: ExecutionResult) -> GraphQLHTTPResponse:
     data: GraphQLHTTPResponse = {"data": result.data}
 
     if result.errors:

strawberry/http/async_base_view.py

@@ -25,9 +25,6 @@ from strawberry.http import (
     process_result,
 )
 from strawberry.http.ides import GraphQL_IDE
-from strawberry.schema._graphql_core import (
-    GraphQLIncrementalExecutionResults,
-)
 from strawberry.schema.base import BaseSchema
 from strawberry.schema.exceptions import InvalidOperationTypeError
 from strawberry.subscriptions import GRAPHQL_TRANSPORT_WS_PROTOCOL, GRAPHQL_WS_PROTOCOL
@@ -261,7 +258,7 @@ class AsyncBaseHTTPView(
         root_value: Optional[RootValue] = UNSET,
     ) -> WebSocketResponse: ...
 
-    async def run(  # noqa: PLR0915
+    async def run(
         self,
         request: Union[Request, WebSocketRequest],
         context: Optional[Context] = UNSET,
@@ -309,7 +306,7 @@ class AsyncBaseHTTPView(
                 await websocket.close(4406, "Subprotocol not acceptable")
 
             return websocket_response
-        request = cast(Request, request)
+        request = cast("Request", request)
 
         request_adapter = self.request_adapter_class(request)
         sub_response = await self.get_sub_response(request)
@@ -352,75 +349,6 @@ class AsyncBaseHTTPView(
                     "Content-Type": "multipart/mixed;boundary=graphql;subscriptionSpec=1.0,application/json",
                 },
             )
-        if isinstance(result, GraphQLIncrementalExecutionResults):
-
-            async def stream() -> AsyncGenerator[str, None]:
-                yield "---"
-
-                response = await self.process_result(request, result.initial_result)
-
-                response["hasNext"] = result.initial_result.has_next
-                response["pending"] = [
-                    p.formatted for p in result.initial_result.pending
-                ]
-                response["extensions"] = result.initial_result.extensions
-
-                yield self.encode_multipart_data(response, "-")
-
-                all_pending = result.initial_result.pending
-
-                async for value in result.subsequent_results:
-                    response = {
-                        "hasNext": value.has_next,
-                        "extensions": value.extensions,
-                    }
-
-                    if value.pending:
-                        response["pending"] = [p.formatted for p in value.pending]
-
-                    if value.completed:
-                        response["completed"] = [p.formatted for p in value.completed]
-
-                    if value.incremental:
-                        incremental = []
-
-                        all_pending.extend(value.pending)
-
-                        for incremental_value in value.incremental:
-                            pending_value = next(
-                                (
-                                    v
-                                    for v in all_pending
-                                    if v.id == incremental_value.id
-                                ),
-                                None,
-                            )
-
-                            assert pending_value
-
-                            incremental.append(
-                                {
-                                    **incremental_value.formatted,
-                                    "path": pending_value.path,
-                                    "label": pending_value.label,
-                                }
-                            )
-
-                        response["incremental"] = incremental
-
-                    yield self.encode_multipart_data(response, "-")
-
-                yield "--\r\n"
-
-            return await self.create_streaming_response(
-                request,
-                stream,
-                sub_response,
-                headers={
-                    "Transfer-Encoding": "chunked",
-                    "Content-Type": 'multipart/mixed; boundary="-"',
-                },
-            )
 
         response_data = await self.process_result(request=request, result=result)
 
@@ -432,16 +360,12 @@ class AsyncBaseHTTPView(
         )
 
     def encode_multipart_data(self, data: Any, separator: str) -> str:
-        encoded_data = self.encode_json(data)
-
         return "".join(
             [
-                "\r\n",
-                "Content-Type: application/json; charset=utf-8\r\n",
-                "Content-Length: " + str(len(encoded_data)) + "\r\n",
-                "\r\n",
-                encoded_data,
-                f"\r\n--{separator}",
+                f"\r\n--{separator}\r\n",
+                "Content-Type: application/json\r\n\r\n",
+                self.encode_json(data),
+                "\n",
             ]
         )
 

strawberry/litestar/controller.py

@@ -163,7 +163,7 @@ class LitestarRequestAdapter(AsyncHTTPRequestAdapter):
 
     @property
     def method(self) -> HTTPMethod:
-        return cast(HTTPMethod, self.request.method.upper())
+        return cast("HTTPMethod", self.request.method.upper())
 
     @property
     def headers(self) -> Mapping[str, str]: