strawberry-graphql 0.234.3__tar.gz → 0.235.1__tar.gz

{strawberry_graphql-0.234.3 → strawberry_graphql-0.235.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: strawberry-graphql
-Version: 0.234.3
+Version: 0.235.1
 Summary: A library for creating GraphQL APIs
 Home-page: https://strawberry.rocks/
 License: MIT

{strawberry_graphql-0.234.3 → strawberry_graphql-0.235.1}/pyproject.toml

@@ -1,7 +1,7 @@
 [tool.poetry]
 name = "strawberry-graphql"
 packages = [ { include = "strawberry" } ]
-version = "0.234.3"
+version = "0.235.1"
 description = "A library for creating GraphQL APIs"
 authors = ["Patrick Arminio <patrick.arminio@gmail.com>"]
 license = "MIT"

{strawberry_graphql-0.234.3 → strawberry_graphql-0.235.1}/strawberry/annotation.py

@@ -54,7 +54,7 @@ ASYNC_TYPES = (
 
 
 class StrawberryAnnotation:
-    __slots__ = "raw_annotation", "namespace", "__eval_cache__"
+    __slots__ = "raw_annotation", "namespace", "__resolve_cache__"
 
     def __init__(
         self,
@@ -65,7 +65,7 @@ class StrawberryAnnotation:
         self.raw_annotation = annotation
         self.namespace = namespace
 
-        self.__eval_cache__: Optional[Type[Any]] = None
+        self.__resolve_cache__: Optional[Union[StrawberryType, type]] = None
 
     def __eq__(self, other: object) -> bool:
         if not isinstance(other, StrawberryAnnotation):
@@ -101,19 +101,17 @@ class StrawberryAnnotation:
     def annotation(self, value: Union[object, str]) -> None:
         self.raw_annotation = value
 
+        self.__resolve_cache__ = None
+
     def evaluate(self) -> type:
         """Return evaluated annotation using `strawberry.util.typing.eval_type`."""
-        evaled_type = self.__eval_cache__
-        if evaled_type:
-            return evaled_type
-
         annotation = self.raw_annotation
+
         if isinstance(annotation, str):
             annotation = ForwardRef(annotation)
 
         evaled_type = eval_type(annotation, self.namespace, None)
 
-        self.__eval_cache__ = evaled_type
         return evaled_type
 
     def _get_type_with_args(
@@ -131,6 +129,12 @@ class StrawberryAnnotation:
 
     def resolve(self) -> Union[StrawberryType, type]:
         """Return resolved (transformed) annotation."""
+        if self.__resolve_cache__ is None:
+            self.__resolve_cache__ = self._resolve()
+
+        return self.__resolve_cache__
+
+    def _resolve(self) -> Union[StrawberryType, type]:
         evaled_type = cast(Any, self.evaluate())
 
         if is_private(evaled_type):
@@ -172,7 +176,7 @@ class StrawberryAnnotation:
         module = sys.modules[field.origin.__module__]
         self.namespace = module.__dict__
 
-        self.__eval_cache__ = None  # Invalidate cache to allow re-evaluation
+        self.__resolve_cache__ = None  # Invalidate cache to allow re-evaluation
 
     def create_concrete_type(self, evaled_type: type) -> type:
         if has_object_definition(evaled_type):

{strawberry_graphql-0.234.3 → strawberry_graphql-0.235.1}/strawberry/arguments.py

@@ -129,7 +129,6 @@ class StrawberryArgument:
 
     @property
     def is_graphql_generic(self) -> bool:
-        # TODO: double check this
         from strawberry.schema.compat import is_graphql_generic
 
         return is_graphql_generic(self.type)

{strawberry_graphql-0.234.3 → strawberry_graphql-0.235.1}/strawberry/schema/base.py

@@ -87,6 +87,25 @@ class BaseSchema(Protocol):
     def as_str(self) -> str:
         raise NotImplementedError
 
+    @staticmethod
+    def remove_field_suggestion(error: GraphQLError) -> None:
+        if (
+            error.message.startswith("Cannot query field")
+            and "Did you mean" in error.message
+        ):
+            error.message = error.message.split("Did you mean")[0].strip()
+
+    def _process_errors(
+        self,
+        errors: List[GraphQLError],
+        execution_context: Optional[ExecutionContext] = None,
+    ) -> None:
+        if self.config.disable_field_suggestions:
+            for error in errors:
+                self.remove_field_suggestion(error)
+
+        self.process_errors(errors, execution_context)
+
     def process_errors(
         self,
         errors: List[GraphQLError],

{strawberry_graphql-0.234.3 → strawberry_graphql-0.235.1}/strawberry/schema/config.py

@@ -12,6 +12,7 @@ class StrawberryConfig:
     name_converter: NameConverter = field(default_factory=NameConverter)
     default_resolver: Callable[[Any, str], object] = getattr
     relay_max_results: int = 100
+    disable_field_suggestions: bool = False
 
     def __post_init__(
         self,

{strawberry_graphql-0.234.3 → strawberry_graphql-0.235.1}/strawberry/schema/schema.py

@@ -269,7 +269,7 @@ class Schema(BaseSchema):
             execution_context_class=self.execution_context_class,
             execution_context=execution_context,
             allowed_operation_types=allowed_operation_types,
-            process_errors=self.process_errors,
+            process_errors=self._process_errors,
         )
 
         return result
@@ -301,7 +301,7 @@ class Schema(BaseSchema):
             execution_context_class=self.execution_context_class,
             execution_context=execution_context,
             allowed_operation_types=allowed_operation_types,
-            process_errors=self.process_errors,
+            process_errors=self._process_errors,
         )
 
         return result