strawberry-graphql 0.289.8__py3-none-any.whl → 0.291.0__py3-none-any.whl

strawberry/federation/argument.py

@@ -1,4 +1,5 @@
 from collections.abc import Iterable
+from typing import Any
 
 from strawberry.types.arguments import StrawberryArgumentAnnotation
 
@@ -10,6 +11,7 @@ def argument(
     directives: Iterable[object] = (),
     inaccessible: bool = False,
     tags: Iterable[str] | None = (),
+    graphql_type: Any | None = None,
 ) -> StrawberryArgumentAnnotation:
     from strawberry.federation.schema_directives import Inaccessible, Tag
 
@@ -26,6 +28,7 @@ def argument(
         name=name,
         deprecation_reason=deprecation_reason,
         directives=directives,
+        graphql_type=graphql_type,
     )
 
 

strawberry/schema_codegen/__init__.py

@@ -32,7 +32,11 @@ from graphql import (
 from graphql.language.ast import (
     BooleanValueNode,
     ConstValueNode,
+    EnumValueNode,
+    FloatValueNode,
+    IntValueNode,
     ListValueNode,
+    NullValueNode,
 )
 
 from strawberry.utils.str_converters import to_snake_case
@@ -108,13 +112,23 @@ def _is_federation_link_directive(directive: ConstDirectiveNode) -> bool:
     ).startswith("https://specs.apollo.dev/federation")
 
 
+def _is_nullable(field_type: TypeNode) -> bool:
+    """Check if a field type is nullable (not wrapped in NonNullTypeNode)."""
+    return not isinstance(field_type, NonNullTypeNode)
+
+
 def _get_field_type(
-    field_type: TypeNode, was_non_nullable: bool = False
+    field_type: TypeNode,
+    was_non_nullable: bool = False,
+    *,
+    wrap_in_maybe: bool = False,
 ) -> cst.BaseExpression:
     expr: cst.BaseExpression | None
 
     if isinstance(field_type, NonNullTypeNode):
-        return _get_field_type(field_type.type, was_non_nullable=True)
+        return _get_field_type(
+            field_type.type, was_non_nullable=True, wrap_in_maybe=wrap_in_maybe
+        )
     if isinstance(field_type, ListTypeNode):
         expr = cst.Subscript(
             value=cst.Name("list"),
@@ -138,12 +152,84 @@ def _get_field_type(
     if was_non_nullable:
         return expr
 
-    return cst.BinaryOperation(
+    nullable_expr = cst.BinaryOperation(
         left=expr,
         operator=cst.BitOr(),
         right=cst.Name("None"),
     )
 
+    if wrap_in_maybe:
+        return cst.Subscript(
+            value=cst.Attribute(
+                value=cst.Name("strawberry"),
+                attr=cst.Name("Maybe"),
+            ),
+            slice=[
+                cst.SubscriptElement(
+                    cst.Index(value=nullable_expr),
+                )
+            ],
+        )
+
+    return nullable_expr
+
+
+def _get_base_type_name(type_node: TypeNode) -> str:
+    """Extract the base named type from a possibly wrapped type node."""
+    if isinstance(type_node, (NonNullTypeNode, ListTypeNode)):
+        return _get_base_type_name(type_node.type)
+
+    if isinstance(type_node, NamedTypeNode):
+        return type_node.name.value
+
+    raise NotImplementedError(f"Unknown type node {type_node}")
+
+
+def _get_default_value_expr(
+    node: ConstValueNode,
+    *,
+    enum_type_name: str | None = None,
+) -> cst.BaseExpression:
+    """Convert a GraphQL default value AST node to a libcst expression."""
+    if isinstance(node, IntValueNode):
+        return cst.Integer(node.value)
+
+    if isinstance(node, FloatValueNode):
+        return cst.Float(node.value)
+
+    if isinstance(node, StringValueNode):
+        if '"' in node.value:
+            return cst.SimpleString(f"'{node.value}'")
+
+        return cst.SimpleString(f'"{node.value}"')
+
+    if isinstance(node, BooleanValueNode):
+        return cst.Name("True" if node.value else "False")
+
+    if isinstance(node, NullValueNode):
+        return cst.Name("None")
+
+    if isinstance(node, EnumValueNode):
+        if enum_type_name is None:
+            raise ValueError("enum_type_name is required for EnumValueNode")
+
+        return cst.Attribute(
+            value=cst.Name(enum_type_name),
+            attr=cst.Name(node.value),
+        )
+
+    if isinstance(node, ListValueNode):
+        return cst.List(
+            elements=[
+                cst.Element(
+                    value=_get_default_value_expr(v, enum_type_name=enum_type_name)
+                )
+                for v in node.values
+            ]
+        )
+
+    raise NotImplementedError(f"Unknown default value node {node}")
+
 
 def _sanitize_argument(value: ArgumentValue) -> cst.SimpleString | cst.Name | cst.List:
     if isinstance(value, bool):
@@ -183,7 +269,9 @@ def _get_field_value(
     alias: str | None,
     is_apollo_federation: bool,
     imports: set[Import],
-) -> cst.Call | None:
+    *,
+    default_value: cst.BaseExpression | None = None,
+) -> cst.Call | cst.BaseExpression | None:
     description = field.description.value if field.description else None
 
     args = list(
@@ -200,7 +288,19 @@ def _get_field_value(
 
     apollo_federation_args = _get_federation_arguments(directives, imports)
 
+    default_arg = (
+        cst.Arg(
+            value=default_value,
+            keyword=cst.Name("default"),
+            equal=cst.AssignEqual(cst.SimpleWhitespace(""), cst.SimpleWhitespace("")),
+        )
+        if default_value is not None
+        else None
+    )
+
     if is_apollo_federation and apollo_federation_args:
+        if default_arg is not None:
+            args.append(default_arg)
         args.extend(apollo_federation_args)
 
         return cst.Call(
@@ -215,6 +315,8 @@ def _get_field_value(
         )
 
     if args:
+        if default_arg is not None:
+            args.append(default_arg)
         return cst.Call(
             func=cst.Attribute(
                 value=cst.Name("strawberry"),
@@ -223,6 +325,9 @@ def _get_field_value(
             args=args,
         )
 
+    if default_value is not None:
+        return default_value
+
     return None
 
 
@@ -230,6 +335,8 @@ def _get_field(
     field: FieldDefinitionNode | InputValueDefinitionNode,
     is_apollo_federation: bool,
     imports: set[Import],
+    *,
+    is_input_field: bool = False,
 ) -> cst.SimpleStatementLine:
     name = to_snake_case(field.name.value)
     alias: str | None = None
@@ -238,18 +345,35 @@ def _get_field(
         name = f"{name}_"
         alias = field.name.value
 
+    # For input types, wrap nullable fields in strawberry.Maybe[...]
+    wrap_in_maybe = is_input_field and _is_nullable(field.type)
+
+    # Extract default value for input fields
+    default_value: cst.BaseExpression | None = None
+    if isinstance(field, InputValueDefinitionNode) and field.default_value is not None:
+        enum_type_name = (
+            _get_base_type_name(field.type)
+            if isinstance(field.default_value, EnumValueNode)
+            else None
+        )
+
+        default_value = _get_default_value_expr(
+            field.default_value, enum_type_name=enum_type_name
+        )
+
     return cst.SimpleStatementLine(
         body=[
             cst.AnnAssign(
                 target=cst.Name(name),
                 annotation=cst.Annotation(
-                    _get_field_type(field.type),
+                    _get_field_type(field.type, wrap_in_maybe=wrap_in_maybe),
                 ),
                 value=_get_field_value(
                     field,
                     alias=alias,
                     is_apollo_federation=is_apollo_federation,
                     imports=imports,
+                    default_value=default_value,
                 ),
             )
         ]
@@ -262,12 +386,16 @@ ArgumentValue: TypeAlias = str | bool | list["ArgumentValue"]
 def _get_argument_value(argument_value: ConstValueNode) -> ArgumentValue:
     if isinstance(argument_value, StringValueNode):
         return argument_value.value
+
     if isinstance(argument_value, EnumValueDefinitionNode):
         return argument_value.name.value
+
     if isinstance(argument_value, ListValueNode):
         return [_get_argument_value(arg) for arg in argument_value.values]
+
     if isinstance(argument_value, BooleanValueNode):
         return argument_value.value
+
     raise NotImplementedError(f"Unknown argument value {argument_value}")
 
 
@@ -440,11 +568,18 @@ def _get_class_definition(
         else []
     )
 
+    is_input_type = isinstance(definition, InputObjectTypeDefinitionNode)
+
     class_definition = cst.ClassDef(
         name=cst.Name(definition.name.value),
         body=cst.IndentedBlock(
             body=[
-                _get_field(field, is_apollo_federation, imports)
+                _get_field(
+                    field,
+                    is_apollo_federation,
+                    imports,
+                    is_input_field=is_input_type,
+                )
                 for field in definition.fields
             ]
         ),

strawberry/types/arguments.py

@@ -51,6 +51,7 @@ class StrawberryArgumentAnnotation:
     deprecation_reason: str | None
     directives: Iterable[object]
     metadata: Mapping[Any, Any]
+    graphql_type: Any | None
 
     def __init__(
         self,
@@ -59,12 +60,14 @@ class StrawberryArgumentAnnotation:
         deprecation_reason: str | None = None,
         directives: Iterable[object] = (),
         metadata: Mapping[Any, Any] | None = None,
+        graphql_type: Any | None = None,
     ) -> None:
         self.description = description
         self.name = name
         self.deprecation_reason = deprecation_reason
         self.directives = directives
         self.metadata = metadata or {}
+        self.graphql_type = graphql_type
 
 
 class StrawberryArgument:
@@ -122,6 +125,10 @@ class StrawberryArgument:
                         self.deprecation_reason = arg.deprecation_reason
                         self.directives = arg.directives
                         self.metadata = arg.metadata
+                        if arg.graphql_type is not None:
+                            self.type_annotation = StrawberryAnnotation(
+                                arg.graphql_type
+                            )
 
                     if isinstance(arg, StrawberryLazyReference):
                         self.type_annotation = StrawberryAnnotation(
@@ -313,6 +320,7 @@ def argument(
     deprecation_reason: str | None = None,
     directives: Iterable[object] = (),
     metadata: Mapping[Any, Any] | None = None,
+    graphql_type: Any | None = None,
 ) -> StrawberryArgumentAnnotation:
     """Function to add metadata to an argument, like a description or deprecation reason.
 
@@ -324,6 +332,8 @@ def argument(
         directives: The directives to attach to the argument
         metadata: Metadata to attach to the argument, this can be used
             to store custom data that can be used by custom logic or plugins
+        graphql_type: The GraphQL type for the argument, useful when you want to use a
+            different type than the one in the schema.
 
     Returns:
         A StrawberryArgumentAnnotation object that can be used to customise an argument
@@ -348,6 +358,7 @@ def argument(
         deprecation_reason=deprecation_reason,
         directives=directives,
         metadata=metadata,
+        graphql_type=graphql_type,
     )
 
 

{strawberry_graphql-0.289.8.dist-info → strawberry_graphql-0.291.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: strawberry-graphql
-Version: 0.289.8
+Version: 0.291.0
 Summary: A library for creating GraphQL APIs
 License: MIT
 License-File: LICENSE

{strawberry_graphql-0.289.8.dist-info → strawberry_graphql-0.291.0.dist-info}/RECORD

@@ -121,7 +121,7 @@ strawberry/fastapi/__init__.py,sha256=p5qg9AlkYjNOWKcT4uRiebIpR6pIb1HqDMiDfF5O3t
 strawberry/fastapi/context.py,sha256=HXOpOwOpPMYbNgf7sQYvfNrqL7SQMNvtVvd6fiC2jKM,653
 strawberry/fastapi/router.py,sha256=sXovpiJUQapHdzBnQ71I4hqRGixSs7mYeLunkJYTeoU,11866
 strawberry/federation/__init__.py,sha256=Pw01N0rG9o0NaUxXLMNGeW5oLENeWVx_d8Kuef1ES4s,549
-strawberry/federation/argument.py,sha256=fFIoUZwEA8f4edmhzzIF_ytckiSrVkORU9vsQSMCSSo,820
+strawberry/federation/argument.py,sha256=nvhaZCHlpZrKa7vtWMOc1zJybJxxqRK-a3k6CIJRnhE,915
 strawberry/federation/enum.py,sha256=RTGlUtwrDw0Iu_5yq3y_EmGlY6IqHRhepy9OPSHRbD4,3068
 strawberry/federation/field.py,sha256=xLnbTUoI1-a361Jte_mjp6LD_uD_sJWvZl3l6FBWNWo,8597
 strawberry/federation/mutation.py,sha256=5t2E419m4K2W6LoWEOzWgMdL2J0PwHnsffYkpChqqDQ,67
@@ -187,7 +187,7 @@ strawberry/schema/types/scalar.py,sha256=1MKFyE7_S0Mb5TafYLhRituidGrPGrmVgR548WR
 strawberry/schema/validation_rules/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 strawberry/schema/validation_rules/maybe_null.py,sha256=RrIq1yV5_2YxIYN7jx8AaY6O_pqxKtylbM1IygFz5z4,5624
 strawberry/schema/validation_rules/one_of.py,sha256=fPuYzCyLT7p9y7dHF_sWTImArTQaEhyF664lZijB1Gw,2629
-strawberry/schema_codegen/__init__.py,sha256=HzgwI-rudoloXqJa5R9zyxXNTKLhdSXgSn7wfjvVDwI,24161
+strawberry/schema_codegen/__init__.py,sha256=HMJUPi-lPYoxAaQlfcCrqmtM_ynZtEqDbVHCO8aNWPM,28119
 strawberry/schema_directive.py,sha256=H5tv1npCkEa-mUkzQ9nilNI3zTGEAhyagRcDwj5Rujw,2025
 strawberry/schema_directives.py,sha256=KGKFWCODjm1Ah9qNV_bBwbic7Mld4qLWnWQkev-PG8A,175
 strawberry/static/apollo-sandbox.html,sha256=2XzkbE0dqsFHqehE-jul9_J9TFOpwA6Ylrlo0Kdx_9w,973
@@ -208,7 +208,7 @@ strawberry/tools/__init__.py,sha256=pdGpZx8wpq03VfUZJyF9JtYxZhGqzzxCiipsalWxJX4,
 strawberry/tools/create_type.py,sha256=lYnqXMaecEWc0CtC2lGhX2mE--6S22q_V8GiIkHlGqw,2295
 strawberry/tools/merge_types.py,sha256=hUMRRNM28FyPp70jRA3d4svv9WoEBjaNpihBt3DaY0I,1023
 strawberry/types/__init__.py,sha256=baWEdDkkmCcITOhkg2hNUOenrNV1OYdxGE5qgvIRwwU,351
-strawberry/types/arguments.py,sha256=3Rt1WlVDMc0KKYmJOnMUckeTB0egJv96Uw7RMopM4DM,11996
+strawberry/types/arguments.py,sha256=K3Pk1YO7LNJV7E8waVB_BSG-ACDsfTed_Txku1hyccQ,12530
 strawberry/types/auto.py,sha256=4sDflIg-Kz-QpK7Qo7bCSFblw7VE-0752rgayukFznU,2954
 strawberry/types/base.py,sha256=Hubo7u6OsU1v1v-w-vBCwlNVTqHaNn4zPOJuX93WR5U,15699
 strawberry/types/cast.py,sha256=fx86MkLW77GIximBAwUk5vZxSGwDqUA6XicXvz8EXwQ,916
@@ -240,8 +240,8 @@ strawberry/utils/logging.py,sha256=Dnivjd0ZhK_lAvjvuyCDkEWDhuURBoK9d3Kt_mIqbRg,7
 strawberry/utils/operation.py,sha256=Qs3ttbuC415xEVqmJ6YsWQpJNUo8CZJq9AoMB-yV65w,1215
 strawberry/utils/str_converters.py,sha256=-eH1Cl16IO_wrBlsGM-km4IY0IKsjhjnSNGRGOwQjVM,897
 strawberry/utils/typing.py,sha256=eE9NeMfASeXRstbjLnQFfOPymcSX8xwg3FGw_HCp95E,11828
-strawberry_graphql-0.289.8.dist-info/METADATA,sha256=ChUTmdnOxdsdIjJtD6zO1zmdM0tcKhtQ8qh59X1WGNA,7394
-strawberry_graphql-0.289.8.dist-info/WHEEL,sha256=3ny-bZhpXrU6vSQ1UPG34FoxZBp3lVcvK0LkgUz6VLk,88
-strawberry_graphql-0.289.8.dist-info/entry_points.txt,sha256=Nk7-aT3_uEwCgyqtHESV9H6Mc31cK-VAvhnQNTzTb4k,49
-strawberry_graphql-0.289.8.dist-info/licenses/LICENSE,sha256=m-XnIVUKqlG_AWnfi9NReh9JfKhYOB-gJfKE45WM1W8,1072
-strawberry_graphql-0.289.8.dist-info/RECORD,,
+strawberry_graphql-0.291.0.dist-info/METADATA,sha256=ZOmFcNGucuN7oKDbKb1EcO_tdFlgyb49xnMD2XEqQOk,7394
+strawberry_graphql-0.291.0.dist-info/WHEEL,sha256=3ny-bZhpXrU6vSQ1UPG34FoxZBp3lVcvK0LkgUz6VLk,88
+strawberry_graphql-0.291.0.dist-info/entry_points.txt,sha256=Nk7-aT3_uEwCgyqtHESV9H6Mc31cK-VAvhnQNTzTb4k,49
+strawberry_graphql-0.291.0.dist-info/licenses/LICENSE,sha256=m-XnIVUKqlG_AWnfi9NReh9JfKhYOB-gJfKE45WM1W8,1072
+strawberry_graphql-0.291.0.dist-info/RECORD,,