strawberry-graphql 0.248.0__tar.gz → 0.249.0__tar.gz

{strawberry_graphql-0.248.0 → strawberry_graphql-0.249.0}/PKG-INFO

@@ -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 → strawberry_graphql-0.249.0}/pyproject.toml

@@ -1,7 +1,7 @@
 [tool.poetry]
 name = "strawberry-graphql"
 packages = [ { include = "strawberry" } ]
-version = "0.248.0"
+version = "0.249.0"
 description = "A library for creating GraphQL APIs"
 authors = ["Patrick Arminio <patrick.arminio@gmail.com>"]
 license = "MIT"
@@ -85,7 +85,6 @@ pytest-xdist = {extras = ["psutil"], version = "^3.1.0"}
 python-multipart = ">=0.0.7"
 rich = {version = ">=12.5.1", optional = false}
 sanic-testing = ">=22.9,<24.0"
-sentry-sdk = "^1.39.2"
 typer = {version = ">=0.7.0", optional = false}
 types-aiofiles = ">=22.1"
 types-certifi = "^2021.10.8"
@@ -157,8 +156,9 @@ markers = [
     "fastapi",
     "flaky",
     "flask",
-    "quart",
+    "litestar",
     "pydantic",
+    "quart",
     "relay",
     "sanic",
     "starlette",

{strawberry_graphql-0.248.0 → strawberry_graphql-0.249.0}/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_graphql-0.248.0 → strawberry_graphql-0.249.0}/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_graphql-0.248.0 → strawberry_graphql-0.249.0}/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_graphql-0.248.0 → strawberry_graphql-0.249.0}/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_graphql-0.248.0 → strawberry_graphql-0.249.0}/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_graphql-0.248.0 → strawberry_graphql-0.249.0}/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/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"]