strawberry-graphql 0.274.2__tar.gz → 0.275.0__tar.gz

{strawberry_graphql-0.274.2 → strawberry_graphql-0.275.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: strawberry-graphql
-Version: 0.274.2
+Version: 0.275.0
 Summary: A library for creating GraphQL APIs
 License: MIT
 Keywords: graphql,api,rest,starlette,async
@@ -37,9 +37,9 @@ Requires-Dist: channels (>=3.0.5) ; extra == "channels"
 Requires-Dist: fastapi (>=0.65.2) ; extra == "fastapi"
 Requires-Dist: flask (>=1.1) ; extra == "flask"
 Requires-Dist: graphql-core (>=3.2.0,<3.4.0)
-Requires-Dist: libcst (>=0.4.7,<1.8.0) ; extra == "cli"
-Requires-Dist: libcst (>=0.4.7,<1.8.0) ; extra == "debug"
-Requires-Dist: libcst (>=0.4.7,<1.8.0) ; extra == "debug-server"
+Requires-Dist: libcst ; extra == "cli"
+Requires-Dist: libcst ; extra == "debug"
+Requires-Dist: libcst ; extra == "debug-server"
 Requires-Dist: litestar (>=2) ; (python_version ~= "3.10") and (extra == "litestar")
 Requires-Dist: opentelemetry-api (<2) ; extra == "opentelemetry"
 Requires-Dist: opentelemetry-sdk (<2) ; extra == "opentelemetry"

{strawberry_graphql-0.274.2 → strawberry_graphql-0.275.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "strawberry-graphql"
-version = "0.274.2"
+version = "0.275.0"
 description = "A library for creating GraphQL APIs"
 authors = [{ name = "Patrick Arminio", email = "patrick.arminio@gmail.com" }]
 license = { text = "MIT" }
@@ -38,7 +38,7 @@ strawberry = "strawberry.cli:run"
 [project.optional-dependencies]
 aiohttp = ["aiohttp>=3.7.4.post0,<4"]
 asgi = ["starlette>=0.18.0", "python-multipart>=0.0.7"]
-debug = ["rich>=12.0.0", "libcst>=0.4.7,<1.8.0"]
+debug = ["rich>=12.0.0", "libcst"]
 debug-server = [
   "starlette>=0.18.0",
   "uvicorn>=0.11.6",
@@ -47,7 +47,7 @@ debug-server = [
   "typer>=0.7.0",
   "pygments~=2.3",
   "rich>=12.0.0",
-  "libcst>=0.4.7,<1.8.0",
+  "libcst",
 ]
 django = ["Django>=3.2", "asgiref~=3.2"]
 channels = ["channels>=3.0.5", "asgiref~=3.2"]
@@ -58,7 +58,7 @@ 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>=0.4.7,<1.8.0"]
+cli = ["typer>=0.7.0", "pygments~=2.3", "rich>=12.0.0", "libcst"]
 litestar = ["litestar>=2; python_version~='3.10'"]
 pyinstrument = ["pyinstrument>=4.0.0"]
 
@@ -71,7 +71,7 @@ ruff = "^0.11.4"
 asgiref = "^3.2"
 email-validator = { version = ">=1.1.3,<3.0.0", optional = false }
 freezegun = "^1.2.1"
-libcst = { version = ">=1.0.0", optional = false }
+libcst = { version = "^1.8.2", optional = false }
 MarkupSafe = "2.1.3"
 nox = "^2024.4.15"
 nox-poetry = "^1.0.3"

{strawberry_graphql-0.274.2 → strawberry_graphql-0.275.0}/strawberry/cli/__init__.py

@@ -2,6 +2,9 @@ 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.locate_definition import (
+        locate_definition as locate_definition,  # noqa: PLC0414
+    )
     from .commands.schema_codegen import (
         schema_codegen as schema_codegen,  # noqa: PLC0414
     )

strawberry_graphql-0.275.0/strawberry/cli/commands/locate_definition.py

@@ -0,0 +1,36 @@
+import sys
+
+import typer
+from rich.console import Console
+
+from strawberry.cli.app import app
+from strawberry.cli.utils import load_schema
+from strawberry.utils.locate_definition import (
+    locate_definition as locate_definition_util,
+)
+
+err_console = Console(stderr=True)
+
+
+@app.command(help="Locate a definition in the schema (output: path:line:column)")
+def locate_definition(
+    schema: str,
+    symbol: str,
+    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:
+    schema_symbol = load_schema(schema, app_dir)
+
+    if location := locate_definition_util(schema_symbol, symbol):
+        typer.echo(location)
+    else:
+        err_console.print(f"Definition not found: {symbol}")
+        sys.exit(1)

{strawberry_graphql-0.274.2 → strawberry_graphql-0.275.0}/strawberry/cli/commands/upgrade/_run_codemod.py

@@ -7,7 +7,6 @@ from multiprocessing import Pool, cpu_count
 from typing import TYPE_CHECKING, Any, Union
 
 from libcst.codemod._cli import ExecutionConfig, ExecutionResult, _execute_transform
-from libcst.codemod._dummy_pool import DummyPool
 from rich.progress import Progress
 
 from ._fake_progress import FakeProgress
@@ -18,7 +17,6 @@ if TYPE_CHECKING:
     from libcst.codemod import Codemod
 
 ProgressType = Union[type[Progress], type[FakeProgress]]
-PoolType = Union[type[Pool], type[DummyPool]]  # type: ignore
 
 
 def _get_libcst_version() -> tuple[int, int, int]:
@@ -37,29 +35,21 @@ def _execute_transform_wrap(
 ) -> ExecutionResult:
     additional_kwargs: dict[str, Any] = {}
 
-    if _get_libcst_version() >= (1, 4, 0):
+    libcst_version = _get_libcst_version()
+
+    if (1, 4, 0) <= libcst_version < (1, 8, 0):
         additional_kwargs["scratch"] = {}
 
+    if libcst_version >= (1, 8, 0):
+        additional_kwargs["original_scratch"] = {}
+        additional_kwargs["codemod_args"] = {}
+        additional_kwargs["repo_manager"] = None
+
     # TODO: maybe capture warnings?
     with open(os.devnull, "w") as null, contextlib.redirect_stderr(null):  # noqa: PTH123
         return _execute_transform(**job, **additional_kwargs)
 
 
-def _get_progress_and_pool(
-    total_files: int, jobs: int
-) -> tuple[PoolType, ProgressType]:
-    poll_impl: PoolType = Pool  # type: ignore
-    progress_impl: ProgressType = Progress
-
-    if total_files == 1 or jobs == 1:
-        poll_impl = DummyPool
-
-    if total_files == 1:
-        progress_impl = FakeProgress
-
-    return poll_impl, progress_impl
-
-
 def run_codemod(
     codemod: Codemod,
     files: Sequence[str],
@@ -70,8 +60,6 @@ def run_codemod(
 
     config = ExecutionConfig()
 
-    pool_impl, progress_impl = _get_progress_and_pool(total, jobs)
-
     tasks = [
         {
             "transformer": codemod,
@@ -81,7 +69,7 @@ def run_codemod(
         for filename in files
     ]
 
-    with pool_impl(processes=jobs) as p, progress_impl() as progress:  # type: ignore
+    with Pool(processes=jobs) as p, Progress() as progress:
         task_id = progress.add_task("[cyan]Updating...", total=len(tasks))
 
         for result in p.imap_unordered(

{strawberry_graphql-0.274.2 → strawberry_graphql-0.275.0}/strawberry/exceptions/utils/source_finder.py

@@ -166,7 +166,8 @@ class LibCSTSourceFinder:
         attribute_definitions = m.findall(
             class_def,
             m.AssignTarget(target=m.Name(value=attribute_name))
-            | m.AnnAssign(target=m.Name(value=attribute_name)),
+            | m.AnnAssign(target=m.Name(value=attribute_name))
+            | m.FunctionDef(name=m.Name(value=attribute_name)),
         )
 
         if not attribute_definitions:
@@ -511,7 +512,8 @@ class LibCSTSourceFinder:
         path = Path(scalar_definition._source_file)
         source = path.read_text()
 
-        matcher = m.Call(
+        # Try to find direct strawberry.scalar() calls with name parameter
+        direct_matcher = m.Call(
             func=m.Attribute(value=m.Name(value="strawberry"), attr=m.Name("scalar"))
             | m.Name("scalar"),
             args=[
@@ -525,31 +527,89 @@ class LibCSTSourceFinder:
             ],
         )
 
-        scalar_calls = self._find(source, matcher)
+        direct_calls = self._find(source, direct_matcher)
+        if direct_calls:
+            return self._create_scalar_exception_source(
+                path, source, direct_calls[0], scalar_definition, is_newtype=False
+            )
 
-        if not scalar_calls:
-            return None  # pragma: no cover
+        # Try to find strawberry.scalar() calls with NewType pattern
+        newtype_matcher = m.Call(
+            func=m.Attribute(value=m.Name(value="strawberry"), attr=m.Name("scalar"))
+            | m.Name("scalar"),
+            args=[
+                m.Arg(
+                    value=m.Call(
+                        func=m.Name(value="NewType"),
+                        args=[
+                            m.Arg(
+                                value=m.SimpleString(
+                                    value=f"'{scalar_definition.name}'"
+                                )
+                                | m.SimpleString(value=f'"{scalar_definition.name}"'),
+                            ),
+                            m.ZeroOrMore(),
+                        ],
+                    )
+                ),
+                m.ZeroOrMore(),
+            ],
+        )
 
-        scalar_call_node = scalar_calls[0]
+        newtype_calls = self._find(source, newtype_matcher)
+        if newtype_calls:
+            return self._create_scalar_exception_source(
+                path, source, newtype_calls[0], scalar_definition, is_newtype=True
+            )
 
-        argument_node = m.findall(
-            scalar_call_node,
-            m.Arg(
-                keyword=m.Name(value="name"),
-            ),
-        )
+        return None  # pragma: no cover
+
+    def _create_scalar_exception_source(
+        self,
+        path: Path,
+        source: str,
+        call_node: Any,
+        scalar_definition: ScalarDefinition,
+        is_newtype: bool,
+    ) -> Optional[ExceptionSource]:
+        """Helper method to create ExceptionSource for scalar calls."""
+        import libcst.matchers as m
+
+        if is_newtype:
+            # For NewType pattern, find the string argument within the NewType call
+            newtype_nodes = m.findall(call_node, m.Call(func=m.Name(value="NewType")))
+            if not newtype_nodes:
+                return None  # pragma: no cover
+
+            target_node = newtype_nodes[0]
+            string_nodes = m.findall(
+                target_node,
+                m.SimpleString(value=f"'{scalar_definition.name}'")
+                | m.SimpleString(value=f'"{scalar_definition.name}"'),
+            )
+            if not string_nodes:
+                return None  # pragma: no cover
+
+            target_node = string_nodes[0]
+        else:
+            # For direct calls, find the name argument
+            target_nodes = m.findall(call_node, m.Arg(keyword=m.Name(value="name")))
+            if not target_nodes:
+                return None  # pragma: no cover
+
+            target_node = target_nodes[0]
 
-        position = self._position_metadata[scalar_call_node]
-        argument_node_position = self._position_metadata[argument_node[0]]
+        position = self._position_metadata[call_node]
+        target_position = self._position_metadata[target_node]
 
         return ExceptionSource(
             path=path,
             code=source,
             start_line=position.start.line,
             end_line=position.end.line,
-            error_line=argument_node_position.start.line,
-            error_column=argument_node_position.start.column,
-            error_column_end=argument_node_position.end.column,
+            error_line=target_position.start.line,
+            error_column=target_position.start.column,
+            error_column_end=target_position.end.column,
         )
 
 

{strawberry_graphql-0.274.2 → strawberry_graphql-0.275.0}/strawberry/types/enum.py

@@ -45,6 +45,10 @@ class EnumDefinition(StrawberryType):
     def is_graphql_generic(self) -> bool:
         return False
 
+    @property
+    def origin(self) -> type:
+        return self.wrapped_cls
+
 
 # TODO: remove duplication of EnumValueDefinition and EnumValue
 @dataclasses.dataclass

{strawberry_graphql-0.274.2 → strawberry_graphql-0.275.0}/strawberry/types/union.py

@@ -283,6 +283,10 @@ def union(
             union._source_file = frame.f_code.co_filename
             union._source_line = frame.f_lineno
 
+            # TODO: here union._source_file could be "<string>"
+            # (when using future annotations)
+            # we should find a better way to handle this
+
         return union
 
     warnings.warn(

strawberry_graphql-0.275.0/strawberry/utils/locate_definition.py

@@ -0,0 +1,46 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from strawberry.exceptions.utils.source_finder import SourceFinder
+from strawberry.types.scalar import ScalarDefinition
+from strawberry.types.union import StrawberryUnion
+from strawberry.utils.str_converters import to_snake_case
+
+if TYPE_CHECKING:
+    from strawberry.schema.schema import Schema
+
+
+def locate_definition(schema_symbol: Schema, symbol: str) -> str | None:
+    finder = SourceFinder()
+
+    if "." in symbol:
+        model, field = symbol.split(".", 1)
+    else:
+        model, field = symbol, None
+
+    schema_type = schema_symbol.get_type_by_name(model)
+
+    if not schema_type:
+        return None
+
+    if field:
+        assert not isinstance(schema_type, StrawberryUnion)
+
+        location = finder.find_class_attribute_from_object(
+            schema_type.origin,  # type: ignore
+            to_snake_case(field)
+            if schema_symbol.config.name_converter.auto_camel_case
+            else field,
+        )
+    elif isinstance(schema_type, StrawberryUnion):
+        location = finder.find_annotated_union(schema_type, None)
+    elif isinstance(schema_type, ScalarDefinition):
+        location = finder.find_scalar_call(schema_type)
+    else:
+        location = finder.find_class_from_object(schema_type.origin)
+
+    if not location:
+        return None
+
+    return f"{location.path}:{location.error_line}:{location.error_column + 1}"