strawberry-graphql 0.281.0__tar.gz → 0.283.0__tar.gz

{strawberry_graphql-0.281.0 → strawberry_graphql-0.283.0}/PKG-INFO

@@ -1,8 +1,9 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: strawberry-graphql
-Version: 0.281.0
+Version: 0.283.0
 Summary: A library for creating GraphQL APIs
 License: MIT
+License-File: LICENSE
 Keywords: graphql,api,rest,starlette,async
 Author: Patrick Arminio
 Author-email: patrick.arminio@gmail.com
@@ -51,6 +52,7 @@ Requires-Dist: pygments (>=2.3,<3.0) ; extra == "debug-server"
 Requires-Dist: pyinstrument (>=4.0.0) ; extra == "pyinstrument"
 Requires-Dist: python-dateutil (>=2.7,<3.0)
 Requires-Dist: python-multipart (>=0.0.7) ; extra == "asgi"
+Requires-Dist: python-multipart (>=0.0.7) ; extra == "cli"
 Requires-Dist: python-multipart (>=0.0.7) ; extra == "debug-server"
 Requires-Dist: python-multipart (>=0.0.7) ; extra == "fastapi"
 Requires-Dist: quart (>=0.19.3) ; extra == "quart"
@@ -59,11 +61,14 @@ Requires-Dist: rich (>=12.0.0) ; extra == "debug"
 Requires-Dist: rich (>=12.0.0) ; extra == "debug-server"
 Requires-Dist: sanic (>=20.12.2) ; extra == "sanic"
 Requires-Dist: starlette (>=0.18.0) ; extra == "asgi"
+Requires-Dist: starlette (>=0.18.0) ; extra == "cli"
 Requires-Dist: starlette (>=0.18.0) ; extra == "debug-server"
 Requires-Dist: typer (>=0.7.0) ; extra == "cli"
 Requires-Dist: typer (>=0.7.0) ; extra == "debug-server"
 Requires-Dist: typing-extensions (>=4.5.0)
+Requires-Dist: uvicorn (>=0.11.6) ; extra == "cli"
 Requires-Dist: uvicorn (>=0.11.6) ; extra == "debug-server"
+Requires-Dist: websockets (>=15.0.1,<16) ; extra == "cli"
 Requires-Dist: websockets (>=15.0.1,<16) ; extra == "debug-server"
 Project-URL: Changelog, https://strawberry.rocks/changelog
 Project-URL: Documentation, https://strawberry.rocks/
@@ -92,7 +97,7 @@ The quick start method provides a server and CLI to get going quickly. Install
 with:
 
 ```shell
-pip install "strawberry-graphql[debug-server]"
+pip install "strawberry-graphql[cli]"
 ```
 
 ## Getting Started
@@ -122,13 +127,13 @@ schema = strawberry.Schema(query=Query)
 This will create a GraphQL schema defining a `User` type and a single query
 field `user` that will return a hardcoded user.
 
-To run the debug server run the following command:
+To serve the schema using the dev server run the following command:
 
 ```shell
-strawberry server app
+strawberry dev app
 ```
 
-Open the debug server by clicking on the following link:
+Open the dev server by clicking on the following link:
 [http://0.0.0.0:8000/graphql](http://0.0.0.0:8000/graphql)
 
 This will open GraphiQL where you can test the API.
@@ -185,7 +190,7 @@ get started follow these steps:
 ```shell
 git clone https://github.com/strawberry-graphql/strawberry
 cd strawberry
-poetry install --with integrations
+poetry install
 poetry run pytest
 ```
 

{strawberry_graphql-0.281.0 → strawberry_graphql-0.283.0}/README.md

@@ -14,7 +14,7 @@ The quick start method provides a server and CLI to get going quickly. Install
 with:
 
 ```shell
-pip install "strawberry-graphql[debug-server]"
+pip install "strawberry-graphql[cli]"
 ```
 
 ## Getting Started
@@ -44,13 +44,13 @@ schema = strawberry.Schema(query=Query)
 This will create a GraphQL schema defining a `User` type and a single query
 field `user` that will return a hardcoded user.
 
-To run the debug server run the following command:
+To serve the schema using the dev server run the following command:
 
 ```shell
-strawberry server app
+strawberry dev app
 ```
 
-Open the debug server by clicking on the following link:
+Open the dev server by clicking on the following link:
 [http://0.0.0.0:8000/graphql](http://0.0.0.0:8000/graphql)
 
 This will open GraphiQL where you can test the API.
@@ -107,7 +107,7 @@ get started follow these steps:
 ```shell
 git clone https://github.com/strawberry-graphql/strawberry
 cd strawberry
-poetry install --with integrations
+poetry install
 poetry run pytest
 ```
 

{strawberry_graphql-0.281.0 → strawberry_graphql-0.283.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "strawberry-graphql"
-version = "0.281.0"
+version = "0.283.0"
 description = "A library for creating GraphQL APIs"
 authors = [{ name = "Patrick Arminio", email = "patrick.arminio@gmail.com" }]
 license = { text = "MIT" }
@@ -59,79 +59,88 @@ pydantic = ["pydantic>1.6.1"]
 sanic = ["sanic>=20.12.2"]
 fastapi = ["fastapi>=0.65.2", "python-multipart>=0.0.7"]
 chalice = ["chalice~=1.22"]
-cli = ["typer>=0.7.0", "pygments~=2.3", "rich>=12.0.0", "libcst"]
+cli = [
+  "typer>=0.7.0",
+  "pygments~=2.3",
+  "rich>=12.0.0",
+  "libcst",
+  "starlette>=0.18.0",
+  "uvicorn>=0.11.6",
+  "websockets>=15.0.1,<16",
+  "python-multipart>=0.0.7",
+]
 litestar = ["litestar>=2; python_version~='3.10'"]
 pyinstrument = ["pyinstrument>=4.0.0"]
 
+[dependency-groups]
+dev = [
+  "ruff (>=0.12.3,<0.13.0)",
+  "asgiref (>=3.2,<4.0)",
+  "email-validator (>=1.1.3,<3.0.0)",
+  "freezegun (>=1.2.1,<2.0.0)",
+  "libcst (>=1.8.2,<2.0.0)",
+  "markupsafe (==2.1.3)",
+  "nox (>=2024.4.15,<2025.0.0)",
+  "nox-poetry (>=1.0.3,<2.0.0)",
+  "opentelemetry-api (<2)",
+  "opentelemetry-sdk (<2)",
+  "pygments (>=2.3,<3.0)",
+  "pyinstrument (>=4.0.0)",
+  "pytest (>=7.2,<8.0)",
+  "pytest-asyncio (>=0.20.3)",
+  "pytest-codspeed (>=3.0.0) ; python_version >= \"3.9\"",
+  "pytest-cov (>=4.0.0,<5.0.0)",
+  "pytest-emoji (>=0.2.0,<0.3.0)",
+  "pytest-mock (>=3.10,<4.0)",
+  "pytest-snapshot (>=0.9.0,<0.10.0)",
+  "pytest-xdist[psutil] (>=3.1.0,<4.0.0)",
+  "python-multipart (>=0.0.7)",
+  "rich (>=12.5.1)",
+  "sanic-testing (>=22.9,<24.0)",
+  "typer (>=0.7.0)",
+  "types-aiofiles (>=24.1.0.20250326,<25.0.0.0)",
+  "types-certifi (>=2021.10.8,<2022.0.0)",
+  "types-chardet (>=5.0.4,<6.0.0)",
+  "types-freezegun (>=1.1.9,<2.0.0)",
+  "types-python-dateutil (>=2.8.19,<3.0.0)",
+  "types-toml (>=0.10.8,<0.11.0)",
+  "types-typed-ast (>=1.5.8,<2.0.0)",
+  "types-ujson (>=5.10.0.20250326,<6.0.0.0)",
+  "types-protobuf (>=5.29.1.20250403,<6.0.0.0)",
+  "poetry-plugin-export (>=1.6.0,<2.0.0)",
+  # another bug in poetry
+  "urllib3 (<2)",
+  "inline-snapshot (>=0.10.1,<0.11.0)",
+  "types-deprecated (>=1.2.15.20241117,<2.0.0.0)",
+  "types-six (>=1.17.0.20250403,<2.0.0.0)",
+  "types-pyyaml (>=6.0.12.20240917,<7.0.0.0)",
+  "mypy (>=1.15.0,<2.0.0)",
+  "pyright (==1.1.401)",
+  "codeflash (>=0.9.2)",
+  "pre-commit (>=4.3.0,<5.0.0)",
+]
+integrations = [
+  "aiohttp (>=3.7.4.post0,<4.0.0)",
+  "chalice (>=1.22,<2.0)",
+  "channels (>=3.0.5,<5.0.0)",
+  "django (>=3.2)",
+  "fastapi (>=0.65.0)",
+  "flask (>=1.1)",
+  "quart (>=0.19.3)",
+  "pydantic (>=2.0)",
+  "pytest-aiohttp (>=1.0.3,<2.0.0)",
+  "pytest-django (>=4.5,<5.0)",
+  "sanic (>=20.12.2)",
+  "starlette (>=0.13.6)",
+  "litestar (>=2) ; python_version >= \"3.10\"",
+  "uvicorn (>=0.11.6)",
+  "daphne (>=4.0.0,<5.0.0)",
+]
+
 [tool.poetry]
 packages = [{ include = "strawberry" }]
 include = ["strawberry/py.typed"]
 
-[tool.poetry.group.dev.dependencies]
-ruff = "^0.12.3"
-asgiref = "^3.2"
-email-validator = { version = ">=1.1.3,<3.0.0", optional = false }
-freezegun = "^1.2.1"
-libcst = { version = "^1.8.2", optional = false }
-MarkupSafe = "2.1.3"
-nox = "^2024.4.15"
-nox-poetry = "^1.0.3"
-opentelemetry-api = "<2"
-opentelemetry-sdk = "<2"
-pygments = "^2.3"
-pyinstrument = { version = ">=4.0.0", optional = false }
-pytest = "^7.2"
-pytest-asyncio = ">=0.20.3"
-pytest-codspeed = { version = ">=3.0.0", python = ">=3.9" }
-pytest-cov = "^4.0.0"
-pytest-emoji = "^0.2.0"
-pytest-mock = "^3.10"
-pytest-snapshot = "^0.9.0"
-pytest-xdist = { extras = ["psutil"], version = "^3.1.0" }
-python-multipart = ">=0.0.7"
-rich = { version = ">=12.5.1", optional = false }
-sanic-testing = ">=22.9,<24.0"
-typer = { version = ">=0.7.0", optional = false }
-types-aiofiles = "^24.1.0.20250326"
-types-certifi = "^2021.10.8"
-types-chardet = "^5.0.4"
-types-freezegun = "^1.1.9"
-types-python-dateutil = "^2.8.19"
-types-toml = "^0.10.8"
-types-typed-ast = "^1.5.8"
-types-ujson = "^5.10.0.20250326"
-types-protobuf = "^5.29.1.20250403"
-poetry-plugin-export = { version = "^1.6.0", python = "<4.0", optional = false }
-# another bug in poetry
-urllib3 = "<2"
-inline-snapshot = "^0.10.1"
-types-deprecated = "^1.2.15.20241117"
-types-six = "^1.17.0.20250403"
-types-pyyaml = "^6.0.12.20240917"
-mypy = "^1.15.0"
-pyright = "1.1.401"
-codeflash = ">=0.9.2"
-
-[tool.poetry.group.integrations]
-optional = true
-
-[tool.poetry.group.integrations.dependencies]
-aiohttp = "^3.7.4.post0"
-chalice = { version = "^1.22" }
-channels = ">=3.0.5,<5.0.0"
-Django = ">=3.2"
-fastapi = { version = ">=0.65.0", optional = false }
-flask = ">=1.1"
-quart = ">=0.19.3"
-pydantic = { version = ">=2.0", optional = false }
-pytest-aiohttp = "^1.0.3"
-pytest-django = { version = "^4.5" }
-sanic = ">=20.12.2"
-starlette = ">=0.13.6"
-litestar = { version = ">=2", python = ">=3.10,<4.0", optional = false }
-uvicorn = ">=0.11.6"
-daphne = "^4.0.0"
-
 [tool.pytest.ini_options]
 addopts = "--emoji"
 DJANGO_SETTINGS_MODULE = "tests.django.django_settings"

{strawberry_graphql-0.281.0 → strawberry_graphql-0.283.0}/strawberry/cli/__init__.py

@@ -1,6 +1,7 @@
 try:
     from .app import app
     from .commands.codegen import codegen as codegen
+    from .commands.dev import dev as dev
     from .commands.export_schema import export_schema as export_schema
     from .commands.locate_definition import (
         locate_definition as locate_definition,

strawberry_graphql-0.283.0/strawberry/cli/commands/dev.py

@@ -0,0 +1,72 @@
+import os
+import sys
+from enum import Enum
+from typing import Annotated
+
+import rich
+import typer
+
+from strawberry.cli.app import app
+from strawberry.cli.constants import DEV_SERVER_SCHEMA_ENV_VAR_KEY
+from strawberry.cli.utils import load_schema
+
+
+class LogLevel(str, Enum):
+    critical = "critical"
+    error = "error"
+    warning = "warning"
+    info = "info"
+    debug = "debug"
+    trace = "trace"
+
+
+@app.command(help="Starts the dev server")
+def dev(
+    schema: str,
+    host: Annotated[
+        str, typer.Option("-h", "--host", help="Host to bind the server to.")
+    ] = "0.0.0.0",  # noqa: S104
+    port: Annotated[
+        int, typer.Option("-p", "--port", help="Port to bind the server to.")
+    ] = 8000,
+    log_level: Annotated[
+        LogLevel,
+        typer.Option(
+            "--log-level", help="Passed to uvicorn to determine the server log level."
+        ),
+    ] = LogLevel.error,
+    app_dir: Annotated[
+        str,
+        typer.Option(
+            "--app-dir",
+            help="Look for the schema module in the specified directory, by adding this to the PYTHONPATH. Defaults to the current working directory.",
+        ),
+    ] = ".",
+) -> None:
+    try:
+        import starlette  # noqa: F401
+        import uvicorn
+    except ImportError:
+        rich.print(
+            "[red]Error: The dev server requires additional packages, install them by running:\n"
+            r"pip install 'strawberry-graphql\[cli]'"
+        )
+        raise typer.Exit(1) from None
+
+    sys.path.insert(0, app_dir)
+    load_schema(schema, app_dir=app_dir)
+
+    os.environ[DEV_SERVER_SCHEMA_ENV_VAR_KEY] = schema
+    asgi_app = "strawberry.cli.dev_server:app"
+
+    end = " 🍓\n" if sys.platform != "win32" else "\n"
+    rich.print(f"Running strawberry on http://{host}:{port}/graphql", end=end)
+
+    uvicorn.run(
+        asgi_app,
+        host=host,
+        port=port,
+        log_level=log_level,
+        reload=True,
+        reload_dirs=[app_dir],
+    )

strawberry_graphql-0.283.0/strawberry/cli/commands/server.py

@@ -0,0 +1,41 @@
+from enum import Enum
+
+import typer
+
+from strawberry.cli.app import app
+
+
+class LogLevel(str, Enum):
+    debug = "debug"
+    info = "info"
+    warning = "warning"
+    error = "error"
+
+    __slots__ = ()
+
+
+@app.command(help="Starts debug server")
+def server(
+    schema: str,
+    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",
+        "--log-level",
+        help="passed to uvicorn to determine the log level",
+    ),
+    app_dir: str = typer.Option(
+        ".",
+        "--app-dir",
+        show_default=True,
+        help=(
+            "Look for the module in the specified directory, by adding this to the "
+            "PYTHONPATH. Defaults to the current working directory. "
+            "Works the same as `--app-dir` in uvicorn."
+        ),
+    ),
+) -> None:
+    typer.echo(
+        "The `strawberry server` command is deprecated, use `strawberry dev` instead."
+    )
+    raise typer.Exit(1)

strawberry_graphql-0.283.0/strawberry/cli/constants.py

@@ -0,0 +1 @@
+DEV_SERVER_SCHEMA_ENV_VAR_KEY = "STRAWBERRY_DEV_SERVER_SCHEMA"

strawberry_graphql-0.281.0/strawberry/cli/debug_server.py → strawberry_graphql-0.283.0/strawberry/cli/dev_server.py

@@ -6,7 +6,7 @@ from starlette.middleware.cors import CORSMiddleware
 
 from strawberry import Schema
 from strawberry.asgi import GraphQL
-from strawberry.cli.constants import DEBUG_SERVER_SCHEMA_ENV_VAR_KEY
+from strawberry.cli.constants import DEV_SERVER_SCHEMA_ENV_VAR_KEY
 from strawberry.utils.importer import import_module_symbol
 
 app = Starlette(debug=True)
@@ -14,7 +14,7 @@ app.add_middleware(
     CORSMiddleware, allow_headers=["*"], allow_origins=["*"], allow_methods=["*"]
 )
 
-schema_import_string = os.environ[DEBUG_SERVER_SCHEMA_ENV_VAR_KEY]
+schema_import_string = os.environ[DEV_SERVER_SCHEMA_ENV_VAR_KEY]
 schema_symbol = import_module_symbol(schema_import_string, default_symbol_name="schema")
 
 assert isinstance(schema_symbol, Schema)

{strawberry_graphql-0.281.0 → strawberry_graphql-0.283.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.281.0/strawberry/cli/commands/server.py

@@ -1,72 +0,0 @@
-import os
-import sys
-from enum import Enum
-
-import rich
-import typer
-
-from strawberry.cli.app import app
-from strawberry.cli.constants import DEBUG_SERVER_SCHEMA_ENV_VAR_KEY
-from strawberry.cli.utils import load_schema
-
-
-class LogLevel(str, Enum):
-    debug = "debug"
-    info = "info"
-    warning = "warning"
-    error = "error"
-
-    __slots__ = ()
-
-
-@app.command(help="Starts debug server")
-def server(
-    schema: str,
-    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",
-        "--log-level",
-        help="passed to uvicorn to determine the log level",
-    ),
-    app_dir: str = typer.Option(
-        ".",
-        "--app-dir",
-        show_default=True,
-        help=(
-            "Look for the module in the specified directory, by adding this to the "
-            "PYTHONPATH. Defaults to the current working directory. "
-            "Works the same as `--app-dir` in uvicorn."
-        ),
-    ),
-) -> None:
-    sys.path.insert(0, app_dir)
-
-    try:
-        import starlette  # noqa: F401
-        import uvicorn
-    except ImportError:
-        rich.print(
-            "[red]Error: The debug server requires additional packages, "
-            "install them by running:\n"
-            r"pip install 'strawberry-graphql\[debug-server]'"
-        )
-        raise typer.Exit(1)  # noqa: B904
-
-    load_schema(schema, app_dir=app_dir)
-
-    os.environ[DEBUG_SERVER_SCHEMA_ENV_VAR_KEY] = schema
-    app = "strawberry.cli.debug_server:app"
-
-    # Windows doesn't support UTF-8 by default
-    endl = " 🍓\n" if sys.platform != "win32" else "\n"
-    print(f"Running strawberry on http://{host}:{port}/graphql", end=endl)  # noqa: T201
-
-    uvicorn.run(
-        app,
-        host=host,
-        port=port,
-        log_level=log_level,
-        reload=True,
-        reload_dirs=[app_dir],
-    )

strawberry_graphql-0.281.0/strawberry/cli/constants.py

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

strawberry_graphql-0.281.0/strawberry/utils/graphql_lexer.py

@@ -1,35 +0,0 @@
-from typing import Any, ClassVar
-
-from pygments import token
-from pygments.lexer import RegexLexer
-
-
-class GraphQLLexer(RegexLexer):
-    """GraphQL Lexer for Pygments, used by the debug server."""
-
-    name = "GraphQL"
-    aliases: ClassVar[list[str]] = ["graphql", "gql"]
-    filenames: ClassVar[list[str]] = ["*.graphql", "*.gql"]
-    mimetypes: ClassVar[list[str]] = ["application/graphql"]
-
-    tokens: ClassVar[dict[str, list[tuple[str, Any]]]] = {
-        "root": [
-            (r"#.*", token.Comment.Singline),
-            (r"\.\.\.", token.Operator),
-            (r'"[\u0009\u000A\u000D\u0020-\uFFFF]*"', token.String.Double),
-            (
-                r"(-?0|-?[1-9][0-9]*)(\.[0-9]+[eE][+-]?[0-9]+|\.[0-9]+|[eE][+-]?[0-9]+)",
-                token.Number.Float,
-            ),
-            (r"(-?0|-?[1-9][0-9]*)", token.Number.Integer),
-            (r"\$+[_A-Za-z][_0-9A-Za-z]*", token.Name.Variable),
-            (r"[_A-Za-z][_0-9A-Za-z]+\s?:", token.Text),
-            (r"(type|query|mutation|@[a-z]+|on|true|false|null)\b", token.Keyword.Type),
-            (r"[!$():=@\[\]{|}]+?", token.Punctuation),
-            (r"[_A-Za-z][_0-9A-Za-z]*", token.Keyword),
-            (r"(\s|,)", token.Text),
-        ]
-    }
-
-
-__all__ = ["GraphQLLexer"]