strawberry-graphql 0.280.0__tar.gz → 0.282.0__tar.gz

{strawberry_graphql-0.280.0 → strawberry_graphql-0.282.0}/PKG-INFO

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

{strawberry_graphql-0.280.0 → strawberry_graphql-0.282.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "strawberry-graphql"
-version = "0.280.0"
+version = "0.282.0"
 description = "A library for creating GraphQL APIs"
 authors = [{ name = "Patrick Arminio", email = "patrick.arminio@gmail.com" }]
 license = { text = "MIT" }

{strawberry_graphql-0.280.0 → strawberry_graphql-0.282.0}/strawberry/aiohttp/views.py

@@ -97,7 +97,6 @@ class GraphQLView(
         allow_queries_via_get: bool = True,
         keep_alive: bool = True,
         keep_alive_interval: float = 1,
-        debug: bool = False,
         subscription_protocols: Sequence[str] = (
             GRAPHQL_TRANSPORT_WS_PROTOCOL,
             GRAPHQL_WS_PROTOCOL,
@@ -109,7 +108,6 @@ class GraphQLView(
         self.allow_queries_via_get = allow_queries_via_get
         self.keep_alive = keep_alive
         self.keep_alive_interval = keep_alive_interval
-        self.debug = debug
         self.subscription_protocols = subscription_protocols
         self.connection_init_wait_timeout = connection_init_wait_timeout
         self.multipart_uploads_enabled = multipart_uploads_enabled

{strawberry_graphql-0.280.0 → strawberry_graphql-0.282.0}/strawberry/asgi/__init__.py

@@ -103,7 +103,6 @@ class GraphQL(
         allow_queries_via_get: bool = True,
         keep_alive: bool = False,
         keep_alive_interval: float = 1,
-        debug: bool = False,
         subscription_protocols: Sequence[str] = (
             GRAPHQL_TRANSPORT_WS_PROTOCOL,
             GRAPHQL_WS_PROTOCOL,
@@ -115,7 +114,6 @@ class GraphQL(
         self.allow_queries_via_get = allow_queries_via_get
         self.keep_alive = keep_alive
         self.keep_alive_interval = keep_alive_interval
-        self.debug = debug
         self.protocols = subscription_protocols
         self.connection_init_wait_timeout = connection_init_wait_timeout
         self.multipart_uploads_enabled = multipart_uploads_enabled

{strawberry_graphql-0.280.0 → strawberry_graphql-0.282.0}/strawberry/channels/handlers/ws_handler.py

@@ -109,7 +109,6 @@ class GraphQLWSConsumer(
         schema: BaseSchema,
         keep_alive: bool = False,
         keep_alive_interval: float = 1,
-        debug: bool = False,
         subscription_protocols: Sequence[str] = (
             GRAPHQL_TRANSPORT_WS_PROTOCOL,
             GRAPHQL_WS_PROTOCOL,
@@ -122,7 +121,6 @@ class GraphQLWSConsumer(
         self.schema = schema
         self.keep_alive = keep_alive
         self.keep_alive_interval = keep_alive_interval
-        self.debug = debug
         self.protocols = subscription_protocols
         self.message_queue: asyncio.Queue[MessageQueueData] = asyncio.Queue()
         self.run_task: Optional[asyncio.Task] = None

{strawberry_graphql-0.280.0 → strawberry_graphql-0.282.0}/strawberry/cli/commands/server.py

@@ -6,10 +6,7 @@ import rich
 import typer
 
 from strawberry.cli.app import app
-from strawberry.cli.constants import (
-    DEBUG_SERVER_LOG_OPERATIONS,
-    DEBUG_SERVER_SCHEMA_ENV_VAR_KEY,
-)
+from strawberry.cli.constants import DEBUG_SERVER_SCHEMA_ENV_VAR_KEY
 from strawberry.cli.utils import load_schema
 
 
@@ -42,12 +39,6 @@ def server(
             "Works the same as `--app-dir` in uvicorn."
         ),
     ),
-    log_operations: bool = typer.Option(
-        True,
-        "--log-operations",
-        show_default=True,
-        help="Log GraphQL operations",
-    ),
 ) -> None:
     sys.path.insert(0, app_dir)
 
@@ -65,7 +56,6 @@ def server(
     load_schema(schema, app_dir=app_dir)
 
     os.environ[DEBUG_SERVER_SCHEMA_ENV_VAR_KEY] = schema
-    os.environ[DEBUG_SERVER_LOG_OPERATIONS] = str(log_operations)
     app = "strawberry.cli.debug_server:app"
 
     # Windows doesn't support UTF-8 by default

strawberry_graphql-0.282.0/strawberry/cli/constants.py

@@ -0,0 +1 @@
+DEBUG_SERVER_SCHEMA_ENV_VAR_KEY = "STRAWBERRY_DEBUG_SERVER_SCHEMA"

{strawberry_graphql-0.280.0 → strawberry_graphql-0.282.0}/strawberry/cli/debug_server.py

@@ -6,10 +6,7 @@ from starlette.middleware.cors import CORSMiddleware
 
 from strawberry import Schema
 from strawberry.asgi import GraphQL
-from strawberry.cli.constants import (
-    DEBUG_SERVER_LOG_OPERATIONS,
-    DEBUG_SERVER_SCHEMA_ENV_VAR_KEY,
-)
+from strawberry.cli.constants import DEBUG_SERVER_SCHEMA_ENV_VAR_KEY
 from strawberry.utils.importer import import_module_symbol
 
 app = Starlette(debug=True)
@@ -19,10 +16,9 @@ app.add_middleware(
 
 schema_import_string = os.environ[DEBUG_SERVER_SCHEMA_ENV_VAR_KEY]
 schema_symbol = import_module_symbol(schema_import_string, default_symbol_name="schema")
-log_operations = os.environ[DEBUG_SERVER_LOG_OPERATIONS] == "True"
 
 assert isinstance(schema_symbol, Schema)
-graphql_app = GraphQL[Any, Any](schema_symbol, debug=log_operations)
+graphql_app = GraphQL[Any, Any](schema_symbol)
 
 paths = ["/", "/graphql"]
 for path in paths:

{strawberry_graphql-0.280.0 → strawberry_graphql-0.282.0}/strawberry/extensions/mask_errors.py

@@ -1,10 +1,11 @@
-from collections.abc import Iterator
-from typing import Any, Callable
+from collections.abc import Callable, Iterator
+from typing import Any
 
 from graphql.error import GraphQLError
-from graphql.execution import ExecutionResult
+from graphql.execution.execute import ExecutionResult as GraphQLExecutionResult
 
 from strawberry.extensions.base_extension import SchemaExtension
+from strawberry.types.execution import ExecutionResult as StrawberryExecutionResult
 
 
 def default_should_mask_error(_: GraphQLError) -> bool:
@@ -54,10 +55,7 @@ class MaskErrors(SchemaExtension):
 
         result = self.execution_context.result
 
-        if isinstance(result, ExecutionResult):
+        if isinstance(result, (GraphQLExecutionResult, StrawberryExecutionResult)):
             self._process_result(result)
         elif result:
             self._process_result(result.initial_result)
-
-
-__all__ = ["MaskErrors"]

{strawberry_graphql-0.280.0 → strawberry_graphql-0.282.0}/strawberry/fastapi/router.py

@@ -127,7 +127,6 @@ class GraphQLRouter(
         allow_queries_via_get: bool = True,
         keep_alive: bool = False,
         keep_alive_interval: float = 1,
-        debug: bool = False,
         root_value_getter: Optional[Callable[[], RootValue]] = None,
         context_getter: Optional[
             Callable[..., Union[Optional[Context], Awaitable[Optional[Context]]]]
@@ -183,7 +182,6 @@ class GraphQLRouter(
         self.allow_queries_via_get = allow_queries_via_get
         self.keep_alive = keep_alive
         self.keep_alive_interval = keep_alive_interval
-        self.debug = debug
         self.root_value_getter = root_value_getter or self.__get_root_value
         # TODO: clean this type up
         self.context_getter = self.__get_context_getter(

{strawberry_graphql-0.280.0 → strawberry_graphql-0.282.0}/strawberry/http/async_base_view.py

@@ -88,7 +88,6 @@ class AsyncBaseHTTPView(
 ):
     schema: BaseSchema
     graphql_ide: Optional[GraphQL_IDE]
-    debug: bool
     keep_alive = False
     keep_alive_interval: Optional[float] = None
     connection_init_wait_timeout: timedelta = timedelta(minutes=1)
@@ -325,7 +324,6 @@ class AsyncBaseHTTPView(
                     context=context,
                     root_value=root_value,
                     schema=self.schema,
-                    debug=self.debug,
                     connection_init_wait_timeout=self.connection_init_wait_timeout,
                 ).handle()
             elif websocket_subprotocol == GRAPHQL_WS_PROTOCOL:
@@ -335,7 +333,6 @@ class AsyncBaseHTTPView(
                     context=context,
                     root_value=root_value,
                     schema=self.schema,
-                    debug=self.debug,
                     keep_alive=self.keep_alive,
                     keep_alive_interval=self.keep_alive_interval,
                 ).handle()

{strawberry_graphql-0.280.0 → strawberry_graphql-0.282.0}/strawberry/litestar/controller.py

@@ -213,7 +213,6 @@ class GraphQLController(
     allow_queries_via_get: bool = True
     graphiql_allowed_accept: frozenset[str] = frozenset({"text/html", "*/*"})
     graphql_ide: Optional[GraphQL_IDE] = "graphiql"
-    debug: bool = False
     connection_init_wait_timeout: timedelta = timedelta(minutes=1)
     protocols: Sequence[str] = (
         GRAPHQL_TRANSPORT_WS_PROTOCOL,
@@ -370,7 +369,6 @@ def make_graphql_controller(
     allow_queries_via_get: bool = True,
     keep_alive: bool = False,
     keep_alive_interval: float = 1,
-    debug: bool = False,
     # TODO: root typevar
     root_value_getter: Optional[AnyCallable] = None,
     # TODO: context typevar
@@ -420,7 +418,6 @@ def make_graphql_controller(
 
     _GraphQLController.keep_alive = keep_alive
     _GraphQLController.keep_alive_interval = keep_alive_interval
-    _GraphQLController.debug = debug
     _GraphQLController.protocols = subscription_protocols
     _GraphQLController.connection_init_wait_timeout = connection_init_wait_timeout
     _GraphQLController.graphiql_allowed_accept = frozenset({"text/html", "*/*"})

{strawberry_graphql-0.280.0 → strawberry_graphql-0.282.0}/strawberry/quart/views.py

@@ -88,7 +88,6 @@ class GraphQLView(
         allow_queries_via_get: bool = True,
         keep_alive: bool = True,
         keep_alive_interval: float = 1,
-        debug: bool = False,
         subscription_protocols: Sequence[str] = (
             GRAPHQL_TRANSPORT_WS_PROTOCOL,
             GRAPHQL_WS_PROTOCOL,
@@ -100,7 +99,6 @@ class GraphQLView(
         self.allow_queries_via_get = allow_queries_via_get
         self.keep_alive = keep_alive
         self.keep_alive_interval = keep_alive_interval
-        self.debug = debug
         self.subscription_protocols = subscription_protocols
         self.connection_init_wait_timeout = connection_init_wait_timeout
         self.multipart_uploads_enabled = multipart_uploads_enabled

{strawberry_graphql-0.280.0 → strawberry_graphql-0.282.0}/strawberry/relay/utils.py

@@ -7,7 +7,7 @@ from typing import TYPE_CHECKING, Any, Union
 from typing_extensions import Self, assert_never
 
 from strawberry.types.base import StrawberryObjectDefinition
-from strawberry.types.nodes import InlineFragment, Selection
+from strawberry.types.nodes import InlineFragment
 
 if TYPE_CHECKING:
     from strawberry.types.info import Info
@@ -83,31 +83,19 @@ def should_resolve_list_connection_edges(info: Info) -> bool:
 
     """
     resolve_for_field_names = {"edges", "pageInfo"}
-
-    def _check_selection(selection: Selection) -> bool:
-        """Recursively inspect the selection to check if the user requested to resolve the `edges` field.
-
-        Args:
-            selection (Selection): The selection to check.
-
-        Returns:
-            bool: True if the user requested to resolve the `edges` field of a connection, False otherwise.
-        """
+    # Recursively inspect the selection to check if the user requested to resolve the `edges` field.
+    stack = []
+    for selection_field in info.selected_fields:
+        stack.extend(selection_field.selections)
+    while stack:
+        selection = stack.pop()
         if (
             not isinstance(selection, InlineFragment)
             and selection.name in resolve_for_field_names
         ):
             return True
-        if selection.selections:
-            return any(
-                _check_selection(selection) for selection in selection.selections
-            )
-        return False
-
-    for selection_field in info.selected_fields:
-        for selection in selection_field.selections:
-            if _check_selection(selection):
-                return True
+        if nested_selections := getattr(selection, "selections", None):
+            stack.extend(nested_selections)
     return False
 
 

{strawberry_graphql-0.280.0 → strawberry_graphql-0.282.0}/strawberry/subscriptions/protocols/graphql_transport_ws/handlers.py

@@ -34,7 +34,6 @@ from strawberry.types import ExecutionResult
 from strawberry.types.execution import PreExecutionError
 from strawberry.types.graphql import OperationType
 from strawberry.types.unset import UnsetType
-from strawberry.utils.debug import pretty_print_graphql_operation
 from strawberry.utils.operation import get_operation_type
 
 if TYPE_CHECKING:
@@ -55,7 +54,6 @@ class BaseGraphQLTransportWSHandler(Generic[Context, RootValue]):
         context: Context,
         root_value: Optional[RootValue],
         schema: BaseSchema,
-        debug: bool,
         connection_init_wait_timeout: timedelta,
     ) -> None:
         self.view = view
@@ -63,7 +61,6 @@ class BaseGraphQLTransportWSHandler(Generic[Context, RootValue]):
         self.context = context
         self.root_value = root_value
         self.schema = schema
-        self.debug = debug
         self.connection_init_wait_timeout = connection_init_wait_timeout
         self.connection_init_timeout_task: Optional[asyncio.Task] = None
         self.connection_init_received = False
@@ -237,13 +234,6 @@ class BaseGraphQLTransportWSHandler(Generic[Context, RootValue]):
             await self.websocket.close(code=4409, reason=reason)
             return
 
-        if self.debug:  # pragma: no cover
-            pretty_print_graphql_operation(
-                message["payload"].get("operationName"),
-                message["payload"]["query"],
-                message["payload"].get("variables"),
-            )
-
         operation = Operation(
             self,
             message["id"],

{strawberry_graphql-0.280.0 → strawberry_graphql-0.282.0}/strawberry/subscriptions/protocols/graphql_ws/handlers.py

@@ -27,7 +27,6 @@ from strawberry.subscriptions.protocols.graphql_ws.types import (
 )
 from strawberry.types.execution import ExecutionResult, PreExecutionError
 from strawberry.types.unset import UnsetType
-from strawberry.utils.debug import pretty_print_graphql_operation
 
 if TYPE_CHECKING:
     from collections.abc import AsyncGenerator
@@ -44,7 +43,6 @@ class BaseGraphQLWSHandler(Generic[Context, RootValue]):
         context: Context,
         root_value: Optional[RootValue],
         schema: BaseSchema,
-        debug: bool,
         keep_alive: bool,
         keep_alive_interval: Optional[float],
     ) -> None:
@@ -53,7 +51,6 @@ class BaseGraphQLWSHandler(Generic[Context, RootValue]):
         self.context = context
         self.root_value = root_value
         self.schema = schema
-        self.debug = debug
         self.keep_alive = keep_alive
         self.keep_alive_interval = keep_alive_interval
         self.keep_alive_task: Optional[asyncio.Task] = None
@@ -139,9 +136,6 @@ class BaseGraphQLWSHandler(Generic[Context, RootValue]):
         operation_name = payload.get("operationName")
         variables = payload.get("variables")
 
-        if self.debug:
-            pretty_print_graphql_operation(operation_name, query, variables)
-
         result_handler = self.handle_async_results(
             operation_id, query, operation_name, variables
         )

strawberry_graphql-0.280.0/strawberry/cli/constants.py

@@ -1,2 +0,0 @@
-DEBUG_SERVER_SCHEMA_ENV_VAR_KEY = "STRAWBERRY_DEBUG_SERVER_SCHEMA"
-DEBUG_SERVER_LOG_OPERATIONS = "STRAWBERRY_DEBUG_SERVER_LOG_OPERATIONS"

strawberry_graphql-0.280.0/strawberry/utils/debug.py

@@ -1,46 +0,0 @@
-import datetime
-import json
-from json import JSONEncoder
-from typing import Any, Optional
-
-
-class StrawberryJSONEncoder(JSONEncoder):
-    def default(self, o: Any) -> Any:
-        return repr(o)
-
-
-def pretty_print_graphql_operation(
-    operation_name: Optional[str], query: str, variables: Optional[dict["str", Any]]
-) -> None:
-    """Pretty print a GraphQL operation using pygments.
-
-    Won't print introspection operation to prevent noise in the output.
-    """
-    try:
-        from pygments import highlight, lexers
-        from pygments.formatters import Terminal256Formatter
-    except ImportError as e:
-        raise ImportError(
-            "pygments is not installed but is required for debug output, install it "
-            "directly or run `pip install strawberry-graphql[debug-server]`"
-        ) from e
-
-    from .graphql_lexer import GraphQLLexer
-
-    if operation_name == "IntrospectionQuery":
-        return
-
-    now = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")  # noqa: DTZ005
-
-    print(f"[{now}]: {operation_name or 'No operation name'}")  # noqa: T201
-    print(highlight(query, GraphQLLexer(), Terminal256Formatter()))  # noqa: T201
-
-    if variables:
-        variables_json = json.dumps(variables, indent=4, cls=StrawberryJSONEncoder)
-
-        print(  # noqa: T201
-            highlight(variables_json, lexers.JsonLexer(), Terminal256Formatter())
-        )
-
-
-__all__ = ["pretty_print_graphql_operation"]