strawberry-graphql 0.248.0__py3-none-any.whl → 0.249.0__py3-none-any.whl

strawberry/channels/testing.py

@@ -111,15 +111,17 @@ class GraphQLWebsocketCommunicator(WebsocketCommunicator):
             await self.send_json_to(
                 ConnectionInitMessage(payload=self.connection_params).as_dict()
             )
-            response = await self.receive_json_from()
-            assert response == ConnectionAckMessage().as_dict()
+            graphql_transport_ws_response = await self.receive_json_from()
+            assert graphql_transport_ws_response == ConnectionAckMessage().as_dict()
         else:
             assert res == (True, GRAPHQL_WS_PROTOCOL)
             await self.send_json_to(
                 GraphQLWSConnectionInitMessage({"type": "connection_init"})
             )
-            response: GraphQLWSConnectionAckMessage = await self.receive_json_from()
-            assert response["type"] == "connection_ack"
+            graphql_ws_response: GraphQLWSConnectionAckMessage = (
+                await self.receive_json_from()
+            )
+            assert graphql_ws_response["type"] == "connection_ack"
 
     # Actual `ExecutionResult`` objects are not available client-side, since they
     # get transformed into `FormattedExecutionResult` on the wire, but we attempt

strawberry/cli/commands/codegen.py

@@ -4,7 +4,7 @@ import functools
 import importlib
 import inspect
 from pathlib import Path  # noqa: TCH003
-from typing import List, Optional, Type
+from typing import List, Optional, Type, Union, cast
 
 import rich
 import typer
@@ -61,7 +61,9 @@ def _import_plugin(plugin: str) -> Optional[Type[QueryCodegenPlugin]]:
 
 
 @functools.lru_cache
-def _load_plugin(plugin_path: str) -> Type[QueryCodegenPlugin]:
+def _load_plugin(
+    plugin_path: str,
+) -> Union[Type[QueryCodegenPlugin], Type[ConsolePlugin]]:
     # try to import plugin_name from current folder
     # then try to import from strawberry.codegen.plugins
 
@@ -77,7 +79,9 @@ def _load_plugin(plugin_path: str) -> Type[QueryCodegenPlugin]:
     return plugin
 
 
-def _load_plugins(plugin_ids: List[str], query: Path) -> List[QueryCodegenPlugin]:
+def _load_plugins(
+    plugin_ids: List[str], query: Path
+) -> List[Union[QueryCodegenPlugin, ConsolePlugin]]:
     plugins = []
     for ptype_id in plugin_ids:
         ptype = _load_plugin(ptype_id)
@@ -127,11 +131,11 @@ def codegen(
 
     console_plugin_type = _load_plugin(cli_plugin) if cli_plugin else ConsolePlugin
     console_plugin = console_plugin_type(output_dir)
+    assert isinstance(console_plugin, ConsolePlugin)
     console_plugin.before_any_start()
 
     for q in query:
-        plugins = _load_plugins(selected_plugins, q)
-        console_plugin.query = q  # update the query in the console plugin.
+        plugins = cast(List[QueryCodegenPlugin], _load_plugins(selected_plugins, q))
 
         code_generator = QueryCodegen(
             schema_symbol, plugins=plugins, console_plugin=console_plugin

strawberry/experimental/pydantic/object_type.py

@@ -105,7 +105,7 @@ def _build_dataclass_creation_fields(
 
     return DataclassCreationFields(
         name=field.name,
-        field_type=field_type,
+        field_type=field_type,  # type: ignore
         field=strawberry_field,
     )
 
@@ -198,7 +198,7 @@ def type(
         all_model_fields = [
             DataclassCreationFields(
                 name=field.name,
-                field_type=field.type,
+                field_type=field.type,  # type: ignore
                 field=field,
             )
             for field in extra_fields + private_fields

strawberry/extensions/tracing/__init__.py

@@ -8,7 +8,6 @@ if TYPE_CHECKING:
         OpenTelemetryExtension,
         OpenTelemetryExtensionSync,
     )
-    from .sentry import SentryTracingExtension, SentryTracingExtensionSync
 
 __all__ = [
     "ApolloTracingExtension",
@@ -17,8 +16,6 @@ __all__ = [
     "DatadogTracingExtensionSync",
     "OpenTelemetryExtension",
     "OpenTelemetryExtensionSync",
-    "SentryTracingExtension",
-    "SentryTracingExtensionSync",
 ]
 
 
@@ -32,7 +29,4 @@ def __getattr__(name: str) -> Any:
     if name in {"OpenTelemetryExtension", "OpenTelemetryExtensionSync"}:
         return getattr(importlib.import_module(".opentelemetry", __name__), name)
 
-    if name in {"SentryTracingExtension", "SentryTracingExtensionSync"}:
-        return getattr(importlib.import_module(".sentry", __name__), name)
-
     raise AttributeError(f"module {__name__!r} has no attribute {name!r}")

strawberry/subscriptions/protocols/graphql_ws/handlers.py

@@ -169,16 +169,17 @@ class BaseGraphQLWSHandler:
                 await self.websocket.send_json(error_message)
             else:
                 self.subscriptions[operation_id] = agen_or_err
+
                 async for result in agen_or_err:
                     await self.send_data(result, operation_id)
-                complete_message: CompleteMessage = {
-                    "type": "complete",
-                    "id": operation_id,
-                }
-                await self.websocket.send_json(complete_message)
+
+                await self.websocket.send_json(
+                    CompleteMessage({"type": "complete", "id": operation_id})
+                )
         except asyncio.CancelledError:
-            complete_message: CompleteMessage = {"type": "complete", "id": operation_id}
-            await self.websocket.send_json(complete_message)
+            await self.websocket.send_json(
+                CompleteMessage({"type": "complete", "id": operation_id})
+            )
 
     async def cleanup_operation(self, operation_id: str) -> None:
         if operation_id in self.subscriptions:

strawberry/utils/typing.py

@@ -350,7 +350,12 @@ def eval_type(
         assert ast_unparse
         type_ = ForwardRef(ast_unparse(ast_obj))
 
-        return _eval_type(type_, globalns, localns)
+        extra: Dict[str, Any] = {}
+
+        if sys.version_info >= (3, 13):
+            extra = {"type_params": None}
+
+        return _eval_type(type_, globalns, localns, **extra)
 
     origin = get_origin(type_)
     if origin is not None:

{strawberry_graphql-0.248.0.dist-info → strawberry_graphql-0.249.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: strawberry-graphql
-Version: 0.248.0
+Version: 0.249.0
 Summary: A library for creating GraphQL APIs
 Home-page: https://strawberry.rocks/
 License: MIT

{strawberry_graphql-0.248.0.dist-info → strawberry_graphql-0.249.0.dist-info}/RECORD

@@ -16,11 +16,11 @@ strawberry/channels/handlers/base.py,sha256=KV4KA0eF5NRtikV9m4ssoPI5pmCZvDuRkfoT
 strawberry/channels/handlers/http_handler.py,sha256=fnQcPwdUz2CboVlnI3s1urQ_ZnZyNZvRx7SM_xPLLEA,11577
 strawberry/channels/handlers/ws_handler.py,sha256=k9xax8S1g0tfEFSe76UOHkheHqIrnYjEioYlLm4UPLo,6052
 strawberry/channels/router.py,sha256=DKIbl4zuRBhfvViUVpyu0Rf_WRT41E6uZC-Yic9Ltvo,2024
-strawberry/channels/testing.py,sha256=Ae2G8v4bKdkw8Se6itQ-gkaHpZREhrHWPPpF5dbhroY,6592
+strawberry/channels/testing.py,sha256=2cZvF9S4ofYLLRh2G8iyWZTphfQi7XrUcFpRqGjUmPQ,6688
 strawberry/cli/__init__.py,sha256=byS5VrEiTJatAH6YS4V1Kd4SOwMRAQO2M1oJdIddivg,585
 strawberry/cli/app.py,sha256=tTMBV1pdWqMcwjWO2yn-8oLDhMhfJvUzyQtWs75LWJ0,54
 strawberry/cli/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-strawberry/cli/commands/codegen.py,sha256=f3TKQVeg0iMYV3qcSXlvTNgG73ZWC60zjbeuK_RkQ3M,3825
+strawberry/cli/commands/codegen.py,sha256=79CRVa01AScZ0dactJzMMpWP_2O00urNIjBAyWjPzA8,3910
 strawberry/cli/commands/export_schema.py,sha256=8XBqbejk0kT2fHky74DzW2TnE8APNMs0cKtatEjErUA,1024
 strawberry/cli/commands/schema_codegen.py,sha256=G6eV08a51sjVxCm3jn75oPn9hC8YarKiAKOY5bpTuKU,749
 strawberry/cli/commands/server.py,sha256=M175Etn4163oqP3egHBpZ8ga2Ilk8XgdDJtz6zfHPxM,2189
@@ -79,7 +79,7 @@ strawberry/experimental/pydantic/conversion_types.py,sha256=LdLFp0e7_YPntmHDwZDp
 strawberry/experimental/pydantic/error_type.py,sha256=kHqACk3F8kKT3V8PZr2h7-KI9M4UNpMjtq_TiOwYI38,4382
 strawberry/experimental/pydantic/exceptions.py,sha256=Q8Deq3bNkMgc8fwvIYdcfxHSONXVMu-ZB6jcsh1NQYo,1498
 strawberry/experimental/pydantic/fields.py,sha256=pmBqlq1DUtNkmDlXdA0Hmp3Xy252P6v5uyDF4WGcnl0,2588
-strawberry/experimental/pydantic/object_type.py,sha256=4CUtBR5wxe4dP-bpKBwNLU6trje7zygkD39_GoiPVBM,12432
+strawberry/experimental/pydantic/object_type.py,sha256=KWpKIPpCsZRmURJOlkce5qODgWm7xgaJ49YZlJQcB80,12464
 strawberry/experimental/pydantic/utils.py,sha256=ViR7HGtnlYmyjUwIqGaEoBPo6dcibckwTFgp0GgwO6A,4073
 strawberry/ext/LICENSE,sha256=_oY0TZg0b_sW0--0T44aMTpy2e2zF1Kiyn8E1qDiivo,1249
 strawberry/ext/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -101,11 +101,10 @@ strawberry/extensions/parser_cache.py,sha256=IvDbkVpKC_2lDXLZyrvj0VleZghbtkD6l2S
 strawberry/extensions/pyinstrument.py,sha256=dy2NPagLDW4mU2jTfaHek3H1SBVZCjwYKf0zPMxTYp8,712
 strawberry/extensions/query_depth_limiter.py,sha256=Jtg-HSmEux97Z09Y5G5nhTbJu56rBiGmMG6lB1_ejz8,9882
 strawberry/extensions/runner.py,sha256=cVsBzNMBDjD4Pg_0jHNzYHv2cJUIVrNL_SzPr6rd7gk,1885
-strawberry/extensions/tracing/__init__.py,sha256=wx8_EAroGhNrP4HiGYMgKo8jnCsfde5ib6lO4OvcLV0,1400
+strawberry/extensions/tracing/__init__.py,sha256=igoDJBlfh7vGhytJ5njx1qQzpxZOUmdfIaH4j5Kmt3E,1112
 strawberry/extensions/tracing/apollo.py,sha256=XlI88NzSZBSmBHEJ9iitDU9br2-9CdjdtHE_eiTJCIw,5880
 strawberry/extensions/tracing/datadog.py,sha256=khxvY4_WTjYaeJUb_dn6mLvmk9TCS4tIodnC3G-9pTo,5541
 strawberry/extensions/tracing/opentelemetry.py,sha256=MH2j71denfLmzInl6zcTzxzckqjcwOzm_F305z8-vYw,7281
-strawberry/extensions/tracing/sentry.py,sha256=r_U1OeiDDq-Mf6v30-aEuHhrio2Pckxfrcrdu_OAnWM,5027
 strawberry/extensions/tracing/utils.py,sha256=tXZNyqfct6YNSWi3GRj4GU1fKQGvSce8ZESfoVeys7U,654
 strawberry/extensions/utils.py,sha256=YPiacKNLQXvpYj-HI6fR5ORFdM9RrcdabGeM7F8vBGg,1001
 strawberry/extensions/validation_cache.py,sha256=CZ-brPYA1grL_lW38Rq4TxEVKlHM2n1DC6q9BHlSF4g,1398
@@ -190,7 +189,7 @@ strawberry/subscriptions/protocols/graphql_transport_ws/__init__.py,sha256=wN6dk
 strawberry/subscriptions/protocols/graphql_transport_ws/handlers.py,sha256=_h-xNf_ZRtjn8PGbxZk3u9qTR-NNNCevdgaFF0uXciw,14728
 strawberry/subscriptions/protocols/graphql_transport_ws/types.py,sha256=udYxzGtwjETYvY5f23org0t-aY4cimTjEGFYUR3idaY,2596
 strawberry/subscriptions/protocols/graphql_ws/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-strawberry/subscriptions/protocols/graphql_ws/handlers.py,sha256=IQsOqh_9uWZMuBPmo05ThEzE9cC98WiRFt2K-2GWymk,7703
+strawberry/subscriptions/protocols/graphql_ws/handlers.py,sha256=oM0o85zC24LpBjtVq8VakKx2hBGL0kb3Q9yl0GyFLS8,7614
 strawberry/subscriptions/protocols/graphql_ws/types.py,sha256=diZ36w56Nb_YmgfWXe6uXGiQOKmWIVjNEkcM-PkjaSs,1939
 strawberry/test/__init__.py,sha256=U3B5Ng7C_H8GpCpfvgZZcfADMw6cor5hm78gS3nDdMI,115
 strawberry/test/client.py,sha256=Va7J1tIjZ6PxbOqPl57jSp5lNLOZSueHPmrUuUx5sRY,6462
@@ -229,9 +228,9 @@ strawberry/utils/inspect.py,sha256=2WOeK3o8pjVkIH-rP_TaaLDa_AvroKC1WXc0gSE0Suc,3
 strawberry/utils/logging.py,sha256=U1cseHGquN09YFhFmRkiphfASKCyK0HUZREImPgVb0c,746
 strawberry/utils/operation.py,sha256=SSXxN-vMqdHO6W2OZtip-1z7y4_A-eTVFdhDvhKeLCk,1193
 strawberry/utils/str_converters.py,sha256=KGd7QH90RevaJjH6SQEkiVVsb8KuhJr_wv5AsI7UzQk,897
-strawberry/utils/typing.py,sha256=3xws5kxSQGsp8BnYyUwClvxXNzZakMAuOPoq1rjHRuk,14252
-strawberry_graphql-0.248.0.dist-info/LICENSE,sha256=m-XnIVUKqlG_AWnfi9NReh9JfKhYOB-gJfKE45WM1W8,1072
-strawberry_graphql-0.248.0.dist-info/METADATA,sha256=aKYBf7nSLOqh8q-WwFvOugbyH8ZlZBDokIS6Y5HfoMw,7758
-strawberry_graphql-0.248.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-strawberry_graphql-0.248.0.dist-info/entry_points.txt,sha256=Nk7-aT3_uEwCgyqtHESV9H6Mc31cK-VAvhnQNTzTb4k,49
-strawberry_graphql-0.248.0.dist-info/RECORD,,
+strawberry/utils/typing.py,sha256=G6k2wWD1TDQ9WFk-Togekj_hTVFqHV-g7Phf2Wu41ms,14380
+strawberry_graphql-0.249.0.dist-info/LICENSE,sha256=m-XnIVUKqlG_AWnfi9NReh9JfKhYOB-gJfKE45WM1W8,1072
+strawberry_graphql-0.249.0.dist-info/METADATA,sha256=y_NXnqJCCHmKI10lZ-r3oodKQHkth_DvEmUTsYaThVc,7758
+strawberry_graphql-0.249.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+strawberry_graphql-0.249.0.dist-info/entry_points.txt,sha256=Nk7-aT3_uEwCgyqtHESV9H6Mc31cK-VAvhnQNTzTb4k,49
+strawberry_graphql-0.249.0.dist-info/RECORD,,

strawberry/extensions/tracing/sentry.py

@@ -1,161 +0,0 @@
-from __future__ import annotations
-
-import hashlib
-import warnings
-from functools import cached_property
-from inspect import isawaitable
-from typing import TYPE_CHECKING, Any, Callable, Generator, Optional
-
-from sentry_sdk import configure_scope, start_span
-
-from strawberry.extensions import SchemaExtension
-from strawberry.extensions.tracing.utils import should_skip_tracing
-
-if TYPE_CHECKING:
-    from graphql import GraphQLResolveInfo
-
-    from strawberry.types.execution import ExecutionContext
-
-
-class SentryTracingExtension(SchemaExtension):
-    def __init__(
-        self,
-        *,
-        execution_context: Optional[ExecutionContext] = None,
-    ) -> None:
-        warnings.warn(
-            "The Sentry tracing extension is deprecated, please update to sentry-sdk>=1.32.0",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-
-        if execution_context:
-            self.execution_context = execution_context
-
-    @cached_property
-    def _resource_name(self) -> str:
-        assert self.execution_context.query
-
-        query_hash = self.hash_query(self.execution_context.query)
-
-        if self.execution_context.operation_name:
-            return f"{self.execution_context.operation_name}:{query_hash}"
-
-        return query_hash
-
-    def hash_query(self, query: str) -> str:
-        return hashlib.md5(query.encode("utf-8")).hexdigest()
-
-    def on_operation(self) -> Generator[None, None, None]:
-        self._operation_name = self.execution_context.operation_name
-        name = f"{self._operation_name}" if self._operation_name else "Anonymous Query"
-
-        with configure_scope() as scope:
-            if scope.span:
-                self.gql_span = scope.span.start_child(
-                    op="gql",
-                    description=name,
-                )
-            else:
-                self.gql_span = start_span(
-                    op="gql",
-                )
-
-        operation_type = "query"
-
-        assert self.execution_context.query
-
-        if self.execution_context.query.strip().startswith("mutation"):
-            operation_type = "mutation"
-        if self.execution_context.query.strip().startswith("subscription"):
-            operation_type = "subscription"
-
-        self.gql_span.set_tag("graphql.operation_type", operation_type)
-        self.gql_span.set_tag("graphql.resource_name", self._resource_name)
-        self.gql_span.set_data("graphql.query", self.execution_context.query)
-
-        yield
-
-        self.gql_span.finish()
-
-    def on_validate(self) -> Generator[None, None, None]:
-        self.validation_span = self.gql_span.start_child(
-            op="validation", description="Validation"
-        )
-
-        yield
-
-        self.validation_span.finish()
-
-    def on_parse(self) -> Generator[None, None, None]:
-        self.parsing_span = self.gql_span.start_child(
-            op="parsing", description="Parsing"
-        )
-
-        yield
-
-        self.parsing_span.finish()
-
-    def should_skip_tracing(self, _next: Callable, info: GraphQLResolveInfo) -> bool:
-        return should_skip_tracing(_next, info)
-
-    async def resolve(
-        self,
-        _next: Callable,
-        root: Any,
-        info: GraphQLResolveInfo,
-        *args: str,
-        **kwargs: Any,
-    ) -> Any:
-        if self.should_skip_tracing(_next, info):
-            result = _next(root, info, *args, **kwargs)
-
-            if isawaitable(result):  # pragma: no cover
-                result = await result
-
-            return result
-
-        field_path = f"{info.parent_type}.{info.field_name}"
-
-        with self.gql_span.start_child(
-            op="resolve", description=f"Resolving: {field_path}"
-        ) as span:
-            span.set_tag("graphql.field_name", info.field_name)
-            span.set_tag("graphql.parent_type", info.parent_type.name)
-            span.set_tag("graphql.field_path", field_path)
-            span.set_tag("graphql.path", ".".join(map(str, info.path.as_list())))
-
-            result = _next(root, info, *args, **kwargs)
-
-            if isawaitable(result):
-                result = await result
-
-            return result
-
-
-class SentryTracingExtensionSync(SentryTracingExtension):
-    def resolve(
-        self,
-        _next: Callable,
-        root: Any,
-        info: GraphQLResolveInfo,
-        *args: str,
-        **kwargs: Any,
-    ) -> Any:
-        if self.should_skip_tracing(_next, info):
-            return _next(root, info, *args, **kwargs)
-
-        field_path = f"{info.parent_type}.{info.field_name}"
-
-        with self.gql_span.start_child(
-            op="resolve", description=f"Resolving: {field_path}"
-        ) as span:
-            span.set_tag("graphql.field_name", info.field_name)
-            span.set_tag("graphql.parent_type", info.parent_type.name)
-            span.set_tag("graphql.field_path", field_path)
-            span.set_tag("graphql.path", ".".join(map(str, info.path.as_list())))
-
-            return _next(root, info, *args, **kwargs)
-
-
-__all__ = ["SentryTracingExtension", "SentryTracingExtensionSync"]