strawberry-graphql 0.275.7__py3-none-any.whl → 0.284.3__py3-none-any.whl

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/schema_codegen.py

@@ -1,5 +1,4 @@
 from pathlib import Path
-from typing import Optional
 
 import typer
 
@@ -10,7 +9,7 @@ from strawberry.schema_codegen import codegen
 @app.command(help="Generate code from a query")
 def schema_codegen(
     schema: Path = typer.Argument(exists=True),
-    output: Optional[Path] = typer.Option(
+    output: Path | None = typer.Option(
         None,
         "-o",
         "--output",

strawberry/cli/commands/server.py

@@ -1,16 +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_LOG_OPERATIONS,
-    DEBUG_SERVER_SCHEMA_ENV_VAR_KEY,
-)
-from strawberry.cli.utils import load_schema
 
 
 class LogLevel(str, Enum):
@@ -42,41 +34,8 @@ def server(
             "Works the same as `--app-dir` in uvicorn."
         ),
     ),
-    log_operations: bool = typer.Option(
-        True,
-        "--log-operations",
-        show_default=True,
-        help="Log GraphQL operations",
-    ),
 ) -> 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
-    os.environ[DEBUG_SERVER_LOG_OPERATIONS] = str(log_operations)
-    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/commands/upgrade/__init__.py

@@ -10,6 +10,7 @@ from libcst.codemod import CodemodContext
 
 from strawberry.cli.app import app
 from strawberry.codemods.annotated_unions import ConvertUnionToAnnotatedUnion
+from strawberry.codemods.maybe_optional import ConvertMaybeToOptional
 from strawberry.codemods.update_imports import UpdateImportsCodemod
 
 from ._run_codemod import run_codemod
@@ -17,6 +18,7 @@ from ._run_codemod import run_codemod
 codemods = {
     "annotated-union": ConvertUnionToAnnotatedUnion,
     "update-imports": UpdateImportsCodemod,
+    "maybe-optional": ConvertMaybeToOptional,
 }
 
 
@@ -45,8 +47,6 @@ def upgrade(
 
         raise typer.Exit(2)
 
-    python_target_version = tuple(int(x) for x in python_target.split("."))
-
     transformer: ConvertUnionToAnnotatedUnion | UpdateImportsCodemod
 
     if codemod == "update-imports":
@@ -55,7 +55,7 @@ def upgrade(
     else:
         transformer = ConvertUnionToAnnotatedUnion(
             CodemodContext(),
-            use_pipe_syntax=python_target_version >= (3, 10),
+            use_pipe_syntax=True,
             use_typing_extensions=use_typing_extensions,
         )
 

strawberry/cli/commands/upgrade/_run_codemod.py

@@ -4,7 +4,7 @@ import contextlib
 import os
 from importlib.metadata import version
 from multiprocessing import Pool, cpu_count
-from typing import TYPE_CHECKING, Any, Union
+from typing import TYPE_CHECKING, Any, TypeAlias
 
 from libcst.codemod._cli import ExecutionConfig, ExecutionResult, _execute_transform
 from rich.progress import Progress
@@ -16,7 +16,7 @@ if TYPE_CHECKING:
 
     from libcst.codemod import Codemod
 
-ProgressType = Union[type[Progress], type[FakeProgress]]
+ProgressType: TypeAlias = type[Progress] | type[FakeProgress]
 
 
 def _get_libcst_version() -> tuple[int, int, int]:

strawberry/cli/constants.py

@@ -1,2 +1 @@
-DEBUG_SERVER_SCHEMA_ENV_VAR_KEY = "STRAWBERRY_DEBUG_SERVER_SCHEMA"
-DEBUG_SERVER_LOG_OPERATIONS = "STRAWBERRY_DEBUG_SERVER_LOG_OPERATIONS"
+DEV_SERVER_SCHEMA_ENV_VAR_KEY = "STRAWBERRY_DEV_SERVER_SCHEMA"

strawberry/cli/{debug_server.py → dev_server.py}

@@ -6,10 +6,7 @@ from starlette.middleware.cors import CORSMiddleware
 
 from strawberry import Schema
 from strawberry.asgi import GraphQL
-from strawberry.cli.constants import (
-    DEBUG_SERVER_LOG_OPERATIONS,
-    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)
@@ -17,12 +14,11 @@ 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")
-log_operations = os.environ[DEBUG_SERVER_LOG_OPERATIONS] == "True"
 
 assert isinstance(schema_symbol, Schema)
-graphql_app = GraphQL[Any, Any](schema_symbol, debug=log_operations)
+graphql_app = GraphQL[Any, Any](schema_symbol)
 
 paths = ["/", "/graphql"]
 for path in paths:

strawberry/codegen/plugins/print_operation.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import textwrap
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 from strawberry.codegen import CodegenFile, QueryCodegenPlugin
 from strawberry.codegen.types import (
@@ -93,7 +93,7 @@ class PrintOperationPlugin(QueryCodegenPlugin):
         return f"({variables})"
 
     def _print_graphql_type(
-        self, type: GraphQLType, parent_type: Optional[GraphQLType] = None
+        self, type: GraphQLType, parent_type: GraphQLType | None = None
     ) -> str:
         if isinstance(type, GraphQLOptional):
             return self._print_graphql_type(type.of_type, type)

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, ClassVar, Optional
+from typing import TYPE_CHECKING, ClassVar
 
 from strawberry.codegen import CodegenFile, QueryCodegenPlugin
 from strawberry.codegen.types import (
@@ -31,7 +31,7 @@ if TYPE_CHECKING:
 @dataclass
 class PythonType:
     type: str
-    module: Optional[str] = None
+    module: str | None = None
 
 
 class PythonPlugin(QueryCodegenPlugin):

strawberry/codegen/query_codegen.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from collections.abc import Iterable, Mapping, Sequence
+from collections.abc import Callable, Iterable, Mapping, Sequence
 from dataclasses import MISSING, dataclass
 from enum import Enum
 from functools import cmp_to_key, partial
@@ -8,12 +8,9 @@ from pathlib import Path
 from typing import (
     TYPE_CHECKING,
     Any,
-    Callable,
-    Optional,
-    Union,
     cast,
 )
-from typing_extensions import Literal, Protocol
+from typing_extensions import Protocol
 
 import rich
 from graphql import (
@@ -122,7 +119,7 @@ class CodegenResult:
 
 
 class HasSelectionSet(Protocol):
-    selection_set: Optional[SelectionSetNode]
+    selection_set: SelectionSetNode | None
 
 
 class QueryCodegenPlugin:
@@ -234,7 +231,7 @@ class QueryCodegenPluginManager:
     def __init__(
         self,
         plugins: list[QueryCodegenPlugin],
-        console_plugin: Optional[ConsolePlugin] = None,
+        console_plugin: ConsolePlugin | None = None,
     ) -> None:
         self.plugins = plugins
         self.console_plugin = console_plugin
@@ -298,7 +295,7 @@ class QueryCodegen:
         self,
         schema: Schema,
         plugins: list[QueryCodegenPlugin],
-        console_plugin: Optional[ConsolePlugin] = None,
+        console_plugin: ConsolePlugin | None = None,
     ) -> None:
         self.schema = schema
         self.plugin_manager = QueryCodegenPluginManager(plugins, console_plugin)
@@ -390,7 +387,7 @@ class QueryCodegen:
         raise ValueError(f"Unsupported type: {type(selection)}")  # pragma: no cover
 
     def _convert_selection_set(
-        self, selection_set: Optional[SelectionSetNode]
+        self, selection_set: SelectionSetNode | None
     ) -> list[GraphQLSelection]:
         if selection_set is None:
             return []
@@ -473,18 +470,13 @@ class QueryCodegen:
             class_name=result_class_name,
         )
 
-        operation_kind = cast(
-            "Literal['query', 'mutation', 'subscription']",
-            operation_definition.operation.value,
-        )
-
         variables, variables_type = self._convert_variable_definitions(
             operation_definition.variable_definitions, operation_name=operation_name
         )
 
         return GraphQLOperation(
             operation_definition.name.value,
-            kind=operation_kind,
+            kind=operation_definition.operation.value,
             selections=self._convert_selection_set(operation_definition.selection_set),
             directives=self._convert_directives(operation_definition.directives),
             variables=variables,
@@ -494,9 +486,9 @@ class QueryCodegen:
 
     def _convert_variable_definitions(
         self,
-        variable_definitions: Optional[Iterable[VariableDefinitionNode]],
+        variable_definitions: Iterable[VariableDefinitionNode] | None,
         operation_name: str,
-    ) -> tuple[list[GraphQLVariable], Optional[GraphQLObjectType]]:
+    ) -> tuple[list[GraphQLVariable], GraphQLObjectType | None]:
         if not variable_definitions:
             return [], None
 
@@ -527,7 +519,7 @@ class QueryCodegen:
 
     def _get_field_type(
         self,
-        field_type: Union[StrawberryType, type],
+        field_type: StrawberryType | type,
     ) -> GraphQLType:
         if isinstance(field_type, StrawberryOptional):
             return GraphQLOptional(self._get_field_type(field_type.of_type))
@@ -557,7 +549,7 @@ class QueryCodegen:
         raise ValueError(f"Unsupported type: {field_type}")  # pragma: no cover
 
     def _collect_type_from_strawberry_type(
-        self, strawberry_type: Union[type, StrawberryType]
+        self, strawberry_type: type | StrawberryType
     ) -> GraphQLType:
         type_: GraphQLType
 
@@ -596,9 +588,9 @@ class QueryCodegen:
         return type_
 
     def _collect_type_from_variable(
-        self, variable_type: TypeNode, parent_type: Optional[TypeNode] = None
+        self, variable_type: TypeNode, parent_type: TypeNode | None = None
     ) -> GraphQLType:
-        type_: Optional[GraphQLType] = None
+        type_: GraphQLType | None = None
 
         if isinstance(variable_type, ListTypeNode):
             type_ = GraphQLList(
@@ -637,11 +629,9 @@ class QueryCodegen:
         )
 
     def _unwrap_type(
-        self, type_: Union[type, StrawberryType]
-    ) -> tuple[
-        Union[type, StrawberryType], Optional[Callable[[GraphQLType], GraphQLType]]
-    ]:
-        wrapper: Optional[Callable[[GraphQLType], GraphQLType]] = None
+        self, type_: type | StrawberryType
+    ) -> tuple[type | StrawberryType, Callable[[GraphQLType], GraphQLType] | None]:
+        wrapper: Callable[[GraphQLType], GraphQLType] | None = None
 
         if isinstance(type_, StrawberryOptional):
             type_, previous_wrapper = self._unwrap_type(type_.of_type)
@@ -738,7 +728,7 @@ class QueryCodegen:
         selection: HasSelectionSet,
         parent_type: StrawberryObjectDefinition,
         class_name: str,
-    ) -> Union[GraphQLObjectType, GraphQLUnion]:
+    ) -> GraphQLObjectType | GraphQLUnion:
         sub_types = self._collect_types_using_fragments(
             selection, parent_type, class_name
         )
@@ -773,7 +763,7 @@ class QueryCodegen:
             )
 
         current_type = graph_ql_object_type_factory(class_name)
-        fields: list[Union[GraphQLFragmentSpread, GraphQLField]] = []
+        fields: list[GraphQLFragmentSpread | GraphQLField] = []
 
         for sub_selection in selection_set.selections:
             if isinstance(sub_selection, FragmentSpreadNode):
@@ -844,7 +834,7 @@ class QueryCodegen:
                 list(common_fields),
                 graphql_typename=type_condition_name,
             )
-            fields: list[Union[GraphQLFragmentSpread, GraphQLField]] = []
+            fields: list[GraphQLFragmentSpread | GraphQLField] = []
 
             for sub_selection in fragment.selection_set.selections:
                 if isinstance(sub_selection, FragmentSpreadNode):
@@ -899,7 +889,7 @@ class QueryCodegen:
         return sub_types
 
     def _collect_scalar(
-        self, scalar_definition: ScalarDefinition, python_type: Optional[type]
+        self, scalar_definition: ScalarDefinition, python_type: type | None
     ) -> GraphQLScalar:
         graphql_scalar = GraphQLScalar(scalar_definition.name, python_type=python_type)
 

strawberry/codegen/types.py

@@ -1,12 +1,12 @@
 from __future__ import annotations
 
 from dataclasses import dataclass, field
-from typing import TYPE_CHECKING, Optional, Union
+from typing import TYPE_CHECKING, TypeAlias
 
 if TYPE_CHECKING:
     from collections.abc import Mapping
     from enum import EnumMeta
-    from typing_extensions import Literal
+    from typing import Literal
 
     from strawberry.types.unset import UnsetType
 
@@ -30,9 +30,9 @@ class GraphQLUnion:
 @dataclass
 class GraphQLField:
     name: str
-    alias: Optional[str]
+    alias: str | None
     type: GraphQLType
-    default_value: Optional[GraphQLArgumentValue] = None
+    default_value: GraphQLArgumentValue | None = None
 
 
 @dataclass
@@ -44,7 +44,7 @@ class GraphQLFragmentSpread:
 class GraphQLObjectType:
     name: str
     fields: list[GraphQLField] = field(default_factory=list)
-    graphql_typename: Optional[str] = None
+    graphql_typename: str | None = None
 
 
 # Subtype of GraphQLObjectType.
@@ -54,7 +54,7 @@ class GraphQLObjectType:
 class GraphQLFragmentType(GraphQLObjectType):
     name: str
     fields: list[GraphQLField] = field(default_factory=list)
-    graphql_typename: Optional[str] = None
+    graphql_typename: str | None = None
     on: str = ""
 
     def __post_init__(self) -> None:
@@ -74,23 +74,23 @@ class GraphQLEnum:
 @dataclass
 class GraphQLScalar:
     name: str
-    python_type: Optional[type]
+    python_type: type | None
 
 
-GraphQLType = Union[
-    GraphQLObjectType,
-    GraphQLEnum,
-    GraphQLScalar,
-    GraphQLOptional,
-    GraphQLList,
-    GraphQLUnion,
-]
+GraphQLType: TypeAlias = (
+    GraphQLObjectType
+    | GraphQLEnum
+    | GraphQLScalar
+    | GraphQLOptional
+    | GraphQLList
+    | GraphQLUnion
+)
 
 
 @dataclass
 class GraphQLFieldSelection:
     field: str
-    alias: Optional[str]
+    alias: str | None
     selections: list[GraphQLSelection]
     directives: list[GraphQLDirective]
     arguments: list[GraphQLArgument]
@@ -102,9 +102,9 @@ class GraphQLInlineFragment:
     selections: list[GraphQLSelection]
 
 
-GraphQLSelection = Union[
-    GraphQLFieldSelection, GraphQLInlineFragment, GraphQLFragmentSpread
-]
+GraphQLSelection: TypeAlias = (
+    GraphQLFieldSelection | GraphQLInlineFragment | GraphQLFragmentSpread
+)
 
 
 @dataclass
@@ -125,7 +125,7 @@ class GraphQLFloatValue:
 @dataclass
 class GraphQLEnumValue:
     name: str
-    enum_type: Optional[str] = None
+    enum_type: str | None = None
 
 
 @dataclass
@@ -155,17 +155,17 @@ class GraphQLVariableReference:
     value: str
 
 
-GraphQLArgumentValue = Union[
-    GraphQLStringValue,
-    GraphQLNullValue,
-    GraphQLIntValue,
-    GraphQLVariableReference,
-    GraphQLFloatValue,
-    GraphQLListValue,
-    GraphQLEnumValue,
-    GraphQLBoolValue,
-    GraphQLObjectValue,
-]
+GraphQLArgumentValue: TypeAlias = (
+    GraphQLStringValue
+    | GraphQLNullValue
+    | GraphQLIntValue
+    | GraphQLVariableReference
+    | GraphQLFloatValue
+    | GraphQLListValue
+    | GraphQLEnumValue
+    | GraphQLBoolValue
+    | GraphQLObjectValue
+)
 
 
 @dataclass
@@ -194,7 +194,7 @@ class GraphQLOperation:
     directives: list[GraphQLDirective]
     variables: list[GraphQLVariable]
     type: GraphQLObjectType
-    variables_type: Optional[GraphQLObjectType]
+    variables_type: GraphQLObjectType | None
 
 
 __all__ = [

strawberry/codemods/__init__.py

@@ -0,0 +1,9 @@
+from .annotated_unions import ConvertUnionToAnnotatedUnion
+from .maybe_optional import ConvertMaybeToOptional
+from .update_imports import UpdateImportsCodemod
+
+__all__ = [
+    "ConvertMaybeToOptional",
+    "ConvertUnionToAnnotatedUnion",
+    "UpdateImportsCodemod",
+]

strawberry/codemods/annotated_unions.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 import libcst as cst
 import libcst.matchers as m
@@ -50,7 +50,7 @@ class ConvertUnionToAnnotatedUnion(VisitorBasedCodemodCommand):
 
         super().__init__(context)
 
-    def visit_Module(self, node: cst.Module) -> Optional[bool]:  # noqa: N802
+    def visit_Module(self, node: cst.Module) -> bool | None:  # noqa: N802
         self._is_using_named_import = False
 
         return super().visit_Module(node)