strawberry-graphql 0.234.2__py3-none-any.whl → 0.235.0__py3-none-any.whl

strawberry/experimental/pydantic/_compat.py

@@ -162,6 +162,9 @@ class PydanticV2Compat:
 
         return type_
 
+    def model_dump(self, model_instance: BaseModel) -> Dict[Any, Any]:
+        return model_instance.model_dump()
+
 
 class PydanticV1Compat:
     @property
@@ -235,6 +238,9 @@ class PydanticV1Compat:
 
         return type_
 
+    def model_dump(self, model_instance: BaseModel) -> Dict[Any, Any]:
+        return model_instance.dict()
+
 
 class PydanticCompat:
     def __init__(self, is_v2: bool) -> None:

strawberry/experimental/pydantic/object_type.py

@@ -91,7 +91,7 @@ def _build_dataclass_creation_fields(
             graphql_name=graphql_name,
             # always unset because we use default_factory instead
             default=dataclasses.MISSING,
-            default_factory=get_default_factory_for_field(field),
+            default_factory=get_default_factory_for_field(field, compat=compat),
             type_annotation=StrawberryAnnotation.from_annotation(field_type),
             description=field.description,
             deprecation_reason=(

strawberry/experimental/pydantic/utils.py

@@ -13,6 +13,8 @@ from typing import (
     cast,
 )
 
+from pydantic import BaseModel
+
 from strawberry.experimental.pydantic._compat import (
     CompatModelField,
     PydanticCompat,
@@ -33,7 +35,6 @@ from strawberry.utils.typing import (
 )
 
 if TYPE_CHECKING:
-    from pydantic import BaseModel
     from pydantic.typing import NoArgAnyCallable
 
 
@@ -72,6 +73,7 @@ class DataclassCreationFields(NamedTuple):
 
 def get_default_factory_for_field(
     field: CompatModelField,
+    compat: PydanticCompat,
 ) -> Union[NoArgAnyCallable, dataclasses._MISSING_TYPE]:
     """
     Gets the default factory for a pydantic field.
@@ -105,9 +107,14 @@ def get_default_factory_for_field(
         return default_factory
 
     # if we have a default, we should return it
-
     if has_default:
-        return lambda: smart_deepcopy(default)
+        # if the default value is a pydantic base model
+        # we should return the serialized version of that default for
+        # printing the value.
+        if isinstance(default, BaseModel):
+            return lambda: compat.model_dump(default)
+        else:
+            return lambda: smart_deepcopy(default)
 
     # if we don't have default or default_factory, but the field is not required,
     # we should return a factory that returns None

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.2.dist-info → strawberry_graphql-0.235.0.dist-info}/METADATA

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

{strawberry_graphql-0.234.2.dist-info → strawberry_graphql-0.235.0.dist-info}/RECORD

@@ -84,14 +84,14 @@ strawberry/exceptions/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMp
 strawberry/exceptions/utils/source_finder.py,sha256=AcuevLgWwOSOR5zBDJbVyXMGRUxsTzrr07XUB0UqNiI,20044
 strawberry/experimental/__init__.py,sha256=2HP5XtxL8ZKsPp4EDRAbMCqiP7p2V4Cca278JUGxnt0,102
 strawberry/experimental/pydantic/__init__.py,sha256=jlsYH1j_9W4ieRpUKgt5zQPERDL7nc1ZBNQ3dAhJs8w,241
-strawberry/experimental/pydantic/_compat.py,sha256=Qnuxy6d0cq5agd8SBlJWqvCPrH3wzMa3gm5Wtzmh0cM,8147
+strawberry/experimental/pydantic/_compat.py,sha256=-qJvpNzsDuY5E2NF87FL7QiakrhJXWqiCjCoS0tr1_g,8371
 strawberry/experimental/pydantic/conversion.py,sha256=nS79s_-nVDvJJgazE84pIgPx2u4g4r-ouOOzRGMuwlU,4220
 strawberry/experimental/pydantic/conversion_types.py,sha256=VuuBULz2v6cz_N1fa51ayJMA5_bQkqZmxaCumDsTGRM,931
 strawberry/experimental/pydantic/error_type.py,sha256=iSDNlbsRYZyU5zrg3mzU3ntREUPnU1f2waGmY_kiXLU,4370
 strawberry/experimental/pydantic/exceptions.py,sha256=Q8Deq3bNkMgc8fwvIYdcfxHSONXVMu-ZB6jcsh1NQYo,1498
 strawberry/experimental/pydantic/fields.py,sha256=QP5vYb8vKf7vOC69cjUPGOdlO_j4kZRdxalWgeqJ5Hk,2588
-strawberry/experimental/pydantic/object_type.py,sha256=icfpKBN4_YrY-243n7XOisI5semFrWuFicmeLAfpU48,12376
-strawberry/experimental/pydantic/utils.py,sha256=9m_oKyz0K1rTmh1ZrYtbFfyUNsiV11RiEb7bLrZuOXs,3770
+strawberry/experimental/pydantic/object_type.py,sha256=ySqKs2_lwwoJiskAn-yLIUaHY2XKUrZMvEFTwKKKzZs,12391
+strawberry/experimental/pydantic/utils.py,sha256=sNVhVXrXHgqZnCma8zrifyffMx34SQwIfuSfWahW-3Y,4065
 strawberry/ext/LICENSE,sha256=_oY0TZg0b_sW0--0T44aMTpy2e2zF1Kiyn8E1qDiivo,1249
 strawberry/ext/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 strawberry/ext/dataclasses/LICENSE,sha256=WZgm35K_3NJwLqxpEHJJi7CWxVrwTumEz5D3Dtd7WnA,13925
@@ -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.2.dist-info/LICENSE,sha256=m-XnIVUKqlG_AWnfi9NReh9JfKhYOB-gJfKE45WM1W8,1072
-strawberry_graphql-0.234.2.dist-info/METADATA,sha256=_gZW-JAxzhCF_jrZq2xw6D07P38OAXkdYsLR255YmpI,7821
-strawberry_graphql-0.234.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-strawberry_graphql-0.234.2.dist-info/entry_points.txt,sha256=Nk7-aT3_uEwCgyqtHESV9H6Mc31cK-VAvhnQNTzTb4k,49
-strawberry_graphql-0.234.2.dist-info/RECORD,,
+strawberry_graphql-0.235.0.dist-info/LICENSE,sha256=m-XnIVUKqlG_AWnfi9NReh9JfKhYOB-gJfKE45WM1W8,1072
+strawberry_graphql-0.235.0.dist-info/METADATA,sha256=pbG-KszzQKU30_gF1B2tUWz0f9OCMXLoXdlhsiUr-bM,7821
+strawberry_graphql-0.235.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+strawberry_graphql-0.235.0.dist-info/entry_points.txt,sha256=Nk7-aT3_uEwCgyqtHESV9H6Mc31cK-VAvhnQNTzTb4k,49
+strawberry_graphql-0.235.0.dist-info/RECORD,,