graphql-core 3.3.0b1__tar.gz → 3.3.0b2__tar.gz

{graphql_core-3.3.0b1 → graphql_core-3.3.0b2}/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 3.3.0b1
+current_version = 3.3.0b2
 commit = False
 tag = False
 

{graphql_core-3.3.0b1 → graphql_core-3.3.0b2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: graphql-core
-Version: 3.3.0b1
+Version: 3.3.0b2
 Summary: GraphQL-core is a Python port of GraphQL.js, the JavaScript reference implementation for GraphQL.
 Keywords: graphql
 Author: Christoph Zwerschke
@@ -42,8 +42,8 @@ with GraphQL.js.
 The current stable version 3.2.11 of GraphQL-core is up-to-date with GraphQL.js
 version 16.14.1 and supports Python versions 3.7 to 3.14.
 
-You can also try out the latest beta version 3.3.0b1 of GraphQL-core,
-which is up-to-date with GraphQL.js version 17.0.0b1.
+You can also try out the latest beta version 3.3.0b2 of GraphQL-core,
+which is up-to-date with GraphQL.js version 17.0.0b2.
 This new minor version of GraphQL-core also supports Python versions 3.10 to 3.14.
 
 Note that for various reasons, GraphQL-core does not use SemVer like GraphQL.js.

{graphql_core-3.3.0b1 → graphql_core-3.3.0b2}/README.md

@@ -18,8 +18,8 @@ with GraphQL.js.
 The current stable version 3.2.11 of GraphQL-core is up-to-date with GraphQL.js
 version 16.14.1 and supports Python versions 3.7 to 3.14.
 
-You can also try out the latest beta version 3.3.0b1 of GraphQL-core,
-which is up-to-date with GraphQL.js version 17.0.0b1.
+You can also try out the latest beta version 3.3.0b2 of GraphQL-core,
+which is up-to-date with GraphQL.js version 17.0.0b2.
 This new minor version of GraphQL-core also supports Python versions 3.10 to 3.14.
 
 Note that for various reasons, GraphQL-core does not use SemVer like GraphQL.js.

{graphql_core-3.3.0b1 → graphql_core-3.3.0b2}/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.0b1"
+version = release = "3.3.0b2"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -100,7 +100,7 @@ graphql_modules = {
 # be nitpicky
 nitpicky = True
 # but not too nitpicky
-suppress_warnings = ["ref.class", "ref.obj", "ref.python"]
+suppress_warnings = ["ref.attr", "ref.class", "ref.obj", "ref.python"]
 
 # The name of the Pygments (syntax highlighting) style to use.
 pygments_style = "sphinx"

{graphql_core-3.3.0b1 → graphql_core-3.3.0b2}/docs/modules/execution.rst

@@ -76,3 +76,5 @@ Execution
 .. autofunction:: get_directive_values
 
 .. autofunction:: get_variable_values
+
+.. autoclass:: VariableValues

{graphql_core-3.3.0b1 → graphql_core-3.3.0b2}/docs/modules/utilities.rst

@@ -127,6 +127,7 @@ Compare two GraphQLSchemas and detect changes:
 .. autoclass:: BreakingChangeType
 .. autoclass:: DangerousChange
 .. autoclass:: DangerousChangeType
+.. autoclass:: SchemaChange
 
 Resolve a schema coordinate to the schema element it refers to:
 

{graphql_core-3.3.0b1 → graphql_core-3.3.0b2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "graphql-core"
-version = "3.3.0b1"
+version = "3.3.0b2"
 description = "GraphQL-core is a Python port of GraphQL.js, the JavaScript reference implementation for GraphQL."
 readme = "README.md"
 requires-python = ">=3.10"

{graphql_core-3.3.0b1 → graphql_core-3.3.0b2}/src/graphql/__init__.py

@@ -249,6 +249,7 @@ from .utilities import (
     DangerousChangeType,
     SafeChange,
     SafeChangeType,
+    SchemaChange,
     find_breaking_changes,
     find_dangerous_changes,
     find_schema_changes,
@@ -439,6 +440,9 @@ from .validation import (
     specified_rules,
     recommended_rules,
     # Individual validation rules.
+    DeferStreamDirectiveLabel,
+    DeferStreamDirectiveOnRootField,
+    DeferStreamDirectiveOnValidOperationsRule,
     ExecutableDefinitionsRule,
     FieldsOnCorrectTypeRule,
     FragmentsOnCompositeTypesRule,
@@ -457,6 +461,7 @@ from .validation import (
     ProvidedRequiredArgumentsRule,
     ScalarLeafsRule,
     SingleFieldSubscriptionsRule,
+    StreamDirectiveOnListField,
     UniqueArgumentNamesRule,
     UniqueDirectivesPerLocationRule,
     UniqueFragmentNamesRule,
@@ -496,6 +501,7 @@ from .execution import (
     # Types
     AsyncWorkFinishedInfo,
     ExecutionHooks,
+    VariableValues,
     Executor,
     ExecutionResult,
     ExperimentalIncrementalExecutionResults,
@@ -572,6 +578,9 @@ __all__ = [
     "ConstValueNode",
     "DangerousChange",
     "DangerousChangeType",
+    "DeferStreamDirectiveLabel",
+    "DeferStreamDirectiveOnRootField",
+    "DeferStreamDirectiveOnValidOperationsRule",
     "DefinitionNode",
     "DirectiveArgumentCoordinateNode",
     "DirectiveCoordinateNode",
@@ -751,6 +760,7 @@ __all__ = [
     "ScalarLeafsRule",
     "ScalarTypeDefinitionNode",
     "ScalarTypeExtensionNode",
+    "SchemaChange",
     "SchemaCoordinateNode",
     "SchemaDefinitionNode",
     "SchemaExtensionNode",
@@ -760,6 +770,7 @@ __all__ = [
     "SingleFieldSubscriptionsRule",
     "Source",
     "SourceLocation",
+    "StreamDirectiveOnListField",
     "StringValueNode",
     "SubsequentIncrementalExecutionResult",
     "Thunk",
@@ -800,6 +811,7 @@ __all__ = [
     "ValuesOfCorrectTypeRule",
     "VariableDefinitionNode",
     "VariableNode",
+    "VariableValues",
     "VariablesAreInputTypesRule",
     "VariablesInAllowedPositionRule",
     "Visitor",

{graphql_core-3.3.0b1 → graphql_core-3.3.0b2}/src/graphql/error/graphql_error.py

@@ -5,6 +5,8 @@ from __future__ import annotations
 from sys import exc_info
 from typing import TYPE_CHECKING, Any, TypeAlias, TypedDict
 
+from ..pyutils import Undefined
+
 if TYPE_CHECKING:
     from collections.abc import Collection
 
@@ -108,12 +110,26 @@ class GraphQLError(Exception):
     """
 
     original_error: Exception | None
-    """The original error thrown from a field resolver during execution"""
+    """Original error that caused this GraphQLError, if one exists
+
+    .. deprecated:: 3.3
+        Use :attr:`cause` instead to better align with the standard exception
+        :attr:`~BaseException.__cause__`.
+    """
+
+    cause: Any
+    """The cause of this error, if one exists
+
+    The value passed as the ``cause`` when creating this error. Adopts the
+    convention of the standard exception cause and is also exposed as the
+    :attr:`~BaseException.__cause__` when it is an exception.
+    """
 
     extensions: GraphQLErrorExtensions | None
     """Extension fields to add to the formatted error"""
 
     __slots__ = (
+        "cause",
         "extensions",
         "locations",
         "message",
@@ -135,15 +151,27 @@ class GraphQLError(Exception):
         path: Collection[str | int] | None = None,
         original_error: Exception | None = None,
         extensions: GraphQLErrorExtensions | None = None,
+        cause: Any = Undefined,
     ) -> None:
         """Initialize a GraphQLError."""
         super().__init__(message)
         self.message = message
 
+        # The cause defaults to the (deprecated) original error when not given.
+        has_cause = cause is not Undefined
+        self.cause = cause if has_cause else original_error
+
         if path and not isinstance(path, list):
             path = list(path)
         self.path = path or None  # type: ignore
-        self.original_error = original_error
+
+        # An Error provided as the cause is also exposed as the original error
+        # for backward compatibility.
+        cause_value = cause if has_cause else None
+        underlying_error = original_error
+        if underlying_error is None and isinstance(cause_value, Exception):
+            underlying_error = cause_value
+        self.original_error = underlying_error
 
         # Compute list of blame nodes.
         if nodes and not isinstance(nodes, list):
@@ -170,16 +198,25 @@ class GraphQLError(Exception):
             locations = [loc.source.get_location(loc.start) for loc in node_locations]
         self.locations = locations or None
 
+        # Adopt the cause as the standard exception cause when it is one, so
+        # that the cause chain is reported without duplicating the traceback.
+        if isinstance(cause_value, BaseException):
+            self.__cause__ = cause_value
+
+        # Preserve the traceback of an explicit original error. The traceback of
+        # a cause is not copied over, since Python already reports cause chains.
         if original_error:
             self.__traceback__ = original_error.__traceback__
-            if original_error.__cause__:
-                self.__cause__ = original_error.__cause__
-            elif original_error.__context__:
-                self.__context__ = original_error.__context__
-            if extensions is None:
-                original_extensions = getattr(original_error, "extensions", None)
-                if isinstance(original_extensions, dict):
-                    extensions = original_extensions
+            if not self.__cause__:
+                if original_error.__cause__:
+                    self.__cause__ = original_error.__cause__
+                elif original_error.__context__:
+                    self.__context__ = original_error.__context__
+
+        if extensions is None and underlying_error is not None:
+            original_extensions = getattr(underlying_error, "extensions", None)
+            if isinstance(original_extensions, dict):
+                extensions = original_extensions
         self.extensions = extensions or {}
         if not self.__traceback__:
             self.__traceback__ = exc_info()[2]
@@ -217,7 +254,7 @@ class GraphQLError(Exception):
             and all(
                 getattr(self, slot) == getattr(other, slot)
                 for slot in self.__slots__
-                if slot != "original_error"
+                if slot not in ("cause", "original_error")
             )
         ) or (
             isinstance(other, dict)
@@ -225,7 +262,7 @@ class GraphQLError(Exception):
             and all(
                 slot in self.__slots__ and getattr(self, slot) == other.get(slot)
                 for slot in other
-                if slot != "original_error"
+                if slot not in ("cause", "original_error")
             )
         )
 

{graphql_core-3.3.0b1 → graphql_core-3.3.0b2}/src/graphql/execution/__init__.py

@@ -30,7 +30,12 @@ from .types import (
     StreamItemsResult,
 )
 from .middleware import MiddlewareManager
-from .values import get_argument_values, get_directive_values, get_variable_values
+from .values import (
+    get_argument_values,
+    get_directive_values,
+    get_variable_values,
+    VariableValues,
+)
 from .execute import (
     create_source_event_stream,
     execute,
@@ -80,6 +85,7 @@ __all__ = [
     "StreamItemsResult",
     "StreamRecord",
     "SubsequentIncrementalExecutionResult",
+    "VariableValues",
     "create_source_event_stream",
     "default_field_resolver",
     "default_type_resolver",

{graphql_core-3.3.0b1 → graphql_core-3.3.0b2}/src/graphql/utilities/__init__.py

@@ -89,6 +89,7 @@ from .find_schema_changes import (
     DangerousChangeType,
     SafeChange,
     SafeChangeType,
+    SchemaChange,
     find_breaking_changes,
     find_dangerous_changes,
     find_schema_changes,
@@ -124,6 +125,7 @@ __all__ = [
     "ResolvedSchemaElement",
     "SafeChange",
     "SafeChangeType",
+    "SchemaChange",
     "TypeInfo",
     "TypeInfoVisitor",
     "ast_from_value",

{graphql_core-3.3.0b1 → graphql_core-3.3.0b2}/src/graphql/utilities/find_schema_changes.py

@@ -45,6 +45,7 @@ __all__ = [
     "DangerousChangeType",
     "SafeChange",
     "SafeChangeType",
+    "SchemaChange",
     "find_breaking_changes",
     "find_dangerous_changes",
     "find_schema_changes",

{graphql_core-3.3.0b1 → graphql_core-3.3.0b2}/src/graphql/version.py

@@ -8,9 +8,9 @@ from typing import NamedTuple
 __all__ = ["version", "version_info", "version_info_js", "version_js"]
 
 
-version = "3.3.0b1"
+version = "3.3.0b2"
 
-version_js = "17.0.0b1"
+version_js = "17.0.0b2"
 
 
 _re_version = re.compile(r"(\d+)\.(\d+)\.(\d+)(\D*)(\d*)")

{graphql_core-3.3.0b1 → graphql_core-3.3.0b2}/tests/error/test_graphql_error.py

@@ -77,6 +77,7 @@ def describe_graphql_error():
             ["a", "b", "c"],
             Exception("test"),
             {"foo": "bar"},
+            cause=Exception("test"),
         )
         assert set(e.formatted) == {"message", "path", "locations", "extensions"}
 
@@ -128,6 +129,67 @@ def describe_graphql_error():
         assert e.original_error is original
         assert str(e.original_error) == "original"
 
+    def does_not_add_a_cause_without_a_cause():
+        e = GraphQLError("msg")
+        assert e.cause is None
+
+    def does_not_copy_over_the_traceback_of_cause():
+        try:
+            raise RuntimeError("cause")
+        except RuntimeError as runtime_error:
+            cause = runtime_error
+        e = GraphQLError("msg", cause=cause)
+        assert e.cause is cause
+        assert e.__cause__ is cause
+        assert cause.__traceback__ is not None
+        assert e.__traceback__ is not cause.__traceback__
+
+    def uses_an_error_cause_as_the_original_error_for_compatibility():
+        class CustomError(Exception):
+            def __init__(self, message: str) -> None:
+                super().__init__(message)
+                self.extensions = {"original": "extensions"}
+
+        cause = CustomError("cause")
+        e = GraphQLError("msg", cause=cause)
+        assert e.message == "msg"
+        assert e.cause is cause
+        assert e.original_error is cause
+        assert e.__cause__ is cause
+        assert e.extensions == {"original": "extensions"}
+
+    def preserves_a_non_error_cause_without_setting_original_error():
+        e = GraphQLError("msg", cause="cause")
+        assert e.cause == "cause"
+        assert e.original_error is None
+        assert e.__cause__ is None
+
+    def prefers_cause_and_original_error_separately():
+        try:
+            raise RuntimeError("original")
+        except RuntimeError as runtime_error:
+            original_error = runtime_error
+        cause = ValueError("cause")
+        e = GraphQLError("msg", original_error=original_error, cause=cause)
+        assert e.cause is cause
+        assert e.original_error is original_error
+        assert e.__cause__ is cause
+        assert e.__traceback__ is original_error.__traceback__
+
+    def creates_new_stack_if_cause_has_no_stack():
+        try:
+            raise RuntimeError
+        except RuntimeError as runtime_error:
+            current_traceback = runtime_error.__traceback__
+            cause = RuntimeError("cause")
+            e = GraphQLError("msg", cause=cause)
+        assert cause.__traceback__ is None
+        assert current_traceback is not None
+        assert e.__traceback__ is current_traceback
+        assert e.message == "msg"
+        assert e.cause is cause
+        assert e.original_error is cause
+
     def converts_nodes_to_positions_and_locations():
         e = GraphQLError("msg", [field_node])
         assert e.nodes == [field_node]
@@ -188,6 +250,25 @@ def describe_graphql_error():
         assert own_empty_error.original_error is original_error
         assert own_empty_error.extensions == {}
 
+    def defaults_to_cause_extension_only_if_arg_is_not_passed():
+        original_extensions = {"original": "extensions"}
+        cause = GraphQLError("original", extensions=original_extensions)
+        inherited_error = GraphQLError("InheritedError", cause=cause)
+        assert inherited_error.message == "InheritedError"
+        assert inherited_error.cause is cause
+        assert inherited_error.extensions is original_extensions
+
+        own_extensions = {"own": "extensions"}
+        own_error = GraphQLError("OwnError", cause=cause, extensions=own_extensions)
+        assert own_error.message == "OwnError"
+        assert own_error.cause is cause
+        assert own_error.extensions is own_extensions
+
+        own_empty_error = GraphQLError("OwnEmptyError", cause=cause, extensions={})
+        assert own_empty_error.message == "OwnEmptyError"
+        assert own_empty_error.cause is cause
+        assert own_empty_error.extensions == {}
+
     def serializes_to_include_message():
         e = GraphQLError("msg")
         assert str(e) == "msg"