strawberry-graphql 0.288.1__py3-none-any.whl → 0.288.2__py3-none-any.whl

strawberry/types/maybe.py

@@ -1,6 +1,6 @@
 import re
 import typing
-from typing import TYPE_CHECKING, Any, Generic, TypeAlias, TypeVar
+from typing import TYPE_CHECKING, Annotated, Any, Generic, TypeAlias, TypeVar
 
 T = TypeVar("T")
 
@@ -47,7 +47,10 @@ def _annotation_is_maybe(annotation: Any) -> bool:
         # Checking for the pattern should be good enough for now.
         return _maybe_re.match(annotation) is not None
 
-    return (orig := typing.get_origin(annotation)) and orig is Maybe
+    orig = typing.get_origin(annotation)
+    if orig is Annotated:
+        return _annotation_is_maybe(typing.get_args(annotation)[0])
+    return orig is Maybe
 
 
 __all__ = [

strawberry/types/object_type.py

@@ -109,8 +109,15 @@ def _inject_default_for_maybe_annotations(
 ) -> None:
     """Inject `= None` for fields with `Maybe` annotations and no default value."""
     for name, annotation in annotations.copy().items():
-        if _annotation_is_maybe(annotation) and not hasattr(cls, name):
-            setattr(cls, name, None)
+        if _annotation_is_maybe(annotation):
+            if not hasattr(cls, name):
+                setattr(cls, name, None)
+            elif (
+                isinstance(attr := getattr(cls, name), StrawberryField)
+                and attr.default is dataclasses.MISSING
+                and attr.default_factory is dataclasses.MISSING
+            ):
+                attr.default = None
 
 
 def _process_type(

{strawberry_graphql-0.288.1.dist-info → strawberry_graphql-0.288.2.dist-info}/METADATA

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

{strawberry_graphql-0.288.1.dist-info → strawberry_graphql-0.288.2.dist-info}/RECORD

@@ -218,10 +218,10 @@ strawberry/types/fields/resolver.py,sha256=sWG4nO8XpsvELna0uLU-rwKzUGiMgwHPzg8N7
 strawberry/types/graphql.py,sha256=gXKzawwKiow7hvoJhq5ApNJOMUCnKmvTiHaKY5CK1Lw,867
 strawberry/types/info.py,sha256=1MTarr040KSsPPdrVx8sDHtKudEfH0LRgQ4adk_1FKA,4698
 strawberry/types/lazy_type.py,sha256=GYy4PnKtZ48ywW-_A-6Ul8sbHRlB0Tc39ui5DMIja4U,5077
-strawberry/types/maybe.py,sha256=hFx-fWvD9XWRK-2tMEzX16pf6Ix-YigzyRmxhmWpwC4,1508
+strawberry/types/maybe.py,sha256=ZBNHGDMuVcorpErPAMjJku4W3I2ygPf_3ZLw-N2O_UU,1610
 strawberry/types/mutation.py,sha256=vcrKt1VpcS6SLl1WKfcR-NTAqfQ12LpzjwgT5Bx-U3Q,11549
 strawberry/types/nodes.py,sha256=bM88j05rMIQ5OTS4RqKeU3kjo38MM-hA3Hrmh3IreV0,5121
-strawberry/types/object_type.py,sha256=uv7nBxL1JF61i9XeZbU4NujUtAYmCu7cAingNRDkL28,15179
+strawberry/types/object_type.py,sha256=CTBVBM7wD4y76lC_2mTFnpdTqADEA7nFIRrF93UhvII,15457
 strawberry/types/private.py,sha256=DhJs50XVGtOXlxWZFkRpMxQ5_6oki0-x_WQsV1bGUxk,518
 strawberry/types/scalar.py,sha256=OgWRFV5x-qTM4-FJC-sAKix-DhMtGRrJTxU7ry4VOlA,8651
 strawberry/types/type_resolver.py,sha256=fH2ZOK4dAGgu8AMPi-JAXe_kEAbvvw2MCYXqbpx-kTc,6529
@@ -238,8 +238,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.288.1.dist-info/METADATA,sha256=OlK3J9bwrNzLc2LRsFQijYL8DOJwrsBzAI8IKiMuyeY,7647
-strawberry_graphql-0.288.1.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-strawberry_graphql-0.288.1.dist-info/entry_points.txt,sha256=Nk7-aT3_uEwCgyqtHESV9H6Mc31cK-VAvhnQNTzTb4k,49
-strawberry_graphql-0.288.1.dist-info/licenses/LICENSE,sha256=m-XnIVUKqlG_AWnfi9NReh9JfKhYOB-gJfKE45WM1W8,1072
-strawberry_graphql-0.288.1.dist-info/RECORD,,
+strawberry_graphql-0.288.2.dist-info/METADATA,sha256=yTioGirWqAPKtjL_NPw6AGSKPTXkUe0dhTUQkNtR-Nk,7647
+strawberry_graphql-0.288.2.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+strawberry_graphql-0.288.2.dist-info/entry_points.txt,sha256=Nk7-aT3_uEwCgyqtHESV9H6Mc31cK-VAvhnQNTzTb4k,49
+strawberry_graphql-0.288.2.dist-info/licenses/LICENSE,sha256=m-XnIVUKqlG_AWnfi9NReh9JfKhYOB-gJfKE45WM1W8,1072
+strawberry_graphql-0.288.2.dist-info/RECORD,,