strawberry-graphql 0.227.0.dev1713463204__py3-none-any.whl → 0.227.1__py3-none-any.whl

strawberry/__init__.py

@@ -7,7 +7,7 @@ from .enum import enum, enum_value
 from .field import field
 from .lazy_type import LazyType, lazy
 from .mutation import mutation, subscription
-from .object_type import asdict, input, interface, one_of_input, type
+from .object_type import asdict, input, interface, type
 from .parent import Parent
 from .permission import BasePermission
 from .private import Private
@@ -38,7 +38,6 @@ __all__ = [
     "federation",
     "field",
     "input",
-    "one_of_input",
     "interface",
     "mutation",
     "scalar",

strawberry/channels/handlers/base.py

@@ -33,32 +33,25 @@ class ChannelsLayer(Protocol):  # pragma: no cover
 
     extensions: List[Literal["groups", "flush"]]
 
-    async def send(self, channel: str, message: dict) -> None:
-        ...
+    async def send(self, channel: str, message: dict) -> None: ...
 
-    async def receive(self, channel: str) -> dict:
-        ...
+    async def receive(self, channel: str) -> dict: ...
 
-    async def new_channel(self, prefix: str = ...) -> str:
-        ...
+    async def new_channel(self, prefix: str = ...) -> str: ...
 
     # If groups extension is supported
 
     group_expiry: int
 
-    async def group_add(self, group: str, channel: str) -> None:
-        ...
+    async def group_add(self, group: str, channel: str) -> None: ...
 
-    async def group_discard(self, group: str, channel: str) -> None:
-        ...
+    async def group_discard(self, group: str, channel: str) -> None: ...
 
-    async def group_send(self, group: str, message: dict) -> None:
-        ...
+    async def group_send(self, group: str, message: dict) -> None: ...
 
     # If flush extension is supported
 
-    async def flush(self) -> None:
-        ...
+    async def flush(self) -> None: ...
 
 
 class ChannelsConsumer(AsyncConsumer):

strawberry/codegen/query_codegen.py

@@ -139,11 +139,9 @@ class QueryCodegenPlugin:
         """
         self.query = query
 
-    def on_start(self) -> None:
-        ...
+    def on_start(self) -> None: ...
 
-    def on_end(self, result: CodegenResult) -> None:
-        ...
+    def on_end(self, result: CodegenResult) -> None: ...
 
     def generate_code(
         self, types: List[GraphQLType], operation: GraphQLOperation

strawberry/custom_scalar.py

@@ -134,8 +134,7 @@ def scalar(
     parse_value: Optional[Callable] = None,
     parse_literal: Optional[Callable] = None,
     directives: Iterable[object] = (),
-) -> Callable[[_T], _T]:
-    ...
+) -> Callable[[_T], _T]: ...
 
 
 @overload
@@ -149,8 +148,7 @@ def scalar(
     parse_value: Optional[Callable] = None,
     parse_literal: Optional[Callable] = None,
     directives: Iterable[object] = (),
-) -> _T:
-    ...
+) -> _T: ...
 
 
 # TODO: We are tricking pyright into thinking that we are returning the given type

strawberry/dataloader.py

@@ -105,8 +105,7 @@ class DataLoader(Generic[K, T]):
         loop: Optional[AbstractEventLoop] = None,
         cache_map: Optional[AbstractCache[K, T]] = None,
         cache_key_fn: Optional[Callable[[K], Hashable]] = None,
-    ) -> None:
-        ...
+    ) -> None: ...
 
     # fallback if load_fn is untyped and there's no other info for inference
     @overload
@@ -118,8 +117,7 @@ class DataLoader(Generic[K, T]):
         loop: Optional[AbstractEventLoop] = None,
         cache_map: Optional[AbstractCache[K, T]] = None,
         cache_key_fn: Optional[Callable[[K], Hashable]] = None,
-    ) -> None:
-        ...
+    ) -> None: ...
 
     def __init__(
         self,

strawberry/directive.py

@@ -32,8 +32,7 @@ def directive_field(name: str, default: object = UNSET) -> Any:
 T = TypeVar("T")
 
 
-class StrawberryDirectiveValue:
-    ...
+class StrawberryDirectiveValue: ...
 
 
 DirectiveValue = Annotated[T, StrawberryDirectiveValue()]

strawberry/django/views.py

@@ -54,7 +54,7 @@ class TemporalHttpResponse(JsonResponse):
         if self.status_code is not None:
             return super().__repr__()
 
-        return "<{cls} status_code={status_code}{content_type}>".format(
+        return "<{cls} status_code={status_code}{content_type}>".format(  # noqa: UP032
             cls=self.__class__.__name__,
             status_code=self.status_code,
             content_type=self._content_type_for_repr,  # pyright: ignore

strawberry/enum.py

@@ -136,8 +136,7 @@ def enum(
     name: Optional[str] = None,
     description: Optional[str] = None,
     directives: Iterable[object] = (),
-) -> EnumType:
-    ...
+) -> EnumType: ...
 
 
 @overload
@@ -147,8 +146,7 @@ def enum(
     name: Optional[str] = None,
     description: Optional[str] = None,
     directives: Iterable[object] = (),
-) -> Callable[[EnumType], EnumType]:
-    ...
+) -> Callable[[EnumType], EnumType]: ...
 
 
 def enum(

strawberry/experimental/pydantic/conversion_types.py

@@ -16,22 +16,17 @@ class StrawberryTypeFromPydantic(Protocol[PydanticModel]):
     """This class does not exist in runtime.
     It only makes the methods below visible for IDEs"""
 
-    def __init__(self, **kwargs: Any) -> None:
-        ...
+    def __init__(self, **kwargs: Any) -> None: ...
 
     @staticmethod
     def from_pydantic(
         instance: PydanticModel, extra: Optional[Dict[str, Any]] = None
-    ) -> StrawberryTypeFromPydantic[PydanticModel]:
-        ...
+    ) -> StrawberryTypeFromPydantic[PydanticModel]: ...
 
-    def to_pydantic(self, **kwargs: Any) -> PydanticModel:
-        ...
+    def to_pydantic(self, **kwargs: Any) -> PydanticModel: ...
 
     @property
-    def __strawberry_definition__(self) -> StrawberryObjectDefinition:
-        ...
+    def __strawberry_definition__(self) -> StrawberryObjectDefinition: ...
 
     @property
-    def _pydantic_type(self) -> Type[PydanticModel]:
-        ...
+    def _pydantic_type(self) -> Type[PydanticModel]: ...

strawberry/experimental/pydantic/error_type.py

@@ -114,7 +114,7 @@ def error_type(
         ]
 
         wrapped = _wrap_dataclass(cls)
-        extra_fields = cast(List[dataclasses.Field], _get_fields(wrapped))
+        extra_fields = cast(List[dataclasses.Field], _get_fields(wrapped, {}))
         private_fields = get_private_fields(wrapped)
 
         all_model_fields.extend(

strawberry/experimental/pydantic/object_type.py

@@ -177,7 +177,7 @@ def type(
         )
 
         wrapped = _wrap_dataclass(cls)
-        extra_strawberry_fields = _get_fields(wrapped)
+        extra_strawberry_fields = _get_fields(wrapped, {})
         extra_fields = cast(List[dataclasses.Field], extra_strawberry_fields)
         private_fields = get_private_fields(wrapped)
 

strawberry/ext/mypy_plugin.py

@@ -11,6 +11,7 @@ from typing import (
     List,
     Optional,
     Set,
+    Tuple,
     Union,
     cast,
 )
@@ -59,11 +60,16 @@ try:
 except ImportError:
     TypeVarDef = TypeVarType
 
+PYDANTIC_VERSION: Optional[Tuple[int, ...]] = None
+
 # To be compatible with user who don't use pydantic
 try:
+    import pydantic
     from pydantic.mypy import METADATA_KEY as PYDANTIC_METADATA_KEY
     from pydantic.mypy import PydanticModelField
 
+    PYDANTIC_VERSION = tuple(map(int, pydantic.__version__.split(".")))
+
     from strawberry.experimental.pydantic._compat import IS_PYDANTIC_V1
 except ImportError:
     PYDANTIC_METADATA_KEY = ""
@@ -464,6 +470,11 @@ def strawberry_pydantic_class_callback(ctx: ClassDefContext) -> None:
                     return_type=model_type,
                 )
             else:
+                extra = {}
+
+                if PYDANTIC_VERSION and PYDANTIC_VERSION >= (2, 7, 0):
+                    extra["api"] = ctx.api
+
                 add_method(
                     ctx,
                     "to_pydantic",
@@ -474,6 +485,7 @@ def strawberry_pydantic_class_callback(ctx: ClassDefContext) -> None:
                             typed=True,
                             force_optional=False,
                             use_alias=True,
+                            **extra,
                         )
                         for f in missing_pydantic_fields
                     ],
@@ -487,12 +499,23 @@ def strawberry_pydantic_class_callback(ctx: ClassDefContext) -> None:
             initializer=None,
             kind=ARG_OPT,
         )
+        extra_type = ctx.api.named_type(
+            "builtins.dict",
+            [ctx.api.named_type("builtins.str"), AnyType(TypeOfAny.explicit)],
+        )
+
+        extra_argument = Argument(
+            variable=Var(name="extra", type=UnionType([NoneType(), extra_type])),
+            type_annotation=UnionType([NoneType(), extra_type]),
+            initializer=None,
+            kind=ARG_OPT,
+        )
 
         add_static_method_to_class(
             ctx.api,
             ctx.cls,
             name="from_pydantic",
-            args=[model_argument],
+            args=[model_argument, extra_argument],
             return_type=fill_typevars(ctx.cls.info),
         )
 

strawberry/federation/enum.py

@@ -50,8 +50,7 @@ def enum(
     policy: Optional[List[List[str]]] = None,
     requires_scopes: Optional[List[List[str]]] = None,
     tags: Optional[Iterable[str]] = (),
-) -> EnumType:
-    ...
+) -> EnumType: ...
 
 
 @overload
@@ -66,8 +65,7 @@ def enum(
     policy: Optional[List[List[str]]] = None,
     requires_scopes: Optional[List[List[str]]] = None,
     tags: Optional[Iterable[str]] = (),
-) -> Callable[[EnumType], EnumType]:
-    ...
+) -> Callable[[EnumType], EnumType]: ...
 
 
 def enum(

strawberry/federation/field.py

@@ -55,8 +55,7 @@ def field(
     directives: Sequence[object] = (),
     extensions: Optional[List[FieldExtension]] = None,
     graphql_type: Optional[Any] = None,
-) -> T:
-    ...
+) -> T: ...
 
 
 @overload
@@ -83,8 +82,7 @@ def field(
     directives: Sequence[object] = (),
     extensions: Optional[List[FieldExtension]] = None,
     graphql_type: Optional[Any] = None,
-) -> Any:
-    ...
+) -> Any: ...
 
 
 @overload
@@ -111,8 +109,7 @@ def field(
     directives: Sequence[object] = (),
     extensions: Optional[List[FieldExtension]] = None,
     graphql_type: Optional[Any] = None,
-) -> StrawberryField:
-    ...
+) -> StrawberryField: ...
 
 
 def field(

strawberry/federation/object_type.py

@@ -114,8 +114,7 @@ def type(
     requires_scopes: Optional[List[List[str]]] = None,
     shareable: bool = False,
     tags: Iterable[str] = (),
-) -> T:
-    ...
+) -> T: ...
 
 
 @overload
@@ -137,8 +136,7 @@ def type(
     requires_scopes: Optional[List[List[str]]] = None,
     shareable: bool = False,
     tags: Iterable[str] = (),
-) -> Callable[[T], T]:
-    ...
+) -> Callable[[T], T]: ...
 
 
 def type(
@@ -186,8 +184,7 @@ def input(
     directives: Sequence[object] = (),
     inaccessible: bool = UNSET,
     tags: Iterable[str] = (),
-) -> T:
-    ...
+) -> T: ...
 
 
 @overload
@@ -203,8 +200,7 @@ def input(
     directives: Sequence[object] = (),
     inaccessible: bool = UNSET,
     tags: Iterable[str] = (),
-) -> Callable[[T], T]:
-    ...
+) -> Callable[[T], T]: ...
 
 
 def input(
@@ -245,8 +241,7 @@ def interface(
     policy: Optional[List[List[str]]] = None,
     requires_scopes: Optional[List[List[str]]] = None,
     tags: Iterable[str] = (),
-) -> T:
-    ...
+) -> T: ...
 
 
 @overload
@@ -266,8 +261,7 @@ def interface(
     policy: Optional[List[List[str]]] = None,
     requires_scopes: Optional[List[List[str]]] = None,
     tags: Iterable[str] = (),
-) -> Callable[[T], T]:
-    ...
+) -> Callable[[T], T]: ...
 
 
 def interface(
@@ -316,8 +310,7 @@ def interface_object(
     policy: Optional[List[List[str]]] = None,
     requires_scopes: Optional[List[List[str]]] = None,
     tags: Iterable[str] = (),
-) -> T:
-    ...
+) -> T: ...
 
 
 @overload
@@ -337,8 +330,7 @@ def interface_object(
     policy: Optional[List[List[str]]] = None,
     requires_scopes: Optional[List[List[str]]] = None,
     tags: Iterable[str] = (),
-) -> Callable[[T], T]:
-    ...
+) -> Callable[[T], T]: ...
 
 
 def interface_object(

strawberry/federation/scalar.py

@@ -40,8 +40,7 @@ def scalar(
     policy: Optional[List[List[str]]] = None,
     requires_scopes: Optional[List[List[str]]] = None,
     tags: Optional[Iterable[str]] = (),
-) -> Callable[[_T], _T]:
-    ...
+) -> Callable[[_T], _T]: ...
 
 
 @overload
@@ -60,8 +59,7 @@ def scalar(
     policy: Optional[List[List[str]]] = None,
     requires_scopes: Optional[List[List[str]]] = None,
     tags: Optional[Iterable[str]] = (),
-) -> _T:
-    ...
+) -> _T: ...
 
 
 def scalar(

strawberry/federation/schema_directive.py

@@ -39,7 +39,7 @@ def schema_directive(
 ) -> Callable[..., T]:
     def _wrap(cls: T) -> T:
         cls = _wrap_dataclass(cls)
-        fields = _get_fields(cls)
+        fields = _get_fields(cls, {})
 
         cls.__strawberry_directive__ = StrawberryFederationSchemaDirective(
             python_name=cls.__name__,

strawberry/field.py

@@ -432,8 +432,7 @@ def field(
     directives: Optional[Sequence[object]] = (),
     extensions: Optional[List[FieldExtension]] = None,
     graphql_type: Optional[Any] = None,
-) -> T:
-    ...
+) -> T: ...
 
 
 @overload
@@ -451,8 +450,7 @@ def field(
     directives: Optional[Sequence[object]] = (),
     extensions: Optional[List[FieldExtension]] = None,
     graphql_type: Optional[Any] = None,
-) -> Any:
-    ...
+) -> Any: ...
 
 
 @overload
@@ -470,8 +468,7 @@ def field(
     directives: Optional[Sequence[object]] = (),
     extensions: Optional[List[FieldExtension]] = None,
     graphql_type: Optional[Any] = None,
-) -> StrawberryField:
-    ...
+) -> StrawberryField: ...
 
 
 def field(

strawberry/http/async_base_view.py

@@ -31,31 +31,25 @@ from .typevars import Context, Request, Response, RootValue, SubResponse
 class AsyncHTTPRequestAdapter(abc.ABC):
     @property
     @abc.abstractmethod
-    def query_params(self) -> QueryParams:
-        ...
+    def query_params(self) -> QueryParams: ...
 
     @property
     @abc.abstractmethod
-    def method(self) -> HTTPMethod:
-        ...
+    def method(self) -> HTTPMethod: ...
 
     @property
     @abc.abstractmethod
-    def headers(self) -> Mapping[str, str]:
-        ...
+    def headers(self) -> Mapping[str, str]: ...
 
     @property
     @abc.abstractmethod
-    def content_type(self) -> Optional[str]:
-        ...
+    def content_type(self) -> Optional[str]: ...
 
     @abc.abstractmethod
-    async def get_body(self) -> Union[str, bytes]:
-        ...
+    async def get_body(self) -> Union[str, bytes]: ...
 
     @abc.abstractmethod
-    async def get_form_data(self) -> FormData:
-        ...
+    async def get_form_data(self) -> FormData: ...
 
 
 class AsyncBaseHTTPView(
@@ -69,30 +63,24 @@ class AsyncBaseHTTPView(
 
     @property
     @abc.abstractmethod
-    def allow_queries_via_get(self) -> bool:
-        ...
+    def allow_queries_via_get(self) -> bool: ...
 
     @abc.abstractmethod
-    async def get_sub_response(self, request: Request) -> SubResponse:
-        ...
+    async def get_sub_response(self, request: Request) -> SubResponse: ...
 
     @abc.abstractmethod
-    async def get_context(self, request: Request, response: SubResponse) -> Context:
-        ...
+    async def get_context(self, request: Request, response: SubResponse) -> Context: ...
 
     @abc.abstractmethod
-    async def get_root_value(self, request: Request) -> Optional[RootValue]:
-        ...
+    async def get_root_value(self, request: Request) -> Optional[RootValue]: ...
 
     @abc.abstractmethod
     def create_response(
         self, response_data: GraphQLHTTPResponse, sub_response: SubResponse
-    ) -> Response:
-        ...
+    ) -> Response: ...
 
     @abc.abstractmethod
-    async def render_graphql_ide(self, request: Request) -> Response:
-        ...
+    async def render_graphql_ide(self, request: Request) -> Response: ...
 
     async def execute_operation(
         self, request: Request, context: Context, root_value: Optional[RootValue]

strawberry/http/base.py

@@ -12,16 +12,13 @@ from .typevars import Request
 
 class BaseRequestProtocol(Protocol):
     @property
-    def query_params(self) -> Mapping[str, Optional[Union[str, List[str]]]]:
-        ...
+    def query_params(self) -> Mapping[str, Optional[Union[str, List[str]]]]: ...
 
     @property
-    def method(self) -> HTTPMethod:
-        ...
+    def method(self) -> HTTPMethod: ...
 
     @property
-    def headers(self) -> Mapping[str, str]:
-        ...
+    def headers(self) -> Mapping[str, str]: ...
 
 
 class BaseView(Generic[Request]):

strawberry/http/sync_base_view.py

@@ -32,38 +32,31 @@ from .typevars import Context, Request, Response, RootValue, SubResponse
 class SyncHTTPRequestAdapter(abc.ABC):
     @property
     @abc.abstractmethod
-    def query_params(self) -> QueryParams:
-        ...
+    def query_params(self) -> QueryParams: ...
 
     @property
     @abc.abstractmethod
-    def body(self) -> Union[str, bytes]:
-        ...
+    def body(self) -> Union[str, bytes]: ...
 
     @property
     @abc.abstractmethod
-    def method(self) -> HTTPMethod:
-        ...
+    def method(self) -> HTTPMethod: ...
 
     @property
     @abc.abstractmethod
-    def headers(self) -> Mapping[str, str]:
-        ...
+    def headers(self) -> Mapping[str, str]: ...
 
     @property
     @abc.abstractmethod
-    def content_type(self) -> Optional[str]:
-        ...
+    def content_type(self) -> Optional[str]: ...
 
     @property
     @abc.abstractmethod
-    def post_data(self) -> Mapping[str, Union[str, bytes]]:
-        ...
+    def post_data(self) -> Mapping[str, Union[str, bytes]]: ...
 
     @property
     @abc.abstractmethod
-    def files(self) -> Mapping[str, Any]:
-        ...
+    def files(self) -> Mapping[str, Any]: ...
 
 
 class SyncBaseHTTPView(
@@ -80,30 +73,24 @@ class SyncBaseHTTPView(
 
     @property
     @abc.abstractmethod
-    def allow_queries_via_get(self) -> bool:
-        ...
+    def allow_queries_via_get(self) -> bool: ...
 
     @abc.abstractmethod
-    def get_sub_response(self, request: Request) -> SubResponse:
-        ...
+    def get_sub_response(self, request: Request) -> SubResponse: ...
 
     @abc.abstractmethod
-    def get_context(self, request: Request, response: SubResponse) -> Context:
-        ...
+    def get_context(self, request: Request, response: SubResponse) -> Context: ...
 
     @abc.abstractmethod
-    def get_root_value(self, request: Request) -> Optional[RootValue]:
-        ...
+    def get_root_value(self, request: Request) -> Optional[RootValue]: ...
 
     @abc.abstractmethod
     def create_response(
         self, response_data: GraphQLHTTPResponse, sub_response: SubResponse
-    ) -> Response:
-        ...
+    ) -> Response: ...
 
     @abc.abstractmethod
-    def render_graphql_ide(self, request: Request) -> Response:
-        ...
+    def render_graphql_ide(self, request: Request) -> Response: ...
 
     def execute_operation(
         self, request: Request, context: Context, root_value: Optional[RootValue]

strawberry/litestar/controller.py

@@ -211,9 +211,9 @@ class GraphQLController(
 
     request_adapter_class = LitestarRequestAdapter
     graphql_ws_handler_class: Type[GraphQLWSHandler] = GraphQLWSHandler
-    graphql_transport_ws_handler_class: Type[
+    graphql_transport_ws_handler_class: Type[GraphQLTransportWSHandler] = (
         GraphQLTransportWSHandler
-    ] = GraphQLTransportWSHandler
+    )
 
     allow_queries_via_get: bool = True
     graphiql_allowed_accept: FrozenSet[str] = frozenset({"text/html", "*/*"})