strawberry-graphql 0.263.0.dev1743450741__tar.gz → 0.263.1__tar.gz

{strawberry_graphql-0.263.0.dev1743450741 → strawberry_graphql-0.263.1}/PKG-INFO

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

{strawberry_graphql-0.263.0.dev1743450741 → strawberry_graphql-0.263.1}/pyproject.toml

@@ -1,7 +1,7 @@
 [tool.poetry]
 name = "strawberry-graphql"
 packages = [ { include = "strawberry" } ]
-version = "0.263.0.dev.1743450741"
+version = "0.263.1"
 description = "A library for creating GraphQL APIs"
 authors = ["Patrick Arminio <patrick.arminio@gmail.com>"]
 license = "MIT"

{strawberry_graphql-0.263.0.dev1743450741 → strawberry_graphql-0.263.1}/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.263.0.dev1743450741 → strawberry_graphql-0.263.1}/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_graphql-0.263.0.dev1743450741 → strawberry_graphql-0.263.1}/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,7 +172,10 @@ 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)

{strawberry_graphql-0.263.0.dev1743450741 → strawberry_graphql-0.263.1}/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_graphql-0.263.0.dev1743450741 → strawberry_graphql-0.263.1}/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_graphql-0.263.0.dev1743450741 → strawberry_graphql-0.263.1}/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_graphql-0.263.0.dev1743450741 → strawberry_graphql-0.263.1}/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,
@@ -352,73 +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, "-")
-
-                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 = []
-
-                        for incremental_value in value.incremental:
-                            pending_value = next(
-                                (
-                                    v
-                                    for v in result.initial_result.pending
-                                    if v.id == incremental_value.id
-                                ),
-                                None,
-                            )
-
-                            assert pending_value
-
-                            incremental.append(
-                                {
-                                    **incremental_value.formatted,
-                                    # for Apollo
-                                    # content type is `multipart/mixed;deferSpec=20220824,application/json`
-                                    "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)
 
@@ -430,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_graphql-0.263.0.dev1743450741 → strawberry_graphql-0.263.1}/strawberry/printer/printer.py

@@ -561,9 +561,9 @@ def print_schema_definition(
 def print_directive(
     directive: GraphQLDirective, *, schema: BaseSchema
 ) -> Optional[str]:
-    strawberry_directive = directive.extensions.get("strawberry-definition")
+    strawberry_directive = directive.extensions["strawberry-definition"]
 
-    if strawberry_directive is None or (
+    if (
         isinstance(strawberry_directive, StrawberrySchemaDirective)
         and not strawberry_directive.print_definition
     ):

{strawberry_graphql-0.263.0.dev1743450741 → strawberry_graphql-0.263.1}/strawberry/schema/config.py

@@ -16,7 +16,6 @@ class StrawberryConfig:
     relay_max_results: int = 100
     disable_field_suggestions: bool = False
     info_class: type[Info] = Info
-    enable_experimental_incremental_execution: bool = False
 
     def __post_init__(
         self,

{strawberry_graphql-0.263.0.dev1743450741 → strawberry_graphql-0.263.1}/strawberry/schema/schema.py

@@ -29,6 +29,8 @@ from graphql import (
     parse,
     validate_schema,
 )
+from graphql.execution import ExecutionContext as GraphQLExecutionContext
+from graphql.execution import execute, subscribe
 from graphql.execution.middleware import MiddlewareManager
 from graphql.type.directives import specified_directives
 from graphql.validation import validate
@@ -61,15 +63,6 @@ from strawberry.utils import IS_GQL_32
 from strawberry.utils.await_maybe import await_maybe
 
 from . import compat
-from ._graphql_core import (
-    GraphQLExecutionContext,
-    GraphQLIncrementalExecutionResults,
-    ResultType,
-    execute,
-    experimental_execute_incrementally,
-    incremental_execution_directives,
-    subscribe,
-)
 from .base import BaseSchema
 from .config import StrawberryConfig
 from .exceptions import InvalidOperationTypeError
@@ -98,7 +91,6 @@ OriginSubscriptionResult = Union[
     AsyncIterator[OriginalExecutionResult],
 ]
 
-
 DEFAULT_ALLOWED_OPERATION_TYPES = {
     OperationType.QUERY,
     OperationType.MUTATION,
@@ -267,16 +259,11 @@ class Schema(BaseSchema):
                 graphql_types.append(graphql_type)
 
         try:
-            directives = specified_directives + tuple(graphql_directives)
-
-            if self.config.enable_experimental_incremental_execution:
-                directives = tuple(directives) + tuple(incremental_execution_directives)
-
             self._schema = GraphQLSchema(
                 query=query_type,
                 mutation=mutation_type,
                 subscription=subscription_type if subscription else None,
-                directives=directives,
+                directives=specified_directives + tuple(graphql_directives),
                 types=graphql_types,
                 extensions={
                     GraphQLCoreConverter.DEFINITION_BACKREF: self,
@@ -454,16 +441,12 @@ class Schema(BaseSchema):
     async def _handle_execution_result(
         self,
         context: ExecutionContext,
-        result: ResultType,
+        result: Union[GraphQLExecutionResult, ExecutionResult],
         extensions_runner: SchemaExtensionsRunner,
         *,
         # TODO: can we remove this somehow, see comment in execute
         skip_process_errors: bool = False,
     ) -> ExecutionResult:
-        # TODO: handle this, also, why do we have both GraphQLExecutionResult and ExecutionResult?
-        if isinstance(result, GraphQLIncrementalExecutionResults):
-            return result
-
         # Set errors on the context so that it's easier
         # to access in extensions
         if result.errors:
@@ -504,14 +487,6 @@ class Schema(BaseSchema):
         extensions_runner = self.create_extensions_runner(execution_context, extensions)
         middleware_manager = self._get_middleware_manager(extensions)
 
-        execute_function = (
-            experimental_execute_incrementally
-            if self.config.enable_experimental_incremental_execution
-            else execute
-        )
-
-        # TODO: raise if experimental_execute_incrementally is not available
-
         try:
             async with extensions_runner.operation():
                 # Note: In graphql-core the schema would be validated here but in
@@ -530,7 +505,7 @@ class Schema(BaseSchema):
                 async with extensions_runner.executing():
                     if not execution_context.result:
                         result = await await_maybe(
-                            execute_function(
+                            execute(
                                 self._schema,
                                 execution_context.graphql_document,
                                 root_value=execution_context.root_value,
@@ -546,9 +521,7 @@ class Schema(BaseSchema):
                         result = execution_context.result
                     # Also set errors on the execution_context so that it's easier
                     # to access in extensions
-
-                    # TODO: maybe here use the first result from incremental execution if it exists
-                    if isinstance(result, GraphQLExecutionResult) and result.errors:
+                    if result.errors:
                         execution_context.errors = result.errors
 
                         # Run the `Schema.process_errors` function here before
@@ -598,14 +571,6 @@ class Schema(BaseSchema):
         extensions_runner = self.create_extensions_runner(execution_context, extensions)
         middleware_manager = self._get_middleware_manager(extensions)
 
-        execute_function = (
-            experimental_execute_incrementally
-            if self.config.enable_experimental_incremental_execution
-            else execute
-        )
-
-        # TODO: raise if experimental_execute_incrementally is not available
-
         try:
             with extensions_runner.operation():
                 # Note: In graphql-core the schema would be validated here but in
@@ -647,7 +612,7 @@ class Schema(BaseSchema):
 
                 with extensions_runner.executing():
                     if not execution_context.result:
-                        result = execute_function(
+                        result = execute(
                             self._schema,
                             execution_context.graphql_document,
                             root_value=execution_context.root_value,

{strawberry_graphql-0.263.0.dev1743450741 → strawberry_graphql-0.263.1}/strawberry/static/graphiql.html

@@ -1,4 +1,4 @@
-<!doctype html>
+<!DOCTYPE html>
 <html>
   <head>
     <title>Strawberry GraphiQL</title>
@@ -61,8 +61,8 @@
     <link
       crossorigin
       rel="stylesheet"
-      href="https://unpkg.com/graphiql@3.8.3/graphiql.min.css"
-      integrity="sha384-Mq3vbRBY71jfjQAt/DcjxUIYY33ksal4cgdRt9U/hNPvHBCaT2JfJ/PTRiPKf0aM"
+      href="https://unpkg.com/graphiql@3.0.9/graphiql.min.css"
+      integrity="sha384-yz3/sqpuplkA7msMo0FE4ekg0xdwdvZ8JX9MVZREsxipqjU4h8IRfmAMRcb1QpUy"
     />
 
     <link
@@ -77,8 +77,8 @@
     <div id="graphiql" class="graphiql-container">Loading...</div>
     <script
       crossorigin
-      src="https://unpkg.com/graphiql@3.8.3/graphiql.min.js"
-      integrity="sha384-HbRVEFG0JGJZeAHCJ9Xm2+tpknBQ7QZmNlO/DgZtkZ0aJSypT96YYGRNod99l9Ie"
+      src="https://unpkg.com/graphiql@3.0.9/graphiql.min.js"
+      integrity="sha384-Mjte+vxCWz1ZYCzszGHiJqJa5eAxiqI4mc3BErq7eDXnt+UGLXSEW7+i0wmfPiji"
     ></script>
     <script
       crossorigin

strawberry_graphql-0.263.0.dev1743450741/strawberry/schema/_graphql_core.py

@@ -1,46 +0,0 @@
-from typing import Union
-
-from graphql.execution import ExecutionContext as GraphQLExecutionContext
-from graphql.execution import ExecutionResult as GraphQLExecutionResult
-from graphql.execution import execute, subscribe
-
-from strawberry.types import ExecutionResult
-
-try:
-    from graphql import (
-        ExperimentalIncrementalExecutionResults as GraphQLIncrementalExecutionResults,
-    )
-    from graphql.execution import experimental_execute_incrementally
-    from graphql.type.directives import (
-        GraphQLDeferDirective,
-        GraphQLStreamDirective,
-    )
-
-    incremental_execution_directives = (
-        GraphQLDeferDirective,
-        GraphQLStreamDirective,
-    )
-
-except ImportError:
-    GraphQLIncrementalExecutionResults = type(None)
-
-    incremental_execution_directives = []
-    experimental_execute_incrementally = None
-
-
-# TODO: give this a better name, maybe also a better place
-ResultType = Union[
-    GraphQLExecutionResult,
-    GraphQLIncrementalExecutionResults,
-    ExecutionResult,
-]
-
-__all__ = [
-    "GraphQLExecutionContext",
-    "GraphQLIncrementalExecutionResults",
-    "ResultType",
-    "execute",
-    "experimental_execute_incrementally",
-    "incremental_execution_directives",
-    "subscribe",
-]