strawberry-graphql 0.260.2__py3-none-any.whl → 0.260.4__py3-none-any.whl

strawberry/extensions/tracing/datadog.py

@@ -5,11 +5,19 @@ from functools import cached_property
 from inspect import isawaitable
 from typing import TYPE_CHECKING, Any, Callable, Optional
 
-from ddtrace import Span, tracer
+import ddtrace
+from packaging import version
 
 from strawberry.extensions import LifecycleStep, SchemaExtension
 from strawberry.extensions.tracing.utils import should_skip_tracing
 
+parsed_ddtrace_version = version.parse(ddtrace.__version__)
+if parsed_ddtrace_version >= version.parse("3.0.0"):
+    from ddtrace.trace import Span, tracer
+else:
+    from ddtrace import Span, tracer
+
+
 if TYPE_CHECKING:
     from collections.abc import Generator, Iterator
 

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/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/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:

{strawberry_graphql-0.260.2.dist-info → strawberry_graphql-0.260.4.dist-info}/METADATA

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

{strawberry_graphql-0.260.2.dist-info → strawberry_graphql-0.260.4.dist-info}/RECORD

@@ -103,7 +103,7 @@ strawberry/extensions/query_depth_limiter.py,sha256=qhVLfZTpp1gpx4O6Qe6bpNBWO7tI
 strawberry/extensions/runner.py,sha256=LCUSzKUrwTYhoIr1nS8uFDN15_YEQ_3BFK1zpPfOfsA,1873
 strawberry/extensions/tracing/__init__.py,sha256=igoDJBlfh7vGhytJ5njx1qQzpxZOUmdfIaH4j5Kmt3E,1112
 strawberry/extensions/tracing/apollo.py,sha256=GONBVew2K4j3clAHrVYfIMDQTLAwFtag-uBaYI2yqfk,5900
-strawberry/extensions/tracing/datadog.py,sha256=9hICpmLWKj7dWNRECGHc3TVX69SI9arbwm4GBu9z_Dg,5587
+strawberry/extensions/tracing/datadog.py,sha256=-5zVf5JSjujzNJQvpu7EANumhL1qeMET2ffjmaf8AU4,5800
 strawberry/extensions/tracing/opentelemetry.py,sha256=4czsWhJnwXbFii3vs4kqKD7r0iOakvnlGr2dlsQ7OwI,7207
 strawberry/extensions/tracing/utils.py,sha256=tXZNyqfct6YNSWi3GRj4GU1fKQGvSce8ZESfoVeys7U,654
 strawberry/extensions/utils.py,sha256=sjhxItHzbDhqHtnR63WbE35qzHhTyf9NSffidet79Hc,995
@@ -114,7 +114,7 @@ strawberry/fastapi/router.py,sha256=4CqapWgqma_mU-s7TpFhpJwlO7UzBClAgouD7HN8NKs,
 strawberry/federation/__init__.py,sha256=Pw01N0rG9o0NaUxXLMNGeW5oLENeWVx_d8Kuef1ES4s,549
 strawberry/federation/argument.py,sha256=rs71S1utiNUd4XOLRa9KVtSMA3yqvKJnR_qdJqX6PPM,860
 strawberry/federation/enum.py,sha256=MdtblT4Z8_-2L8gUdo0ROnw3aY8RAAtTvyfHbCBBPrA,3033
-strawberry/federation/field.py,sha256=QMMxKP4F3ZsedpT-Tfi-K-2mg-t8zA9ZFibq-SuA0eM,6215
+strawberry/federation/field.py,sha256=pcFgl33xgJcunb6TxfOPuzsAQTGbbzjKi41SUUSV3w4,8914
 strawberry/federation/mutation.py,sha256=5t2E419m4K2W6LoWEOzWgMdL2J0PwHnsffYkpChqqDQ,67
 strawberry/federation/object_type.py,sha256=tuUn_YqtOcvivVSHrXESSFr2kae79xW_SLUV3oNINdE,9381
 strawberry/federation/scalar.py,sha256=sOVmhYnogew6hP6-7PQMMYQHHWE-BEyo52BT7_IYGiw,4649
@@ -152,7 +152,7 @@ strawberry/quart/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 strawberry/quart/views.py,sha256=Xo7n5cu85fUZW-SGKTbZ4e4UuFrQvRb9PkMPjk0uPSM,4431
 strawberry/relay/__init__.py,sha256=Vi4btvA_g6Cj9Tk_F9GCSegapIf2WqkOWV8y3P0cTCs,553
 strawberry/relay/exceptions.py,sha256=KjqzBhOo4qp38GZ7O8aRtAb82sijc1wJKllhGFaRvt4,4029
-strawberry/relay/fields.py,sha256=wAee3lZE4dCbyzQEFaRpWGq6xBQmbEcv7JoxH83A0nk,18059
+strawberry/relay/fields.py,sha256=3J5py9uXGDowSxlG-NvwjTquw1abUIUtgyZd8egGtD4,18086
 strawberry/relay/types.py,sha256=0JFO3HYGM1YlRQ11ZGiL89WLr5cvLMN_PMSEC0Vv2n4,30168
 strawberry/relay/utils.py,sha256=OqeeTy_3TFMjmERnCNleUpW3bFf-yuQDzra8l5PNlyY,5817
 strawberry/resolvers.py,sha256=Vdidc3YFc4-olSQZD_xQ1icyAFbyzqs_8I3eSpMFlA4,260
@@ -187,7 +187,7 @@ strawberry/subscriptions/protocols/graphql_transport_ws/__init__.py,sha256=wN6dk
 strawberry/subscriptions/protocols/graphql_transport_ws/handlers.py,sha256=wqE30sf07aaZwM1DYtHdOgcJuRiYiAPwAZ5LpA7Me-g,14931
 strawberry/subscriptions/protocols/graphql_transport_ws/types.py,sha256=N9r2mXg5jmmjYoZV5rWf3lAzgylCOUrbKGmClXCoOso,2169
 strawberry/subscriptions/protocols/graphql_ws/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-strawberry/subscriptions/protocols/graphql_ws/handlers.py,sha256=CsZJKyvxxcanTo1fu_zqCGDc2ASJqGai4s7Uwc8e_p0,8119
+strawberry/subscriptions/protocols/graphql_ws/handlers.py,sha256=ZJ790BiXuUc8or3DdRcTukJMHMETkkzUi7jmmUuSoNM,8174
 strawberry/subscriptions/protocols/graphql_ws/types.py,sha256=Uumiz-1O5qQnx-ERBaQtaf7db5yx-V9LMypOn9oGKwM,2003
 strawberry/test/__init__.py,sha256=lKVbKJDBnrYSPYHIKrg54UpaZcSoL93Z01zOpA1IzZM,115
 strawberry/test/client.py,sha256=ILAttb6A3jplH5wJNMeyyT1u_Q8KnollfpYLP_BVZR4,6438
@@ -228,8 +228,8 @@ strawberry/utils/logging.py,sha256=U1cseHGquN09YFhFmRkiphfASKCyK0HUZREImPgVb0c,7
 strawberry/utils/operation.py,sha256=SSXxN-vMqdHO6W2OZtip-1z7y4_A-eTVFdhDvhKeLCk,1193
 strawberry/utils/str_converters.py,sha256=-eH1Cl16IO_wrBlsGM-km4IY0IKsjhjnSNGRGOwQjVM,897
 strawberry/utils/typing.py,sha256=Ux0Hl46lhuXvOKK-C5hj6nlz3zDn8P4CUGH2nUVD2vU,13373
-strawberry_graphql-0.260.2.dist-info/LICENSE,sha256=m-XnIVUKqlG_AWnfi9NReh9JfKhYOB-gJfKE45WM1W8,1072
-strawberry_graphql-0.260.2.dist-info/METADATA,sha256=rmiNESgOWHoH9dBpw6p66qztTShT-VZifhel1rgGqj0,7539
-strawberry_graphql-0.260.2.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-strawberry_graphql-0.260.2.dist-info/entry_points.txt,sha256=Nk7-aT3_uEwCgyqtHESV9H6Mc31cK-VAvhnQNTzTb4k,49
-strawberry_graphql-0.260.2.dist-info/RECORD,,
+strawberry_graphql-0.260.4.dist-info/LICENSE,sha256=m-XnIVUKqlG_AWnfi9NReh9JfKhYOB-gJfKE45WM1W8,1072
+strawberry_graphql-0.260.4.dist-info/METADATA,sha256=SjBQ_1CMFk8FTGTww7hfjll7xXFu0eJzhHHr21YobMQ,7539
+strawberry_graphql-0.260.4.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+strawberry_graphql-0.260.4.dist-info/entry_points.txt,sha256=Nk7-aT3_uEwCgyqtHESV9H6Mc31cK-VAvhnQNTzTb4k,49
+strawberry_graphql-0.260.4.dist-info/RECORD,,

{strawberry_graphql-0.260.2.dist-info → strawberry_graphql-0.260.4.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.0.1
+Generator: poetry-core 2.1.1
 Root-Is-Purelib: true
 Tag: py3-none-any