strawberry-graphql 0.227.0.dev1713475585__py3-none-any.whl → 0.227.2__py3-none-any.whl

strawberry/object_type.py

@@ -67,7 +67,8 @@ def _check_field_annotations(cls: Type[Any]):
             # If the field has a type override then use that instead of using
             # the class annotations or resolver annotation
             if field_.type_annotation is not None:
-                cls_annotations[field_name] = field_.type_annotation.annotation
+                if field_name not in cls_annotations:
+                    cls_annotations[field_name] = field_.type_annotation.annotation
                 continue
 
             # Make sure the cls has an annotation
@@ -85,7 +86,8 @@ def _check_field_annotations(cls: Type[Any]):
                         field_name, resolver=field_.base_resolver
                     )
 
-                cls_annotations[field_name] = field_.base_resolver.type_annotation
+                if field_name not in cls_annotations:
+                    cls_annotations[field_name] = field_.base_resolver.type_annotation
 
             # TODO: Make sure the cls annotation agrees with the field's type
             # >>> if cls_annotations[field_name] != field.base_resolver.type:
@@ -133,11 +135,13 @@ def _process_type(
     description: Optional[str] = None,
     directives: Optional[Sequence[object]] = (),
     extend: bool = False,
+    original_type_annotations: Optional[Dict[str, Any]] = None,
 ) -> T:
     name = name or to_camel_case(cls.__name__)
+    original_type_annotations = original_type_annotations or {}
 
     interfaces = _get_interfaces(cls)
-    fields = _get_fields(cls)
+    fields = _get_fields(cls, original_type_annotations)
     is_type_of = getattr(cls, "is_type_of", None)
     resolve_type = getattr(cls, "resolve_type", None)
 
@@ -198,8 +202,7 @@ def type(
     description: Optional[str] = None,
     directives: Optional[Sequence[object]] = (),
     extend: bool = False,
-) -> T:
-    ...
+) -> T: ...
 
 
 @overload
@@ -214,8 +217,7 @@ def type(
     description: Optional[str] = None,
     directives: Optional[Sequence[object]] = (),
     extend: bool = False,
-) -> Callable[[T], T]:
-    ...
+) -> Callable[[T], T]: ...
 
 
 def type(
@@ -247,7 +249,25 @@ def type(
                 exc = ObjectIsNotClassError.type
             raise exc(cls)
 
+        # when running `_wrap_dataclass` we lose some of the information about the
+        # the passed types, especially the type_annotation inside the StrawberryField
+        # this makes it impossible to customise the field type, like this:
+        # >>> @strawberry.type
+        # >>> class Query:
+        # >>>     a: int = strawberry.field(graphql_type=str)
+        # so we need to extract the information before running `_wrap_dataclass`
+        original_type_annotations: Dict[str, Any] = {}
+
+        annotations = getattr(cls, "__annotations__", {})
+
+        for field_name in annotations:
+            field = getattr(cls, field_name, None)
+
+            if field and isinstance(field, StrawberryField) and field.type_annotation:
+                original_type_annotations[field_name] = field.type_annotation.annotation
+
         wrapped = _wrap_dataclass(cls)
+
         return _process_type(
             wrapped,
             name=name,
@@ -256,6 +276,7 @@ def type(
             description=description,
             directives=directives,
             extend=extend,
+            original_type_annotations=original_type_annotations,
         )
 
     if cls is None:
@@ -272,11 +293,9 @@ def input(
     cls: T,
     *,
     name: Optional[str] = None,
-    one_of: Optional[bool] = None,
     description: Optional[str] = None,
     directives: Optional[Sequence[object]] = (),
-) -> T:
-    ...
+) -> T: ...
 
 
 @overload
@@ -286,18 +305,15 @@ def input(
 def input(
     *,
     name: Optional[str] = None,
-    one_of: Optional[bool] = None,
     description: Optional[str] = None,
     directives: Optional[Sequence[object]] = (),
-) -> Callable[[T], T]:
-    ...
+) -> Callable[[T], T]: ...
 
 
 def input(
     cls: Optional[T] = None,
     *,
     name: Optional[str] = None,
-    one_of: Optional[bool] = None,
     description: Optional[str] = None,
     directives: Optional[Sequence[object]] = (),
 ):
@@ -308,11 +324,6 @@ def input(
     >>>     field_abc: str = "ABC"
     """
 
-    from strawberry.schema_directives import OneOf
-
-    if one_of:
-        directives = (*(directives or ()), OneOf())
-
     return type(  # type: ignore # not sure why mypy complains here
         cls,
         name=name,
@@ -332,8 +343,7 @@ def interface(
     name: Optional[str] = None,
     description: Optional[str] = None,
     directives: Optional[Sequence[object]] = (),
-) -> T:
-    ...
+) -> T: ...
 
 
 @overload
@@ -345,8 +355,7 @@ def interface(
     name: Optional[str] = None,
     description: Optional[str] = None,
     directives: Optional[Sequence[object]] = (),
-) -> Callable[[T], T]:
-    ...
+) -> Callable[[T], T]: ...
 
 
 @dataclass_transform(

strawberry/parent.py

@@ -2,8 +2,7 @@ from typing import TypeVar
 from typing_extensions import Annotated
 
 
-class StrawberryParent:
-    ...
+class StrawberryParent: ...
 
 
 T = TypeVar("T")

strawberry/printer/printer.py

@@ -69,20 +69,17 @@ class PrintExtras:
 
 
 @overload
-def _serialize_dataclasses(value: Dict[_T, object]) -> Dict[_T, object]:
-    ...
+def _serialize_dataclasses(value: Dict[_T, object]) -> Dict[_T, object]: ...
 
 
 @overload
 def _serialize_dataclasses(
     value: Union[List[object], Tuple[object]],
-) -> List[object]:
-    ...
+) -> List[object]: ...
 
 
 @overload
-def _serialize_dataclasses(value: object) -> object:
-    ...
+def _serialize_dataclasses(value: object) -> object: ...
 
 
 def _serialize_dataclasses(value):

strawberry/private.py

@@ -4,8 +4,7 @@ from typing_extensions import Annotated
 from strawberry.utils.typing import type_has_annotation
 
 
-class StrawberryPrivate:
-    ...
+class StrawberryPrivate: ...
 
 
 T = TypeVar("T")

strawberry/relay/fields.py

@@ -331,8 +331,7 @@ def connection(
     metadata: Optional[Mapping[Any, Any]] = None,
     directives: Optional[Sequence[object]] = (),
     extensions: List[FieldExtension] = (),  # type: ignore
-) -> Any:
-    ...
+) -> Any: ...
 
 
 @overload
@@ -349,8 +348,7 @@ def connection(
     metadata: Optional[Mapping[Any, Any]] = None,
     directives: Optional[Sequence[object]] = (),
     extensions: List[FieldExtension] = (),  # type: ignore
-) -> StrawberryField:
-    ...
+) -> StrawberryField: ...
 
 
 def connection(

strawberry/relay/types.py

@@ -130,8 +130,7 @@ class GlobalID:
         *,
         required: Literal[True] = ...,
         ensure_type: Type[_T],
-    ) -> _T:
-        ...
+    ) -> _T: ...
 
     @overload
     async def resolve_node(
@@ -140,8 +139,7 @@ class GlobalID:
         *,
         required: Literal[True],
         ensure_type: None = ...,
-    ) -> Node:
-        ...
+    ) -> Node: ...
 
     @overload
     async def resolve_node(
@@ -150,8 +148,7 @@ class GlobalID:
         *,
         required: bool = ...,
         ensure_type: None = ...,
-    ) -> Optional[Node]:
-        ...
+    ) -> Optional[Node]: ...
 
     async def resolve_node(self, info, *, required=False, ensure_type=None) -> Any:
         """Resolve the type name and node id info to the node itself.
@@ -235,8 +232,7 @@ class GlobalID:
         *,
         required: Literal[True] = ...,
         ensure_type: Type[_T],
-    ) -> _T:
-        ...
+    ) -> _T: ...
 
     @overload
     def resolve_node_sync(
@@ -245,8 +241,7 @@ class GlobalID:
         *,
         required: Literal[True],
         ensure_type: None = ...,
-    ) -> Node:
-        ...
+    ) -> Node: ...
 
     @overload
     def resolve_node_sync(
@@ -255,8 +250,7 @@ class GlobalID:
         *,
         required: bool = ...,
         ensure_type: None = ...,
-    ) -> Optional[Node]:
-        ...
+    ) -> Optional[Node]: ...
 
     def resolve_node_sync(self, info, *, required=False, ensure_type=None) -> Any:
         """Resolve the type name and node id info to the node itself.
@@ -485,8 +479,7 @@ class Node:
         info: Info,
         node_ids: Iterable[str],
         required: Literal[True],
-    ) -> AwaitableOrValue[Iterable[Self]]:
-        ...
+    ) -> AwaitableOrValue[Iterable[Self]]: ...
 
     @overload
     @classmethod
@@ -496,8 +489,7 @@ class Node:
         info: Info,
         node_ids: Iterable[str],
         required: Literal[False] = ...,
-    ) -> AwaitableOrValue[Iterable[Optional[Self]]]:
-        ...
+    ) -> AwaitableOrValue[Iterable[Optional[Self]]]: ...
 
     @overload
     @classmethod
@@ -510,8 +502,7 @@ class Node:
     ) -> Union[
         AwaitableOrValue[Iterable[Self]],
         AwaitableOrValue[Iterable[Optional[Self]]],
-    ]:
-        ...
+    ]: ...
 
     @classmethod
     def resolve_nodes(
@@ -555,8 +546,7 @@ class Node:
         *,
         info: Info,
         required: Literal[True],
-    ) -> AwaitableOrValue[Self]:
-        ...
+    ) -> AwaitableOrValue[Self]: ...
 
     @overload
     @classmethod
@@ -566,8 +556,7 @@ class Node:
         *,
         info: Info,
         required: Literal[False] = ...,
-    ) -> AwaitableOrValue[Optional[Self]]:
-        ...
+    ) -> AwaitableOrValue[Optional[Self]]: ...
 
     @overload
     @classmethod
@@ -577,8 +566,7 @@ class Node:
         *,
         info: Info,
         required: bool,
-    ) -> AwaitableOrValue[Optional[Self]]:
-        ...
+    ) -> AwaitableOrValue[Optional[Self]]: ...
 
     @classmethod
     def resolve_node(

strawberry/relay/utils.py

@@ -41,7 +41,7 @@ def to_base64(type_: Union[str, type, StrawberryObjectDefinition], node_id: Any)
             The node id itself
 
     Returns:
-        A tuple of (TypeName, NodeID).
+        A GlobalID, which is a string resulting from base64 encoding <TypeName>:<NodeID>.
 
     Raises:
         ValueError:

strawberry/schema/execute.py

@@ -23,7 +23,6 @@ from graphql.validation import validate
 
 from strawberry.exceptions import MissingQueryError
 from strawberry.extensions.runner import SchemaExtensionsRunner
-from strawberry.schema.validation_rules.one_of import OneOfInputValidationRule
 from strawberry.types import ExecutionResult
 
 from .exceptions import InvalidOperationTypeError
@@ -56,10 +55,6 @@ def validate_document(
     document: DocumentNode,
     validation_rules: Tuple[Type[ASTValidationRule], ...],
 ) -> List[GraphQLError]:
-    validation_rules = (
-        *validation_rules,
-        OneOfInputValidationRule,
-    )
     return validate(
         schema,
         document,

strawberry/schema/schema.py

@@ -16,8 +16,6 @@ from typing import (
 )
 
 from graphql import (
-    GraphQLBoolean,
-    GraphQLField,
     GraphQLNamedType,
     GraphQLNonNull,
     GraphQLSchema,
@@ -170,7 +168,6 @@ class Schema(BaseSchema):
 
         self._warn_for_federation_directives()
         self._resolve_node_ids()
-        self._extend_introspection()
 
         # Validate schema early because we want developers to know about
         # possible issues as soon as possible
@@ -378,14 +375,6 @@ class Schema(BaseSchema):
                 stacklevel=3,
             )
 
-    def _extend_introspection(self):
-        def _resolve_is_one_of(obj: Any, info: Any) -> bool:
-            return obj.extensions["strawberry-definition"].is_one_of
-
-        instrospection_type = self._schema.type_map["__Type"]
-        instrospection_type.fields["isOneOf"] = GraphQLField(GraphQLBoolean)  # type: ignore[attr-defined]
-        instrospection_type.fields["isOneOf"].resolve = _resolve_is_one_of  # type: ignore[attr-defined]
-
     def as_str(self) -> str:
         return print_schema(self)
 

strawberry/schema/schema_converter.py

@@ -26,7 +26,6 @@ from graphql import (
     GraphQLDirective,
     GraphQLEnumType,
     GraphQLEnumValue,
-    GraphQLError,
     GraphQLField,
     GraphQLInputField,
     GraphQLInputObjectType,
@@ -102,8 +101,7 @@ class FieldConverterProtocol(Generic[FieldType], Protocol):
         field: StrawberryField,
         *,
         type_definition: Optional[StrawberryObjectDefinition] = None,
-    ) -> FieldType:
-        ...
+    ) -> FieldType: ...
 
 
 def _get_thunk_mapping(
@@ -411,37 +409,6 @@ class GraphQLCoreConverter:
             assert isinstance(graphql_object_type, GraphQLInputObjectType)  # For mypy
             return graphql_object_type
 
-        def check_one_of(value: dict[str, Any]) -> dict[str, Any]:
-            if len(value) != 1:
-                raise GraphQLError(
-                    f"OneOf Input Object '{type_name}' must specify exactly one key."
-                )
-
-            first_key, first_value = next(iter(value.items()))
-
-            if first_value is None or first_value is UNSET:
-                raise GraphQLError(
-                    f"Value for member field '{first_key}' must be non-null"
-                )
-
-            # We are populating all missing keys with `None`, so users
-            # don't have to set an explicit default for the input type
-            # The alternative is to tell them to use `UNSET`, but it looks
-            # a bit unfriendly to use
-
-            for field in type_definition.fields:
-                name = self.config.name_converter.from_field(field)
-                if name not in value:
-                    value[name] = None
-
-            return value
-
-        out_type = (
-            check_one_of
-            if type_definition.is_input and type_definition.is_one_of
-            else None
-        )
-
         graphql_object_type = GraphQLInputObjectType(
             name=type_name,
             fields=lambda: self.get_graphql_input_fields(type_definition),
@@ -449,7 +416,6 @@ class GraphQLCoreConverter:
             extensions={
                 GraphQLCoreConverter.DEFINITION_BACKREF: type_definition,
             },
-            out_type=out_type,
         )
 
         self.type_map[type_name] = ConcreteType(