django-pfx 1.4.dev108__tar.gz → 1.4.dev110__tar.gz

{django_pfx-1.4.dev108 → django_pfx-1.4.dev110}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-pfx
-Version: 1.4.dev108
+Version: 1.4.dev110
 Summary: Django PFX is a toolkit designed to streamline the development of RESTful APIs using the Django framework.
 Author: Hervé Martinet
 Author-email: herve.martinet@gmail.com

{django_pfx-1.4.dev108 → django_pfx-1.4.dev110}/django_pfx.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-pfx
-Version: 1.4.dev108
+Version: 1.4.dev110
 Summary: Django PFX is a toolkit designed to streamline the development of RESTful APIs using the Django framework.
 Author: Hervé Martinet
 Author-email: herve.martinet@gmail.com

{django_pfx-1.4.dev108 → django_pfx-1.4.dev110}/pfx/pfxcore/exceptions.py

@@ -1,3 +1,4 @@
+from django.core.exceptions import NON_FIELD_ERRORS
 from django.utils.translation import gettext_lazy as _
 
 from pfx.pfxcore.http import JsonResponse
@@ -5,10 +6,25 @@ from pfx.pfxcore.http import JsonResponse
 from .shortcuts import delete_token_cookie, f
 
 
+def validation_error_dict(e):
+    if hasattr(e, 'error_dict'):
+        return dict(e)
+    return {NON_FIELD_ERRORS: list(e)}
+
+
 class APIError(Exception):
-    def __init__(self, message, status=400, delete_cookie=False, **kwargs):
+    def __init__(
+            self, message, status=400, delete_cookie=False,
+            validation_error=None, **kwargs):
         self.status = status
-        self.data = dict(message=message, **kwargs)
+        if validation_error:
+            d = validation_error_dict(validation_error)
+            mlist = d.get(NON_FIELD_ERRORS)
+            if mlist:
+                message = mlist[0]
+            self.data = dict(message=message, errors=d, **kwargs)
+        else:
+            self.data = dict(message=message, **kwargs)
         self.delete_cookie = delete_cookie
 
     @property

{django_pfx-1.4.dev108 → django_pfx-1.4.dev110}/pfx/pfxcore/locale/fr/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-03-31 12:17+0200\n"
+"POT-Creation-Date: 2025-04-01 13:31+0200\n"
 "PO-Revision-Date: 2021-06-22 23:31+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -22,28 +22,28 @@ msgstr ""
 msgid "An internal server error occured."
 msgstr "Une erreur interne du serveur est survenue."
 
-#: exceptions.py:25 exceptions.py:48
+#: exceptions.py:41 exceptions.py:64
 #, python-brace-format
 msgid "{model} not found."
 msgstr "{model} non trouvé."
 
-#: exceptions.py:32
+#: exceptions.py:48
 msgid "JSON Malformed {}"
 msgstr "JSON malformé {}"
 
-#: exceptions.py:55
+#: exceptions.py:71
 msgid "Login failed"
 msgstr "La connexion a échoué"
 
-#: exceptions.py:62
+#: exceptions.py:78
 msgid "Unauthorized"
 msgstr "Non autorisé"
 
-#: exceptions.py:69
+#: exceptions.py:85
 msgid "Forbidden"
 msgstr "Interdit"
 
-#: exceptions.py:76
+#: exceptions.py:92
 msgid "Resource not found"
 msgstr "Ressource non trouvée"
 

{django_pfx-1.4.dev108 → django_pfx-1.4.dev110}/tests/tests/basic_api_errors.py

@@ -1,8 +1,10 @@
 from unittest.mock import MagicMock, patch
 
+from django.core.exceptions import ValidationError
 from django.test import TestCase
 from django.test.utils import override_settings
 
+from pfx.pfxcore.exceptions import APIError
 from pfx.pfxcore.test import APIClient, TestAssertMixin
 from tests.models import User
 
@@ -64,3 +66,13 @@ class BasicAPIErrorTest(TestAssertMixin, TestCase):
             "of object: line 3 column 47 (char 96)",  # python >= 3.13
             "JSON Malformed Expecting property name enclosed in "
             "double quotes: line 4 column 17 (char 114)"])  # python <= 3.12
+
+    def test_api_error_from_validation_error(self):
+        error = APIError("Default", validation_error=ValidationError(
+            ValidationError("Message")))
+        self.assertEqual(error.data['message'], "Message")
+
+        # If no general message, default message is used.
+        error = APIError("Default", validation_error=ValidationError(
+            ValidationError(dict(field1="Message"))))
+        self.assertEqual(error.data['message'], "Default")