strawberry-graphql 0.257.0.dev1735244504__tar.gz → 0.258.1__tar.gz

{strawberry_graphql-0.257.0.dev1735244504 → strawberry_graphql-0.258.1}/PKG-INFO

@@ -1,8 +1,7 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: strawberry-graphql
-Version: 0.257.0.dev1735244504
+Version: 0.258.1
 Summary: A library for creating GraphQL APIs
-Home-page: https://strawberry.rocks/
 License: MIT
 Keywords: graphql,api,rest,starlette,async
 Author: Patrick Arminio
@@ -62,6 +61,7 @@ Requires-Dist: uvicorn (>=0.11.6) ; extra == "debug-server"
 Project-URL: Changelog, https://strawberry.rocks/changelog
 Project-URL: Documentation, https://strawberry.rocks/
 Project-URL: Discord, https://discord.com/invite/3uQ2PaY
+Project-URL: Homepage, https://strawberry.rocks/
 Project-URL: Mastodon, https://farbun.social/@strawberry
 Project-URL: Repository, https://github.com/strawberry-graphql/strawberry
 Project-URL: Sponsor on GitHub, https://github.com/sponsors/strawberry-graphql

{strawberry_graphql-0.257.0.dev1735244504 → strawberry_graphql-0.258.1}/pyproject.toml

@@ -1,7 +1,7 @@
 [tool.poetry]
 name = "strawberry-graphql"
 packages = [ { include = "strawberry" } ]
-version = "0.257.0.dev.1735244504"
+version = "0.258.1"
 description = "A library for creating GraphQL APIs"
 authors = ["Patrick Arminio <patrick.arminio@gmail.com>"]
 license = "MIT"
@@ -228,125 +228,70 @@ src = ["strawberry", "tests"]
 select = ["ALL"]
 ignore = [
     # https://github.com/astral-sh/ruff/pull/4427
-    # equivalent to keep-runtime-typing
+    # equivalent to keep-runtime-typing. We might want to enable those
+    # after we drop support for Python 3.9
     "UP006",
     "UP007",
 
-    "TID252",
     # we use asserts in tests and to hint mypy
     "S101",
-    "S102",
-    "S104",
-    "S324",
-    # definitely enable these, maybe not in tests
+
+    # Allow "Any" for annotations. We have too many Any annotations and some
+    # are legit. Maybe reconsider in the future, except for tests?
     "ANN401",
-    "PGH003",
-    "PGH004",
-    "RET504",
-    "RET505",
-    "RET506",
-    "RET507",
-    "RET503",
-    "BLE001",
-    "B008",
-    "N811",
-    "N804",
+
+    # Allow our exceptions to have names that don't end in "Error". Maybe refactor
+    # in the future? But that would be a breaking change.
     "N818",
+
+    # Allow "type: ignore" without rule code. Because we support both mypy and
+    # pyright, and they have different codes for the same error, we can't properly
+    # fix those issues.
+    "PGH003",
+
     # Variable `T` in function should be lowercase
     # this seems a potential bug or opportunity for improvement in ruff
     "N806",
 
-    # first argument should named self (found in tests)
-    "N805",
-
-    "N815",
-
     # shadowing builtins
     "A001",
     "A002",
     "A003",
+    "A005",
 
+    # Unused arguments
     "ARG001",
     "ARG002",
     "ARG003",
     "ARG004",
     "ARG005",
+
+    # Boolean positional arguments
     "FBT001",
     "FBT002",
     "FBT003",
 
-    "PT001",
-    "PT023",
-
-    # this is pretty much handled by black
-    "E501",
-
-    # enable these, we have some in tests
-    "B006",
-    "PT007",
-    "PT011",
-    "PT012",
-    "PT015",
-    "PT017",
-    "C414",
-    "N802",
-
-    "SIM117",
-    "SIM102",
-
-    "F841",
-    "B027",
-    "B905",
-    "ISC001",
-
-    # same?
-    "S105",
-    "S106",
+    # Too many arguments/branches/return statements
+    "PLR0913",
+    "PLR0912",
+    "PLR0911",
 
-    "DTZ003",
-    "DTZ005",
+    # Do not force adding _co to covariant typevars
+    "PLC0105",
 
-    "RSE102",
+    # Allow private access to attributes
     "SLF001",
 
-    # in tests
-    "DTZ001",
-
-    "EM101",
-    "EM102",
-    "EM103",
-
-    "B904",
-    "B019",
-
-    "N801",
-    "N807",
-
-    # pandas
-    "PD",
-
-    "RUF012",
-    "PLC0105",
-    "FA102",
-
     # code complexity
-    "C",
     "C901",
 
-    # trailing commas
-    "COM812",
-
-    "PLR",
-    "INP",
-    "TRY",
-    "SIM300",
-    "SIM114",
-
-    "DJ008",
+    # Allow todo/fixme/etc comments
     "TD002",
     "TD003",
     "FIX001",
     "FIX002",
+
+    # We don't want to add "from __future__ mport annotations" everywhere
     "FA100",
 
     # Docstrings, maybe to enable later
@@ -359,29 +304,72 @@ ignore = [
     "D106",
     "D107",
     "D412",
+
+    # Allow to define exceptions text in the exception body
+    "TRY003",
+    "EM101",
+    "EM102",
+    "EM103",
+
+    # Allow comparisons with magic numbers
+    "PLR2004",
+
+    # Allow methods to use lru_cache
+    "B019",
+
+    # Don't force if branches to be converted to "or"
+    "SIM114",
+
+    # ruff formatter recommends to disable those, as they conflict with it
+    # we don't need to ever enable those.
+    "COM812",
+    "COM819",
+    "D206",
+    "E111",
+    "E114",
+    "E117",
+    "E501",
+    "ISC001",
+    "Q000",
+    "Q001",
+    "Q002",
+    "Q003",
+    "W191",
 ]
 
 [tool.ruff.lint.per-file-ignores]
-"strawberry/schema/types/concrete_type.py" = ["TCH002"]
+".github/*" = ["INP001"]
+"federation-compatibility/*" = ["INP001"]
+"strawberry/cli/*" = ["B008"]
+"strawberry/extensions/tracing/__init__.py" = ["TCH004"]
+"strawberry/fastapi/*" = ["B008"]
+"strawberry/annotation.py" = ["RET505"]
 "tests/*" = [
-    "RSE102",
-    "SLF001",
-    "TCH001",
-    "TCH002",
-    "TCH003",
     "ANN001",
     "ANN201",
     "ANN202",
     "ANN204",
-    "PLW0603",
+    "B008",
+    "B018",
+    "D",
+    "DTZ001",
+    "DTZ005",
+    "FA102",
+    "N805",
     "PLC1901",
+    "PLR2004",
+    "PLW0603",
+    "PT011",
+    "RUF012",
+    "S105",
+    "S106",
     "S603",
     "S607",
-    "B018",
-    "D",
+    "TCH001",
+    "TCH002",
+    "TCH003",
+    "TRY002",
 ]
-"strawberry/extensions/tracing/__init__.py" = ["TCH004"]
-"tests/http/clients/__init__.py" = ["F401"]
 
 [tool.ruff.lint.isort]
 known-first-party = ["strawberry"]

{strawberry_graphql-0.257.0.dev1735244504 → strawberry_graphql-0.258.1}/strawberry/__init__.py

@@ -13,6 +13,7 @@ from .schema import Schema
 from .schema_directive import schema_directive
 from .types.arguments import argument
 from .types.auto import auto
+from .types.cast import cast
 from .types.enum import enum, enum_value
 from .types.field import field
 from .types.info import Info
@@ -36,6 +37,7 @@ __all__ = [
     "argument",
     "asdict",
     "auto",
+    "cast",
     "directive",
     "directive_field",
     "enum",

{strawberry_graphql-0.257.0.dev1735244504 → strawberry_graphql-0.258.1}/strawberry/aiohttp/test/client.py

@@ -57,13 +57,11 @@ class GraphQLTestClient(BaseGraphQLTestClient):
         headers: Optional[dict[str, object]] = None,
         files: Optional[dict[str, object]] = None,
     ) -> Any:
-        response = await self._client.post(
+        return await self._client.post(
             self.url,
             json=body if not files else None,
             data=body if files else None,
         )
 
-        return response
-
 
 __all__ = ["GraphQLTestClient"]

{strawberry_graphql-0.257.0.dev1735244504 → strawberry_graphql-0.258.1}/strawberry/aiohttp/views.py

@@ -99,12 +99,12 @@ class AioHTTPWebSocketAdapter(AsyncWebSocketAdapter):
             if ws_message.type == http.WSMsgType.TEXT:
                 try:
                     yield self.view.decode_json(ws_message.data)
-                except JSONDecodeError:
+                except JSONDecodeError as e:
                     if not ignore_parsing_errors:
-                        raise NonJsonMessageReceived()
+                        raise NonJsonMessageReceived from e
 
             elif ws_message.type == http.WSMsgType.BINARY:
-                raise NonTextMessageReceived()
+                raise NonTextMessageReceived
 
     async def send_json(self, message: Mapping[str, object]) -> None:
         try:

{strawberry_graphql-0.257.0.dev1735244504 → strawberry_graphql-0.258.1}/strawberry/annotation.py

@@ -107,9 +107,7 @@ class StrawberryAnnotation:
         if isinstance(annotation, str):
             annotation = ForwardRef(annotation)
 
-        evaled_type = eval_type(annotation, self.namespace, None)
-
-        return evaled_type
+        return eval_type(annotation, self.namespace, None)
 
     def _get_type_with_args(
         self, evaled_type: type[Any]
@@ -155,13 +153,13 @@ class StrawberryAnnotation:
         # a StrawberryType
         if self._is_enum(evaled_type):
             return self.create_enum(evaled_type)
-        elif self._is_optional(evaled_type, args):
+        if self._is_optional(evaled_type, args):
             return self.create_optional(evaled_type)
-        elif self._is_union(evaled_type, args):
+        if self._is_union(evaled_type, args):
             return self.create_union(evaled_type, args)
-        elif is_type_var(evaled_type) or evaled_type is Self:
+        if is_type_var(evaled_type) or evaled_type is Self:
             return self.create_type_var(cast(TypeVar, evaled_type))
-        elif self._is_strawberry_type(evaled_type):
+        if self._is_strawberry_type(evaled_type):
             # Simply return objects that are already StrawberryTypes
             return evaled_type
 

{strawberry_graphql-0.257.0.dev1735244504 → strawberry_graphql-0.258.1}/strawberry/asgi/__init__.py

@@ -97,11 +97,11 @@ class ASGIWebSocketAdapter(AsyncWebSocketAdapter):
                 try:
                     text = await self.ws.receive_text()
                     yield self.view.decode_json(text)
-                except JSONDecodeError:  # noqa: PERF203
+                except JSONDecodeError as e:  # noqa: PERF203
                     if not ignore_parsing_errors:
-                        raise NonJsonMessageReceived()
-        except KeyError:
-            raise NonTextMessageReceived()
+                        raise NonJsonMessageReceived from e
+        except KeyError as e:
+            raise NonTextMessageReceived from e
         except WebSocketDisconnect:  # pragma: no cover
             pass
 

{strawberry_graphql-0.257.0.dev1735244504 → strawberry_graphql-0.258.1}/strawberry/channels/handlers/ws_handler.py

@@ -45,13 +45,13 @@ class ChannelsWebSocketAdapter(AsyncWebSocketAdapter):
                 break
 
             if message["message"] is None:
-                raise NonTextMessageReceived()
+                raise NonTextMessageReceived
 
             try:
                 yield self.view.decode_json(message["message"])
-            except json.JSONDecodeError:
+            except json.JSONDecodeError as e:
                 if not ignore_parsing_errors:
-                    raise NonJsonMessageReceived()
+                    raise NonJsonMessageReceived from e
 
     async def send_json(self, message: Mapping[str, object]) -> None:
         serialized_message = self.view.encode_json(message)

{strawberry_graphql-0.257.0.dev1735244504 → strawberry_graphql-0.258.1}/strawberry/channels/testing.py

@@ -55,7 +55,7 @@ class GraphQLWebsocketCommunicator(WebsocketCommunicator):
         path: str,
         headers: Optional[list[tuple[bytes, bytes]]] = None,
         protocol: str = GRAPHQL_TRANSPORT_WS_PROTOCOL,
-        connection_params: dict = {},
+        connection_params: dict | None = None,
         **kwargs: Any,
     ) -> None:
         """Create a new communicator.
@@ -69,6 +69,8 @@ class GraphQLWebsocketCommunicator(WebsocketCommunicator):
             subprotocols: an ordered list of preferred subprotocols to be sent to the server.
             **kwargs: additional arguments to be passed to the `WebsocketCommunicator` constructor.
         """
+        if connection_params is None:
+            connection_params = {}
         self.protocol = protocol
         subprotocols = kwargs.get("subprotocols", [])
         subprotocols.append(protocol)

strawberry_graphql-0.258.1/strawberry/cli/__init__.py

@@ -0,0 +1,17 @@
+try:
+    from .app import app
+    from .commands.codegen import codegen as codegen  # noqa: PLC0414
+    from .commands.export_schema import export_schema as export_schema  # noqa: PLC0414
+    from .commands.schema_codegen import (
+        schema_codegen as schema_codegen,  # noqa: PLC0414
+    )
+    from .commands.server import server as server  # noqa: PLC0414
+    from .commands.upgrade import upgrade as upgrade  # noqa: PLC0414
+
+    def run() -> None:
+        app()
+
+except ModuleNotFoundError as exc:
+    from strawberry.exceptions import MissingOptionalDependenciesError
+
+    raise MissingOptionalDependenciesError(extras=["cli"]) from exc

{strawberry_graphql-0.257.0.dev1735244504 → strawberry_graphql-0.258.1}/strawberry/cli/commands/codegen.py

@@ -39,23 +39,21 @@ def _import_plugin(plugin: str) -> Optional[type[QueryCodegenPlugin]]:
 
         assert _is_codegen_plugin(obj)
         return obj
-    else:
+
+    symbols = {
+        key: value for key, value in module.__dict__.items() if not key.startswith("__")
+    }
+
+    if "__all__" in module.__dict__:
         symbols = {
-            key: value
-            for key, value in module.__dict__.items()
-            if not key.startswith("__")
+            name: symbol
+            for name, symbol in symbols.items()
+            if name in module.__dict__["__all__"]
         }
 
-        if "__all__" in module.__dict__:
-            symbols = {
-                name: symbol
-                for name, symbol in symbols.items()
-                if name in module.__dict__["__all__"]
-            }
-
-        for obj in symbols.values():
-            if _is_codegen_plugin(obj):
-                return obj
+    for obj in symbols.values():
+        if _is_codegen_plugin(obj):
+            return obj
 
     return None
 

{strawberry_graphql-0.257.0.dev1735244504 → strawberry_graphql-0.258.1}/strawberry/cli/commands/server.py

@@ -25,7 +25,7 @@ class LogLevel(str, Enum):
 @app.command(help="Starts debug server")
 def server(
     schema: str,
-    host: str = typer.Option("0.0.0.0", "-h", "--host", show_default=True),
+    host: str = typer.Option("0.0.0.0", "-h", "--host", show_default=True),  # noqa: S104
     port: int = typer.Option(8000, "-p", "--port", show_default=True),
     log_level: LogLevel = typer.Option(
         "error",
@@ -60,7 +60,7 @@ def server(
             "install them by running:\n"
             r"pip install 'strawberry-graphql\[debug-server]'"
         )
-        raise typer.Exit(1)
+        raise typer.Exit(1)  # noqa: B904
 
     load_schema(schema, app_dir=app_dir)
 

{strawberry_graphql-0.257.0.dev1735244504 → strawberry_graphql-0.258.1}/strawberry/cli/commands/upgrade/_run_codemod.py

@@ -41,9 +41,8 @@ def _execute_transform_wrap(
         additional_kwargs["scratch"] = {}
 
     # TODO: maybe capture warnings?
-    with open(os.devnull, "w") as null:  # noqa: PTH123
-        with contextlib.redirect_stderr(null):
-            return _execute_transform(**job, **additional_kwargs)
+    with open(os.devnull, "w") as null, contextlib.redirect_stderr(null):  # noqa: PTH123
+        return _execute_transform(**job, **additional_kwargs)
 
 
 def _get_progress_and_pool(

{strawberry_graphql-0.257.0.dev1735244504 → strawberry_graphql-0.258.1}/strawberry/cli/utils/__init__.py

@@ -16,7 +16,7 @@ def load_schema(schema: str, app_dir: str) -> Schema:
         message = str(exc)
 
         rich.print(f"[red]Error: {message}")
-        raise typer.Exit(2)
+        raise typer.Exit(2)  # noqa: B904
 
     if not isinstance(schema_symbol, Schema):
         message = "The `schema` must be an instance of strawberry.Schema"

{strawberry_graphql-0.257.0.dev1735244504 → strawberry_graphql-0.258.1}/strawberry/codegen/plugins/python.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import textwrap
 from collections import defaultdict
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING, ClassVar, Optional
 
 from strawberry.codegen import CodegenFile, QueryCodegenPlugin
 from strawberry.codegen.types import (
@@ -35,7 +35,7 @@ class PythonType:
 
 
 class PythonPlugin(QueryCodegenPlugin):
-    SCALARS_TO_PYTHON_TYPES: dict[str, PythonType] = {
+    SCALARS_TO_PYTHON_TYPES: ClassVar[dict[str, PythonType]] = {
         "ID": PythonType("str"),
         "Int": PythonType("int"),
         "String": PythonType("str"),
@@ -65,7 +65,7 @@ class PythonPlugin(QueryCodegenPlugin):
 
     def _print_imports(self) -> str:
         imports = [
-            f'from {import_} import {", ".join(sorted(types))}'
+            f"from {import_} import {', '.join(sorted(types))}"
             for import_, types in self.imports.items()
         ]
 
@@ -128,7 +128,7 @@ class PythonPlugin(QueryCodegenPlugin):
                     + ", ".join(self._print_argument_value(v) for v in argval.values)
                     + "]"
                 )
-            elif isinstance(argval.values, dict):
+            if isinstance(argval.values, dict):
                 return (
                     "{"
                     + ", ".join(
@@ -137,8 +137,7 @@ class PythonPlugin(QueryCodegenPlugin):
                     )
                     + "}"
                 )
-            else:
-                raise TypeError(f"Unrecognized values type: {argval}")
+            raise TypeError(f"Unrecognized values type: {argval}")
         if isinstance(argval, GraphQLEnumValue):
             # This is an enum.  It needs the namespace alongside the name.
             if argval.enum_type is None:
@@ -188,9 +187,9 @@ class PythonPlugin(QueryCodegenPlugin):
         if type_.name in self.SCALARS_TO_PYTHON_TYPES:
             return ""
 
-        assert (
-            type_.python_type is not None
-        ), f"Scalar type must have a python type: {type_.name}"
+        assert type_.python_type is not None, (
+            f"Scalar type must have a python type: {type_.name}"
+        )
 
         return f'{type_.name} = NewType("{type_.name}", {type_.python_type.__name__})'
 

{strawberry_graphql-0.257.0.dev1735244504 → strawberry_graphql-0.258.1}/strawberry/codegen/plugins/typescript.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import textwrap
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, ClassVar
 
 from strawberry.codegen import CodegenFile, QueryCodegenPlugin
 from strawberry.codegen.types import (
@@ -20,7 +20,7 @@ if TYPE_CHECKING:
 
 
 class TypeScriptPlugin(QueryCodegenPlugin):
-    SCALARS_TO_TS_TYPE = {
+    SCALARS_TO_TS_TYPE: ClassVar[dict[str | type, str]] = {
         "ID": "string",
         "Int": "number",
         "String": "string",
@@ -102,6 +102,7 @@ class TypeScriptPlugin(QueryCodegenPlugin):
         if type_.name in self.SCALARS_TO_TS_TYPE:
             return ""
 
+        assert type_.python_type is not None
         return f"type {type_.name} = {self.SCALARS_TO_TS_TYPE[type_.python_type]}"
 
     def _print_union_type(self, type_: GraphQLUnion) -> str:

{strawberry_graphql-0.257.0.dev1735244504 → strawberry_graphql-0.258.1}/strawberry/codegen/query_codegen.py

@@ -202,7 +202,7 @@ def _get_deps(t: GraphQLType) -> Iterable[GraphQLType]:
             yield from _get_deps(gql_type)
     else:
         # Want to make sure that all types are covered.
-        raise ValueError(f"Unknown GraphQLType: {t}")
+        raise ValueError(f"Unknown GraphQLType: {t}")  # noqa: TRY004
 
 
 _TYPE_TO_GRAPHQL_TYPE = {
@@ -249,14 +249,15 @@ class QueryCodegenPluginManager:
         def type_cmp(t1: GraphQLType, t2: GraphQLType) -> int:
             """Compare the types."""
             if t1 is t2:
-                return 0
-
-            if t1 in _get_deps(t2):
-                return -1
+                retval = 0
+            elif t1 in _get_deps(t2):
+                retval = -1
             elif t2 in _get_deps(t1):
-                return 1
+                retval = 1
             else:
-                return 0
+                retval = 0
+
+            return retval
 
         return sorted(types, key=cmp_to_key(type_cmp))
 
@@ -311,15 +312,15 @@ class QueryCodegen:
         operations = self._get_operations(ast)
 
         if not operations:
-            raise NoOperationProvidedError()
+            raise NoOperationProvidedError
 
         if len(operations) > 1:
-            raise MultipleOperationsProvidedError()
+            raise MultipleOperationsProvidedError
 
         operation = operations[0]
 
         if operation.name is None:
-            raise NoOperationNameProvidedError()
+            raise NoOperationNameProvidedError
 
         # Look for any free-floating fragments and create types out of them
         # These types can then be referenced and included later via the
@@ -346,9 +347,9 @@ class QueryCodegen:
         )
         for fd in fragment_definitions:
             query_type = self.schema.get_type_by_name(fd.type_condition.name.value)
-            assert isinstance(
-                query_type, StrawberryObjectDefinition
-            ), f"{fd.type_condition.name.value!r} is not a type in the graphql schema!"
+            assert isinstance(query_type, StrawberryObjectDefinition), (
+                f"{fd.type_condition.name.value!r} is not a type in the graphql schema!"
+            )
 
             typename = fd.type_condition.name.value
             graph_ql_object_type_factory = partial(
@@ -550,7 +551,7 @@ class QueryCodegen:
         if isinstance(field_type, ScalarDefinition):
             return self._collect_scalar(field_type, None)
 
-        elif isinstance(field_type, EnumDefinition):
+        if isinstance(field_type, EnumDefinition):
             return self._collect_enum(field_type)
 
         raise ValueError(f"Unsupported type: {field_type}")  # pragma: no cover
@@ -694,9 +695,9 @@ class QueryCodegen:
             selection.name.value, parent_type_name
         )
 
-        assert (
-            selected_field
-        ), f"Couldn't find {parent_type_name}.{selection.name.value}"
+        assert selected_field, (
+            f"Couldn't find {parent_type_name}.{selection.name.value}"
+        )
 
         selected_field_type, wrapper = self._unwrap_type(selected_field.type)
         name = capitalize_first(to_camel_case(selection.name.value))

{strawberry_graphql-0.257.0.dev1735244504 → strawberry_graphql-0.258.1}/strawberry/codemods/annotated_unions.py

@@ -50,7 +50,7 @@ class ConvertUnionToAnnotatedUnion(VisitorBasedCodemodCommand):
 
         super().__init__(context)
 
-    def visit_Module(self, node: cst.Module) -> Optional[bool]:
+    def visit_Module(self, node: cst.Module) -> Optional[bool]:  # noqa: N802
         self._is_using_named_import = False
 
         return super().visit_Module(node)