🪛 Fix validation_error responses

dymmond · Jul 18, 2023 · 0ce6c43 · 0ce6c43
1 parent 7af5d34
commit 0ce6c43
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 6 deletions.
diff --git a/esmerald/exception_handlers.py b/esmerald/exception_handlers.py
@@ -1,6 +1,6 @@
 from typing import Any, List, Union
 
-from orjson import loads
+from orjson import JSONDecodeError, loads
 from pydantic import ValidationError
 from starlette import status
 from starlette.exceptions import HTTPException as StarletteHTTPException
@@ -44,7 +44,10 @@ def parse_non_serializable_objects_from_validation_error(values: List[Any]) -> L
     """
     details = []
     for detail in values:
-        detail_inputs = detail["input"]
+        detail_inputs = detail.get("input", None)
+        if not isinstance(detail_inputs, list):
+            details.append(detail)
+            continue
 
         inputs = []
         for input in detail_inputs:
@@ -63,11 +66,11 @@ async def validation_error_exception_handler(
     status_code = status.HTTP_400_BAD_REQUEST
 
     if extra:
+        errors_extra = exc.extra.get("extra", {})
         try:
-            details = loads(exc.extra.get("extra", {}))
-        except TypeError:
-            extra_details = exc.extra.get("extra", {})
-            details = parse_non_serializable_objects_from_validation_error(extra_details)
+            details = loads(errors_extra)
+        except (TypeError, JSONDecodeError):
+            details = parse_non_serializable_objects_from_validation_error(errors_extra)
 
         return JSONResponse(
             {"detail": exc.detail, "errors": details},

diff --git a/tests/uploads_and_forms/__init__.py → tests/datastructures_upload/__init__.py b/tests/uploads_and_forms/__init__.py → tests/datastructures_upload/__init__.py
diff --git a/...s/uploads_and_forms/test_datastructure.py → ...tastructures_upload/test_datastructure.py b/...s/uploads_and_forms/test_datastructure.py → ...tastructures_upload/test_datastructure.py
diff --git a/.../uploads_and_forms/test_no_upload_file.py → ...astructures_upload/test_no_upload_file.py b/.../uploads_and_forms/test_no_upload_file.py → ...astructures_upload/test_no_upload_file.py
diff --git a/...oads_and_forms/test_single_upload_file.py → ...uctures_upload/test_single_upload_file.py b/...oads_and_forms/test_single_upload_file.py → ...uctures_upload/test_single_upload_file.py
diff --git a/...loads_and_forms/test_upload_list_files.py → ...ructures_upload/test_upload_list_files.py b/...loads_and_forms/test_upload_list_files.py → ...ructures_upload/test_upload_list_files.py