strawberry-graphql 0.289.1__py3-none-any.whl → 0.289.3__py3-none-any.whl

strawberry/schema/schema_converter.py

@@ -870,12 +870,6 @@ class GraphQLCoreConverter:
         if compat.is_graphql_generic(type_):
             raise MissingTypesForGenericError(type_)
 
-        # to handle lazy unions
-        if typing.get_origin(type_) is Annotated:
-            args = typing.get_args(type_)
-            if len(args) >= 2 and isinstance(args[1], StrawberryUnion):
-                type_ = args[1]
-
         if isinstance(type_, StrawberryEnumDefinition):
             return self.from_enum(type_)
         if compat.is_input_type(type_):  # TODO: Replace with StrawberryInputObject
@@ -897,7 +891,13 @@ class GraphQLCoreConverter:
         if isinstance(type_, StrawberryUnion):
             return self.from_union(type_)
         if isinstance(type_, LazyType):
-            return self.from_type(type_.resolve_type())
+            resolved = type_.resolve_type()
+            # If the resolved type is an Annotated type (e.g., a union defined with
+            # the new syntax), run it through StrawberryAnnotation to properly
+            # resolve it. This ensures unions get their type_annotations populated.
+            if typing.get_origin(resolved) is Annotated:
+                return self.from_type(StrawberryAnnotation(resolved).resolve())
+            return self.from_type(resolved)
         if compat.is_scalar(
             type_, self.scalar_registry
         ):  # TODO: Replace with StrawberryScalar

strawberry/types/lazy_type.py

@@ -1,4 +1,5 @@
 import importlib
+import importlib.util
 import inspect
 import sys
 import warnings
@@ -60,12 +61,19 @@ class LazyType(Generic[TypeName, Module]):
 
     def resolve_type(self) -> type[Any]:
         module = importlib.import_module(self.module, self.package)
+
+        # Resolve full module name for __main__ comparison
+        if self.package:
+            full_module_name = importlib.util.resolve_name(self.module, self.package)
+        else:
+            full_module_name = self.module
+
         main_module = sys.modules.get("__main__", None)
         if main_module:
             # If lazy type points to the main module, use it instead of the imported
             # module. Otherwise duplication checks during schema-conversion might fail.
             # Refer to: https://github.com/strawberry-graphql/strawberry/issues/2397
-            if main_module.__spec__ and main_module.__spec__.name == self.module:
+            if main_module.__spec__ and main_module.__spec__.name == full_module_name:
                 module = main_module
             elif hasattr(main_module, "__file__") and hasattr(module, "__file__"):
                 main_file = main_module.__file__
@@ -78,6 +86,7 @@ class LazyType(Generic[TypeName, Module]):
                         # path contains `strawberry.exe`
                         is_samefile = False
                     module = main_module if is_samefile else module
+
         return module.__dict__[self.type_name]
 
     # this empty call method allows LazyTypes to be used in generic types

{strawberry_graphql-0.289.1.dist-info → strawberry_graphql-0.289.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: strawberry-graphql
-Version: 0.289.1
+Version: 0.289.3
 Summary: A library for creating GraphQL APIs
 License: MIT
 License-File: LICENSE
@@ -87,7 +87,6 @@ Description-Content-Type: text/markdown
 
 > Python GraphQL library based on dataclasses
 
-[![CircleCI](https://img.shields.io/circleci/token/307b40d5e152e074d34f84d30d226376a15667d5/project/github/strawberry-graphql/strawberry/main.svg?style=for-the-badge)](https://circleci.com/gh/strawberry-graphql/strawberry/tree/main)
 [![Discord](https://img.shields.io/discord/689806334337482765?label=discord&logo=discord&logoColor=white&style=for-the-badge&color=blue)](https://discord.gg/ZkRTEJQ)
 [![PyPI](https://img.shields.io/pypi/v/strawberry-graphql?logo=pypi&logoColor=white&style=for-the-badge)](https://pypi.org/project/strawberry-graphql/)
 

{strawberry_graphql-0.289.1.dist-info → strawberry_graphql-0.289.3.dist-info}/RECORD

@@ -179,7 +179,7 @@ strawberry/schema/config.py,sha256=1i80WOoml_9qzOV-kfcx-LYMXYwWYl0uisdcZX1vMEg,2
 strawberry/schema/exceptions.py,sha256=SaEWtahVAg_f43coyg2h7H2UMZP10CZ_GJg72khBIAs,1105
 strawberry/schema/name_converter.py,sha256=G3yOj-BmZ6E0bcvvSbb2cWu8ngsXi8M6W0c6rKROMjc,6933
 strawberry/schema/schema.py,sha256=FKtqHGrOCnYMWhMwy1qWU_VXtw2IxyjpZZScL4PmVlg,39606
-strawberry/schema/schema_converter.py,sha256=nzTZIOyIwe9jCX66ZT7m7vm8UzpcUs-AW25XWnZC9J0,40791
+strawberry/schema/schema_converter.py,sha256=RwSQaP8BeQVG9EXFrjawcemweaobrGrU6L7ScMT5xBM,40978
 strawberry/schema/types/__init__.py,sha256=oHO3COWhL3L1KLYCJNY1XFf5xt2GGtHiMC-UaYbFfnA,68
 strawberry/schema/types/base_scalars.py,sha256=ajMeN4W45AALhCnJO8MIisRb9slDZRyIl1S61LvHfSQ,2678
 strawberry/schema/types/concrete_type.py,sha256=Z0oPu52dlAMcGYw4_ZCv3OSyoSLw2DxyoegK-GH8s0U,801
@@ -219,7 +219,7 @@ strawberry/types/fields/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 strawberry/types/fields/resolver.py,sha256=sWG4nO8XpsvELna0uLU-rwKzUGiMgwHPzg8N7xRXqe4,16239
 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/lazy_type.py,sha256=Zwt_etpUp1bBfDNgWk3aamK6UUlnQGYmR8VDNYM-PoQ,5334
 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
@@ -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.1.dist-info/METADATA,sha256=bbupgRYRkCQ5q4LdqolspO2jFu9Xy8bCoX2qwvg8RjM,7627
-strawberry_graphql-0.289.1.dist-info/WHEEL,sha256=3ny-bZhpXrU6vSQ1UPG34FoxZBp3lVcvK0LkgUz6VLk,88
-strawberry_graphql-0.289.1.dist-info/entry_points.txt,sha256=Nk7-aT3_uEwCgyqtHESV9H6Mc31cK-VAvhnQNTzTb4k,49
-strawberry_graphql-0.289.1.dist-info/licenses/LICENSE,sha256=m-XnIVUKqlG_AWnfi9NReh9JfKhYOB-gJfKE45WM1W8,1072
-strawberry_graphql-0.289.1.dist-info/RECORD,,
+strawberry_graphql-0.289.3.dist-info/METADATA,sha256=vMusEjG-2fSGhOb2veBJSmUGo_hfZ1zSBwDzIQbboHU,7394
+strawberry_graphql-0.289.3.dist-info/WHEEL,sha256=3ny-bZhpXrU6vSQ1UPG34FoxZBp3lVcvK0LkgUz6VLk,88
+strawberry_graphql-0.289.3.dist-info/entry_points.txt,sha256=Nk7-aT3_uEwCgyqtHESV9H6Mc31cK-VAvhnQNTzTb4k,49
+strawberry_graphql-0.289.3.dist-info/licenses/LICENSE,sha256=m-XnIVUKqlG_AWnfi9NReh9JfKhYOB-gJfKE45WM1W8,1072
+strawberry_graphql-0.289.3.dist-info/RECORD,,