strawberry-graphql 0.266.0.dev1744797470__tar.gz → 0.266.1__tar.gz

{strawberry_graphql-0.266.0.dev1744797470 → strawberry_graphql-0.266.1}/PKG-INFO

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

{strawberry_graphql-0.266.0.dev1744797470 → strawberry_graphql-0.266.1}/pyproject.toml

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

{strawberry_graphql-0.266.0.dev1744797470 → strawberry_graphql-0.266.1}/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
@@ -19,6 +18,7 @@ from .types.enum import enum, enum_value
 from .types.field import field
 from .types.info import Info
 from .types.lazy_type import LazyType, lazy
+from .types.maybe import Maybe, Some
 from .types.mutation import mutation, subscription
 from .types.object_type import asdict, input, interface, type  # noqa: A004
 from .types.private import Private
@@ -32,10 +32,11 @@ __all__ = [
     "BasePermission",
     "Info",
     "LazyType",
+    "Maybe",
     "Parent",
     "Private",
     "Schema",
-    "Streamable",
+    "Some",
     "argument",
     "asdict",
     "auto",

{strawberry_graphql-0.266.0.dev1744797470 → strawberry_graphql-0.266.1}/strawberry/annotation.py

@@ -17,9 +17,9 @@ from typing import (
 )
 from typing_extensions import Self, get_args, get_origin
 
-from strawberry.streamable import StrawberryStreamable
 from strawberry.types.base import (
     StrawberryList,
+    StrawberryMaybe,
     StrawberryObjectDefinition,
     StrawberryOptional,
     StrawberryTypeVar,
@@ -29,6 +29,7 @@ from strawberry.types.base import (
 from strawberry.types.enum import EnumDefinition
 from strawberry.types.enum import enum as strawberry_enum
 from strawberry.types.lazy_type import LazyType
+from strawberry.types.maybe import _annotation_is_maybe
 from strawberry.types.private import is_private
 from strawberry.types.scalar import ScalarDefinition
 from strawberry.types.unset import UNSET
@@ -142,10 +143,12 @@ 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)
+        if type_of := self._get_maybe_type(evaled_type):
+            return StrawberryMaybe(
+                of_type=type_of,
+            )
 
         if self._is_graphql_generic(evaled_type):
             if any(is_type_var(type_) for type_ in get_args(evaled_type)):
@@ -317,8 +320,8 @@ class StrawberryAnnotation:
         )
 
     @classmethod
-    def _is_streamable(cls, annotation: Any, args: list[Any]) -> bool:
-        return any(isinstance(arg, StrawberryStreamable) for arg in args)
+    def _get_maybe_type(cls, annotation: Any) -> type | None:
+        return get_args(annotation)[0] if _annotation_is_maybe(annotation) else None
 
     @classmethod
     def _is_strawberry_type(cls, evaled_type: Any) -> bool:

{strawberry_graphql-0.266.0.dev1744797470 → strawberry_graphql-0.266.1}/strawberry/federation/enum.py

@@ -20,6 +20,7 @@ if TYPE_CHECKING:
 
 def enum_value(
     value: Any,
+    name: Optional[str] = None,
     deprecation_reason: Optional[str] = None,
     directives: Iterable[object] = (),
     inaccessible: bool = False,
@@ -35,7 +36,12 @@ def enum_value(
     if tags:
         directives.extend(Tag(name=tag) for tag in tags)
 
-    return base_enum_value(value, deprecation_reason, directives)
+    return base_enum_value(
+        value=value,
+        name=name,
+        deprecation_reason=deprecation_reason,
+        directives=directives,
+    )
 
 
 @overload

{strawberry_graphql-0.266.0.dev1744797470 → strawberry_graphql-0.266.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,16 +14,13 @@ 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}
 
-    errors, extensions = result.errors, result.extensions
-    data: GraphQLHTTPResponse = {
-        "data": result.data,
-        **({"errors": [err.formatted for err in errors]} if errors else {}),
-        **({"extensions": extensions} if extensions else {}),
-    }
+    if result.errors:
+        data["errors"] = [err.formatted for err in result.errors]
+    if result.extensions:
+        data["extensions"] = result.extensions
 
     return data
 

{strawberry_graphql-0.266.0.dev1744797470 → strawberry_graphql-0.266.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,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_graphql-0.266.0.dev1744797470 → strawberry_graphql-0.266.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.266.0.dev1744797470 → strawberry_graphql-0.266.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.266.0.dev1744797470 → strawberry_graphql-0.266.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
@@ -62,15 +64,6 @@ from strawberry.utils.aio import aclosing
 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
@@ -99,7 +92,6 @@ OriginSubscriptionResult = Union[
     AsyncIterator[OriginalExecutionResult],
 ]
 
-
 DEFAULT_ALLOWED_OPERATION_TYPES = {
     OperationType.QUERY,
     OperationType.MUTATION,
@@ -270,16 +262,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,
@@ -457,16 +444,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:
@@ -507,17 +490,6 @@ class Schema(BaseSchema):
         extensions_runner = self.create_extensions_runner(execution_context, extensions)
         middleware_manager = self._get_middleware_manager(extensions)
 
-        execute_function = execute
-
-        if self.config.enable_experimental_incremental_execution:
-            execute_function = experimental_execute_incrementally
-
-            if execute_function is None:
-                raise RuntimeError(
-                    "Incremental execution is enabled but experimental_execute_incrementally is not available, "
-                    "please install graphql-core>=3.3.0"
-                )
-
         try:
             async with extensions_runner.operation():
                 # Note: In graphql-core the schema would be validated here but in
@@ -536,7 +508,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,
@@ -552,9 +524,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
@@ -604,16 +574,6 @@ class Schema(BaseSchema):
         extensions_runner = self.create_extensions_runner(execution_context, extensions)
         middleware_manager = self._get_middleware_manager(extensions)
 
-        execute_function = execute
-
-        if self.config.enable_experimental_incremental_execution:
-            execute_function = experimental_execute_incrementally
-
-            if execute_function is None:
-                raise RuntimeError(
-                    "Incremental execution is enabled but experimental_execute_incrementally is not available, "
-                    "please install graphql-core>=3.3.0"
-                )
         try:
             with extensions_runner.operation():
                 # Note: In graphql-core the schema would be validated here but in
@@ -655,7 +615,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.266.0.dev1744797470 → strawberry_graphql-0.266.1}/strawberry/schema/schema_converter.py

@@ -52,6 +52,7 @@ from strawberry.schema.types.scalar import _make_scalar_type
 from strawberry.types.arguments import StrawberryArgument, convert_arguments
 from strawberry.types.base import (
     StrawberryList,
+    StrawberryMaybe,
     StrawberryObjectDefinition,
     StrawberryOptional,
     StrawberryType,
@@ -254,7 +255,10 @@ class GraphQLCoreConverter:
         argument_type = cast(
             "GraphQLInputType", self.from_maybe_optional(argument.type)
         )
-        default_value = Undefined if argument.default is UNSET else argument.default
+        if argument.is_maybe:
+            default_value: Any = Undefined
+        else:
+            default_value = Undefined if argument.default is UNSET else argument.default
 
         return GraphQLArgument(
             type_=argument_type,
@@ -419,8 +423,9 @@ class GraphQLCoreConverter:
             ),
         )
         default_value: object
-
-        if field.default_value is UNSET or field.default_value is dataclasses.MISSING:
+        if isinstance(field.type, StrawberryMaybe):
+            default_value = Undefined
+        elif field.default_value is UNSET or field.default_value is dataclasses.MISSING:
             default_value = Undefined
         else:
             default_value = field.default_value

{strawberry_graphql-0.266.0.dev1744797470 → strawberry_graphql-0.266.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.266.0.dev1744797470 → strawberry_graphql-0.266.1}/strawberry/types/arguments.py

@@ -17,13 +17,17 @@ from strawberry.exceptions import MultipleStrawberryArgumentsError, UnsupportedT
 from strawberry.scalars import is_scalar
 from strawberry.types.base import (
     StrawberryList,
+    StrawberryMaybe,
     StrawberryOptional,
     has_object_definition,
 )
 from strawberry.types.enum import EnumDefinition
 from strawberry.types.lazy_type import LazyType, StrawberryLazyReference
+from strawberry.types.maybe import Some
 from strawberry.types.unset import UNSET as _deprecated_UNSET  # noqa: N811
-from strawberry.types.unset import _deprecated_is_unset  # noqa: F401
+from strawberry.types.unset import (
+    _deprecated_is_unset,  # noqa: F401
+)
 
 if TYPE_CHECKING:
     from collections.abc import Iterable, Mapping
@@ -135,6 +139,10 @@ class StrawberryArgument:
 
         return is_graphql_generic(self.type)
 
+    @property
+    def is_maybe(self) -> bool:
+        return isinstance(self.type, StrawberryMaybe)
+
 
 def convert_argument(
     value: object,
@@ -143,6 +151,10 @@ def convert_argument(
     config: StrawberryConfig,
 ) -> object:
     # TODO: move this somewhere else and make it first class
+    if isinstance(type_, StrawberryOptional):
+        res = convert_argument(value, type_.of_type, scalar_registry, config)
+
+        return Some(res) if isinstance(type_, StrawberryMaybe) else res
 
     if value is None:
         return None
@@ -150,9 +162,6 @@ def convert_argument(
     if value is _deprecated_UNSET:
         return _deprecated_UNSET
 
-    if isinstance(type_, StrawberryOptional):
-        return convert_argument(value, type_.of_type, scalar_registry, config)
-
     if isinstance(type_, StrawberryList):
         value_list = cast("Iterable", value)
         return [

{strawberry_graphql-0.266.0.dev1744797470 → strawberry_graphql-0.266.1}/strawberry/types/base.py

@@ -152,7 +152,16 @@ class StrawberryContainer(StrawberryType):
 class StrawberryList(StrawberryContainer): ...
 
 
-class StrawberryOptional(StrawberryContainer): ...
+class StrawberryOptional(StrawberryContainer):
+    def __init__(
+        self,
+        of_type: Union[StrawberryType, type[WithStrawberryObjectDefinition], type],
+    ) -> None:
+        super().__init__(of_type)
+
+
+class StrawberryMaybe(StrawberryOptional):
+    pass
 
 
 class StrawberryTypeVar(StrawberryType):

{strawberry_graphql-0.266.0.dev1744797470 → strawberry_graphql-0.266.1}/strawberry/types/enum.py

@@ -50,6 +50,7 @@ class EnumDefinition(StrawberryType):
 @dataclasses.dataclass
 class EnumValueDefinition:
     value: Any
+    graphql_name: Optional[str] = None
     deprecation_reason: Optional[str] = None
     directives: Iterable[object] = ()
     description: Optional[str] = None
@@ -60,6 +61,7 @@ class EnumValueDefinition:
 
 def enum_value(
     value: Any,
+    name: Optional[str] = None,
     deprecation_reason: Optional[str] = None,
     directives: Iterable[object] = (),
     description: Optional[str] = None,
@@ -68,6 +70,7 @@ def enum_value(
 
     Args:
         value: The value of the enum member.
+        name: The GraphQL name of the enum member.
         deprecation_reason: The deprecation reason of the enum member,
             setting this will mark the enum member as deprecated.
         directives: The directives to attach to the enum member.
@@ -90,6 +93,7 @@ def enum_value(
     """
     return EnumValueDefinition(
         value=value,
+        graphql_name=name,
         deprecation_reason=deprecation_reason,
         directives=directives,
         description=description,
@@ -123,12 +127,16 @@ def _process_enum(
             item_directives = item_value.directives
             enum_value_description = item_value.description
             deprecation_reason = item_value.deprecation_reason
-            item_value = item_value.value
 
             # update _value2member_map_ so that doing `MyEnum.MY_VALUE` and
             # `MyEnum['MY_VALUE']` both work
-            cls._value2member_map_[item_value] = item
-            cls._member_map_[item_name]._value_ = item_value
+            cls._value2member_map_[item_value.value] = item
+            cls._member_map_[item_name]._value_ = item_value.value
+
+            if item_value.graphql_name:
+                item_name = item_value.graphql_name
+
+            item_value = item_value.value
 
         value = EnumValue(
             item_name,

strawberry_graphql-0.266.1/strawberry/types/maybe.py

@@ -0,0 +1,47 @@
+import typing
+from typing import TYPE_CHECKING, Any, Generic, TypeVar, Union
+from typing_extensions import TypeAlias
+
+T = TypeVar("T")
+
+
+class Some(Generic[T]):
+    """A special value that can be used to represent an unset value in a field or argument.
+
+    Similar to `undefined` in JavaScript, this value can be used to differentiate between
+    a field that was not set and a field that was set to `None` or `null`.
+    """
+
+    __slots__ = ("value",)
+
+    def __init__(self, value: T) -> None:
+        self.value = value
+
+    def __repr__(self) -> str:
+        return f"Some({self.value!r})"
+
+    def __eq__(self, other: object) -> bool:
+        return self.value == other.value if isinstance(other, Some) else False
+
+    def __hash__(self) -> int:
+        return hash(self.value)
+
+    def __bool__(self) -> bool:
+        return True
+
+
+if TYPE_CHECKING:
+    Maybe: TypeAlias = Union[Some[Union[T, None]], None]
+else:
+    # we do this trick so we can inspect that at runtime
+    class Maybe(Generic[T]): ...
+
+
+def _annotation_is_maybe(annotation: Any) -> bool:
+    return (orig := typing.get_origin(annotation)) and orig is Maybe
+
+
+__all__ = [
+    "Maybe",
+    "Some",
+]