strawberry-graphql 0.268.0__tar.gz → 0.268.1__tar.gz

{strawberry_graphql-0.268.0 → strawberry_graphql-0.268.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: strawberry-graphql
-Version: 0.268.0
+Version: 0.268.1
 Summary: A library for creating GraphQL APIs
 License: MIT
 Keywords: graphql,api,rest,starlette,async

{strawberry_graphql-0.268.0 → strawberry_graphql-0.268.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "strawberry-graphql"
-version = "0.268.0"
+version = "0.268.1"
 packages = [{ include = "strawberry" }]
 description = "A library for creating GraphQL APIs"
 authors = ["Patrick Arminio <patrick.arminio@gmail.com>"]

{strawberry_graphql-0.268.0 → strawberry_graphql-0.268.1}/strawberry/schema/schema_converter.py

@@ -817,9 +817,9 @@ class GraphQLCoreConverter:
 
         scalar_name = self.config.name_converter.from_type(scalar_definition)
 
-        if scalar_name not in self.type_map:
-            from strawberry.relay import GlobalID
+        from strawberry.relay import GlobalID
 
+        if scalar_name not in self.type_map:
             if scalar is GlobalID and hasattr(GraphQLNamedType, "reserved_types"):
                 GraphQLNamedType.reserved_types.pop("ID")
 
@@ -841,7 +841,17 @@ class GraphQLCoreConverter:
             # TODO: the other definition might not be a scalar, we should
             # handle this case better, since right now we assume it is a scalar
 
-            if other_definition != scalar_definition:
+            # special case to allow GlobalID to be used as an ID scalar
+            # TODO: we need to find a better way to handle this, might be
+            # worth reworking our scalar implementation.
+            if (
+                hasattr(other_definition, "origin")
+                and hasattr(scalar_definition, "origin")
+                and other_definition.origin == GlobalID
+                and scalar_definition.origin == GraphQLID
+            ):
+                pass
+            elif other_definition != scalar_definition:
                 other_definition = cast("ScalarDefinition", other_definition)
 
                 raise ScalarAlreadyRegisteredError(scalar_definition, other_definition)

{strawberry_graphql-0.268.0 → strawberry_graphql-0.268.1}/strawberry/schema/types/scalar.py

@@ -40,6 +40,7 @@ def _make_scalar_definition(scalar_type: GraphQLScalarType) -> ScalarDefinition:
         parse_literal=scalar_type.parse_literal,
         parse_value=scalar_type.parse_value,
         implementation=scalar_type,
+        origin=scalar_type,
     )
 
 

{strawberry_graphql-0.268.0 → strawberry_graphql-0.268.1}/strawberry/types/scalar.py

@@ -43,6 +43,7 @@ class ScalarDefinition(StrawberryType):
     parse_value: Optional[Callable]
     parse_literal: Optional[Callable]
     directives: Iterable[object] = ()
+    origin: Optional[GraphQLScalarType | type] = None
 
     # Optionally store the GraphQLScalarType instance so that we don't get
     # duplicates
@@ -115,6 +116,7 @@ def _process_scalar(
         parse_literal=parse_literal,
         parse_value=parse_value,
         directives=directives,
+        origin=cls,  # type: ignore[arg-type]
         _source_file=_source_file,
         _source_line=_source_line,
     )