strawberry-graphql 0.282.0__py3-none-any.whl → 0.283.0__py3-none-any.whl

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/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/cli/commands/server.py

@@ -1,13 +1,8 @@
-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):
@@ -40,33 +35,7 @@ def server(
         ),
     ),
 ) -> 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],
+    typer.echo(
+        "The `strawberry server` command is deprecated, use `strawberry dev` instead."
     )
+    raise typer.Exit(1)

strawberry/cli/constants.py

@@ -1 +1 @@
-DEBUG_SERVER_SCHEMA_ENV_VAR_KEY = "STRAWBERRY_DEBUG_SERVER_SCHEMA"
+DEV_SERVER_SCHEMA_ENV_VAR_KEY = "STRAWBERRY_DEV_SERVER_SCHEMA"

strawberry/cli/{debug_server.py → 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.282.0.dist-info → strawberry_graphql-0.283.0.dist-info}/METADATA

@@ -1,8 +1,9 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: strawberry-graphql
-Version: 0.282.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.282.0.dist-info → strawberry_graphql-0.283.0.dist-info}/RECORD

@@ -17,19 +17,20 @@ strawberry/channels/handlers/http_handler.py,sha256=EmRVgn0AHG9-dNUOU_rgKf0Ppsh8
 strawberry/channels/handlers/ws_handler.py,sha256=846Nj9bdcRJ1jezIa-Dmn3S_cgi8W-JTLt6mITG8ff4,6172
 strawberry/channels/router.py,sha256=DKIbl4zuRBhfvViUVpyu0Rf_WRT41E6uZC-Yic9Ltvo,2024
 strawberry/channels/testing.py,sha256=dc9mvSm9YdNOUgQk5ou5K4iE2h6TP5quKnk4Xdtn-IY,6558
-strawberry/cli/__init__.py,sha256=9rqBIeRSi0P0JljMWO43KC3inm4BBf0CX5pEWQWnTos,662
+strawberry/cli/__init__.py,sha256=szPgUPbmZKgoYVY1EsqnUFWi8onJVje3EUx3ACbnfA4,703
 strawberry/cli/app.py,sha256=tTMBV1pdWqMcwjWO2yn-8oLDhMhfJvUzyQtWs75LWJ0,54
 strawberry/cli/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 strawberry/cli/commands/codegen.py,sha256=WbX8uqF-dpQk1QjQm3H4AvNSZ4lIUOTSPghii3attj8,3812
+strawberry/cli/commands/dev.py,sha256=WSyOtaApia746B-X3AyiaPQd4jQ506mNrTGUN0Iq7RI,1968
 strawberry/cli/commands/export_schema.py,sha256=pyp_Q3BiO7lFH0L3mNPvr7UF8hlhcoUPqqBP4JPWUu0,1049
 strawberry/cli/commands/locate_definition.py,sha256=aJJ_KeAnV-c8zTdWIhzcHUilUmCpqsmrVy24qHbyWKk,1001
 strawberry/cli/commands/schema_codegen.py,sha256=G6eV08a51sjVxCm3jn75oPn9hC8YarKiAKOY5bpTuKU,749
-strawberry/cli/commands/server.py,sha256=Q55Eog7oseB127Qvy81MJPQb2DcVkACFg4NGJq2Hl24,1953
+strawberry/cli/commands/server.py,sha256=nbIz-0l_EqQkvpSlg5h9eGFtfW3eSjxUt9bLgRelylo,1066
 strawberry/cli/commands/upgrade/__init__.py,sha256=yj7OxtXhvYdV-P072VFrLnbQmtREnYMLn7iku8gap6k,2596
 strawberry/cli/commands/upgrade/_fake_progress.py,sha256=fefLgJwTXe4kG9RntdEJdzkPPRBK_pZqnmMH-pxD85Y,484
 strawberry/cli/commands/upgrade/_run_codemod.py,sha256=LZd5D1PP65bwVZjBvPPVrZ9t-bfvrafZ__HPBrW2WYA,2168
-strawberry/cli/constants.py,sha256=oELrG15571w3fG66EGBwtMHmMFbknJigkL385yzQnyI,67
-strawberry/cli/debug_server.py,sha256=KANdDHyOybr2SZMs2OAuOf4Haz_SNSHKiiBeemx8fGc,868
+strawberry/cli/constants.py,sha256=MZ8JTo6YyS8t_mRtJJuNCQPiaKzyqjDbncizDb2pG-c,63
+strawberry/cli/dev_server.py,sha256=u6PAAl6Un0SHdsHDWDnQ85VPCY9g5HTNi2VKOFgJl_A,864
 strawberry/cli/utils/__init__.py,sha256=5h6QMXbY4zbWVGg8xpsKlgWSEsNgn1fcjbRrJjgzdEc,987
 strawberry/cli/utils/load_schema.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 strawberry/codegen/__init__.py,sha256=qVfUJXv_2HqZTzi02An2V9auAseT9efi1f5APDG5DjA,250
@@ -229,7 +230,6 @@ strawberry/utils/aio.py,sha256=Nry5jxFHvipGS1CwX5VvFS2YQ6_bp-_cewnI6v9A7-A,2226
 strawberry/utils/await_maybe.py,sha256=YdjfuzjDVjph0VH0WkwvU4ezsjl_fELnGrLC1_bvb_U,449
 strawberry/utils/dataclasses.py,sha256=1wvVq0vgvjrRSamJ3CBJpkLu1KVweTmw5JLXmagdGes,856
 strawberry/utils/deprecations.py,sha256=Yrp4xBzp36mQprH8qPHpPMhkCLm527q7XU7pP4aar_0,782
-strawberry/utils/graphql_lexer.py,sha256=JUVJrJ6Ax0t7m6-DTWFzf4cvXrC02VPmL1NS2zMEMbY,1255
 strawberry/utils/importer.py,sha256=NtTgNaNSW4TnlLo_S34nxXq14RxUAec-QlEZ0LON28M,629
 strawberry/utils/inspect.py,sha256=-aFT65PkQ9KXo5w8Q2uveBJ8jEpi40sTqRipRQVdYR8,3406
 strawberry/utils/locate_definition.py,sha256=raABxyWE9MkhO5_w5tO8_xKHSZumRJCJt1QY1OgHO-M,1429
@@ -237,8 +237,8 @@ strawberry/utils/logging.py,sha256=U1cseHGquN09YFhFmRkiphfASKCyK0HUZREImPgVb0c,7
 strawberry/utils/operation.py,sha256=ZgVOw3K2jQuLjNOYUHauF7itJD0QDNoPw9PBi0IYf6k,1234
 strawberry/utils/str_converters.py,sha256=-eH1Cl16IO_wrBlsGM-km4IY0IKsjhjnSNGRGOwQjVM,897
 strawberry/utils/typing.py,sha256=SDvX-Du-9HAV3-XXjqi7Q5f5qPDDFd_gASIITiwBQT4,14073
-strawberry_graphql-0.282.0.dist-info/LICENSE,sha256=m-XnIVUKqlG_AWnfi9NReh9JfKhYOB-gJfKE45WM1W8,1072
-strawberry_graphql-0.282.0.dist-info/METADATA,sha256=V997csv_7Je1S5Bk7JlMN2pVd9eTNENIoCQogatt2MQ,7426
-strawberry_graphql-0.282.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-strawberry_graphql-0.282.0.dist-info/entry_points.txt,sha256=Nk7-aT3_uEwCgyqtHESV9H6Mc31cK-VAvhnQNTzTb4k,49
-strawberry_graphql-0.282.0.dist-info/RECORD,,
+strawberry_graphql-0.283.0.dist-info/METADATA,sha256=8JyB52vLWMOLDrJaDMa1YT-2qGi7ek_-TCGIn7TbUVA,7652
+strawberry_graphql-0.283.0.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+strawberry_graphql-0.283.0.dist-info/entry_points.txt,sha256=Nk7-aT3_uEwCgyqtHESV9H6Mc31cK-VAvhnQNTzTb4k,49
+strawberry_graphql-0.283.0.dist-info/licenses/LICENSE,sha256=m-XnIVUKqlG_AWnfi9NReh9JfKhYOB-gJfKE45WM1W8,1072
+strawberry_graphql-0.283.0.dist-info/RECORD,,

{strawberry_graphql-0.282.0.dist-info → strawberry_graphql-0.283.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.1.3
+Generator: poetry-core 2.2.1
 Root-Is-Purelib: true
 Tag: py3-none-any

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"]