strawberry-graphql 0.221.0.dev1710955937__tar.gz → 0.221.1__tar.gz

{strawberry_graphql-0.221.0.dev1710955937 → strawberry_graphql-0.221.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: strawberry-graphql
-Version: 0.221.0.dev1710955937
+Version: 0.221.1
 Summary: A library for creating GraphQL APIs
 Home-page: https://strawberry.rocks/
 License: MIT

{strawberry_graphql-0.221.0.dev1710955937 → strawberry_graphql-0.221.1}/pyproject.toml

@@ -1,7 +1,7 @@
 [tool.poetry]
 name = "strawberry-graphql"
 packages = [ { include = "strawberry" } ]
-version = "0.221.0.dev.1710955937"
+version = "0.221.1"
 description = "A library for creating GraphQL APIs"
 authors = ["Patrick Arminio <patrick.arminio@gmail.com>"]
 license = "MIT"
@@ -97,7 +97,7 @@ types-toml = "^0.10.8"
 types-typed-ast = "^1.5.8"
 types-ujson = "^5.6.0"
 types-protobuf = "^4.23.0.1"
-mypy = "1.8.0"
+mypy = "1.9.0"
 pytest-mypy-plugins = ">=1.10,<4.0"
 poetry-plugin-export = "^1.6.0"
 # another bug in poetry

{strawberry_graphql-0.221.0.dev1710955937 → strawberry_graphql-0.221.1}/strawberry/__init__.py

@@ -14,6 +14,7 @@ from .private import Private
 from .scalars import ID
 from .schema import Schema
 from .schema_directive import schema_directive
+from .types.info import Info
 from .union import union
 from .unset import UNSET
 
@@ -21,6 +22,7 @@ __all__ = [
     "BasePermission",
     "experimental",
     "ID",
+    "Info",
     "UNSET",
     "lazy",
     "LazyType",

{strawberry_graphql-0.221.0.dev1710955937 → strawberry_graphql-0.221.1}/strawberry/field_extensions/input_mutation.py

@@ -65,7 +65,7 @@ class InputMutationExtension(FieldExtension):
         self,
         next_: SyncExtensionResolver,
         source: Any,
-        info: Info[Any, Any],
+        info: Info,
         **kwargs: Any,
     ) -> Any:
         input_args = kwargs.pop("input")

{strawberry_graphql-0.221.0.dev1710955937 → strawberry_graphql-0.221.1}/strawberry/schema_codegen/__init__.py

@@ -2,9 +2,6 @@ from __future__ import annotations
 
 import dataclasses
 import keyword
-from collections import defaultdict
-from typing import TYPE_CHECKING, Tuple
-from typing_extensions import Protocol
 
 import libcst as cst
 from graphql import (
@@ -22,7 +19,6 @@ from graphql import (
     OperationType,
     ScalarTypeDefinitionNode,
     SchemaDefinitionNode,
-    SchemaExtensionNode,
     StringValueNode,
     TypeNode,
     UnionTypeDefinitionNode,
@@ -31,14 +27,6 @@ from graphql import (
 
 from strawberry.utils.str_converters import to_snake_case
 
-if TYPE_CHECKING:
-    from graphql.language.ast import ConstDirectiveNode
-
-
-class HasDirectives(Protocol):
-    directives: Tuple[ConstDirectiveNode]
-
-
 _SCALAR_MAP = {
     "Int": cst.Name("int"),
     "Float": cst.Name("float"),
@@ -60,19 +48,6 @@ _SCALAR_MAP = {
 }
 
 
-def _is_federation_link_directive(directive: ConstDirectiveNode) -> bool:
-    if directive.name.value != "link":
-        return False
-
-    for argument in directive.arguments:
-        if argument.name.value == "url":
-            return argument.value.value.startswith(
-                "https://specs.apollo.dev/federation"
-            )
-
-    return False
-
-
 def _get_field_type(
     field_type: TypeNode, was_non_nullable: bool = False
 ) -> cst.BaseExpression:
@@ -110,10 +85,7 @@ def _get_field_type(
     )
 
 
-def _sanitize_argument(value: str | bool) -> cst.SimpleString | cst.Name:
-    if isinstance(value, bool):
-        return cst.Name(value=str(value))
-
+def _get_argument(name: str, value: str) -> cst.Arg:
     if "\n" in value:
         argument_value = cst.SimpleString(f'"""\n{value}\n"""')
     elif '"' in value:
@@ -121,12 +93,6 @@ def _sanitize_argument(value: str | bool) -> cst.SimpleString | cst.Name:
     else:
         argument_value = cst.SimpleString(f'"{value}"')
 
-    return argument_value
-
-
-def _get_argument(name: str, value: str | bool) -> cst.Arg:
-    argument_value = _sanitize_argument(value)
-
     return cst.Arg(
         value=argument_value,
         keyword=cst.Name(name),
@@ -134,25 +100,7 @@ def _get_argument(name: str, value: str | bool) -> cst.Arg:
     )
 
 
-def _get_argument_list(name: str, values: list[str]) -> cst.Arg:
-    value = cst.List(
-        elements=[cst.Element(value=_sanitize_argument(value)) for value in values],
-    )
-
-    return cst.Arg(
-        value=value,
-        keyword=cst.Name(name),
-        equal=cst.AssignEqual(cst.SimpleWhitespace(""), cst.SimpleWhitespace("")),
-    )
-
-
-def _get_field_value(
-    field: FieldDefinitionNode | InputValueDefinitionNode,
-    alias: str | None,
-    is_apollo_federation: bool,
-) -> cst.Call | None:
-    description = field.description.value if field.description else None
-
+def _get_field_value(description: str | None, alias: str | None) -> cst.Call | None:
     args = list(
         filter(
             None,
@@ -163,24 +111,6 @@ def _get_field_value(
         )
     )
 
-    directives = _get_directives(field)
-
-    apollo_federation_args = _get_federation_arguments(directives)
-
-    if is_apollo_federation and apollo_federation_args:
-        args.extend(apollo_federation_args)
-
-        return cst.Call(
-            func=cst.Attribute(
-                value=cst.Attribute(
-                    value=cst.Name("strawberry"),
-                    attr=cst.Name("federation"),
-                ),
-                attr=cst.Name("field"),
-            ),
-            args=args,
-        )
-
     if args:
         return cst.Call(
             func=cst.Attribute(
@@ -195,7 +125,6 @@ def _get_field_value(
 
 def _get_field(
     field: FieldDefinitionNode | InputValueDefinitionNode,
-    is_apollo_federation: bool,
 ) -> cst.SimpleStatementLine:
     name = to_snake_case(field.name.value)
     alias: str | None = None
@@ -212,67 +141,19 @@ def _get_field(
                     _get_field_type(field.type),
                 ),
                 value=_get_field_value(
-                    field, alias=alias, is_apollo_federation=is_apollo_federation
+                    description=field.description.value if field.description else None,
+                    alias=alias if alias != name else None,
                 ),
             )
         ]
     )
 
 
-def _get_directives(definition: HasDirectives) -> dict[str, list[dict[str, str]]]:
-    directives = defaultdict(list)
-
-    for directive in definition.directives:
-        directive_name = directive.name.value
-
-        directives[directive_name].append(
-            {
-                argument.name.value: argument.value.value
-                for argument in directive.arguments
-            }
-        )
-
-    return directives
-
-
-def _get_federation_arguments(
-    directives: dict[str, list[dict[str, str]]],
-) -> list[cst.Arg]:
-    def append_arg_from_directive(
-        directive: str, argument_name: str, keyword_name: str | None = None
-    ):
-        keyword_name = keyword_name or directive
-
-        if directive in directives:
-            arguments.append(
-                _get_argument_list(
-                    keyword_name,
-                    [item[argument_name] for item in directives[directive]],
-                )
-            )
-
-    arguments: list[cst.Arg] = []
-
-    append_arg_from_directive("key", "fields", "keys")
-    append_arg_from_directive("requires", "fields")
-    append_arg_from_directive("provides", "fields")
-    append_arg_from_directive("tag", "name", "tags")
-
-    boolean_keys = ("shareable", "inaccessible", "external", "override")
-
-    arguments.extend(
-        _get_argument(key, True) for key in boolean_keys if directives.get(key, False)
-    )
-
-    return arguments
-
-
 def _get_strawberry_decorator(
     definition: ObjectTypeDefinitionNode
     | ObjectTypeExtensionNode
     | InterfaceTypeDefinitionNode
     | InputObjectTypeDefinitionNode,
-    is_apollo_federation: bool,
 ) -> cst.Decorator:
     type_ = {
         ObjectTypeDefinitionNode: "type",
@@ -287,36 +168,15 @@ def _get_strawberry_decorator(
         else None
     )
 
-    directives = _get_directives(definition)
-
     decorator: cst.BaseExpression = cst.Attribute(
         value=cst.Name("strawberry"),
         attr=cst.Name(type_),
     )
 
-    arguments: list[cst.Arg] = []
-
     if description is not None:
-        arguments.append(_get_argument("description", description.value))
-
-    federation_arguments = _get_federation_arguments(directives)
-
-    # and has any directive that is a federation directive
-    if is_apollo_federation and federation_arguments:
-        decorator = cst.Attribute(
-            value=cst.Attribute(
-                value=cst.Name("strawberry"),
-                attr=cst.Name("federation"),
-            ),
-            attr=cst.Name(type_),
-        )
-
-        arguments.extend(federation_arguments)
-
-    if arguments:
         decorator = cst.Call(
             func=decorator,
-            args=arguments,
+            args=[_get_argument("description", description.value)],
         )
 
     return cst.Decorator(
@@ -329,9 +189,8 @@ def _get_class_definition(
     | ObjectTypeExtensionNode
     | InterfaceTypeDefinitionNode
     | InputObjectTypeDefinitionNode,
-    is_apollo_federation: bool,
 ) -> cst.ClassDef:
-    decorator = _get_strawberry_decorator(definition, is_apollo_federation)
+    decorator = _get_strawberry_decorator(definition)
 
     bases = (
         [cst.Arg(cst.Name(interface.name.value)) for interface in definition.interfaces]
@@ -345,11 +204,7 @@ def _get_class_definition(
     return cst.ClassDef(
         name=cst.Name(definition.name.value),
         bases=bases,
-        body=cst.IndentedBlock(
-            body=[
-                _get_field(field, is_apollo_federation) for field in definition.fields
-            ]
-        ),
+        body=cst.IndentedBlock(body=[_get_field(field) for field in definition.fields]),
         decorators=[decorator],
     )
 
@@ -388,7 +243,6 @@ def _get_schema_definition(
     root_query_name: str | None,
     root_mutation_name: str | None,
     root_subscription_name: str | None,
-    is_apollo_federation: bool,
 ) -> cst.SimpleStatementLine | None:
     if not any([root_query_name, root_mutation_name, root_subscription_name]):
         return None
@@ -411,40 +265,17 @@ def _get_schema_definition(
     if root_subscription_name:
         args.append(_get_arg("subscription", root_subscription_name))
 
-    schema_call = cst.Call(
-        func=cst.Attribute(
-            value=cst.Name("strawberry"),
-            attr=cst.Name("Schema"),
-        ),
-        args=args,
-    )
-
-    if is_apollo_federation:
-        args.append(
-            cst.Arg(
-                keyword=cst.Name("enable_federation_2"),
-                value=cst.Name("True"),
-                equal=cst.AssignEqual(
-                    cst.SimpleWhitespace(""), cst.SimpleWhitespace("")
-                ),
-            )
-        )
-        schema_call = cst.Call(
-            func=cst.Attribute(
-                value=cst.Attribute(
-                    value=cst.Name(value="strawberry"),
-                    attr=cst.Name(value="federation"),
-                ),
-                attr=cst.Name(value="Schema"),
-            ),
-            args=args,
-        )
-
     return cst.SimpleStatementLine(
         body=[
             cst.Assign(
                 targets=[cst.AssignTarget(cst.Name("schema"))],
-                value=schema_call,
+                value=cst.Call(
+                    func=cst.Attribute(
+                        value=cst.Name("strawberry"),
+                        attr=cst.Name("Schema"),
+                    ),
+                    args=args,
+                ),
             )
         ]
     )
@@ -599,12 +430,6 @@ def codegen(schema: str) -> str:
 
     object_types: dict[str, cst.ClassDef] = {}
 
-    # when we encounter a extend schema @link ..., we check if is an apollo federation schema
-    # and we use this variable to keep track of it, but at the moment the assumption is that
-    # the schema extension is always done at the top, this might not be the case all the
-    # time
-    is_apollo_federation = False
-
     for definition in document.definitions:
         if isinstance(
             definition,
@@ -615,7 +440,7 @@ def codegen(schema: str) -> str:
                 ObjectTypeExtensionNode,
             ),
         ):
-            class_definition = _get_class_definition(definition, is_apollo_federation)
+            class_definition = _get_class_definition(definition)
 
             object_types[definition.name.value] = class_definition
 
@@ -653,11 +478,6 @@ def codegen(schema: str) -> str:
                 definitions.append(cst.EmptyLine())
                 definitions.append(scalar_definition)
                 definitions.append(cst.EmptyLine())
-        elif isinstance(definition, SchemaExtensionNode):
-            is_apollo_federation = any(
-                _is_federation_link_directive(directive)
-                for directive in definition.directives
-            )
         else:
             raise NotImplementedError(f"Unknown definition {definition}")
 
@@ -676,7 +496,6 @@ def codegen(schema: str) -> str:
         root_query_name=root_query_name,
         root_mutation_name=root_mutation_name,
         root_subscription_name=root_subscription_name,
-        is_apollo_federation=is_apollo_federation,
     )
 
     if schema_definition:

{strawberry_graphql-0.221.0.dev1710955937 → strawberry_graphql-0.221.1}/strawberry/types/fields/resolver.py

@@ -155,7 +155,7 @@ class ReservedType(NamedTuple):
             # Handle annotated arguments such as Private[str] and DirectiveValue[str]
             return type_has_annotation(other, self.type)
         else:
-            # Handle both concrete and generic types (i.e Info, and Info[Any, Any])
+            # Handle both concrete and generic types (i.e Info, and Info)
             return (
                 issubclass(origin, self.type)
                 if isinstance(origin, type)

{strawberry_graphql-0.221.0.dev1710955937 → strawberry_graphql-0.221.1}/strawberry/types/info.py

@@ -10,10 +10,11 @@ from typing import (
     Generic,
     List,
     Optional,
+    Tuple,
     Type,
-    TypeVar,
     Union,
 )
+from typing_extensions import TypeVar
 
 from .nodes import convert_selections
 
@@ -29,8 +30,8 @@ if TYPE_CHECKING:
 
     from .nodes import Selection
 
-ContextType = TypeVar("ContextType")
-RootValueType = TypeVar("RootValueType")
+ContextType = TypeVar("ContextType", default=Any)
+RootValueType = TypeVar("RootValueType", default=Any)
 
 
 @dataclasses.dataclass
@@ -38,6 +39,21 @@ class Info(Generic[ContextType, RootValueType]):
     _raw_info: GraphQLResolveInfo
     _field: StrawberryField
 
+    def __class_getitem__(cls, types: Union[type, Tuple[type, ...]]) -> Type[Info]:
+        """Workaround for when passing only one type.
+
+        Python doesn't yet support directly passing only one type to a generic class
+        that has typevars with defaults. This is a workaround for that.
+
+        See:
+        https://discuss.python.org/t/passing-only-one-typevar-of-two-when-using-defaults/49134
+        """
+
+        if not isinstance(types, tuple):
+            types = (types, Any)  # type: ignore
+
+        return super().__class_getitem__(types)  # type: ignore
+
     @property
     def field_name(self) -> str:
         return self._raw_info.field_name