strawberry-graphql 0.279.0.dev1754138688__py3-none-any.whl → 0.279.0.dev1754159379__py3-none-any.whl

strawberry/pydantic/__init__.py

@@ -10,6 +10,7 @@ Example:
         age: int
 """
 
+from .error import Error
 from .object_type import input as input_decorator
 from .object_type import interface
 from .object_type import type as type_decorator
@@ -18,4 +19,4 @@ from .object_type import type as type_decorator
 input = input_decorator
 type = type_decorator
 
-__all__ = ["input", "interface", "type"]
+__all__ = ["Error", "input", "interface", "type"]

strawberry/pydantic/error.py

@@ -0,0 +1,51 @@
+"""Generic error type for Pydantic validation errors in Strawberry GraphQL.
+
+This module provides a generic Error type that can be used to represent
+Pydantic validation errors in GraphQL responses.
+"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from strawberry.types.object_type import type as strawberry_type
+
+if TYPE_CHECKING:
+    from pydantic import ValidationError
+
+
+@strawberry_type
+class ErrorDetail:
+    """Represents a single validation error detail."""
+
+    type: str
+    loc: list[str]
+    msg: str
+
+
+@strawberry_type
+class Error:
+    """Generic error type for Pydantic validation errors."""
+
+    errors: list[ErrorDetail]
+
+    @staticmethod
+    def from_validation_error(exc: ValidationError) -> Error:
+        """Create an Error instance from a Pydantic ValidationError.
+
+        Args:
+            exc: The Pydantic ValidationError to convert
+
+        Returns:
+            An Error instance containing all validation errors
+        """
+        return Error(
+            errors=[
+                ErrorDetail(
+                    type=error["type"],
+                    loc=[str(loc) for loc in error["loc"]],
+                    msg=error["msg"],
+                )
+                for error in exc.errors()
+            ]
+        )

strawberry/schema/schema_converter.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import contextlib
 import dataclasses
 import sys
 from functools import partial, reduce
@@ -731,14 +732,27 @@ class GraphQLCoreConverter:
             ) -> Any:
                 # parse field arguments into Strawberry input types and convert
                 # field names to Python equivalents
-                field_args, field_kwargs = get_arguments(
-                    field=field,
-                    source=_source,
-                    info=info,
-                    kwargs=kwargs,
-                    config=self.config,
-                    scalar_registry=self.scalar_registry,
-                )
+                try:
+                    field_args, field_kwargs = get_arguments(
+                        field=field,
+                        source=_source,
+                        info=info,
+                        kwargs=kwargs,
+                        config=self.config,
+                        scalar_registry=self.scalar_registry,
+                    )
+                except Exception as exc:
+                    # Try to import Pydantic ValidationError
+                    with contextlib.suppress(ImportError):
+                        from pydantic import ValidationError
+
+                        if isinstance(
+                            exc, ValidationError
+                        ) and self._should_convert_validation_error(field):
+                            from strawberry.pydantic import Error
+
+                            return Error.from_validation_error(exc)
+                    raise
 
                 resolver_requested_info = False
                 if "info" in field_kwargs:
@@ -799,6 +813,22 @@ class GraphQLCoreConverter:
         _resolver._is_default = not field.base_resolver  # type: ignore
         return _resolver
 
+    def _should_convert_validation_error(self, field: StrawberryField) -> bool:
+        """Check if field return type is a Union containing strawberry.pydantic.Error."""
+        from strawberry.types.union import StrawberryUnion
+
+        field_type = field.type
+        if isinstance(field_type, StrawberryUnion):
+            # Import Error dynamically to avoid circular imports
+            try:
+                from strawberry.pydantic import Error
+
+                return any(union_type is Error for union_type in field_type.types)
+            except ImportError:
+                # If strawberry.pydantic doesn't exist or Error isn't available
+                return False
+        return False
+
     def from_scalar(self, scalar: type) -> GraphQLScalarType:
         from strawberry.relay.types import GlobalID
 

{strawberry_graphql-0.279.0.dev1754138688.dist-info → strawberry_graphql-0.279.0.dev1754159379.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: strawberry-graphql
-Version: 0.279.0.dev1754138688
+Version: 0.279.0.dev1754159379
 Summary: A library for creating GraphQL APIs
 License: MIT
 Keywords: graphql,api,rest,starlette,async

{strawberry_graphql-0.279.0.dev1754138688.dist-info → strawberry_graphql-0.279.0.dev1754159379.dist-info}/RECORD

@@ -152,7 +152,8 @@ strawberry/printer/__init__.py,sha256=DmepjmgtkdF5RxK_7yC6qUyRWn56U-9qeZMbkztYB9
 strawberry/printer/ast_from_value.py,sha256=Tkme60qlykbN2m3dNPNMOe65X-wj6EmcDQwgQv7gUkc,4987
 strawberry/printer/printer.py,sha256=5E9w0wDsUv1hvkeXof12277NLMiCVy5MgJ6gSo_NJhQ,19177
 strawberry/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-strawberry/pydantic/__init__.py,sha256=1Z6_WtYpLGZR_Ev0indyL40EXFlNS3bqtonNRm2O9q8,558
+strawberry/pydantic/__init__.py,sha256=_QAGALzygcRyKE2iiK_rHt4s_d0g3ms0SUP64rEjrYI,592
+strawberry/pydantic/error.py,sha256=EvS2R99CCoe5Oo5Dh3V9Xc6eGcSFpo-r4F5Wq8RjF7U,1271
 strawberry/pydantic/fields.py,sha256=8oBY7Z-sTj6Tt3l9sNl1Wqk2ERxh-Doe2onQYnsGCP4,7188
 strawberry/pydantic/object_type.py,sha256=sxFTE_VSpAcmOm7-EGL-tp0aobjoctOSjVQs34fRcD8,10785
 strawberry/quart/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -176,7 +177,7 @@ strawberry/schema/config.py,sha256=bkEMn0EkBRg2Tl6ZZH5hpOGBNiAw9QcOclt5dI_Yd1g,1
 strawberry/schema/exceptions.py,sha256=8gsMxxFDynMvRkUDuVL9Wwxk_zsmo6QoJ2l4NPxd64M,1137
 strawberry/schema/name_converter.py,sha256=JG5JKLr9wp8BMJIvG3_bVkwFdoLGbknNR1Bt75urXN0,6950
 strawberry/schema/schema.py,sha256=EZ6YLV5wqHrjxi3rVJ0HvbGeIlZrbSOZqEomKlu4-OY,39433
-strawberry/schema/schema_converter.py,sha256=ZGkZjLsqjZ-0y5NItsECHZbOOhjJioYRT6YROwmo4Gg,40125
+strawberry/schema/schema_converter.py,sha256=6wgiLkQtA77AEBCH9TqKdGWmRsv4HScKx9YahnZlQQg,41441
 strawberry/schema/types/__init__.py,sha256=oHO3COWhL3L1KLYCJNY1XFf5xt2GGtHiMC-UaYbFfnA,68
 strawberry/schema/types/base_scalars.py,sha256=JRUq0WjEkR9dFewstZnqnZKp0uOEipo4UXNF5dzRf4M,1971
 strawberry/schema/types/concrete_type.py,sha256=axIyFZgdwNv-XYkiqX67464wuFX6Vp0jYATwnBZSUvM,750
@@ -239,8 +240,8 @@ strawberry/utils/logging.py,sha256=U1cseHGquN09YFhFmRkiphfASKCyK0HUZREImPgVb0c,7
 strawberry/utils/operation.py,sha256=ZgVOw3K2jQuLjNOYUHauF7itJD0QDNoPw9PBi0IYf6k,1234
 strawberry/utils/str_converters.py,sha256=-eH1Cl16IO_wrBlsGM-km4IY0IKsjhjnSNGRGOwQjVM,897
 strawberry/utils/typing.py,sha256=SDvX-Du-9HAV3-XXjqi7Q5f5qPDDFd_gASIITiwBQT4,14073
-strawberry_graphql-0.279.0.dev1754138688.dist-info/LICENSE,sha256=m-XnIVUKqlG_AWnfi9NReh9JfKhYOB-gJfKE45WM1W8,1072
-strawberry_graphql-0.279.0.dev1754138688.dist-info/METADATA,sha256=JMWoCdEfWN1cM7Y5cOj95RNtcdAWpRjbLTwuJCy08VA,7407
-strawberry_graphql-0.279.0.dev1754138688.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-strawberry_graphql-0.279.0.dev1754138688.dist-info/entry_points.txt,sha256=Nk7-aT3_uEwCgyqtHESV9H6Mc31cK-VAvhnQNTzTb4k,49
-strawberry_graphql-0.279.0.dev1754138688.dist-info/RECORD,,
+strawberry_graphql-0.279.0.dev1754159379.dist-info/LICENSE,sha256=m-XnIVUKqlG_AWnfi9NReh9JfKhYOB-gJfKE45WM1W8,1072
+strawberry_graphql-0.279.0.dev1754159379.dist-info/METADATA,sha256=d3JxV0Ow32IbDnXy_XQBZmYFP9dfbrzcXbycU5arydU,7407
+strawberry_graphql-0.279.0.dev1754159379.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+strawberry_graphql-0.279.0.dev1754159379.dist-info/entry_points.txt,sha256=Nk7-aT3_uEwCgyqtHESV9H6Mc31cK-VAvhnQNTzTb4k,49
+strawberry_graphql-0.279.0.dev1754159379.dist-info/RECORD,,