strawberry-graphql 0.234.3__py3-none-any.whl → 0.235.1__py3-none-any.whl

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/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/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/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/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

{strawberry_graphql-0.234.3.dist-info → strawberry_graphql-0.235.1.dist-info}/METADATA

@@ -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.dist-info → strawberry_graphql-0.235.1.dist-info}/RECORD

@@ -7,8 +7,8 @@ strawberry/aiohttp/handlers/graphql_ws_handler.py,sha256=Zi1y_XLsZwqX52vvy0Se3S0
 strawberry/aiohttp/test/__init__.py,sha256=4xxdUZtIISSOwjrcnmox7AvT4WWjowCm5bUuPdQneMg,71
 strawberry/aiohttp/test/client.py,sha256=tlpHymSWqhiQbLmKwodcaX2vdc8BW1IaNTFTHlWKlOY,1323
 strawberry/aiohttp/views.py,sha256=l5Gb_9twQo1TQuWk7v0dGFry0yM1ivnGztUtwQ_N5-c,6063
-strawberry/annotation.py,sha256=YYWKjDUxgwFLuTtHYjrCZTub0R4knUngidDauXovDg8,12887
-strawberry/arguments.py,sha256=bIfpFN2kcs4cjmeI8UPV1Xxzm5bb4jmbggejOyouulw,8440
+strawberry/annotation.py,sha256=JiQTFbDLaq8gWhUjdTlKiiE5K1jUuIobizEV8DCLxL0,13005
+strawberry/arguments.py,sha256=yFbL1o9vFemrJSVGadt80wN_ajU1khw2--S0nDjrx78,8406
 strawberry/asgi/__init__.py,sha256=9s_6505Aa68y_qAgzQV3yXE0IrGVZbuhQ7rIUNPXOlE,6985
 strawberry/asgi/handlers/__init__.py,sha256=rz5Gth2eJUn7tDq2--99KSNFeMdDPpLFCkfA7vge0cI,235
 strawberry/asgi/handlers/graphql_transport_ws_handler.py,sha256=obBZ1bQ1R9eZL1_Xcr5eKQObjSPB0FFLtMFj9EAmFc0,2105
@@ -183,13 +183,13 @@ strawberry/sanic/utils.py,sha256=eDiJPJYpELj4hFsx8CCAHomqe7dDEpStDPm6OfkstJ0,998
 strawberry/sanic/views.py,sha256=CyhR9RCS4atekEorOH6wAOqfJgmi-h-hAfHA1rq8sA8,5584
 strawberry/scalars.py,sha256=usENRKCwl60KstV9sBGYhk2dqW5zw2wGX5eTpOWQiqg,2106
 strawberry/schema/__init__.py,sha256=u1QCyDVQExUVDA20kyosKPz3TS5HMCN2NrXclhiFAL4,92
-strawberry/schema/base.py,sha256=lQBJyzG2ZhKc544oLbXEbpYOPOjaXBop3lxp68h_lfI,2976
+strawberry/schema/base.py,sha256=RNacxV0AdRSG2kFDitiB2G59mUjp-tFBf2mU3ZkcBbc,3607
 strawberry/schema/compat.py,sha256=n0r3UPUcGemMqK8vklgtCkkuCA1p6tWAYbc6Vl4iNOw,1684
-strawberry/schema/config.py,sha256=XkWwmxEsmecscH29o4qU0iSe-hgwJJ2X0DPBVlka2OE,640
+strawberry/schema/config.py,sha256=X83kbrNUCocueAwkDWuwq0GZD2Spgfjo4-zqR5b_r_E,684
 strawberry/schema/exceptions.py,sha256=T-DsvBtjx9svkegIm1YrVPGPswpVEpMTFc0_7flLEkM,542
 strawberry/schema/execute.py,sha256=dwxMrJrR2Qdd1nPGcIS9-Viq7h5qtPfsD6qdujALoMw,11153
 strawberry/schema/name_converter.py,sha256=UdNyd-QtqF2HsDCQK-nsOcLGxDTj4hJwYFNvMtZnpq4,6533
-strawberry/schema/schema.py,sha256=aYvznvDecNbcqT0H0kLHwlnYHdwQQhiU-Jd5ean2BtU,14368
+strawberry/schema/schema.py,sha256=RWR28Nu8RpFxr5vFaswnp-0sWkO6-ZZcbfJVq2mgVEQ,14370
 strawberry/schema/schema_converter.py,sha256=_kufIUo71mWCAC7QaXcW8KxKXa86vdvh75mBdjbJE7Y,36795
 strawberry/schema/types/__init__.py,sha256=oHO3COWhL3L1KLYCJNY1XFf5xt2GGtHiMC-UaYbFfnA,68
 strawberry/schema/types/base_scalars.py,sha256=NzGQmDtHdCcBeJpRpyeZQ6EgYRpQBTd8fUf1p9cMWlQ,1847
@@ -245,8 +245,8 @@ strawberry/utils/logging.py,sha256=flS7hV0JiIOEdXcrIjda4WyIWix86cpHHFNJL8gl1y4,7
 strawberry/utils/operation.py,sha256=Um-tBCPl3_bVFN2Ph7o1mnrxfxBes4HFCj6T0x4kZxE,1135
 strawberry/utils/str_converters.py,sha256=avIgPVLg98vZH9mA2lhzVdyyjqzLsK2NdBw9mJQ02Xk,813
 strawberry/utils/typing.py,sha256=G92wuT2WhEGQrwjek_On2K8l0nyVFtBW3P7I_cfjG-8,13870
-strawberry_graphql-0.234.3.dist-info/LICENSE,sha256=m-XnIVUKqlG_AWnfi9NReh9JfKhYOB-gJfKE45WM1W8,1072
-strawberry_graphql-0.234.3.dist-info/METADATA,sha256=PlHR6aVWRNm-JxNjj4yUJ6ItDcvzEAKgNIW4D0-kgQk,7821
-strawberry_graphql-0.234.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-strawberry_graphql-0.234.3.dist-info/entry_points.txt,sha256=Nk7-aT3_uEwCgyqtHESV9H6Mc31cK-VAvhnQNTzTb4k,49
-strawberry_graphql-0.234.3.dist-info/RECORD,,
+strawberry_graphql-0.235.1.dist-info/LICENSE,sha256=m-XnIVUKqlG_AWnfi9NReh9JfKhYOB-gJfKE45WM1W8,1072
+strawberry_graphql-0.235.1.dist-info/METADATA,sha256=VV9Bw1wq9Ep6V2KOZKP6mQnl-QyFtb3oSiYNFTTMFdo,7821
+strawberry_graphql-0.235.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+strawberry_graphql-0.235.1.dist-info/entry_points.txt,sha256=Nk7-aT3_uEwCgyqtHESV9H6Mc31cK-VAvhnQNTzTb4k,49
+strawberry_graphql-0.235.1.dist-info/RECORD,,