strawberry-graphql 0.159.1__tar.gz → 0.160.0__tar.gz

{strawberry_graphql-0.159.1 → strawberry_graphql-0.160.0}/PKG-INFO

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

{strawberry_graphql-0.159.1 → strawberry_graphql-0.160.0}/pyproject.toml

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

strawberry_graphql-0.160.0/strawberry/extensions/__init__.py

@@ -0,0 +1,35 @@
+import warnings
+
+from .add_validation_rules import AddValidationRules
+from .base_extension import SchemaExtension
+from .disable_validation import DisableValidation
+from .mask_errors import MaskErrors
+from .parser_cache import ParserCache
+from .query_depth_limiter import QueryDepthLimiter
+from .validation_cache import ValidationCache
+
+
+def __getattr__(name: str):
+    if name == "Extension":
+        warnings.warn(
+            (
+                "importing `Extension` from `strawberry.extensions` "
+                "is deprecated, import `SchemaExtension` instead."
+            ),
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        return SchemaExtension
+
+    raise AttributeError(f"module {__name__} has no attribute {name}")
+
+
+__all__ = [
+    "SchemaExtension",
+    "AddValidationRules",
+    "DisableValidation",
+    "ParserCache",
+    "QueryDepthLimiter",
+    "ValidationCache",
+    "MaskErrors",
+]

{strawberry_graphql-0.159.1 → strawberry_graphql-0.160.0}/strawberry/extensions/add_validation_rules.py

@@ -2,13 +2,13 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING, Iterator, List, Type
 
-from strawberry.extensions.base_extension import Extension
+from strawberry.extensions.base_extension import SchemaExtension
 
 if TYPE_CHECKING:
     from graphql import ASTValidationRule
 
 
-class AddValidationRules(Extension):
+class AddValidationRules(SchemaExtension):
     """
     Add graphql-core validation rules
 

{strawberry_graphql-0.159.1 → strawberry_graphql-0.160.0}/strawberry/extensions/base_extension.py

@@ -10,7 +10,9 @@ if TYPE_CHECKING:
     from strawberry.types import ExecutionContext
 
 
-class Extension:
+class SchemaExtension:
+    execution_context: ExecutionContext
+
     def __init__(self, *, execution_context: ExecutionContext):
         self.execution_context = execution_context
 
@@ -47,11 +49,11 @@ class Extension:
         return {}
 
 
-Hook = Callable[[Extension], AsyncIteratorOrIterator[None]]
+Hook = Callable[[SchemaExtension], AsyncIteratorOrIterator[None]]
 
 HOOK_METHODS: Set[str] = {
-    Extension.on_operation.__name__,
-    Extension.on_validate.__name__,
-    Extension.on_parse.__name__,
-    Extension.on_execute.__name__,
+    SchemaExtension.on_operation.__name__,
+    SchemaExtension.on_validate.__name__,
+    SchemaExtension.on_parse.__name__,
+    SchemaExtension.on_execute.__name__,
 }

{strawberry_graphql-0.159.1 → strawberry_graphql-0.160.0}/strawberry/extensions/context.py

@@ -17,7 +17,7 @@ from typing import (
     Union,
 )
 
-from strawberry.extensions import Extension
+from strawberry.extensions import SchemaExtension
 from strawberry.utils.await_maybe import AwaitableOrValue, await_maybe
 
 if TYPE_CHECKING:
@@ -27,7 +27,7 @@ if TYPE_CHECKING:
 
 
 class WrappedHook(NamedTuple):
-    extension: Extension
+    extension: SchemaExtension
     initialized_hook: Union[AsyncIterator[None], Iterator[None]]
     is_async: bool
 
@@ -47,15 +47,15 @@ class ExtensionContextManagerBase:
     LEGACY_ENTER: str
     LEGACY_EXIT: str
 
-    def __init__(self, extensions: List[Extension]):
+    def __init__(self, extensions: List[SchemaExtension]):
         self.hooks: List[WrappedHook] = []
-        self.default_hook: Hook = getattr(Extension, self.HOOK_NAME)
+        self.default_hook: Hook = getattr(SchemaExtension, self.HOOK_NAME)
         for extension in extensions:
             hook = self.get_hook(extension)
             if hook:
                 self.hooks.append(hook)
 
-    def get_hook(self, extension: Extension) -> Optional[WrappedHook]:
+    def get_hook(self, extension: SchemaExtension) -> Optional[WrappedHook]:
         on_start = getattr(extension, self.LEGACY_ENTER, None)
         on_end = getattr(extension, self.LEGACY_EXIT, None)
 
@@ -90,7 +90,7 @@ class ExtensionContextManagerBase:
 
     @staticmethod
     def from_legacy(
-        extension: Extension,
+        extension: SchemaExtension,
         on_start: Optional[Callable[[], None]] = None,
         on_end: Optional[Callable[[], None]] = None,
     ) -> WrappedHook:
@@ -120,8 +120,8 @@ class ExtensionContextManagerBase:
 
     @staticmethod
     def from_callable(
-        extension: Extension,
-        func: Callable[[Extension], AwaitableOrValue[Any]],
+        extension: SchemaExtension,
+        func: Callable[[SchemaExtension], AwaitableOrValue[Any]],
     ) -> WrappedHook:
         if iscoroutinefunction(func):
 
@@ -151,7 +151,7 @@ class ExtensionContextManagerBase:
             with ctx:
                 if hook.is_async:
                     raise RuntimeError(
-                        f"Extension hook {hook.extension}.{self.HOOK_NAME} "
+                        f"SchemaExtension hook {hook.extension}.{self.HOOK_NAME} "
                         "failed to complete synchronously."
                     )
                 else:
@@ -200,24 +200,24 @@ class ExtensionContextManagerBase:
 
 
 class OperationContextManager(ExtensionContextManagerBase):
-    HOOK_NAME = Extension.on_operation.__name__
+    HOOK_NAME = SchemaExtension.on_operation.__name__
     LEGACY_ENTER = "on_request_start"
     LEGACY_EXIT = "on_request_end"
 
 
 class ValidationContextManager(ExtensionContextManagerBase):
-    HOOK_NAME = Extension.on_validate.__name__
+    HOOK_NAME = SchemaExtension.on_validate.__name__
     LEGACY_ENTER = "on_validation_start"
     LEGACY_EXIT = "on_validation_end"
 
 
 class ParsingContextManager(ExtensionContextManagerBase):
-    HOOK_NAME = Extension.on_parse.__name__
+    HOOK_NAME = SchemaExtension.on_parse.__name__
     LEGACY_ENTER = "on_parsing_start"
     LEGACY_EXIT = "on_parsing_end"
 
 
 class ExecutingContextManager(ExtensionContextManagerBase):
-    HOOK_NAME = Extension.on_execute.__name__
+    HOOK_NAME = SchemaExtension.on_execute.__name__
     LEGACY_ENTER = "on_executing_start"
     LEGACY_EXIT = "on_executing_end"

{strawberry_graphql-0.159.1 → strawberry_graphql-0.160.0}/strawberry/extensions/directives.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING, Any, Dict, Tuple
 
-from strawberry.extensions import Extension
+from strawberry.extensions import SchemaExtension
 from strawberry.types import Info
 from strawberry.utils.await_maybe import await_maybe
 
@@ -18,7 +18,7 @@ if TYPE_CHECKING:
 SPECIFIED_DIRECTIVES = {"include", "skip"}
 
 
-class DirectivesExtension(Extension):
+class DirectivesExtension(SchemaExtension):
     async def resolve(
         self, _next, root, info: GraphQLResolveInfo, *args, **kwargs
     ) -> AwaitableOrValue[Any]:
@@ -33,7 +33,7 @@ class DirectivesExtension(Extension):
         return value
 
 
-class DirectivesExtensionSync(Extension):
+class DirectivesExtensionSync(SchemaExtension):
     def resolve(
         self, _next, root, info: GraphQLResolveInfo, *args, **kwargs
     ) -> AwaitableOrValue[Any]:

{strawberry_graphql-0.159.1 → strawberry_graphql-0.160.0}/strawberry/extensions/disable_validation.py

@@ -1,9 +1,9 @@
 from typing import Iterator
 
-from strawberry.extensions.base_extension import Extension
+from strawberry.extensions.base_extension import SchemaExtension
 
 
-class DisableValidation(Extension):
+class DisableValidation(SchemaExtension):
     """
     Disable query validation
 

{strawberry_graphql-0.159.1 → strawberry_graphql-0.160.0}/strawberry/extensions/mask_errors.py

@@ -2,7 +2,7 @@ from typing import Callable
 
 from graphql.error import GraphQLError
 
-from strawberry.extensions import Extension
+from strawberry.extensions.base_extension import SchemaExtension
 
 
 def default_should_mask_error(_) -> bool:
@@ -10,7 +10,7 @@ def default_should_mask_error(_) -> bool:
     return True
 
 
-class MaskErrors(Extension):
+class MaskErrors(SchemaExtension):
     should_mask_error: Callable[[GraphQLError], bool]
     error_message: str
 

{strawberry_graphql-0.159.1 → strawberry_graphql-0.160.0}/strawberry/extensions/parser_cache.py

@@ -1,11 +1,11 @@
 from functools import lru_cache
 from typing import Iterator, Optional
 
-from strawberry.extensions.base_extension import Extension
+from strawberry.extensions.base_extension import SchemaExtension
 from strawberry.schema.execute import parse_document
 
 
-class ParserCache(Extension):
+class ParserCache(SchemaExtension):
     """
     Add LRU caching the parsing step during execution to improve performance.
 

{strawberry_graphql-0.159.1 → strawberry_graphql-0.160.0}/strawberry/extensions/runner.py

@@ -13,31 +13,33 @@ from strawberry.extensions.context import (
 )
 from strawberry.utils.await_maybe import await_maybe
 
-from . import Extension
+from . import SchemaExtension
 
 if TYPE_CHECKING:
     from strawberry.types import ExecutionContext
 
 
-class ExtensionsRunner:
-    extensions: List[Extension]
+class SchemaExtensionsRunner:
+    extensions: List[SchemaExtension]
 
     def __init__(
         self,
         execution_context: ExecutionContext,
-        extensions: Optional[List[Union[Type[Extension], Extension]]] = None,
+        extensions: Optional[
+            List[Union[Type[SchemaExtension], SchemaExtension]]
+        ] = None,
     ):
         self.execution_context = execution_context
 
         if not extensions:
             extensions = []
 
-        init_extensions: List[Extension] = []
+        init_extensions: List[SchemaExtension] = []
 
         for extension in extensions:
             # If the extension has already been instantiated then set the
             # `execution_context` attribute
-            if isinstance(extension, Extension):
+            if isinstance(extension, SchemaExtension):
                 extension.execution_context = execution_context
                 init_extensions.append(extension)
             else:

{strawberry_graphql-0.159.1 → strawberry_graphql-0.160.0}/strawberry/extensions/tracing/apollo.py

@@ -6,7 +6,7 @@ from datetime import datetime
 from inspect import isawaitable
 from typing import TYPE_CHECKING, Any, Dict, List, Optional
 
-from strawberry.extensions import Extension
+from strawberry.extensions import SchemaExtension
 from strawberry.extensions.utils import get_path_from_info
 
 from .utils import should_skip_tracing
@@ -76,7 +76,7 @@ class ApolloTracingStats:
         }
 
 
-class ApolloTracingExtension(Extension):
+class ApolloTracingExtension(SchemaExtension):
     def __init__(self, execution_context: ExecutionContext):
         self._resolver_stats: List[ApolloResolverStats] = []
         self.execution_context = execution_context

{strawberry_graphql-0.159.1 → strawberry_graphql-0.160.0}/strawberry/extensions/tracing/datadog.py

@@ -6,7 +6,7 @@ from typing import TYPE_CHECKING, Iterator, Optional
 
 from ddtrace import tracer
 
-from strawberry.extensions import Extension
+from strawberry.extensions import SchemaExtension
 from strawberry.extensions.tracing.utils import should_skip_tracing
 from strawberry.utils.cached_property import cached_property
 
@@ -14,7 +14,7 @@ if TYPE_CHECKING:
     from strawberry.types.execution import ExecutionContext
 
 
-class DatadogTracingExtension(Extension):
+class DatadogTracingExtension(SchemaExtension):
     def __init__(
         self,
         *,

{strawberry_graphql-0.159.1 → strawberry_graphql-0.160.0}/strawberry/extensions/tracing/opentelemetry.py

@@ -8,7 +8,7 @@ from typing import TYPE_CHECKING, Any, Callable, Dict, Optional
 from opentelemetry import trace
 from opentelemetry.trace import SpanKind
 
-from strawberry.extensions import Extension
+from strawberry.extensions import SchemaExtension
 from strawberry.extensions.utils import get_path_from_info
 
 from .utils import should_skip_tracing
@@ -31,7 +31,7 @@ class RequestStage(enum.Enum):
     VALIDATION = enum.auto()
 
 
-class OpenTelemetryExtension(Extension):
+class OpenTelemetryExtension(SchemaExtension):
     _arg_filter: Optional[ArgFilter]
     _span_holder: Dict[RequestStage, Span] = dict()
     _tracer: Tracer

{strawberry_graphql-0.159.1 → strawberry_graphql-0.160.0}/strawberry/extensions/validation_cache.py

@@ -1,11 +1,11 @@
 from functools import lru_cache
 from typing import Iterator, Optional
 
-from strawberry.extensions.base_extension import Extension
+from strawberry.extensions.base_extension import SchemaExtension
 from strawberry.schema.execute import validate_document
 
 
-class ValidationCache(Extension):
+class ValidationCache(SchemaExtension):
     """
     Add LRU caching the validation step during execution to improve performance.
 

{strawberry_graphql-0.159.1 → strawberry_graphql-0.160.0}/strawberry/federation/schema.py

@@ -42,7 +42,7 @@ if TYPE_CHECKING:
 
     from strawberry.custom_scalar import ScalarDefinition, ScalarWrapper
     from strawberry.enum import EnumDefinition
-    from strawberry.extensions import Extension
+    from strawberry.extensions import SchemaExtension
     from strawberry.federation.schema_directives import ComposeDirective
     from strawberry.schema.config import StrawberryConfig
     from strawberry.schema.types.concrete_type import TypeMap
@@ -59,7 +59,7 @@ class Schema(BaseSchema):
         # TODO: we should update directives' type in the main schema
         directives: Iterable[Type] = (),
         types: Iterable[Type] = (),
-        extensions: Iterable[Union[Type["Extension"], "Extension"]] = (),
+        extensions: Iterable[Union[Type["SchemaExtension"], "SchemaExtension"]] = (),
         execution_context_class: Optional[Type["GraphQLExecutionContext"]] = None,
         config: Optional["StrawberryConfig"] = None,
         scalar_overrides: Optional[

{strawberry_graphql-0.159.1 → strawberry_graphql-0.160.0}/strawberry/schema/execute.py

@@ -21,7 +21,7 @@ from graphql import execute as original_execute
 from graphql.validation import validate
 
 from strawberry.exceptions import MissingQueryError
-from strawberry.extensions.runner import ExtensionsRunner
+from strawberry.extensions.runner import SchemaExtensionsRunner
 from strawberry.types import ExecutionResult
 
 from .exceptions import InvalidOperationTypeError
@@ -33,7 +33,7 @@ if TYPE_CHECKING:
     from graphql.language import DocumentNode
     from graphql.validation import ASTValidationRule
 
-    from strawberry.extensions import Extension
+    from strawberry.extensions import SchemaExtension
     from strawberry.types import ExecutionContext
     from strawberry.types.graphql import OperationType
 
@@ -70,12 +70,12 @@ async def execute(
     schema: GraphQLSchema,
     *,
     allowed_operation_types: Iterable[OperationType],
-    extensions: Sequence[Union[Type[Extension], Extension]],
+    extensions: Sequence[Union[Type[SchemaExtension], SchemaExtension]],
     execution_context: ExecutionContext,
     execution_context_class: Optional[Type[GraphQLExecutionContext]] = None,
     process_errors: Callable[[List[GraphQLError], Optional[ExecutionContext]], None],
 ) -> ExecutionResult:
-    extensions_runner = ExtensionsRunner(
+    extensions_runner = SchemaExtensionsRunner(
         execution_context=execution_context,
         extensions=list(extensions),
     )
@@ -163,12 +163,12 @@ def execute_sync(
     schema: GraphQLSchema,
     *,
     allowed_operation_types: Iterable[OperationType],
-    extensions: Sequence[Union[Type[Extension], Extension]],
+    extensions: Sequence[Union[Type[SchemaExtension], SchemaExtension]],
     execution_context: ExecutionContext,
     execution_context_class: Optional[Type[GraphQLExecutionContext]] = None,
     process_errors: Callable[[List[GraphQLError], Optional[ExecutionContext]], None],
 ) -> ExecutionResult:
-    extensions_runner = ExtensionsRunner(
+    extensions_runner = SchemaExtensionsRunner(
         execution_context=execution_context,
         extensions=list(extensions),
     )

{strawberry_graphql-0.159.1 → strawberry_graphql-0.160.0}/strawberry/schema/schema.py

@@ -37,7 +37,7 @@ if TYPE_CHECKING:
     from strawberry.custom_scalar import ScalarDefinition, ScalarWrapper
     from strawberry.directive import StrawberryDirective
     from strawberry.enum import EnumDefinition
-    from strawberry.extensions import Extension
+    from strawberry.extensions import SchemaExtension
     from strawberry.field import StrawberryField
     from strawberry.types import ExecutionResult
     from strawberry.union import StrawberryUnion
@@ -59,7 +59,7 @@ class Schema(BaseSchema):
         subscription: Optional[Type] = None,
         directives: Iterable[StrawberryDirective] = (),
         types=(),
-        extensions: Iterable[Union[Type[Extension], Extension]] = (),
+        extensions: Iterable[Union[Type[SchemaExtension], SchemaExtension]] = (),
         execution_context_class: Optional[Type[GraphQLExecutionContext]] = None,
         config: Optional[StrawberryConfig] = None,
         scalar_overrides: Optional[
@@ -157,7 +157,7 @@ class Schema(BaseSchema):
 
     def get_extensions(
         self, sync: bool = False
-    ) -> List[Union[Type[Extension], Extension]]:
+    ) -> List[Union[Type[SchemaExtension], SchemaExtension]]:
         extensions = list(self.extensions)
 
         if self.directives:

strawberry_graphql-0.159.1/strawberry/extensions/__init__.py

@@ -1,17 +0,0 @@
-from .add_validation_rules import AddValidationRules
-from .base_extension import Extension
-from .disable_validation import DisableValidation
-from .mask_errors import MaskErrors
-from .parser_cache import ParserCache
-from .query_depth_limiter import QueryDepthLimiter
-from .validation_cache import ValidationCache
-
-__all__ = [
-    "Extension",
-    "AddValidationRules",
-    "DisableValidation",
-    "ParserCache",
-    "QueryDepthLimiter",
-    "ValidationCache",
-    "MaskErrors",
-]