Merge pull request #877 from cordada/deploy/v0.54.0

Deploy release v0.54.0

Author: jtrobles-cdd

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.53.0
+current_version = 0.54.0
 commit = True
 tag = False
 message = chore: Bump version from {current_version} to {new_version}

HISTORY.md

@@ -1,5 +1,13 @@
 # History
 
+## 0.54.0 (2025-09-09)
+
+- (PR #871, 2025-09-09) rut: Use class variables for exception messages raised by `Rut`
+- (PR #873, 2025-09-09) chore(deps): Bump the python-development group across 1 directory with 2 updates
+- (PR #874, 2025-09-09) extras: Add option to validate RUT DV to Django model field `RutField`
+- (PR #875, 2025-09-09) extras: Refactor `dj_form_fields.RutField.to_python()`
+- (PR #872, 2025-09-09) chore(deps): Bump django from 4.2.23 to 4.2.24
+
 ## 0.53.0 (2025-09-02)
 
 - (PR #862, 2025-08-28) chore(deps): Bump the github-actions-production group with 5 updates

requirements-dev.in

@@ -7,13 +7,13 @@
 black==25.1.0
 build==1.3.0
 bumpversion==0.5.3
-coverage==7.10.4
+coverage==7.10.6
 flake8==7.3.0
 isort==6.0.1
 mypy==1.17.1
 pip-tools==7.4.1
 tox==4.27.0
-twine==6.1.0
+twine==6.2.0
 types-jsonschema==4.25.0.20250809
 types-lxml==2025.3.30
 types-pytz==2025.2.0.20250809

requirements-dev.txt

@@ -40,7 +40,7 @@ click==8.0.3
     #   pip-tools
 colorama==0.4.6
     # via tox
-coverage==7.10.4
+coverage==7.10.6
     # via -r requirements-dev.in
 cryptography==45.0.4
     # via
@@ -164,7 +164,7 @@ tomli==2.2.1
     #   tox
 tox==4.27.0
     # via -r requirements-dev.in
-twine==6.1.0
+twine==6.2.0
     # via -r requirements-dev.in
 types-html5lib==1.1.11.20241018
     # via types-lxml

requirements.txt

@@ -23,7 +23,7 @@ cryptography==45.0.4
     #   signxml
 defusedxml==0.7.1
     # via -r requirements.in
-django==4.2.23
+django==4.2.24
     # via
     #   -r requirements.in
     #   django-filter

src/cl_sii/__init__.py

@@ -4,4 +4,4 @@
 
 """
 
-__version__ = '0.53.0'
+__version__ = '0.54.0'

src/cl_sii/extras/dj_form_fields.py

@@ -66,7 +66,7 @@ def to_python(self, value: Optional[object]) -> Optional[Rut]:
         if (
             converted_value is not None
             and self.validate_dv
-            and Rut.calc_dv(converted_value.digits) != converted_value.dv
+            and not converted_value.validate_dv(raise_exception=False)
         ):
             raise django.core.exceptions.ValidationError(
                 self.error_messages['invalid_dv'],

src/cl_sii/extras/dj_model_fields.py

@@ -8,7 +8,7 @@
 except ImportError as exc:  # pragma: no cover
     raise ImportError("Package 'Django' is required to use this module.") from exc
 
-from typing import Any, Optional, Tuple
+from typing import Any, ClassVar, Optional, Tuple
 
 import django.core.exceptions
 import django.db.models
@@ -41,7 +41,6 @@ class RutField(django.db.models.Field):
 
     """
 
-    # TODO: add option to validate that "digito verificador" is correct.
     # TODO: implement method 'formfield'. Probably a copy of 'CharField.formfield' is fine.
 
     description = 'RUT for SII (Chile)'
@@ -50,8 +49,18 @@ class RutField(django.db.models.Field):
         'invalid_dv': "\"digito verificador\" of RUT '%(value)s' is incorrect.",
     }
     empty_strings_allowed = False
+    validate_dv_by_default: ClassVar[bool] = False
+
+    def __init__(
+        self,
+        verbose_name: Optional[str] = None,
+        name: Optional[str] = None,
+        validate_dv: bool = validate_dv_by_default,
+        *args: Any,
+        **kwargs: Any,
+    ) -> None:
+        self.validate_dv = validate_dv
 
-    def __init__(self, *args: Any, **kwargs: Any) -> None:
         # note: the value saved to the DB will always be in canonical format.
         db_column_max_length = cl_sii.rut.constants.RUT_CANONICAL_MAX_LENGTH
 
@@ -62,7 +71,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
             raise ValueError("This field does not allow customization of 'max_length'.")
 
         kwargs['max_length'] = db_column_max_length
-        super().__init__(*args, **kwargs)
+        super().__init__(verbose_name, name, *args, **kwargs)
 
     def deconstruct(self) -> Tuple[str, str, Any, Any]:
         """
@@ -71,6 +80,10 @@ def deconstruct(self) -> Tuple[str, str, Any, Any]:
         # note: this override is necessary because we have a custom constructor.
 
         name, path, args, kwargs = super().deconstruct()
+
+        if self.validate_dv != self.validate_dv_by_default:
+            kwargs['validate_dv'] = self.validate_dv
+
         del kwargs['max_length']
 
         return name, path, args, kwargs
@@ -144,8 +157,19 @@ def to_python(self, value: Optional[object]) -> Optional[Rut]:
             converted_value = value
         else:
             try:
-                converted_value = Rut(value, validate_dv=False)  # type: ignore
-            except (AttributeError, TypeError, ValueError):
+                converted_value = Rut(value, validate_dv=self.validate_dv)  # type: ignore
+            except (AttributeError, TypeError, ValueError) as exc:
+                if (
+                    isinstance(exc, ValueError)
+                    and exc.args
+                    and exc.args[0] == Rut.INVALID_DV_ERROR_MESSAGE
+                ):
+                    raise django.core.exceptions.ValidationError(
+                        self.error_messages['invalid_dv'],
+                        code='invalid_dv',
+                        params={'value': value},
+                    )
+
                 raise django.core.exceptions.ValidationError(
                     self.error_messages['invalid'],
                     code='invalid',

src/cl_sii/rut/__init__.py

@@ -15,6 +15,7 @@
 import itertools
 import random
 import re
+from typing import ClassVar
 
 from . import constants
 
@@ -52,6 +53,21 @@ class Rut:
 
     """
 
+    INVALID_TYPE_ERROR_MESSAGE: ClassVar[str] = "Invalid type."
+    """
+    Error message used when the input type is not one of the accepted ones.
+    """
+
+    INVALID_RUT_ERROR_MESSAGE: ClassVar[str] = "Syntactically invalid RUT."
+    """
+    Error message used when the input is not a syntactically valid RUT.
+    """
+
+    INVALID_DV_ERROR_MESSAGE: ClassVar[str] = "RUT's \"digito verificador\" is incorrect."
+    """
+    Error message used when the RUT's "digito verificador" is incorrect.
+    """
+
     def __init__(self, value: str | Rut, validate_dv: bool = False) -> None:
         """
         Constructor.
@@ -64,17 +80,15 @@ def __init__(self, value: str | Rut, validate_dv: bool = False) -> None:
         :raises TypeError:
 
         """
-        invalid_rut_msg = "Syntactically invalid RUT."
-
         if isinstance(value, Rut):
             value = value.canonical
         if not isinstance(value, str):
-            raise TypeError("Invalid type.")
+            raise TypeError(self.INVALID_TYPE_ERROR_MESSAGE)
 
         clean_value = Rut.clean_str(value)
         match_obj = constants.RUT_CANONICAL_STRICT_REGEX.match(clean_value)
         if match_obj is None:
-            raise ValueError(invalid_rut_msg, value)
+            raise ValueError(self.INVALID_RUT_ERROR_MESSAGE, value)
 
         match_groups = match_obj.groupdict()
         self._digits = match_groups['digits']
@@ -151,7 +165,7 @@ def validate_dv(self, raise_exception: bool = False) -> bool:
         """
         is_valid = self.calc_dv(self._digits) == self._dv
         if not is_valid and raise_exception:
-            raise ValueError("RUT's \"digito verificador\" is incorrect.", self.canonical)
+            raise ValueError(self.INVALID_DV_ERROR_MESSAGE, self.canonical)
         return is_valid
 
     ############################################################################

src/tests/test_extras_dj_model_fields.py

@@ -1,20 +1,28 @@
 import unittest
+import unittest.mock
 
-import django.db.models  # noqa: F401
+import django.core.exceptions
+import django.db.models
 
 from cl_sii.extras.dj_model_fields import Rut, RutField
 
 
 class RutFieldTest(unittest.TestCase):
     valid_rut_canonical: str
     valid_rut_instance: Rut
+    valid_rut_canonical_with_invalid_dv: str
     valid_rut_verbose_leading_zero_lowercase: str
+    mock_model_instance: django.db.models.Model
 
     @classmethod
     def setUpClass(cls) -> None:
         cls.valid_rut_canonical = '60803000-K'
         cls.valid_rut_instance = Rut(cls.valid_rut_canonical)
+        cls.valid_rut_canonical_with_invalid_dv = '60803000-0'
         cls.valid_rut_verbose_leading_zero_lowercase = '060.803.000-k'
+        cls.mock_model_instance = unittest.mock.create_autospec(
+            django.db.models.Model, instance=True
+        )
 
     def test_get_prep_value_of_canonical_str(self) -> None:
         prepared_value = RutField().get_prep_value(self.valid_rut_canonical)
@@ -34,3 +42,33 @@ def test_get_prep_value_of_Rut(self) -> None:
     def test_get_prep_value_of_None(self) -> None:
         prepared_value = RutField().get_prep_value(None)
         self.assertIsNone(prepared_value)
+
+    def test_clean_value_of_rut_str_with_invalid_dv_if_validated(self) -> None:
+        rut_field = RutField(validate_dv=True)
+        with self.assertRaises(django.core.exceptions.ValidationError) as cm:
+            rut_field.clean(self.valid_rut_canonical_with_invalid_dv, self.mock_model_instance)
+        self.assertEqual(cm.exception.code, 'invalid_dv')
+
+    def test_clean_value_of_rut_str_with_invalid_dv_if_not_validated(self) -> None:
+        rut_field = RutField(validate_dv=False)
+        cleaned_value = rut_field.clean(
+            self.valid_rut_canonical_with_invalid_dv, self.mock_model_instance
+        )
+        self.assertIsInstance(cleaned_value, Rut)
+        self.assertEqual(cleaned_value.canonical, self.valid_rut_canonical_with_invalid_dv)
+
+    def test_deconstruct_without_options(self) -> None:
+        name, path, args, kwargs = RutField().deconstruct()
+        self.assertEqual(path, 'cl_sii.extras.dj_model_fields.RutField')
+        self.assertEqual(args, [])
+        self.assertEqual(kwargs, {})
+
+    def test_deconstruct_with_option_validate_dv_enabled(self) -> None:
+        name, path, args, kwargs = RutField(validate_dv=True).deconstruct()
+        self.assertEqual(args, [])
+        self.assertEqual(kwargs, {'validate_dv': True})
+
+    def test_deconstruct_with_option_validate_dv_disabled(self) -> None:
+        name, path, args, kwargs = RutField(validate_dv=False).deconstruct()
+        self.assertEqual(args, [])
+        self.assertEqual(kwargs, {})