strawberry-graphql 0.264.1__tar.gz → 0.265.1__tar.gz

{strawberry_graphql-0.264.1 → strawberry_graphql-0.265.1}/PKG-INFO

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

{strawberry_graphql-0.264.1 → strawberry_graphql-0.265.1}/pyproject.toml

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

{strawberry_graphql-0.264.1 → strawberry_graphql-0.265.1}/strawberry/sanic/utils.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-from io import BytesIO
 from typing import TYPE_CHECKING, Any, Optional, Union, cast
 
 if TYPE_CHECKING:
@@ -8,7 +7,7 @@ if TYPE_CHECKING:
 
 
 def convert_request_to_files_dict(request: Request) -> dict[str, Any]:
-    """Converts the request.files dictionary to a dictionary of BytesIO objects.
+    """Converts the request.files dictionary to a dictionary of sanic Request objects.
 
     `request.files` has the following format, even if only a single file is uploaded:
 
@@ -27,12 +26,12 @@ def convert_request_to_files_dict(request: Request) -> dict[str, Any]:
     if not request_files:
         return {}
 
-    files_dict: dict[str, Union[BytesIO, list[BytesIO]]] = {}
+    files_dict: dict[str, Union[File, list[File]]] = {}
 
     for field_name, file_list in request_files.items():
         assert len(file_list) == 1
 
-        files_dict[field_name] = BytesIO(file_list[0].body)
+        files_dict[field_name] = file_list[0]
 
     return files_dict
 

{strawberry_graphql-0.264.1 → strawberry_graphql-0.265.1}/strawberry/schema/name_converter.py

@@ -106,8 +106,14 @@ class NameConverter:
             return union.graphql_name
 
         name = ""
+        types: tuple[StrawberryType, ...] = union.types
 
-        for type_ in union.types:
+        if union.concrete_of and union.concrete_of.graphql_name:
+            concrete_of_types = set(union.concrete_of.types)
+
+            types = tuple(type_ for type_ in types if type_ not in concrete_of_types)
+
+        for type_ in types:
             if isinstance(type_, LazyType):
                 type_ = cast("StrawberryType", type_.resolve_type())  # noqa: PLW2901
 
@@ -120,6 +126,9 @@ class NameConverter:
 
             name += type_name
 
+        if union.concrete_of and union.concrete_of.graphql_name:
+            name += union.concrete_of.graphql_name
+
         return name
 
     def from_generic(
@@ -132,12 +141,12 @@ class NameConverter:
         names: list[str] = []
 
         for type_ in types:
-            name = self.get_from_type(type_)
+            name = self.get_name_from_type(type_)
             names.append(name)
 
         return "".join(names) + generic_type_name
 
-    def get_from_type(self, type_: Union[StrawberryType, type]) -> str:
+    def get_name_from_type(self, type_: Union[StrawberryType, type]) -> str:
         type_ = eval_type(type_)
 
         if isinstance(type_, LazyType):
@@ -147,9 +156,9 @@ class NameConverter:
         elif isinstance(type_, StrawberryUnion):
             name = type_.graphql_name if type_.graphql_name else self.from_union(type_)
         elif isinstance(type_, StrawberryList):
-            name = self.get_from_type(type_.of_type) + "List"
+            name = self.get_name_from_type(type_.of_type) + "List"
         elif isinstance(type_, StrawberryOptional):
-            name = self.get_from_type(type_.of_type) + "Optional"
+            name = self.get_name_from_type(type_.of_type) + "Optional"
         elif hasattr(type_, "_scalar_definition"):
             strawberry_type = type_._scalar_definition
 

{strawberry_graphql-0.264.1 → strawberry_graphql-0.265.1}/strawberry/schema/schema_converter.py

@@ -865,14 +865,20 @@ class GraphQLCoreConverter:
             return graphql_union
 
         graphql_types: list[GraphQLObjectType] = []
+
         for type_ in union.types:
             graphql_type = self.from_type(type_)
 
             if isinstance(graphql_type, GraphQLInputObjectType):
                 raise InvalidTypeInputForUnion(graphql_type)
-            assert isinstance(graphql_type, GraphQLObjectType)
+            assert isinstance(graphql_type, (GraphQLObjectType, GraphQLUnionType))
 
-            graphql_types.append(graphql_type)
+            # If the graphql_type is a GraphQLUnionType, merge its child types
+            if isinstance(graphql_type, GraphQLUnionType):
+                # Add the child types of the GraphQLUnionType to the list of graphql_types
+                graphql_types.extend(graphql_type.types)
+            else:
+                graphql_types.append(graphql_type)
 
         graphql_union = GraphQLUnionType(
             name=union_name,

{strawberry_graphql-0.264.1 → strawberry_graphql-0.265.1}/strawberry/types/union.py

@@ -64,6 +64,7 @@ class StrawberryUnion(StrawberryType):
         self.directives = directives
         self._source_file = None
         self._source_line = None
+        self.concrete_of: Optional[StrawberryUnion] = None
 
     def __eq__(self, other: object) -> bool:
         if isinstance(other, StrawberryType):
@@ -136,6 +137,7 @@ class StrawberryUnion(StrawberryType):
             return self
 
         new_types = []
+
         for type_ in self.types:
             new_type: Union[StrawberryType, type]
 
@@ -151,10 +153,13 @@ class StrawberryUnion(StrawberryType):
 
             new_types.append(new_type)
 
-        return StrawberryUnion(
+        new_union = StrawberryUnion(
             type_annotations=tuple(map(StrawberryAnnotation, new_types)),
             description=self.description,
         )
+        new_union.concrete_of = self
+
+        return new_union
 
     def __call__(self, *args: str, **kwargs: Any) -> NoReturn:
         """Do not use.