feat/rustberry integration v2 #3504

erikwrede · 2024-05-18T15:09:40Z

WIP

for more information, see https://pre-commit.ci

# Conflicts: # poetry.lock # strawberry/schema/execute.py

…eat/rustberry-integration

botberry · 2024-05-18T15:10:55Z

Hi, thanks for contributing to Strawberry 🍓!

We noticed that this PR is missing a RELEASE.md file. We use that to automatically do releases here on GitHub and, most importantly, to PyPI!

So as soon as this PR is merged, a release will be made 🚀.

Here's an example of RELEASE.md:

Release type: patch

Description of the changes, ideally with some examples, if adding a new feature.

Release type can be one of patch, minor or major. We use semver, so make sure to pick the appropriate type. If in doubt feel free to ask :)

Here's the tweet text:

🆕 Release (next) is out! Thanks to Erik Wrede for the PR 👏

Get it here 👉 https://strawberry.rocks/release/(next)

sourcery-ai

Hey @erikwrede - I've reviewed your changes and they look great!

Here's what I looked at during the review

🟡 General issues: 7 issues found
🟢 Security: all looks good
🟢 Testing: all looks good
🟢 Complexity: all looks good

Sourcery is free for open source - if you like our reviews please consider sharing them ✨

_{Help me be more useful! Please click 👍 or 👎 on each comment to tell me if it was helpful.}

sourcery-ai · 2024-05-18T15:10:56Z

strawberry/schema/execute.py

@@ -82,6 +82,7 @@ async def execute(
    execution_context: ExecutionContext,
    execution_context_class: Optional[Type[GraphQLExecutionContext]] = None,
    process_errors: Callable[[List[GraphQLError], Optional[ExecutionContext]], None],
+    executor: Executor,


suggestion: Consider making the executor parameter optional.

If the executor parameter is not provided, you could default to a standard executor like GraphQlCoreExecutor. This would make the function more flexible and backward-compatible.

Suggested change

executor: Executor,

executor: Executor = GraphQlCoreExecutor(),

sourcery-ai · 2024-05-18T15:10:56Z

strawberry/types/execution.py

@@ -29,6 +30,45 @@
    from .graphql import OperationType


+class Executor(abc.ABC):


suggestion: Consider adding a docstring to the Executor class.

Adding a docstring to the Executor class would help other developers understand its purpose and usage.

Suggested change

class Executor(abc.ABC):

class Executor(abc.ABC):

"""

Abstract base class for executing operations on a given schema.

Attributes:

schema (Schema): The GraphQL schema to execute operations on.

"""

sourcery-ai · 2024-05-18T15:10:56Z

strawberry/types/execution.py

+    ) -> None: ...
+
+
+class GraphQlCoreExecutor(Executor):


suggestion: Consider adding a docstring to the GraphQlCoreExecutor class.

Adding a docstring to the GraphQlCoreExecutor class would help other developers understand its purpose and usage.

Suggested change

class GraphQlCoreExecutor(Executor):

class GraphQlCoreExecutor(Executor):

"""

Executes GraphQL queries using the provided schema.

This class extends the Executor to handle the execution of GraphQL

queries, mutations, and subscriptions.

"""

sourcery-ai · 2024-05-18T15:10:56Z

strawberry/schema/schema.py

@@ -82,6 +83,7 @@ def __init__(
            Dict[object, Union[Type, ScalarWrapper, ScalarDefinition]]
        ] = None,
        schema_directives: Iterable[object] = (),
+        executor_class: Optional[Type[Executor]] = None,


suggestion: Consider adding a docstring to the executor_class parameter.

Adding a docstring to the executor_class parameter would help other developers understand its purpose and usage.

Suggested change

executor_class: Optional[Type[Executor]] = None,

"""

executor_class: Optional[Type[Executor]] = None,

The class to use for executing queries. If not provided, a default executor will be used.

"""

executor_class: Optional[Type[Executor]] = None,

sourcery-ai · 2024-05-18T15:10:56Z

strawberry/schema/executors.py

@@ -0,0 +1,35 @@
+from typing import TYPE_CHECKING


suggestion: Consider adding a module-level docstring.

Adding a module-level docstring to strawberry/schema/executors.py would help other developers understand the purpose and usage of the module.

Suggested change

from typing import TYPE_CHECKING

"""

This module provides the necessary components for executing GraphQL queries

within the Strawberry framework. It includes error handling and type checking

utilities to ensure robust and type-safe query execution.

"""

from typing import TYPE_CHECKING

from graphql import GraphQLError

sourcery-ai · 2024-05-18T15:10:56Z

strawberry/schema/executors.py

+RUSTBERRY_DOCUMENT_FIELD = "__rustberry_document"
+
+
+class RustberryExecutor(Executor):


suggestion: Consider adding a docstring to the RustberryExecutor class.

Adding a docstring to the RustberryExecutor class would help other developers understand its purpose and usage.

Suggested change

class RustberryExecutor(Executor):

class RustberryExecutor(Executor):

"""

Executor for handling Rustberry-specific operations within the schema.

Args:

schema (Schema): The GraphQL schema to execute against.

"""

sourcery-ai · 2024-05-18T15:10:56Z

strawberry/schema/executors.py

+        validation_successful = self.compiler.validate(document)
+        if not validation_successful:
+            execution_context.errors = execution_context.errors or []
+            execution_context.errors.append(GraphQLError("Validation failed"))


suggestion: Consider providing more context in the validation error message.

Providing more context in the validation error message, such as which part of the document failed validation, would help in debugging and understanding the issue.

Suggested change

execution_context.errors.append(GraphQLError("Validation failed"))

validation_errors = self.compiler.get_validation_errors(document)

error_message = f"Validation failed: {validation_errors}"

execution_context.errors.append(GraphQLError(error_message))

sourcery-ai · 2024-05-18T15:10:56Z

strawberry/schema/execute.py

-                        extensions=extensions_runner.get_extensions_results_sync(),
-                    )
+            except GraphQLError as exc:
+                execution_context.errors = [exc]


issue (code-quality): Extract duplicate code into function (extract-duplicate-method)

botberry · 2024-05-18T15:11:39Z

Apollo Federation Subgraph Compatibility Results

Federation 1 Support Federation 2 Support

`_service`	🟢
`@key (single)`	🟢
`@key (multi)`	🟢
`@key (composite)`	🟢
`repeatable @key`	🟢
`@requires`	🟢
`@provides`	🟢
`federated tracing`	🔲

`@link`	🟢
`@shareable`	🟢
`@tag`	🟢
`@override`	🟢
`@inaccessible`	🟢
`@composeDirective`	🟢
`@interfaceObject`	🟢

Learn more:

codecov · 2024-05-18T15:14:42Z

Codecov Report

Attention: Patch coverage is 93.33333% with 6 lines in your changes are missing coverage. Please review.

Project coverage is 94.24%. Comparing base (fc322a8) to head (3ca28b3).

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #3504      +/-   ##
==========================================
- Coverage   96.51%   94.24%   -2.28%     
==========================================
  Files         511      507       -4     
  Lines       32965    31865    -1100     
  Branches     5482     3666    -1816     
==========================================
- Hits        31815    30030    -1785     
- Misses        917     1550     +633     
- Partials      233      285      +52

codspeed-hq · 2024-05-18T15:16:22Z

CodSpeed Performance Report

Merging #3504 will improve performances by ×1,100

_{Comparing feat/rustberry-integration-v2 (3ca28b3) with main (fc322a8)}

Summary

⚡ 4 improvements
✅ 8 untouched benchmarks

Benchmarks breakdown

	Benchmark	`main`	`feat/rustberry-integration-v2`	Change
⚡	`test_execute_complex_schema[50]`	23,158.3 ms	21.3 ms	×1,100
⚡	`test_execute_with_100_items`	58.6 ms	39.7 ms	+47.74%
⚡	`test_execute_with_10_items`	27.3 ms	6.1 ms	×4.5
⚡	`test_execute_with_many_fields_and_directives`	232.3 ms	210.1 ms	+10.55%

erikwrede and others added 20 commits July 23, 2023 14:04

feat: initial rustberry integration

f8990c8

feat: initial rustberry integration

16a2bb4

[pre-commit.ci] auto fixes from pre-commit.com hooks

d8f3d15

for more information, see https://pre-commit.ci

fix: add removed code back

ca8129f

[pre-commit.ci] auto fixes from pre-commit.com hooks

e7437e5

for more information, see https://pre-commit.ci

fix: pycharm removed imports

434653c

fix: parse

7fd22d0

[pre-commit.ci] auto fixes from pre-commit.com hooks

d19a212

for more information, see https://pre-commit.ci

chore: adjust workflow

5b49773

fix: correctly instantiate executor

2558c2d

fix: recreate lock

845aa38

chore: fix parser

aa2bb83

fix?: mark rustberry as non-optional

377ac47

[pre-commit.ci] auto fixes from pre-commit.com hooks

d928e57

for more information, see https://pre-commit.ci

chore: uncomment several tests

17097a3

[pre-commit.ci] auto fixes from pre-commit.com hooks

20340ed

for more information, see https://pre-commit.ci

Merge branch 'main' into feat/rustberry-integration

5f85b24

# Conflicts: # poetry.lock # strawberry/schema/execute.py

Merge remote-tracking branch 'fork/feat/rustberry-integration' into f…

76aa2bd

…eat/rustberry-integration

merge main into rustberry

a5beaf1

chore: update rustberry to v0.0.10

384d281

sourcery-ai bot reviewed May 18, 2024

View reviewed changes

erikwrede added 3 commits May 18, 2024 19:35

chore: update rustberry to v0.0.12

59353ab

chore: update rustberry to v0.0.12

4b6d378

test: use rustberry executor

3ca28b3

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat/rustberry integration v2 #3504

feat/rustberry integration v2 #3504

erikwrede commented May 18, 2024 •

edited

Loading

botberry commented May 18, 2024 •

edited

Loading

sourcery-ai bot left a comment

sourcery-ai bot May 18, 2024

sourcery-ai bot May 18, 2024

sourcery-ai bot May 18, 2024

sourcery-ai bot May 18, 2024

sourcery-ai bot May 18, 2024

sourcery-ai bot May 18, 2024

sourcery-ai bot May 18, 2024

sourcery-ai bot May 18, 2024

botberry commented May 18, 2024 •

edited

Loading

codecov bot commented May 18, 2024 •

edited

Loading

codspeed-hq bot commented May 18, 2024 •

edited

Loading

	executor: Executor,
	executor: Executor = GraphQlCoreExecutor(),

		@@ -29,6 +30,45 @@
		from .graphql import OperationType


		class Executor(abc.ABC):

-class Executor(abc.ABC):
+class Executor(abc.ABC):
+    """
+    Abstract base class for executing operations on a given schema.
+    Attributes:
+        schema (Schema): The GraphQL schema to execute operations on.
+    """

-class GraphQlCoreExecutor(Executor):
+class GraphQlCoreExecutor(Executor):
+    """
+    Executes GraphQL queries using the provided schema.
+    This class extends the Executor to handle the execution of GraphQL
+    queries, mutations, and subscriptions.
+    """

-from typing import TYPE_CHECKING
+"""
+This module provides the necessary components for executing GraphQL queries
+within the Strawberry framework. It includes error handling and type checking
+utilities to ensure robust and type-safe query execution.
+"""
+from typing import TYPE_CHECKING
+from graphql import GraphQLError

		RUSTBERRY_DOCUMENT_FIELD = "__rustberry_document"


		class RustberryExecutor(Executor):

-            execution_context.errors.append(GraphQLError("Validation failed"))
+            validation_errors = self.compiler.get_validation_errors(document)
+            error_message = f"Validation failed: {validation_errors}"
+            execution_context.errors.append(GraphQLError(error_message))

feat/rustberry integration v2 #3504

Are you sure you want to change the base?

feat/rustberry integration v2 #3504

Conversation

erikwrede commented May 18, 2024 • edited Loading

botberry commented May 18, 2024 • edited Loading

sourcery-ai bot left a comment

Choose a reason for hiding this comment

sourcery-ai bot May 18, 2024

Choose a reason for hiding this comment

sourcery-ai bot May 18, 2024

Choose a reason for hiding this comment

sourcery-ai bot May 18, 2024

Choose a reason for hiding this comment

sourcery-ai bot May 18, 2024

Choose a reason for hiding this comment

sourcery-ai bot May 18, 2024

Choose a reason for hiding this comment

sourcery-ai bot May 18, 2024

Choose a reason for hiding this comment

sourcery-ai bot May 18, 2024

Choose a reason for hiding this comment

sourcery-ai bot May 18, 2024

Choose a reason for hiding this comment

botberry commented May 18, 2024 • edited Loading

Apollo Federation Subgraph Compatibility Results

codecov bot commented May 18, 2024 • edited Loading

Codecov Report

codspeed-hq bot commented May 18, 2024 • edited Loading

CodSpeed Performance Report

Merging #3504 will improve performances by ×1,100

Summary

Benchmarks breakdown

erikwrede commented May 18, 2024 •

edited

Loading

botberry commented May 18, 2024 •

edited

Loading

botberry commented May 18, 2024 •

edited

Loading

codecov bot commented May 18, 2024 •

edited

Loading

codspeed-hq bot commented May 18, 2024 •

edited

Loading