strawberry-graphql 0.221.0.dev1710955937__py3-none-any.whl → 0.222.0__py3-none-any.whl

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/federation/enum.py

@@ -1,6 +1,15 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Callable, Iterable, Optional, Union, overload
+from typing import (
+    TYPE_CHECKING,
+    Any,
+    Callable,
+    Iterable,
+    List,
+    Optional,
+    Union,
+    overload,
+)
 
 from strawberry.enum import _process_enum
 from strawberry.enum import enum_value as base_enum_value
@@ -36,7 +45,10 @@ def enum(
     name: Optional[str] = None,
     description: Optional[str] = None,
     directives: Iterable[object] = (),
+    authenticated: bool = False,
     inaccessible: bool = False,
+    policy: Optional[List[List[str]]] = None,
+    requires_scopes: Optional[List[List[str]]] = None,
     tags: Optional[Iterable[str]] = (),
 ) -> EnumType:
     ...
@@ -49,7 +61,10 @@ def enum(
     name: Optional[str] = None,
     description: Optional[str] = None,
     directives: Iterable[object] = (),
+    authenticated: bool = False,
     inaccessible: bool = False,
+    policy: Optional[List[List[str]]] = None,
+    requires_scopes: Optional[List[List[str]]] = None,
     tags: Optional[Iterable[str]] = (),
 ) -> Callable[[EnumType], EnumType]:
     ...
@@ -61,8 +76,11 @@ def enum(
     name=None,
     description=None,
     directives=(),
-    inaccessible=False,
-    tags=(),
+    authenticated: bool = False,
+    inaccessible: bool = False,
+    policy: Optional[List[List[str]]] = None,
+    requires_scopes: Optional[List[List[str]]] = None,
+    tags: Optional[Iterable[str]] = (),
 ) -> Union[EnumType, Callable[[EnumType], EnumType]]:
     """Registers the enum in the GraphQL type system.
 
@@ -70,13 +88,28 @@ def enum(
     the value passed of name instead of the Enum class name.
     """
 
-    from strawberry.federation.schema_directives import Inaccessible, Tag
+    from strawberry.federation.schema_directives import (
+        Authenticated,
+        Inaccessible,
+        Policy,
+        RequiresScopes,
+        Tag,
+    )
 
     directives = list(directives)
 
+    if authenticated:
+        directives.append(Authenticated())
+
     if inaccessible:
         directives.append(Inaccessible())
 
+    if policy:
+        directives.append(Policy(policies=policy))
+
+    if requires_scopes:
+        directives.append(RequiresScopes(scopes=requires_scopes))
+
     if tags:
         directives.extend(Tag(name=tag) for tag in tags)
 

strawberry/federation/field.py

@@ -25,6 +25,7 @@ if TYPE_CHECKING:
     from strawberry.field import _RESOLVER_TYPE, StrawberryField
     from strawberry.permission import BasePermission
 
+    from .schema_directives import Override
 
 T = TypeVar("T")
 
@@ -36,13 +37,16 @@ def field(
     name: Optional[str] = None,
     is_subscription: bool = False,
     description: Optional[str] = None,
+    authenticated: bool = False,
+    external: bool = False,
+    inaccessible: bool = False,
+    policy: Optional[List[List[str]]] = None,
     provides: Optional[List[str]] = None,
+    override: Optional[Union[Override, str]] = None,
     requires: Optional[List[str]] = None,
-    external: bool = False,
-    shareable: bool = False,
+    requires_scopes: Optional[List[List[str]]] = None,
     tags: Optional[Iterable[str]] = (),
-    override: Optional[str] = None,
-    inaccessible: bool = False,
+    shareable: bool = False,
     init: Literal[False] = False,
     permission_classes: Optional[List[Type[BasePermission]]] = None,
     deprecation_reason: Optional[str] = None,
@@ -61,13 +65,16 @@ def field(
     name: Optional[str] = None,
     is_subscription: bool = False,
     description: Optional[str] = None,
+    authenticated: bool = False,
+    external: bool = False,
+    inaccessible: bool = False,
+    policy: Optional[List[List[str]]] = None,
     provides: Optional[List[str]] = None,
+    override: Optional[Union[Override, str]] = None,
     requires: Optional[List[str]] = None,
-    external: bool = False,
-    shareable: bool = False,
+    requires_scopes: Optional[List[List[str]]] = None,
     tags: Optional[Iterable[str]] = (),
-    override: Optional[str] = None,
-    inaccessible: bool = False,
+    shareable: bool = False,
     init: Literal[True] = True,
     permission_classes: Optional[List[Type[BasePermission]]] = None,
     deprecation_reason: Optional[str] = None,
@@ -87,13 +94,16 @@ def field(
     name: Optional[str] = None,
     is_subscription: bool = False,
     description: Optional[str] = None,
+    authenticated: bool = False,
+    external: bool = False,
+    inaccessible: bool = False,
+    policy: Optional[List[List[str]]] = None,
     provides: Optional[List[str]] = None,
+    override: Optional[Union[Override, str]] = None,
     requires: Optional[List[str]] = None,
-    external: bool = False,
-    shareable: bool = False,
+    requires_scopes: Optional[List[List[str]]] = None,
     tags: Optional[Iterable[str]] = (),
-    override: Optional[str] = None,
-    inaccessible: bool = False,
+    shareable: bool = False,
     permission_classes: Optional[List[Type[BasePermission]]] = None,
     deprecation_reason: Optional[str] = None,
     default: Any = UNSET,
@@ -111,13 +121,16 @@ def field(
     name: Optional[str] = None,
     is_subscription: bool = False,
     description: Optional[str] = None,
+    authenticated: bool = False,
+    external: bool = False,
+    inaccessible: bool = False,
+    policy: Optional[List[List[str]]] = None,
     provides: Optional[List[str]] = None,
+    override: Optional[Union[Override, str]] = None,
     requires: Optional[List[str]] = None,
-    external: bool = False,
-    shareable: bool = False,
+    requires_scopes: Optional[List[List[str]]] = None,
     tags: Optional[Iterable[str]] = (),
-    override: Optional[str] = None,
-    inaccessible: bool = False,
+    shareable: bool = False,
     permission_classes: Optional[List[Type[BasePermission]]] = None,
     deprecation_reason: Optional[str] = None,
     default: Any = dataclasses.MISSING,
@@ -131,25 +144,47 @@ def field(
     init: Literal[True, False, None] = None,
 ) -> Any:
     from .schema_directives import (
+        Authenticated,
         External,
         Inaccessible,
         Override,
+        Policy,
         Provides,
         Requires,
+        RequiresScopes,
         Shareable,
         Tag,
     )
 
     directives = list(directives)
 
+    if authenticated:
+        directives.append(Authenticated())
+
+    if external:
+        directives.append(External())
+
+    if inaccessible:
+        directives.append(Inaccessible())
+
+    if override:
+        directives.append(
+            Override(override_from=override, label=UNSET)
+            if isinstance(override, str)
+            else override
+        )
+
+    if policy:
+        directives.append(Policy(policies=policy))
+
     if provides:
         directives.append(Provides(fields=" ".join(provides)))
 
     if requires:
         directives.append(Requires(fields=" ".join(requires)))
 
-    if external:
-        directives.append(External())
+    if requires_scopes:
+        directives.append(RequiresScopes(scopes=requires_scopes))
 
     if shareable:
         directives.append(Shareable())
@@ -157,12 +192,6 @@ def field(
     if tags:
         directives.extend(Tag(name=tag) for tag in tags)
 
-    if override:
-        directives.append(Override(override_from=override))
-
-    if inaccessible:
-        directives.append(Inaccessible())
-
     return base_field(  # type: ignore
         resolver=resolver,  # type: ignore
         name=name,

strawberry/federation/object_type.py

@@ -2,6 +2,7 @@ from typing import (
     TYPE_CHECKING,
     Callable,
     Iterable,
+    List,
     Optional,
     Sequence,
     Type,
@@ -31,19 +32,25 @@ def _impl_type(
     name: Optional[str] = None,
     description: Optional[str] = None,
     directives: Iterable[object] = (),
+    authenticated: bool = False,
     keys: Iterable[Union["Key", str]] = (),
     extend: bool = False,
     shareable: bool = False,
     inaccessible: bool = UNSET,
+    policy: Optional[List[List[str]]] = None,
+    requires_scopes: Optional[List[List[str]]] = None,
     tags: Iterable[str] = (),
     is_input: bool = False,
     is_interface: bool = False,
     is_interface_object: bool = False,
 ) -> T:
     from strawberry.federation.schema_directives import (
+        Authenticated,
         Inaccessible,
         InterfaceObject,
         Key,
+        Policy,
+        RequiresScopes,
         Shareable,
         Tag,
     )
@@ -55,12 +62,21 @@ def _impl_type(
         for key in keys
     )
 
-    if shareable:
-        directives.append(Shareable())
+    if authenticated:
+        directives.append(Authenticated())
 
     if inaccessible is not UNSET:
         directives.append(Inaccessible())
 
+    if policy:
+        directives.append(Policy(policies=policy))
+
+    if requires_scopes:
+        directives.append(RequiresScopes(scopes=requires_scopes))
+
+    if shareable:
+        directives.append(Shareable())
+
     if tags:
         directives.extend(Tag(name=tag) for tag in tags)
 
@@ -89,10 +105,15 @@ def type(
     *,
     name: Optional[str] = None,
     description: Optional[str] = None,
-    keys: Iterable[Union["Key", str]] = (),
+    directives: Iterable[object] = (),
+    authenticated: bool = False,
+    extend: bool = False,
     inaccessible: bool = UNSET,
+    keys: Iterable[Union["Key", str]] = (),
+    policy: Optional[List[List[str]]] = None,
+    requires_scopes: Optional[List[List[str]]] = None,
+    shareable: bool = False,
     tags: Iterable[str] = (),
-    extend: bool = False,
 ) -> T:
     ...
 
@@ -107,12 +128,15 @@ def type(
     *,
     name: Optional[str] = None,
     description: Optional[str] = None,
-    keys: Iterable[Union["Key", str]] = (),
-    inaccessible: bool = UNSET,
-    tags: Iterable[str] = (),
+    directives: Iterable[object] = (),
+    authenticated: bool = False,
     extend: bool = False,
+    inaccessible: bool = UNSET,
+    keys: Iterable[Union["Key", str]] = (),
+    policy: Optional[List[List[str]]] = None,
+    requires_scopes: Optional[List[List[str]]] = None,
     shareable: bool = False,
-    directives: Iterable[object] = (),
+    tags: Iterable[str] = (),
 ) -> Callable[[T], T]:
     ...
 
@@ -122,22 +146,28 @@ def type(
     *,
     name: Optional[str] = None,
     description: Optional[str] = None,
-    keys: Iterable[Union["Key", str]] = (),
-    inaccessible: bool = UNSET,
-    tags: Iterable[str] = (),
+    directives: Iterable[object] = (),
+    authenticated: bool = False,
     extend: bool = False,
+    inaccessible: bool = UNSET,
+    keys: Iterable[Union["Key", str]] = (),
+    policy: Optional[List[List[str]]] = None,
+    requires_scopes: Optional[List[List[str]]] = None,
     shareable: bool = False,
-    directives: Iterable[object] = (),
+    tags: Iterable[str] = (),
 ):
     return _impl_type(
         cls,
         name=name,
         description=description,
         directives=directives,
+        authenticated=authenticated,
         keys=keys,
         extend=extend,
-        shareable=shareable,
         inaccessible=inaccessible,
+        policy=policy,
+        requires_scopes=requires_scopes,
+        shareable=shareable,
         tags=tags,
     )
 
@@ -208,10 +238,13 @@ def interface(
     *,
     name: Optional[str] = None,
     description: Optional[str] = None,
-    keys: Iterable[Union["Key", str]] = (),
+    directives: Iterable[object] = (),
+    authenticated: bool = False,
     inaccessible: bool = UNSET,
+    keys: Iterable[Union["Key", str]] = (),
+    policy: Optional[List[List[str]]] = None,
+    requires_scopes: Optional[List[List[str]]] = None,
     tags: Iterable[str] = (),
-    directives: Iterable[object] = (),
 ) -> T:
     ...
 
@@ -226,10 +259,13 @@ def interface(
     *,
     name: Optional[str] = None,
     description: Optional[str] = None,
-    keys: Iterable[Union["Key", str]] = (),
+    directives: Iterable[object] = (),
+    authenticated: bool = False,
     inaccessible: bool = UNSET,
+    keys: Iterable[Union["Key", str]] = (),
+    policy: Optional[List[List[str]]] = None,
+    requires_scopes: Optional[List[List[str]]] = None,
     tags: Iterable[str] = (),
-    directives: Iterable[object] = (),
 ) -> Callable[[T], T]:
     ...
 
@@ -239,20 +275,26 @@ def interface(
     *,
     name: Optional[str] = None,
     description: Optional[str] = None,
-    keys: Iterable[Union["Key", str]] = (),
+    directives: Iterable[object] = (),
+    authenticated: bool = False,
     inaccessible: bool = UNSET,
+    keys: Iterable[Union["Key", str]] = (),
+    policy: Optional[List[List[str]]] = None,
+    requires_scopes: Optional[List[List[str]]] = None,
     tags: Iterable[str] = (),
-    directives: Iterable[object] = (),
 ):
     return _impl_type(
         cls,
         name=name,
         description=description,
         directives=directives,
+        authenticated=authenticated,
         keys=keys,
         inaccessible=inaccessible,
-        is_interface=True,
+        policy=policy,
+        requires_scopes=requires_scopes,
         tags=tags,
+        is_interface=True,
     )
 
 
@@ -265,12 +307,15 @@ def interface(
 def interface_object(
     cls: T,
     *,
-    keys: Iterable[Union["Key", str]],
     name: Optional[str] = None,
     description: Optional[str] = None,
+    directives: Iterable[object] = (),
+    authenticated: bool = False,
     inaccessible: bool = UNSET,
+    keys: Iterable[Union["Key", str]] = (),
+    policy: Optional[List[List[str]]] = None,
+    requires_scopes: Optional[List[List[str]]] = None,
     tags: Iterable[str] = (),
-    directives: Iterable[object] = (),
 ) -> T:
     ...
 
@@ -283,12 +328,15 @@ def interface_object(
 )
 def interface_object(
     *,
-    keys: Iterable[Union["Key", str]],
     name: Optional[str] = None,
     description: Optional[str] = None,
+    directives: Iterable[object] = (),
+    authenticated: bool = False,
     inaccessible: bool = UNSET,
+    keys: Iterable[Union["Key", str]] = (),
+    policy: Optional[List[List[str]]] = None,
+    requires_scopes: Optional[List[List[str]]] = None,
     tags: Iterable[str] = (),
-    directives: Iterable[object] = (),
 ) -> Callable[[T], T]:
     ...
 
@@ -296,21 +344,27 @@ def interface_object(
 def interface_object(
     cls: Optional[T] = None,
     *,
-    keys: Iterable[Union["Key", str]],
     name: Optional[str] = None,
     description: Optional[str] = None,
+    directives: Iterable[object] = (),
+    authenticated: bool = False,
     inaccessible: bool = UNSET,
+    keys: Iterable[Union["Key", str]] = (),
+    policy: Optional[List[List[str]]] = None,
+    requires_scopes: Optional[List[List[str]]] = None,
     tags: Iterable[str] = (),
-    directives: Iterable[object] = (),
 ):
     return _impl_type(
         cls,
         name=name,
         description=description,
         directives=directives,
+        authenticated=authenticated,
         keys=keys,
         inaccessible=inaccessible,
+        policy=policy,
+        requires_scopes=requires_scopes,
+        tags=tags,
         is_interface=False,
         is_interface_object=True,
-        tags=tags,
     )

strawberry/federation/scalar.py

@@ -3,6 +3,7 @@ from typing import (
     Any,
     Callable,
     Iterable,
+    List,
     NewType,
     Optional,
     Type,
@@ -34,7 +35,10 @@ def scalar(
     parse_value: Optional[Callable] = None,
     parse_literal: Optional[Callable] = None,
     directives: Iterable[object] = (),
+    authenticated: bool = False,
     inaccessible: bool = False,
+    policy: Optional[List[List[str]]] = None,
+    requires_scopes: Optional[List[List[str]]] = None,
     tags: Optional[Iterable[str]] = (),
 ) -> Callable[[_T], _T]:
     ...
@@ -51,7 +55,10 @@ def scalar(
     parse_value: Optional[Callable] = None,
     parse_literal: Optional[Callable] = None,
     directives: Iterable[object] = (),
+    authenticated: bool = False,
     inaccessible: bool = False,
+    policy: Optional[List[List[str]]] = None,
+    requires_scopes: Optional[List[List[str]]] = None,
     tags: Optional[Iterable[str]] = (),
 ) -> _T:
     ...
@@ -67,7 +74,10 @@ def scalar(
     parse_value: Optional[Callable] = None,
     parse_literal: Optional[Callable] = None,
     directives: Iterable[object] = (),
+    authenticated: bool = False,
     inaccessible: bool = False,
+    policy: Optional[List[List[str]]] = None,
+    requires_scopes: Optional[List[List[str]]] = None,
     tags: Optional[Iterable[str]] = (),
 ) -> Any:
     """Annotates a class or type as a GraphQL custom scalar.
@@ -95,16 +105,31 @@ def scalar(
     >>>         self.items = items
 
     """
-    from strawberry.federation.schema_directives import Inaccessible, Tag
+    from strawberry.federation.schema_directives import (
+        Authenticated,
+        Inaccessible,
+        Policy,
+        RequiresScopes,
+        Tag,
+    )
 
     if parse_value is None:
         parse_value = cls
 
     directives = list(directives)
 
+    if authenticated:
+        directives.append(Authenticated())
+
     if inaccessible:
         directives.append(Inaccessible())
 
+    if policy:
+        directives.append(Policy(policies=policy))
+
+    if requires_scopes:
+        directives.append(RequiresScopes(scopes=requires_scopes))
+
     if tags:
         directives.extend(Tag(name=tag) for tag in tags)
 

strawberry/federation/schema_directives.py

@@ -5,13 +5,17 @@ from strawberry import directive_field
 from strawberry.schema_directive import Location, schema_directive
 from strawberry.unset import UNSET
 
-from .types import FieldSet, LinkImport, LinkPurpose
+from .types import (
+    FieldSet,
+    LinkImport,
+    LinkPurpose,
+)
 
 
 @dataclass
 class ImportedFrom:
     name: str
-    url: str = "https://specs.apollo.dev/federation/v2.3"
+    url: str = "https://specs.apollo.dev/federation/v2.7"
 
 
 class FederationDirective:
@@ -23,7 +27,7 @@ class FederationDirective:
 )
 class External(FederationDirective):
     imported_from: ClassVar[ImportedFrom] = ImportedFrom(
-        name="external", url="https://specs.apollo.dev/federation/v2.3"
+        name="external", url="https://specs.apollo.dev/federation/v2.7"
     )
 
 
@@ -33,7 +37,7 @@ class External(FederationDirective):
 class Requires(FederationDirective):
     fields: FieldSet
     imported_from: ClassVar[ImportedFrom] = ImportedFrom(
-        name="requires", url="https://specs.apollo.dev/federation/v2.3"
+        name="requires", url="https://specs.apollo.dev/federation/v2.7"
     )
 
 
@@ -43,7 +47,7 @@ class Requires(FederationDirective):
 class Provides(FederationDirective):
     fields: FieldSet
     imported_from: ClassVar[ImportedFrom] = ImportedFrom(
-        name="provides", url="https://specs.apollo.dev/federation/v2.3"
+        name="provides", url="https://specs.apollo.dev/federation/v2.7"
     )
 
 
@@ -57,7 +61,7 @@ class Key(FederationDirective):
     fields: FieldSet
     resolvable: Optional[bool] = True
     imported_from: ClassVar[ImportedFrom] = ImportedFrom(
-        name="key", url="https://specs.apollo.dev/federation/v2.3"
+        name="key", url="https://specs.apollo.dev/federation/v2.7"
     )
 
 
@@ -69,7 +73,7 @@ class Key(FederationDirective):
 )
 class Shareable(FederationDirective):
     imported_from: ClassVar[ImportedFrom] = ImportedFrom(
-        name="shareable", url="https://specs.apollo.dev/federation/v2.3"
+        name="shareable", url="https://specs.apollo.dev/federation/v2.7"
     )
 
 
@@ -115,7 +119,7 @@ class Link:
 class Tag(FederationDirective):
     name: str
     imported_from: ClassVar[ImportedFrom] = ImportedFrom(
-        name="tag", url="https://specs.apollo.dev/federation/v2.3"
+        name="tag", url="https://specs.apollo.dev/federation/v2.7"
     )
 
 
@@ -124,8 +128,9 @@ class Tag(FederationDirective):
 )
 class Override(FederationDirective):
     override_from: str = directive_field(name="from")
+    label: Optional[str] = UNSET
     imported_from: ClassVar[ImportedFrom] = ImportedFrom(
-        name="override", url="https://specs.apollo.dev/federation/v2.3"
+        name="override", url="https://specs.apollo.dev/federation/v2.7"
     )
 
 
@@ -147,7 +152,7 @@ class Override(FederationDirective):
 )
 class Inaccessible(FederationDirective):
     imported_from: ClassVar[ImportedFrom] = ImportedFrom(
-        name="inaccessible", url="https://specs.apollo.dev/federation/v2.3"
+        name="inaccessible", url="https://specs.apollo.dev/federation/v2.7"
     )
 
 
@@ -157,7 +162,7 @@ class Inaccessible(FederationDirective):
 class ComposeDirective(FederationDirective):
     name: str
     imported_from: ClassVar[ImportedFrom] = ImportedFrom(
-        name="composeDirective", url="https://specs.apollo.dev/federation/v2.3"
+        name="composeDirective", url="https://specs.apollo.dev/federation/v2.7"
     )
 
 
@@ -166,5 +171,58 @@ class ComposeDirective(FederationDirective):
 )
 class InterfaceObject(FederationDirective):
     imported_from: ClassVar[ImportedFrom] = ImportedFrom(
-        name="interfaceObject", url="https://specs.apollo.dev/federation/v2.3"
+        name="interfaceObject", url="https://specs.apollo.dev/federation/v2.7"
+    )
+
+
+@schema_directive(
+    locations=[
+        Location.FIELD_DEFINITION,
+        Location.OBJECT,
+        Location.INTERFACE,
+        Location.SCALAR,
+        Location.ENUM,
+    ],
+    name="authenticated",
+    print_definition=False,
+)
+class Authenticated(FederationDirective):
+    imported_from: ClassVar[ImportedFrom] = ImportedFrom(
+        name="authenticated", url="https://specs.apollo.dev/federation/v2.7"
+    )
+
+
+@schema_directive(
+    locations=[
+        Location.FIELD_DEFINITION,
+        Location.OBJECT,
+        Location.INTERFACE,
+        Location.SCALAR,
+        Location.ENUM,
+    ],
+    name="requiresScopes",
+    print_definition=False,
+)
+class RequiresScopes(FederationDirective):
+    scopes: "List[List[str]]"
+    imported_from: ClassVar[ImportedFrom] = ImportedFrom(
+        name="requiresScopes", url="https://specs.apollo.dev/federation/v2.7"
+    )
+
+
+@schema_directive(
+    locations=[
+        Location.FIELD_DEFINITION,
+        Location.OBJECT,
+        Location.INTERFACE,
+        Location.SCALAR,
+        Location.ENUM,
+    ],
+    name="policy",
+    print_definition=False,
+)
+class Policy(FederationDirective):
+    policies: "List[List[str]]"
+    imported_from: ClassVar[ImportedFrom] = ImportedFrom(
+        name="policy", url="https://specs.apollo.dev/federation/v2.7"
     )

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/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/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/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

{strawberry_graphql-0.221.0.dev1710955937.dist-info → strawberry_graphql-0.222.0.dist-info}/METADATA

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

{strawberry_graphql-0.221.0.dev1710955937.dist-info → strawberry_graphql-0.222.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-strawberry/__init__.py,sha256=rq7MRtYXzCOd792dYdgZqS6Ejv7UiX7U2hqFfQhLkGk,1063
+strawberry/__init__.py,sha256=NP_R8Benm6W-v3Qqj3MSPm_CMickSCJIMaW2sZZ5oGs,1104
 strawberry/__main__.py,sha256=3U77Eu21mJ-LY27RG-JEnpbh6Z63wGOom4i-EoLtUcY,59
 strawberry/aiohttp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 strawberry/aiohttp/handlers/__init__.py,sha256=7EeGIIwrgJYHAS9XJnZLfRGL_GHrligKm39rrVt7qDA,241
@@ -127,19 +127,19 @@ strawberry/fastapi/handlers/graphql_ws_handler.py,sha256=U84lpd7Lxl2bEnFr9Qroswm
 strawberry/fastapi/router.py,sha256=o55NLbL7n-LoKM30eUCJgzyPlRYPsybWb07L8-fcZZo,11573
 strawberry/federation/__init__.py,sha256=FeUxLiBVuk9TKBmJJi51SeUaI8c80rS8hbl9No-hjII,535
 strawberry/federation/argument.py,sha256=5qyJYlQGEZd6iXWseQ7dnnejCYj5HyglfK10jOCIJBg,802
-strawberry/federation/enum.py,sha256=KpcQfL_efoaNBbb2gl-CYO5PtyVsuyz1LcluTMuRcks,2185
-strawberry/federation/field.py,sha256=XaQRTxA9gVANrnR-9awi3VZcafsNP7tUd0GO3cxtbvA,5147
+strawberry/federation/enum.py,sha256=wpM1z2NOkoBCqTVyD6vJJXoNlcnrNIERt2YpB4R9ybU,2977
+strawberry/federation/field.py,sha256=HHOs8FL52_jxuYxPiR2EwJsXtk7LyapJeBUPqvJ6pCg,6184
 strawberry/federation/mutation.py,sha256=0lV5HJwgw4HYR_59pwxWqnPs342HwakTNMc98w5Hb-c,43
-strawberry/federation/object_type.py,sha256=2eqgF_LI_FvEGgzgx7ucRl2aZncZf7TX8rZrpyyCB3E,7014
-strawberry/federation/scalar.py,sha256=P5ZXoW4VHVvGkmHc1LwEvsKPjjBzyzqKIJbOTnXs2GA,3083
+strawberry/federation/object_type.py,sha256=nQLFbuS6KvAnGCGie_KXxjmtJC6gnQZFh5FAwFHTH-c,9037
+strawberry/federation/scalar.py,sha256=jrSvaqfGEnj_Vl7b-LYMdq_NDMwfdu0t5Pfzlw5WAmU,3807
 strawberry/federation/schema.py,sha256=Z9ZtDav5dwFQvts1XeeT4xoKeIhDwdGoocBUX-y233Y,13707
 strawberry/federation/schema_directive.py,sha256=TpqoVeN3-iE-acndIRAVyU4LIXh6FTHz-Pv2kI8zGu0,1719
-strawberry/federation/schema_directives.py,sha256=TKIAqmMEyq0SwNxiNr0YLiqAUjS5kKxZyHW_NPS5nkM,4780
+strawberry/federation/schema_directives.py,sha256=gpJwpPg_UNiJdQtolY3qQ0lyVYD215c3JFyYH0yFRG8,6131
 strawberry/federation/types.py,sha256=mM70g1aLgjplOc3SdtuJjy7NAKFLv35Z4BDC4s_j5us,301
 strawberry/federation/union.py,sha256=QXeh-nhApqFtXa3To9MX_IwvtwErZBhWYnssUK7JB2E,1005
 strawberry/field.py,sha256=2LvlnoQyRQHYcZV2Yy1E-2DYKXpOROUa8jyWgxG2QsI,18883
 strawberry/field_extensions/__init__.py,sha256=0z6RG9jEO7jpAuyEaQhRI5A_30rdcvsBM0qMhLs8y2s,96
-strawberry/field_extensions/input_mutation.py,sha256=G1nWnIdPS877MZXnDzGU4VvlRHT56KDpK-YBDOn6rDI,2660
+strawberry/field_extensions/input_mutation.py,sha256=a2zK97Fc5biqBt2ZlUPEPTQgMTRx6sJCSd3hSsjLSxI,2650
 strawberry/file_uploads/__init__.py,sha256=v2-6FGBqnTnMPSUTFOiXpIutDMl-ga0PFtw5tKlcagk,50
 strawberry/file_uploads/scalars.py,sha256=jccJh-h7t4naRiDzrszGoYsp95zdF30c7y5Ht0Zrk_s,131
 strawberry/file_uploads/utils.py,sha256=U8gk1aHjWOBa_Opyvc47h6OpYToGq1QiSnEkI2kphdo,1112
@@ -194,7 +194,7 @@ strawberry/schema/types/__init__.py,sha256=oHO3COWhL3L1KLYCJNY1XFf5xt2GGtHiMC-Ua
 strawberry/schema/types/base_scalars.py,sha256=Z_BmgwLicNexLipGyw6MmZ7OBnkGJU3ySgaY9SwBWrw,1837
 strawberry/schema/types/concrete_type.py,sha256=HB30G1hMUuuvjAvfSe6ADS35iI_T_wKO-EprVOWTMSs,746
 strawberry/schema/types/scalar.py,sha256=SVJ8HiKncCvOw2xwABI5xYaHcC7KkGHG-tx2WDtSoCA,2802
-strawberry/schema_codegen/__init__.py,sha256=bPWBUwYPGYRtLwLu1QtDWa0Knt0IgF0FcZnePvDkveI,20837
+strawberry/schema_codegen/__init__.py,sha256=U-ABa02BAfCN6zEGlc2LJEju18ErtGjbf0S8BhJXc6w,15592
 strawberry/schema_directive.py,sha256=GxiOedFB-RJAflpQNUZv00C5Z6gavR-AYdsvoCA_0jc,1963
 strawberry/starlite/__init__.py,sha256=v209swT8H9MljVL-npvANhEO1zz3__PSfxb_Ix-NoeE,134
 strawberry/starlite/controller.py,sha256=x6Mm3r36cRfzo6hz9B4AYWbVh2QlYtndYcXFOr_3THM,11860
@@ -220,9 +220,9 @@ strawberry/type.py,sha256=KDztUFxVju4CEPPRzZYcyHtDNRrkFYxK-mI99GcqCgU,6511
 strawberry/types/__init__.py,sha256=APb1Cjy6bxqFxIfDfempP6eb9NE3LYDwQ3gX7r07lXI,139
 strawberry/types/execution.py,sha256=qCqDMJgdAFwdc3uPzVTAKsZlu6fgxPLrFwkoX_PFBq8,2775
 strawberry/types/fields/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-strawberry/types/fields/resolver.py,sha256=7-fzFfQdf0uWuYyWiSIsGbt2qvpLpGPy6w1T_57cYL8,14140
+strawberry/types/fields/resolver.py,sha256=Lwy2XVKnTbDyibk9pPsWsunlm22akXjy-gKCg22Tp1A,14130
 strawberry/types/graphql.py,sha256=3SWZEsa0Zy1eVW6vy75BnB7t9_lJVi6TBV3_1j3RNBs,687
-strawberry/types/info.py,sha256=AwYUVQgCiTGFU9x97ntF3v6W6qnknOBvuYnERdfIe4w,2776
+strawberry/types/info.py,sha256=b1ZWW_wUop6XrGNcGHKBQeUYjlX-y8u3s2Wm_XhKPYI,3412
 strawberry/types/nodes.py,sha256=2ZVa1HOFgHZ96QTfz3QEr1fufi6Sz9hAzcZxsN7KtGE,5026
 strawberry/types/type_resolver.py,sha256=F0z_geS4VEun8EhD571LaTgI8ypjCeLfp910gF0Q3MY,6280
 strawberry/types/types.py,sha256=t5MOV4xiutPL2Ka02u3Z2V3eqy2R2JPYQxsqCnY2Aqk,7139
@@ -241,8 +241,8 @@ strawberry/utils/logging.py,sha256=flS7hV0JiIOEdXcrIjda4WyIWix86cpHHFNJL8gl1y4,7
 strawberry/utils/operation.py,sha256=Um-tBCPl3_bVFN2Ph7o1mnrxfxBes4HFCj6T0x4kZxE,1135
 strawberry/utils/str_converters.py,sha256=avIgPVLg98vZH9mA2lhzVdyyjqzLsK2NdBw9mJQ02Xk,813
 strawberry/utils/typing.py,sha256=Qxz1LwyVsNGV7LQW1dFsaUbsswj5LHBOdKLMom5eyEA,13491
-strawberry_graphql-0.221.0.dev1710955937.dist-info/LICENSE,sha256=m-XnIVUKqlG_AWnfi9NReh9JfKhYOB-gJfKE45WM1W8,1072
-strawberry_graphql-0.221.0.dev1710955937.dist-info/METADATA,sha256=l7sfrGtQwOGjYGDh5RVMKFg7bL4dvPYKnTzz6xo-eFU,7754
-strawberry_graphql-0.221.0.dev1710955937.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-strawberry_graphql-0.221.0.dev1710955937.dist-info/entry_points.txt,sha256=Nk7-aT3_uEwCgyqtHESV9H6Mc31cK-VAvhnQNTzTb4k,49
-strawberry_graphql-0.221.0.dev1710955937.dist-info/RECORD,,
+strawberry_graphql-0.222.0.dist-info/LICENSE,sha256=m-XnIVUKqlG_AWnfi9NReh9JfKhYOB-gJfKE45WM1W8,1072
+strawberry_graphql-0.222.0.dist-info/METADATA,sha256=yc6q0kAtPFBIqo0Whk1t6bxehAmcOKFfnd4-4lcAIcs,7740
+strawberry_graphql-0.222.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+strawberry_graphql-0.222.0.dist-info/entry_points.txt,sha256=Nk7-aT3_uEwCgyqtHESV9H6Mc31cK-VAvhnQNTzTb4k,49
+strawberry_graphql-0.222.0.dist-info/RECORD,,