strawberry-graphql 0.260.1__tar.gz → 0.260.3__tar.gz

{strawberry_graphql-0.260.1 → strawberry_graphql-0.260.3}/PKG-INFO

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

{strawberry_graphql-0.260.1 → strawberry_graphql-0.260.3}/pyproject.toml

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

{strawberry_graphql-0.260.1 → strawberry_graphql-0.260.3}/strawberry/federation/field.py

@@ -15,22 +15,59 @@ from strawberry.types.field import field as base_field
 from strawberry.types.unset import UNSET
 
 if TYPE_CHECKING:
-    from collections.abc import Iterable, Sequence
+    from collections.abc import Iterable, Mapping, Sequence
     from typing_extensions import Literal
 
     from strawberry.extensions.field_extension import FieldExtension
     from strawberry.permission import BasePermission
-    from strawberry.types.field import _RESOLVER_TYPE, StrawberryField
+    from strawberry.types.field import (
+        _RESOLVER_TYPE,
+        _RESOLVER_TYPE_ASYNC,
+        _RESOLVER_TYPE_SYNC,
+        StrawberryField,
+    )
 
     from .schema_directives import Override
 
 T = TypeVar("T")
 
+# NOTE: we are separating the sync and async resolvers because using both
+# in the same function will cause mypy to raise an error. Not sure if it is a bug
+
+
+@overload
+def field(
+    *,
+    resolver: _RESOLVER_TYPE_ASYNC[T],
+    name: Optional[str] = None,
+    is_subscription: bool = False,
+    description: Optional[str] = None,
+    authenticated: bool = False,
+    external: bool = False,
+    inaccessible: bool = False,
+    policy: Optional[list[list[str]]] = None,
+    provides: Optional[list[str]] = None,
+    override: Optional[Union[Override, str]] = None,
+    requires: Optional[list[str]] = None,
+    requires_scopes: Optional[list[list[str]]] = None,
+    tags: Optional[Iterable[str]] = (),
+    shareable: bool = False,
+    init: Literal[False] = False,
+    permission_classes: Optional[list[type[BasePermission]]] = None,
+    deprecation_reason: Optional[str] = None,
+    default: Any = dataclasses.MISSING,
+    default_factory: Union[Callable[..., object], object] = dataclasses.MISSING,
+    metadata: Optional[Mapping[Any, Any]] = None,
+    directives: Optional[Sequence[object]] = (),
+    extensions: Optional[list[FieldExtension]] = None,
+    graphql_type: Optional[Any] = None,
+) -> T: ...
+
 
 @overload
 def field(
     *,
-    resolver: _RESOLVER_TYPE[T],
+    resolver: _RESOLVER_TYPE_SYNC[T],
     name: Optional[str] = None,
     is_subscription: bool = False,
     description: Optional[str] = None,
@@ -47,9 +84,10 @@ def field(
     init: Literal[False] = False,
     permission_classes: Optional[list[type[BasePermission]]] = None,
     deprecation_reason: Optional[str] = None,
-    default: Any = UNSET,
-    default_factory: Union[Callable[..., object], object] = UNSET,
-    directives: Sequence[object] = (),
+    default: Any = dataclasses.MISSING,
+    default_factory: Union[Callable[..., object], object] = dataclasses.MISSING,
+    metadata: Optional[Mapping[Any, Any]] = None,
+    directives: Optional[Sequence[object]] = (),
     extensions: Optional[list[FieldExtension]] = None,
     graphql_type: Optional[Any] = None,
 ) -> T: ...
@@ -74,9 +112,10 @@ def field(
     init: Literal[True] = True,
     permission_classes: Optional[list[type[BasePermission]]] = None,
     deprecation_reason: Optional[str] = None,
-    default: Any = UNSET,
-    default_factory: Union[Callable[..., object], object] = UNSET,
-    directives: Sequence[object] = (),
+    default: Any = dataclasses.MISSING,
+    default_factory: Union[Callable[..., object], object] = dataclasses.MISSING,
+    metadata: Optional[Mapping[Any, Any]] = None,
+    directives: Optional[Sequence[object]] = (),
     extensions: Optional[list[FieldExtension]] = None,
     graphql_type: Optional[Any] = None,
 ) -> Any: ...
@@ -84,7 +123,7 @@ def field(
 
 @overload
 def field(
-    resolver: _RESOLVER_TYPE[T],
+    resolver: _RESOLVER_TYPE_ASYNC[T],
     *,
     name: Optional[str] = None,
     is_subscription: bool = False,
@@ -101,9 +140,38 @@ def field(
     shareable: bool = False,
     permission_classes: Optional[list[type[BasePermission]]] = None,
     deprecation_reason: Optional[str] = None,
-    default: Any = UNSET,
-    default_factory: Union[Callable[..., object], object] = UNSET,
-    directives: Sequence[object] = (),
+    default: Any = dataclasses.MISSING,
+    default_factory: Union[Callable[..., object], object] = dataclasses.MISSING,
+    metadata: Optional[Mapping[Any, Any]] = None,
+    directives: Optional[Sequence[object]] = (),
+    extensions: Optional[list[FieldExtension]] = None,
+    graphql_type: Optional[Any] = None,
+) -> StrawberryField: ...
+
+
+@overload
+def field(
+    resolver: _RESOLVER_TYPE_SYNC[T],
+    *,
+    name: Optional[str] = None,
+    is_subscription: bool = False,
+    description: Optional[str] = None,
+    authenticated: bool = False,
+    external: bool = False,
+    inaccessible: bool = False,
+    policy: Optional[list[list[str]]] = None,
+    provides: Optional[list[str]] = None,
+    override: Optional[Union[Override, str]] = None,
+    requires: Optional[list[str]] = None,
+    requires_scopes: Optional[list[list[str]]] = None,
+    tags: Optional[Iterable[str]] = (),
+    shareable: bool = False,
+    permission_classes: Optional[list[type[BasePermission]]] = None,
+    deprecation_reason: Optional[str] = None,
+    default: Any = dataclasses.MISSING,
+    default_factory: Union[Callable[..., object], object] = dataclasses.MISSING,
+    metadata: Optional[Mapping[Any, Any]] = None,
+    directives: Optional[Sequence[object]] = (),
     extensions: Optional[list[FieldExtension]] = None,
     graphql_type: Optional[Any] = None,
 ) -> StrawberryField: ...
@@ -129,7 +197,8 @@ def field(
     deprecation_reason: Optional[str] = None,
     default: Any = dataclasses.MISSING,
     default_factory: Union[Callable[..., object], object] = dataclasses.MISSING,
-    directives: Sequence[object] = (),
+    metadata: Optional[Mapping[Any, Any]] = None,
+    directives: Optional[Sequence[object]] = (),
     extensions: Optional[list[FieldExtension]] = None,
     graphql_type: Optional[Any] = None,
     # This init parameter is used by PyRight to determine whether this field
@@ -150,7 +219,7 @@ def field(
         Tag,
     )
 
-    directives = list(directives)
+    directives = list(directives or [])
 
     if authenticated:
         directives.append(Authenticated())
@@ -197,6 +266,7 @@ def field(
         default_factory=default_factory,
         init=init,  # type: ignore
         directives=directives,
+        metadata=metadata,
         extensions=extensions,
         graphql_type=graphql_type,
     )

{strawberry_graphql-0.260.1 → strawberry_graphql-0.260.3}/strawberry/printer/printer.py

@@ -5,6 +5,7 @@ from itertools import chain
 from typing import (
     TYPE_CHECKING,
     Any,
+    Callable,
     Optional,
     TypeVar,
     Union,
@@ -68,32 +69,59 @@ class PrintExtras:
 
 
 @overload
-def _serialize_dataclasses(value: dict[_T, object]) -> dict[_T, object]: ...
+def _serialize_dataclasses(
+    value: dict[_T, object],
+    *,
+    name_converter: Callable[[str], str] | None = None,
+) -> dict[_T, object]: ...
 
 
 @overload
 def _serialize_dataclasses(
     value: Union[list[object], tuple[object]],
+    *,
+    name_converter: Callable[[str], str] | None = None,
 ) -> list[object]: ...
 
 
 @overload
-def _serialize_dataclasses(value: object) -> object: ...
+def _serialize_dataclasses(
+    value: object,
+    *,
+    name_converter: Callable[[str], str] | None = None,
+) -> object: ...
 
 
-def _serialize_dataclasses(value):
+def _serialize_dataclasses(
+    value,
+    *,
+    name_converter: Callable[[str], str] | None = None,
+):
+    if name_converter is None:
+        name_converter = lambda x: x  # noqa: E731
+
     if dataclasses.is_dataclass(value):
-        return {k: v for k, v in dataclasses.asdict(value).items() if v is not UNSET}  # type: ignore
+        return {
+            name_converter(k): v
+            for k, v in dataclasses.asdict(value).items()  # type: ignore
+            if v is not UNSET
+        }
     if isinstance(value, (list, tuple)):
-        return [_serialize_dataclasses(v) for v in value]
+        return [_serialize_dataclasses(v, name_converter=name_converter) for v in value]
     if isinstance(value, dict):
-        return {k: _serialize_dataclasses(v) for k, v in value.items()}
+        return {
+            name_converter(k): _serialize_dataclasses(v, name_converter=name_converter)
+            for k, v in value.items()
+        }
 
     return value
 
 
 def print_schema_directive_params(
-    directive: GraphQLDirective, values: dict[str, Any]
+    directive: GraphQLDirective,
+    values: dict[str, Any],
+    *,
+    schema: BaseSchema,
 ) -> str:
     params = []
     for name, arg in directive.args.items():
@@ -101,7 +129,13 @@ def print_schema_directive_params(
         if value is UNSET:
             value = None
         else:
-            ast = ast_from_value(_serialize_dataclasses(value), arg.type)
+            ast = ast_from_value(
+                _serialize_dataclasses(
+                    value,
+                    name_converter=schema.config.name_converter.apply_naming_config,
+                ),
+                arg.type,
+            )
             value = ast and f"{name}: {print_ast(ast)}"
 
         if value:
@@ -129,6 +163,7 @@ def print_schema_directive(
             )
             for f in strawberry_directive.fields
         },
+        schema=schema,
     )
 
     printed_directive = print_directive(gql_directive, schema=schema)

{strawberry_graphql-0.260.1 → strawberry_graphql-0.260.3}/strawberry/relay/fields.py

@@ -386,7 +386,7 @@ def connection(
     default_factory: Union[Callable[..., object], object] = dataclasses.MISSING,
     metadata: Optional[Mapping[Any, Any]] = None,
     directives: Optional[Sequence[object]] = (),
-    extensions: list[FieldExtension] = (),  # type: ignore
+    extensions: list[FieldExtension] | None = None,
     max_results: Optional[int] = None,
     # This init parameter is used by pyright to determine whether this field
     # is added in the constructor or not. It is not used to change
@@ -473,6 +473,7 @@ def connection(
         https://relay.dev/graphql/connections.htm
 
     """
+    extensions = extensions or []
     f = StrawberryField(
         python_name=None,
         graphql_name=name,

{strawberry_graphql-0.260.1 → strawberry_graphql-0.260.3}/strawberry/subscriptions/protocols/graphql_ws/handlers.py

@@ -76,8 +76,7 @@ class BaseGraphQLWSHandler(Generic[Context, RootValue]):
                 with suppress(BaseException):
                     await self.keep_alive_task
 
-            for operation_id in list(self.subscriptions.keys()):
-                await self.cleanup_operation(operation_id)
+            await self.cleanup()
 
     async def handle_message(
         self,
@@ -202,6 +201,10 @@ class BaseGraphQLWSHandler(Generic[Context, RootValue]):
             await self.tasks[operation_id]
         del self.tasks[operation_id]
 
+    async def cleanup(self) -> None:
+        for operation_id in list(self.tasks.keys()):
+            await self.cleanup_operation(operation_id)
+
     async def send_data_message(
         self, execution_result: ExecutionResult, operation_id: str
     ) -> None: