graphql-core 3.3.1__tar.gz → 3.3.2__tar.gz

{graphql_core-3.3.1 → graphql_core-3.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: graphql-core
-Version: 3.3.1
+Version: 3.3.2
 Summary: GraphQL-core is a Python port of GraphQL.js, the JavaScript reference implementation for GraphQL.
 Keywords: graphql
 Author: Christoph Zwerschke
@@ -40,11 +40,11 @@ An extensive test suite with over 3000 unit tests and 100% coverage replicates t
 complete test suite of GraphQL.js, ensuring that this port is reliable and compatible
 with GraphQL.js.
 
-The current stable version 3.3.1 of GraphQL-core is up-to-date with GraphQL.js
-version 17.0.2 and supports Python versions 3.10 to 3.15.
+The current stable version 3.3.2 of GraphQL-core is up-to-date with GraphQL.js
+version 17.1.0 and supports Python versions 3.10 to 3.15.
 
 If you need compatibility with GraphQL.js 16 or support for Python 3.7 to 3.9,
-you can use the latest version 3.2.13 from the 3.2 branch.
+you can use the latest version 3.2.14 from the 3.2 branch.
 
 Note that for various reasons, GraphQL-core does not use SemVer like GraphQL.js.
 Changes in the major version of GraphQL.js are reflected in the minor version of

{graphql_core-3.3.1 → graphql_core-3.3.2}/README.md

@@ -15,11 +15,11 @@ An extensive test suite with over 3000 unit tests and 100% coverage replicates t
 complete test suite of GraphQL.js, ensuring that this port is reliable and compatible
 with GraphQL.js.
 
-The current stable version 3.3.1 of GraphQL-core is up-to-date with GraphQL.js
-version 17.0.2 and supports Python versions 3.10 to 3.15.
+The current stable version 3.3.2 of GraphQL-core is up-to-date with GraphQL.js
+version 17.1.0 and supports Python versions 3.10 to 3.15.
 
 If you need compatibility with GraphQL.js 16 or support for Python 3.7 to 3.9,
-you can use the latest version 3.2.13 from the 3.2 branch.
+you can use the latest version 3.2.14 from the 3.2 branch.
 
 Note that for various reasons, GraphQL-core does not use SemVer like GraphQL.js.
 Changes in the major version of GraphQL.js are reflected in the minor version of

{graphql_core-3.3.1 → graphql_core-3.3.2}/docs/conf.py

@@ -52,7 +52,7 @@ author = "Christoph Zwerschke"
 # The short X.Y version.
 # version = '3.3'
 # The full version, including alpha/beta/rc tags.
-version = release = "3.3.1"
+version = release = "3.3.2"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

{graphql_core-3.3.1 → graphql_core-3.3.2}/docs/modules/pyutils.rst

@@ -38,3 +38,5 @@ PyUtils
    :no-inherited-members:
 .. autoclass:: RefSet
    :no-inherited-members:
+.. autoclass:: SetMap
+   :no-inherited-members:

{graphql_core-3.3.1 → graphql_core-3.3.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "graphql-core"
-version = "3.3.1"
+version = "3.3.2"
 description = "GraphQL-core is a Python port of GraphQL.js, the JavaScript reference implementation for GraphQL."
 readme = "README.md"
 requires-python = ">=3.10"
@@ -32,19 +32,19 @@ Changelog = "https://github.com/graphql-python/graphql-core/releases"
 
 [dependency-groups]
 test = [
-    "anyio>=4.15,<5",
-    "pytest>=9.1,<10",
-    "pytest-benchmark>=5.3,<6",
+    "anyio>=4.16,<5",
+    "pytest>=9.2,<10",
+    "pytest-benchmark>=5.3.1,<6",
     "pytest-cov>=7.1,<8",
     "pytest-describe>=3.2,<4",
     "pytest-timeout>=2.4,<3",
     "pytest-codspeed>=5",
-    "tox>=4.64,<5",
+    "tox>=4.65,<5",
 ]
 lint = [
-    "ruff>=0.16.9,<0.17",
-    "mypy>=2.3.1,<3",
-    "bump-my-version>=1.5.1,<2",
+    "ruff>=0.17.4,<0.18",
+    "mypy>=2.4.1,<3",
+    "bump-my-version>=1.8.1,<2",
     "typing-extensions>=4.16; python_version<'3.11'",
 ]
 doc = [
@@ -312,7 +312,7 @@ filterwarnings = "ignore::pytest.PytestConfigWarning"
 testpaths = ["tests"]
 
 [tool.bumpversion]
-current_version = "3.3.1"
+current_version = "3.3.2"
 commit = false
 tag = false
 parse = '''
@@ -356,5 +356,5 @@ search = '^version = "{current_version}"'
 replace = 'version = "{new_version}"'
 
 [build-system]
-requires = ["uv_build>=0.12,<0.13"]
+requires = ["uv_build>=0.13,<0.14"]
 build-backend = "uv_build"

{graphql_core-3.3.1 → graphql_core-3.3.2}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "graphql-core"
-version = "3.3.1"
+version = "3.3.2"
 description = "GraphQL-core is a Python port of GraphQL.js, the JavaScript reference implementation for GraphQL."
 readme = "README.md"
 requires-python = ">=3.10"
@@ -29,19 +29,19 @@ Changelog = "https://github.com/graphql-python/graphql-core/releases"
 
 [dependency-groups]
 test = [
-    "anyio>=4.15,<5",
-    "pytest>=9.1,<10",
-    "pytest-benchmark>=5.3,<6",
+    "anyio>=4.16,<5",
+    "pytest>=9.2,<10",
+    "pytest-benchmark>=5.3.1,<6",
     "pytest-cov>=7.1,<8",
     "pytest-describe>=3.2,<4",
     "pytest-timeout>=2.4,<3",
     "pytest-codspeed>=5",
-    "tox>=4.64,<5",
+    "tox>=4.65,<5",
 ]
 lint = [
-    "ruff>=0.16.9,<0.17",
-    "mypy>=2.3.1,<3",
-    "bump-my-version>=1.5.1,<2",
+    "ruff>=0.17.4,<0.18",
+    "mypy>=2.4.1,<3",
+    "bump-my-version>=1.8.1,<2",
     "typing-extensions>=4.16; python_version<'3.11'",
 ]
 doc = [
@@ -313,7 +313,7 @@ filterwarnings = "ignore::pytest.PytestConfigWarning"
 testpaths = ["tests"]
 
 [tool.bumpversion]
-current_version = "3.3.1"
+current_version = "3.3.2"
 commit = false
 tag = false
 parse = '''(?x)
@@ -351,5 +351,5 @@ search = '^version = "{current_version}"'
 replace = 'version = "{new_version}"'
 
 [build-system]
-requires = ["uv_build>=0.12,<0.13"]
+requires = ["uv_build>=0.13,<0.14"]
 build-backend = "uv_build"

{graphql_core-3.3.1 → graphql_core-3.3.2}/src/graphql/error/graphql_error.py

@@ -287,13 +287,18 @@ class GraphQLError(Exception):
         if not positions and node_locations:
             positions = [loc.start for loc in node_locations]
         self.positions = positions or None
-        if positions and source:
-            locations: list[SourceLocation] | None = [
-                source.get_location(pos) for pos in positions
-            ]
+        source_positions = (
+            [(source, pos) for pos in positions]
+            if positions and source
+            else [(loc.source, loc.start) for loc in node_locations]
+        )
+        if source_positions:
+            # Lazy import to avoid a cyclic dependency between error and language
+            from ..language.location import get_locations
+
+            self.locations = get_locations(source_positions)
         else:
-            locations = [loc.source.get_location(loc.start) for loc in node_locations]
-        self.locations = locations or None
+            self.locations = None
 
         # Adopt the cause as the standard exception cause when it is one, so
         # that the cause chain is reported without duplicating the traceback.

{graphql_core-3.3.1 → graphql_core-3.3.2}/src/graphql/execution/collect_fields.py

@@ -14,6 +14,7 @@ from ..language import (
     OperationDefinitionNode,
     SelectionSetNode,
 )
+from ..pyutils import RefSet
 from ..type import (
     GraphQLDeferDirective,
     GraphQLIncludeDirective,
@@ -27,11 +28,12 @@ from .values import (
     FragmentVariableValues,
     VariableValues,
     get_argument_values,
-    get_directive_values,
     get_fragment_variable_values,
 )
 
 if TYPE_CHECKING:
+    from collections.abc import Callable
+
     from .get_variable_signature import GraphQLVariableSignature
 
 __all__ = [
@@ -44,12 +46,14 @@ __all__ = [
     "GroupedFieldSet",
     "collect_fields",
     "collect_subfields",
+    "visit_selection_sets",
 ]
 
 
 class DeferUsage(NamedTuple):
     """An optionally labelled linked list of defer usages."""
 
+    directive_node: DirectiveNode
     label: str | None
     parent_defer_usage: DeferUsage | None
 
@@ -72,6 +76,8 @@ class FragmentDetails(NamedTuple):
 FieldDetailsList: TypeAlias = list[FieldDetails]
 GroupedFieldSet: TypeAlias = dict[str, FieldDetailsList]
 
+VisitedFragmentNames: TypeAlias = dict[str, RefSet[DirectiveNode | None]]
+
 
 class CollectFieldsContext(NamedTuple):
     """Context for collecting fields."""
@@ -81,10 +87,11 @@ class CollectFieldsContext(NamedTuple):
     variable_values: VariableValues
     operation: OperationDefinitionNode
     runtime_type: GraphQLObjectType
-    visited_fragment_names: dict[str, bool]
+    visited_fragment_names: VisitedFragmentNames
     hide_suggestions: bool
     forbidden_directive_instances: list[DirectiveNode]
     forbid_skip_and_include: bool
+    on_selection_set: Callable[[SelectionSetNode], None] | None = None
 
 
 class CollectedFields(NamedTuple):
@@ -103,6 +110,7 @@ def collect_fields(
     operation: OperationDefinitionNode,
     hide_suggestions: bool = False,
     forbid_skip_and_include: bool = False,
+    on_selection_set: Callable[[SelectionSetNode], None] | None = None,
 ) -> CollectedFields:
     """Collect fields.
 
@@ -126,9 +134,10 @@ def collect_fields(
         hide_suggestions,
         [],
         forbid_skip_and_include,
+        on_selection_set,
     )
 
-    collect_fields_impl(
+    visit_selection_sets(
         context, operation.selection_set, grouped_field_set, new_defer_usages
     )
     return CollectedFields(
@@ -173,7 +182,7 @@ def collect_subfields(
     for field_detail in field_details_list:
         node = field_detail.node
         if node.selection_set:
-            collect_fields_impl(
+            visit_selection_sets(
                 context,
                 node.selection_set,
                 sub_grouped_field_set,
@@ -187,7 +196,7 @@ def collect_subfields(
     )
 
 
-def collect_fields_impl(
+def visit_selection_sets(
     context: CollectFieldsContext,
     selection_set: SelectionSetNode,
     grouped_field_set: dict[str, list[FieldDetails]],
@@ -195,7 +204,10 @@ def collect_fields_impl(
     defer_usage: DeferUsage | None = None,
     fragment_variable_values: FragmentVariableValues | None = None,
 ) -> None:
-    """Collect fields (internal implementation)."""
+    """Collect the fields of a selection set and the selection sets it contains.
+
+    For internal use only.
+    """
     (
         schema,
         fragments,
@@ -206,8 +218,12 @@ def collect_fields_impl(
         hide_suggestions,
         _forbidden_directive_instances,
         _forbid_skip_and_include,
+        on_selection_set,
     ) = context
 
+    if on_selection_set:
+        on_selection_set(selection_set)
+
     for selection in selection_set.selections:
         if isinstance(selection, FieldNode):
             if not should_include_node(
@@ -232,7 +248,7 @@ def collect_fields_impl(
             )
 
             if new_defer_usage is None:
-                collect_fields_impl(
+                visit_selection_sets(
                     context,
                     selection.selection_set,
                     grouped_field_set,
@@ -242,7 +258,7 @@ def collect_fields_impl(
                 )
             else:
                 new_defer_usages.append(new_defer_usage)
-                collect_fields_impl(
+                visit_selection_sets(
                     context,
                     selection.selection_set,
                     grouped_field_set,
@@ -271,24 +287,27 @@ def collect_fields_impl(
                 defer_usage,
             )
 
-            visited_as_deferred = visited_fragment_names.get(frag_name)
+            maybe_new_defer_usage = (
+                defer_usage if new_defer_usage is None else new_defer_usage
+            )
+            visited_defer_set = visited_fragment_names.get(frag_name)
+            if visited_defer_set is None:
+                visited_defer_set = visited_fragment_names[frag_name] = RefSet()
 
-            if new_defer_usage is None:
-                # If this spread is not deferred, it may be skipped when already
-                # visited as a non-deferred spread. If it was previously visited as
-                # a deferred spread, it must be revisited.
-                if visited_as_deferred is False:
-                    continue
-                visited_fragment_names[frag_name] = False
-                maybe_new_defer_usage = defer_usage
-            else:
-                # If this spread is deferred, it can be skipped if it has already
-                # been visited.
-                if visited_as_deferred is not None:
-                    continue
-                visited_fragment_names[frag_name] = True
+            if None in visited_defer_set or (
+                maybe_new_defer_usage is not None
+                and maybe_new_defer_usage.directive_node in visited_defer_set
+            ):
+                continue
+
+            if new_defer_usage is not None:
                 new_defer_usages.append(new_defer_usage)
-                maybe_new_defer_usage = new_defer_usage
+
+            visited_defer_set.add(
+                None
+                if maybe_new_defer_usage is None
+                else maybe_new_defer_usage.directive_node
+            )
 
             fragment_variable_signatures = fragment.variable_signatures
             new_fragment_variable_values: FragmentVariableValues | None = None
@@ -301,7 +320,7 @@ def collect_fields_impl(
                     hide_suggestions,
                 )
 
-            collect_fields_impl(
+            visit_selection_sets(
                 context,
                 fragment.definition.selection_set,
                 grouped_field_set,
@@ -323,14 +342,30 @@ def get_defer_usage(
     deferred based on the experimental flag, defer directive present and
     not disabled by the "if" argument.
     """
-    defer = get_directive_values(
-        GraphQLDeferDirective, node, variable_values, fragment_variable_values
+    defer_name = GraphQLDeferDirective.name
+    directive_node = next(
+        (
+            directive
+            for directive in node.directives or ()
+            if directive.name.value == defer_name
+        ),
+        None,
+    )
+
+    if directive_node is None:
+        return None
+
+    defer = get_argument_values(
+        GraphQLDeferDirective,
+        directive_node,
+        variable_values,
+        fragment_variable_values,
     )
 
-    if not defer or defer.get("if") is False:
+    if defer.get("if") is False:
         return None
 
-    return DeferUsage(defer.get("label"), parent_defer_usage)
+    return DeferUsage(directive_node, defer.get("label"), parent_defer_usage)
 
 
 def should_include_node(

{graphql_core-3.3.1 → graphql_core-3.3.2}/src/graphql/execution/execute.py

@@ -25,6 +25,7 @@ from ..pyutils.is_awaitable import (
 from .async_iterables import map_async_iterable
 from .collect_fields import collect_fields
 from .executor import (
+    SELECTIONS_NESTED_TOO_DEEPLY,
     UNEXPECTED_MULTIPLE_PAYLOADS,
     AsyncWorkFinishedInfo,
     ExecutionHooks,
@@ -465,6 +466,14 @@ def assume_not_awaitable(_value: Any) -> TypeGuard[Awaitable]:
     return False
 
 
+def assume_not_async_iterable(_value: Any) -> TypeGuard[AsyncIterable]:
+    """Replacement for is_async_iterable if everything is assumed to be synchronous.
+
+    :meta private:
+    """
+    return False
+
+
 def execute_sync(
     schema: GraphQLSchema,
     document: DocumentNode,
@@ -549,6 +558,7 @@ def execute_sync(
         if callable(check_sync)
         else (None if check_sync else assume_not_awaitable)
     )
+    is_async_iterable = assume_not_async_iterable if not check_sync else None
 
     result = experimental_execute_incrementally(
         schema,
@@ -565,6 +575,7 @@ def execute_sync(
         middleware,
         executor_class,
         is_awaitable,
+        is_async_iterable,
         hide_suggestions=hide_suggestions,
         abort_signal=abort_signal,
         hooks=hooks,
@@ -988,6 +999,13 @@ def create_source_event_stream(
         event_stream = execute_subscription(executor)
     except GraphQLError as error:
         return ExecutionResult(None, errors=[error])
+    except RecursionError:
+        # This error is never raised, so it has no traceback or context
+        # that would keep all the frames of the recursion alive.
+        return ExecutionResult(
+            None,
+            errors=[GraphQLError(SELECTIONS_NESTED_TOO_DEEPLY, executor.operation)],
+        )
 
     if executor.is_awaitable(event_stream):
 

{graphql_core-3.3.1 → graphql_core-3.3.2}/src/graphql/execution/executor.py

@@ -126,6 +126,8 @@ UNEXPECTED_MULTIPLE_PAYLOADS = (
     " (due to @defer or @stream directive)"
 )
 
+SELECTIONS_NESTED_TOO_DEEPLY = "Selections are nested too deeply. Execution aborted."
+
 DEFER_NOT_SUPPORTED_ON_SUBSCRIPTIONS = (
     "`@defer` directive not supported on subscription operations."
     " Disable `@defer` by setting the `if` argument to `false`."
@@ -696,14 +698,21 @@ class Executor(Generic[TContext]):
                 raise GraphQLError(msg, operation)  # noqa: TRY301
             root_value = self.root_value
 
-            collected_fields = collect_fields(
-                schema,
-                self.fragments,
-                self.variable_values,
-                root_type,
-                operation,
-                self.hide_suggestions,
-            )
+            try:
+                collected_fields = collect_fields(
+                    schema,
+                    self.fragments,
+                    self.variable_values,
+                    root_type,
+                    operation,
+                    self.hide_suggestions,
+                )
+            except RecursionError:
+                collected_fields = None
+            # Leave the block above first, or the RecursionError would be kept as the
+            # context of this error and keep all the frames of the recursion alive.
+            if collected_fields is None:
+                raise GraphQLError(SELECTIONS_NESTED_TOO_DEEPLY, operation)  # noqa: TRY301
 
             grouped_field_set, new_defer_usages, _forbidden = collected_fields
 
@@ -956,12 +965,16 @@ class Executor(Generic[TContext]):
         try:
             # Build a dictionary of arguments from the field.arguments AST, using the
             # variables scope to fulfill any variable references.
-            args = get_argument_values(
-                field_def,
-                first_field_node,
-                self.variable_values,
-                first_field_details.fragment_variable_values,
-                self.hide_suggestions,
+            args = (
+                get_argument_values(
+                    field_def,
+                    first_field_node,
+                    self.variable_values,
+                    first_field_details.fragment_variable_values,
+                    self.hide_suggestions,
+                )
+                if field_def.args or first_field_node.arguments
+                else {}
             )
 
             # Note that contrary to the JavaScript implementation, we pass the context
@@ -988,11 +1001,17 @@ class Executor(Generic[TContext]):
             )
             if self.is_awaitable(completed):
 
-                async def await_completed() -> Any:
+                async def await_completed(
+                    executor: Executor,
+                    completed: Awaitable[Any],
+                    return_type: GraphQLOutputType,
+                    field_details_list: FieldDetailsList,
+                    path: Path,
+                ) -> Any:
                     try:
                         return await completed
                     except Exception as raw_error:
-                        self.handle_field_error(
+                        executor.handle_field_error(
                             raw_error,
                             return_type,
                             field_details_list,
@@ -1000,7 +1019,9 @@ class Executor(Generic[TContext]):
                         )
                         return None
 
-                return await_completed()
+                return await_completed(
+                    self, completed, return_type, field_details_list, path
+                )
 
         except Exception as raw_error:
             self.handle_field_error(
@@ -1024,7 +1045,7 @@ class Executor(Generic[TContext]):
 
         :meta private:
         """
-        # The resolve function's first argument is a collection of information about
+        # The resolve function's second argument is a collection of information about
         # the current execution state.
         return GraphQLResolveInfo(
             field_nodes[0].name.value,

{graphql_core-3.3.1 → graphql_core-3.3.2}/src/graphql/execution/incremental/build_execution_plan.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from typing import NamedTuple, TypeAlias
 
-from ...pyutils import RefMap, RefSet
+from ...pyutils import RefSet, SetMap
 from ..collect_fields import DeferUsage, FieldDetailsList, GroupedFieldSet
 
 __all__ = [
@@ -22,7 +22,7 @@ class ExecutionPlan(NamedTuple):
     """A plan for executing fields."""
 
     grouped_field_set: GroupedFieldSet
-    new_grouped_field_sets: RefMap[DeferUsageSet, GroupedFieldSet]
+    new_grouped_field_sets: SetMap[DeferUsageSet, GroupedFieldSet]
 
 
 def build_execution_plan(
@@ -34,7 +34,7 @@ def build_execution_plan(
         parent_defer_usages = RefSet()
 
     grouped_field_set: GroupedFieldSet = {}
-    new_grouped_field_sets: RefMap[DeferUsageSet, GroupedFieldSet] = RefMap()
+    new_grouped_field_sets: SetMap[DeferUsageSet, GroupedFieldSet] = SetMap()
 
     for response_key, field_details_list in original_grouped_field_set.items():
         filtered_defer_usage_set = get_filtered_defer_usage_set(field_details_list)
@@ -43,14 +43,9 @@ def build_execution_plan(
             grouped_field_set[response_key] = field_details_list
             continue
 
-        for defer_usage_set in new_grouped_field_sets:
-            if defer_usage_set == filtered_defer_usage_set:
-                new_grouped_field_set = new_grouped_field_sets[defer_usage_set]
-                break
-        else:
-            new_grouped_field_set = {}
-            new_grouped_field_sets[filtered_defer_usage_set] = new_grouped_field_set
-
+        new_grouped_field_set = new_grouped_field_sets.get_or_insert_computed(
+            filtered_defer_usage_set, lambda _members: {}
+        )
         new_grouped_field_set[response_key] = field_details_list
 
     return ExecutionPlan(grouped_field_set, new_grouped_field_sets)

{graphql_core-3.3.1 → graphql_core-3.3.2}/src/graphql/execution/incremental/incremental_executor.py

@@ -26,7 +26,7 @@ from .work_queue import Work, WorkResult, WorkTask
 if TYPE_CHECKING:
     from collections.abc import AsyncIterator, Iterator, Sequence
 
-    from ...pyutils import AwaitableOrValue, Path
+    from ...pyutils import AwaitableOrValue, Path, SetMap
     from ...type import (
         GraphQLObjectType,
         GraphQLOutputType,
@@ -403,7 +403,7 @@ class IncrementalExecutor(Executor[DeliveryGroupMap]):
         parent_type: GraphQLObjectType,
         source_value: Any,
         path: Path | None,
-        new_grouped_field_sets: RefMap[DeferUsageSet, GroupedFieldSet],
+        new_grouped_field_sets: SetMap[DeferUsageSet, GroupedFieldSet],
         delivery_group_map: DeliveryGroupMap,
     ) -> None:
         """Create execution groups for the new deferred grouped field sets."""