strawberry-graphql 0.166.0__py3-none-any.whl → 0.167.1__py3-none-any.whl

strawberry/extensions/context.py

@@ -68,7 +68,7 @@ class ExtensionContextManagerBase:
                 "{self.HOOK_NAME}"
             )
         elif is_legacy:
-            warnings.warn(self.DEPRECATION_MESSAGE, DeprecationWarning)
+            warnings.warn(self.DEPRECATION_MESSAGE, DeprecationWarning, stacklevel=3)
             return self.from_legacy(extension, on_start, on_end)
 
         if hook_fn:
@@ -140,7 +140,7 @@ class ExtensionContextManagerBase:
             hook = iterator()
             return WrappedHook(extension, hook, False)
 
-    def run_hooks_sync(self, is_exit: bool = False):
+    def run_hooks_sync(self, is_exit: bool = False) -> None:
         """Run extensions synchronously."""
         ctx = (
             contextlib.suppress(StopIteration, StopAsyncIteration)
@@ -157,7 +157,7 @@ class ExtensionContextManagerBase:
                 else:
                     hook.initialized_hook.__next__()  # type: ignore[union-attr]
 
-    async def run_hooks_async(self, is_exit: bool = False):
+    async def run_hooks_async(self, is_exit: bool = False) -> None:
         """Run extensions asynchronously with support for sync lifecycle hooks.
 
         The ``is_exit`` flag is required as a `StopIteration` cannot be raised from

strawberry/extensions/tracing/apollo.py

@@ -4,7 +4,7 @@ import dataclasses
 import time
 from datetime import datetime
 from inspect import isawaitable
-from typing import TYPE_CHECKING, Any, Dict, List, Optional
+from typing import TYPE_CHECKING, Any, Dict, Generator, List, Optional
 
 from strawberry.extensions import SchemaExtension
 from strawberry.extensions.utils import get_path_from_info
@@ -81,19 +81,19 @@ class ApolloTracingExtension(SchemaExtension):
         self._resolver_stats: List[ApolloResolverStats] = []
         self.execution_context = execution_context
 
-    def on_operation(self):
+    def on_operation(self) -> Generator[None, None, None]:
         self.start_timestamp = self.now()
         self.start_time = datetime.utcnow()
         yield
         self.end_timestamp = self.now()
         self.end_time = datetime.utcnow()
 
-    def on_parse(self):
+    def on_parse(self) -> Generator[None, None, None]:
         self._start_parsing = self.now()
         yield
         self._end_parsing = self.now()
 
-    def on_validate(self):
+    def on_validate(self) -> Generator[None, None, None]:
         self._start_validation = self.now()
         yield
         self._end_validation = self.now()
@@ -118,10 +118,10 @@ class ApolloTracingExtension(SchemaExtension):
             ),
         )
 
-    def get_results(self):
+    def get_results(self) -> Dict[str, Dict[str, Any]]:
         return {"tracing": self.stats.to_json()}
 
-    async def resolve(self, _next, root, info, *args, **kwargs):
+    async def resolve(self, _next, root, info, *args, **kwargs) -> Any:
         if should_skip_tracing(_next, info):
             result = _next(root, info, *args, **kwargs)
 
@@ -154,7 +154,7 @@ class ApolloTracingExtension(SchemaExtension):
 
 
 class ApolloTracingExtensionSync(ApolloTracingExtension):
-    def resolve(self, _next, root, info, *args, **kwargs):
+    def resolve(self, _next, root, info, *args, **kwargs) -> Any:
         if should_skip_tracing(_next, info):
             return _next(root, info, *args, **kwargs)
 

strawberry/extensions/tracing/datadog.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import hashlib
 from inspect import isawaitable
-from typing import TYPE_CHECKING, Iterator, Optional
+from typing import TYPE_CHECKING, Any, Generator, Iterator, Optional
 
 from ddtrace import tracer
 
@@ -34,7 +34,7 @@ class DatadogTracingExtension(SchemaExtension):
 
         return query_hash
 
-    def hash_query(self, query: str):
+    def hash_query(self, query: str) -> str:
         return hashlib.md5(query.encode("utf-8")).hexdigest()
 
     def on_operation(self) -> Iterator[None]:
@@ -64,17 +64,17 @@ class DatadogTracingExtension(SchemaExtension):
         yield
         self.request_span.finish()
 
-    def on_validate(self):
+    def on_validate(self) -> Generator[None, None, None]:
         self.validation_span = tracer.trace("Validation", span_type="graphql")
         yield
         self.validation_span.finish()
 
-    def on_parse(self):
+    def on_parse(self) -> Generator[None, None, None]:
         self.parsing_span = tracer.trace("Parsing", span_type="graphql")
         yield
         self.parsing_span.finish()
 
-    async def resolve(self, _next, root, info, *args, **kwargs):
+    async def resolve(self, _next, root, info, *args, **kwargs) -> Any:
         if should_skip_tracing(_next, info):
             result = _next(root, info, *args, **kwargs)
 
@@ -100,7 +100,7 @@ class DatadogTracingExtension(SchemaExtension):
 
 
 class DatadogTracingExtensionSync(DatadogTracingExtension):
-    def resolve(self, _next, root, info, *args, **kwargs):
+    def resolve(self, _next, root, info, *args, **kwargs) -> Any:
         if should_skip_tracing(_next, info):
             return _next(root, info, *args, **kwargs)
 

strawberry/extensions/tracing/opentelemetry.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import enum
 from copy import deepcopy
 from inspect import isawaitable
-from typing import TYPE_CHECKING, Any, Callable, Dict, Optional
+from typing import TYPE_CHECKING, Any, Callable, Dict, Generator, Optional
 
 from opentelemetry import trace
 from opentelemetry.trace import SpanKind
@@ -47,7 +47,7 @@ class OpenTelemetryExtension(SchemaExtension):
         if execution_context:
             self.execution_context = execution_context
 
-    def on_operation(self):
+    def on_operation(self) -> Generator[None, None, None]:
         self._operation_name = self.execution_context.operation_name
         span_name = (
             f"GraphQL Query: {self._operation_name}"
@@ -76,7 +76,7 @@ class OpenTelemetryExtension(SchemaExtension):
             self._span_holder[RequestStage.REQUEST].update_name(span_name)
         self._span_holder[RequestStage.REQUEST].end()
 
-    def on_validate(self):
+    def on_validate(self) -> Generator[None, None, None]:
         ctx = trace.set_span_in_context(self._span_holder[RequestStage.REQUEST])
         self._span_holder[RequestStage.VALIDATION] = self._tracer.start_span(
             "GraphQL Validation",
@@ -85,7 +85,7 @@ class OpenTelemetryExtension(SchemaExtension):
         yield
         self._span_holder[RequestStage.VALIDATION].end()
 
-    def on_parse(self):
+    def on_parse(self) -> Generator[None, None, None]:
         ctx = trace.set_span_in_context(self._span_holder[RequestStage.REQUEST])
         self._span_holder[RequestStage.PARSING] = self._tracer.start_span(
             "GraphQL Parsing", context=ctx
@@ -101,7 +101,9 @@ class OpenTelemetryExtension(SchemaExtension):
             return args
         return self._arg_filter(deepcopy(args), info)
 
-    def add_tags(self, span: Span, info: GraphQLResolveInfo, kwargs: Dict[str, Any]):
+    def add_tags(
+        self, span: Span, info: GraphQLResolveInfo, kwargs: Dict[str, Any]
+    ) -> None:
         graphql_path = ".".join(map(str, get_path_from_info(info)))
 
         span.set_attribute("component", "graphql")
@@ -114,7 +116,7 @@ class OpenTelemetryExtension(SchemaExtension):
             for kwarg, value in filtered_kwargs.items():
                 span.set_attribute(f"graphql.param.{kwarg}", value)
 
-    async def resolve(self, _next, root, info, *args, **kwargs):
+    async def resolve(self, _next, root, info, *args, **kwargs) -> Any:
         if should_skip_tracing(_next, info):
             result = _next(root, info, *args, **kwargs)
 
@@ -137,7 +139,7 @@ class OpenTelemetryExtension(SchemaExtension):
 
 
 class OpenTelemetryExtensionSync(OpenTelemetryExtension):
-    def resolve(self, _next, root, info, *args, **kwargs):
+    def resolve(self, _next, root, info, *args, **kwargs) -> Any:
         if should_skip_tracing(_next, info):
             result = _next(root, info, *args, **kwargs)
 

strawberry/fastapi/router.py

@@ -318,7 +318,7 @@ class GraphQLRouter(APIRouter):
         operation_name: Optional[str] = None,
         root_value: Any = None,
         allowed_operation_types: Optional[Iterable[OperationType]] = None,
-    ):
+    ) -> ExecutionResult:
         if self.debug and query:
             pretty_print_graphql_operation(operation_name, query, variables)
 

strawberry/federation/scalar.py

@@ -10,7 +10,7 @@ else:
     _T = TypeVar("_T", bound=type)
 
 
-def identity(x):  # pragma: no cover
+def identity(x: _T) -> _T:  # pragma: no cover
     return x
 
 

strawberry/federation/schema.py

@@ -171,7 +171,7 @@ class Schema(BaseSchema):
         self._schema.query_type = query_type
         self._schema.type_map[query_type.name] = query_type
 
-    def entities_resolver(self, root, info, representations):
+    def entities_resolver(self, root, info, representations) -> List[object]:
         results = []
 
         for representation in representations:
@@ -342,6 +342,13 @@ class Schema(BaseSchema):
             resolve=self.entities_resolver,
         )
 
+    def _warn_for_federation_directives(self) -> None:
+        # this is used in the main schema to raise if there's a directive
+        # that's for federation, but in this class we don't want to warn,
+        # since it is expected to have federation directives
+
+        pass
+
 
 def _get_entity_type(type_map: "TypeMap"):
     # https://www.apollographql.com/docs/apollo-server/federation/federation-spec/#resolve-requests-for-entities

strawberry/federation/schema_directive.py

@@ -1,5 +1,5 @@
 import dataclasses
-from typing import List, Optional, Type, TypeVar
+from typing import Callable, List, Optional, Type, TypeVar
 
 from strawberry.directive import directive_field
 from strawberry.field import StrawberryField, field
@@ -36,7 +36,7 @@ def schema_directive(
     print_definition: bool = True,
     compose: bool = False,
     import_url: Optional[str] = None,
-):
+) -> Callable[..., T]:
     def _wrap(cls: T) -> T:
         cls = _wrap_dataclass(cls)
         fields = _get_fields(cls)

strawberry/printer/printer.py

@@ -320,7 +320,7 @@ def print_enum(
     )
 
 
-def print_extends(type_, schema: BaseSchema):
+def print_extends(type_, schema: BaseSchema) -> str:
     from strawberry.schema.schema_converter import GraphQLCoreConverter
 
     strawberry_type = type_.extensions and type_.extensions.get(

strawberry/sanic/context.py

@@ -18,6 +18,7 @@ class StrawberrySanicContext(TypedDict):
             "Accessing context attributes via the dot notation is deprecated, "
             "please use context.get('key') or context['key'] instead",
             DeprecationWarning,
+            stacklevel=2,
         )
 
         return super().__getitem__(key)

strawberry/sanic/views.py

@@ -69,17 +69,19 @@ class GraphQLView(HTTPMethodView):
             warnings.warn(
                 "json_encoder is deprecated, override encode_json instead",
                 DeprecationWarning,
+                stacklevel=2,
             )
 
         if self.json_dumps_params is not None:
             warnings.warn(
                 "json_dumps_params is deprecated, override encode_json instead",
                 DeprecationWarning,
+                stacklevel=2,
             )
 
             self.json_encoder = json.JSONEncoder
 
-    def get_root_value(self):
+    def get_root_value(self) -> Any:
         return None
 
     async def get_context(

strawberry/schema/base.py

@@ -62,7 +62,7 @@ class BaseSchema(Protocol):
         context_value: Optional[Any] = None,
         root_value: Optional[Any] = None,
         operation_name: Optional[str] = None,
-    ):
+    ) -> Any:
         raise NotImplementedError
 
     @abstractmethod

strawberry/schema/name_converter.py

@@ -101,7 +101,7 @@ class NameConverter:
 
         for type_ in union.types:
             if isinstance(type_, LazyType):
-                type_ = cast("StrawberryType", type_.resolve_type())
+                type_ = cast("StrawberryType", type_.resolve_type())  # noqa: PLW2901
 
             if hasattr(type_, "_type_definition"):
                 type_name = self.from_type(type_._type_definition)

strawberry/schema/schema.py

@@ -2,7 +2,18 @@ from __future__ import annotations
 
 import warnings
 from functools import lru_cache
-from typing import TYPE_CHECKING, Any, Dict, Iterable, List, Optional, Type, Union, cast
+from typing import (
+    TYPE_CHECKING,
+    Any,
+    AsyncIterator,
+    Dict,
+    Iterable,
+    List,
+    Optional,
+    Type,
+    Union,
+    cast,
+)
 
 from graphql import (
     GraphQLNamedType,
@@ -34,6 +45,7 @@ from .execute import execute, execute_sync
 
 if TYPE_CHECKING:
     from graphql import ExecutionContext as GraphQLExecutionContext
+    from graphql import ExecutionResult as GraphQLExecutionResult
 
     from strawberry.custom_scalar import ScalarDefinition, ScalarWrapper
     from strawberry.directive import StrawberryDirective
@@ -114,7 +126,7 @@ class Schema(BaseSchema):
             else:
                 if hasattr(type_, "_type_definition"):
                     if type_._type_definition.is_generic:
-                        type_ = StrawberryAnnotation(type_).resolve()
+                        type_ = StrawberryAnnotation(type_).resolve()  # noqa: PLW2901
                 graphql_type = self.schema_converter.from_maybe_optional(type_)
                 if isinstance(graphql_type, GraphQLNonNull):
                     graphql_type = graphql_type.of_type
@@ -283,7 +295,7 @@ class Schema(BaseSchema):
         context_value: Optional[Any] = None,
         root_value: Optional[Any] = None,
         operation_name: Optional[str] = None,
-    ):
+    ) -> Union[AsyncIterator[GraphQLExecutionResult], GraphQLExecutionResult]:
         return await subscribe(
             self._schema,
             parse(query),
@@ -297,19 +309,23 @@ class Schema(BaseSchema):
         """Raises a warning if the schema has any federation directives."""
         from strawberry.federation.schema_directives import FederationDirective
 
+        all_types = self.schema_converter.type_map.values()
+        all_type_defs = (type_.definition for type_ in all_types)
+
+        all_directives = (
+            directive
+            for type_def in all_type_defs
+            for directive in (type_def.directives or [])
+        )
+
         if any(
-            type_
-            for type_ in self.schema_converter.type_map.values()
-            if any(
-                directive
-                for directive in (type_.definition.directives or [])
-                if isinstance(directive, FederationDirective)
-            )
+            isinstance(directive, FederationDirective) for directive in all_directives
         ):
             warnings.warn(
                 "Federation directive found in schema. "
-                "Should use strawberry.federation.Schema instead.",
+                "Use `strawberry.federation.Schema` instead of `strawberry.Schema`.",
                 UserWarning,
+                stacklevel=3,
             )
 
     def as_str(self) -> str:

strawberry/schema/schema_converter.py

@@ -762,7 +762,7 @@ class GraphQLCoreConverter:
                 # both lazy types are always resolved because two different lazy types
                 # may be referencing the same actual type
                 if isinstance(type1, LazyType):
-                    type1 = type1.resolve_type()
+                    type1 = type1.resolve_type()  # noqa: PLW2901
                 elif isinstance(type1, StrawberryOptional) and isinstance(
                     type1.of_type, LazyType
                 ):

strawberry/schema_directive.py

@@ -1,6 +1,6 @@
 import dataclasses
 from enum import Enum
-from typing import List, Optional, Type, TypeVar
+from typing import Callable, List, Optional, Type, TypeVar
 
 from strawberry.object_type import _wrap_dataclass
 from strawberry.types.type_resolver import _get_fields
@@ -51,7 +51,7 @@ def schema_directive(
     name: Optional[str] = None,
     repeatable: bool = False,
     print_definition: bool = True,
-):
+) -> Callable[..., T]:
     def _wrap(cls: T) -> T:
         cls = _wrap_dataclass(cls)
         fields = _get_fields(cls)

strawberry/subscriptions/protocols/graphql_transport_ws/handlers.py

@@ -77,7 +77,7 @@ class BaseGraphQLTransportWSHandler(ABC):
         self.connection_init_timeout_task = asyncio.create_task(timeout_handler)
         return await self.handle_request()
 
-    async def handle_connection_init_timeout(self):
+    async def handle_connection_init_timeout(self) -> None:
         delay = self.connection_init_wait_timeout.total_seconds()
         await asyncio.sleep(delay=delay)
 
@@ -87,7 +87,7 @@ class BaseGraphQLTransportWSHandler(ABC):
         reason = "Connection initialisation timeout"
         await self.close(code=4408, reason=reason)
 
-    async def handle_message(self, message: dict):
+    async def handle_message(self, message: dict) -> None:
         handler: Callable
         handler_arg: Any
         try:

strawberry/test/client.py

@@ -56,7 +56,7 @@ class BaseGraphQLTestClient(ABC):
         body: Dict[str, object],
         headers: Optional[Dict[str, object]] = None,
         files: Optional[Dict[str, object]] = None,
-    ):
+    ) -> Any:
         raise NotImplementedError
 
     def _build_body(

strawberry/tools/merge_types.py

@@ -29,6 +29,8 @@ def merge_types(name: str, types: Tuple[type, ...]) -> type:
     counter = Counter(f.name for f in fields)
     dupes = [f for f, c in counter.most_common() if c > 1]
     if dupes:
-        warnings.warn("{} has overridden fields: {}".format(name, ", ".join(dupes)))
+        warnings.warn(
+            "{} has overridden fields: {}".format(name, ", ".join(dupes)), stacklevel=2
+        )
 
     return strawberry.type(type(name, types, {}))

strawberry/types/fields/resolver.py

@@ -125,7 +125,7 @@ class ReservedType(NamedTuple):
                 "their respective types (i.e. use value: 'DirectiveValue[str]' instead "
                 "of 'value: str' and 'info: Info' instead of a plain 'info')."
             )
-            warnings.warn(warning)
+            warnings.warn(warning, stacklevel=3)
             return reserved_name
         else:
             return None

strawberry/types/info.py

@@ -41,6 +41,7 @@ class Info(Generic[ContextType, RootValueType]):
         warnings.warn(
             "`info.field_nodes` is deprecated, use `selected_fields` instead",
             DeprecationWarning,
+            stacklevel=2,
         )
 
         return self._raw_info.field_nodes

strawberry/types/type_resolver.py

@@ -157,7 +157,7 @@ def _get_fields(cls: Type) -> List[StrawberryField]:
                     )
 
             # Create a StrawberryField, for fields of Types #1 and #2a
-            field = StrawberryField(
+            field = StrawberryField(  # noqa: PLW2901
                 python_name=field.name,
                 graphql_name=None,
                 type_annotation=StrawberryAnnotation(

strawberry/utils/await_maybe.py

@@ -1,5 +1,5 @@
 import inspect
-from typing import AsyncIterator, Awaitable, Iterator, TypeVar, Union
+from typing import AsyncIterator, Awaitable, Iterator, TypeVar, Union, cast
 
 T = TypeVar("T")
 
@@ -7,8 +7,8 @@ AwaitableOrValue = Union[Awaitable[T], T]
 AsyncIteratorOrIterator = Union[AsyncIterator[T], Iterator[T]]
 
 
-async def await_maybe(value: AwaitableOrValue):
+async def await_maybe(value: AwaitableOrValue[T]) -> T:
     if inspect.isawaitable(value):
         return await value
 
-    return value
+    return cast(T, value)

strawberry/utils/dataclasses.py

@@ -13,7 +13,7 @@ from typing import Any
 from strawberry.ext.dataclasses.dataclasses import dataclass_init_fn
 
 
-def add_custom_init_fn(cls: Any):
+def add_custom_init_fn(cls: Any) -> None:
     fields = [
         f
         for f in getattr(cls, _FIELDS).values()

strawberry/utils/debug.py

@@ -11,7 +11,7 @@ class StrawberryJSONEncoder(JSONEncoder):
 
 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."""

strawberry/utils/inspect.py

@@ -1,11 +1,11 @@
 import inspect
 from functools import lru_cache
-from typing import Any, Callable, Dict, Optional, TypeVar, Union, overload
+from typing import Any, Callable, Dict, List, Optional, TypeVar, Union, overload
 from typing_extensions import Literal, get_args
 
 
 @lru_cache(maxsize=250)
-def get_func_args(func: Callable[[Any], Any]):
+def get_func_args(func: Callable[[Any], Any]) -> List[str]:
     """Returns a list of arguments for the function"""
 
     sig = inspect.signature(func)

strawberry/utils/operation.py

@@ -27,7 +27,7 @@ def get_operation_type(
 
     if operation_name:
         for d in graphql_document.definitions:
-            d = cast(OperationDefinitionNode, d)
+            d = cast(OperationDefinitionNode, d)  # noqa: PLW2901
             if d.name and d.name.value == operation_name:
                 definition = d
                 break

strawberry/utils/typing.py

@@ -161,7 +161,7 @@ def is_type_var(annotation: Type) -> bool:
     return isinstance(annotation, TypeVar)
 
 
-def get_parameters(annotation: Type):
+def get_parameters(annotation: Type) -> Union[Tuple[object], Tuple[()]]:
     if (
         isinstance(annotation, _GenericAlias)
         or isinstance(annotation, type)

{strawberry_graphql-0.166.0.dist-info → strawberry_graphql-0.167.1.dist-info}/METADATA

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