brdocs-validation 0.4.0__tar.gz → 0.5.0__tar.gz

{brdocs_validation-0.4.0/brdocs_validation.egg-info → brdocs_validation-0.5.0}/PKG-INFO

@@ -1,9 +1,9 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: brdocs-validation
-Version: 0.4.0
+Version: 0.5.0
 Summary: Validate brazilian documents using Type Hints in classes inheriting Pydantic's (V2) BaseModel
-Author-email: Vinícius Aguiar <vaguiararqdevsoftware@proton.me>
-Maintainer-email: Vinícius Aguiar <vaguiararqdevsoftware@proton.me>
+Author-email: Vinícius Aguiar <vaguiararqdevsoftware@proton.me>, Rafael Kamimura <rafael.kamimura@proton.me>
+Maintainer-email: Vinícius Aguiar <vaguiararqdevsoftware@proton.me>, Rafael Kamimura <rafael.kamimura@proton.me>
 Project-URL: Repository, https://github.com/vinicius-oa/BRdocs-validation
 Keywords: pydantic-v2,cpf-validador,cnpj-validador,validador-pispasep,validador-titulo-eleitor
 Classifier: Development Status :: 5 - Production/Stable
@@ -29,6 +29,7 @@ Requires-Dist: wheel; extra == "dev"
 Requires-Dist: twine; extra == "dev"
 Requires-Dist: tox; extra == "dev"
 Requires-Dist: ruff; extra == "dev"
+Dynamic: license-file
 
 ![Test](https://github.com/vinicius-oa/BRdocs-validation/actions/workflows/test.yml/badge.svg)
 ![codecov](https://codecov.io/gh/vinicius-oa/BRdocs-validation/graph/badge.svg?token=Z211YIKO8L)

{brdocs_validation-0.4.0 → brdocs_validation-0.5.0}/br_docs/__init__.py

@@ -1,5 +1,6 @@
+from typing import Annotated
+
 from pydantic.functional_validators import AfterValidator
-from typing_extensions import Annotated
 
 from br_docs.validators.cert import CERTv
 from br_docs.validators.cnh import CNHv
@@ -8,9 +9,8 @@ from br_docs.validators.cns import CNSv
 from br_docs.validators.cpf import CPFv
 from br_docs.validators.nis import NISv
 from br_docs.validators.renavam import RENAVAMv
-from br_docs.validators.te import TEv
 from br_docs.validators.sei import SEIv
-
+from br_docs.validators.te import TEv
 
 CPF = Annotated[str, AfterValidator(CPFv())]
 CNPJ = Annotated[str, AfterValidator(CNPJv())]

{brdocs_validation-0.4.0 → brdocs_validation-0.5.0}/br_docs/validators/__init__.py

@@ -16,7 +16,7 @@ class CheckDigits(ABC, ValuesRegex):
         return value
 
     def validate(self, value: str):
-        numbers = list(map(int, re.findall(r"\d", value)))
+        numbers = list(map(int, re.findall(r'\d', value)))
         check_digits = [numbers.pop(x) for x in range(-self.CHECK_DIGITS, 0)]
         digits_calculated = self.calculate_digits(numbers)
         for check_digit, digit_calculated in zip(check_digits, digits_calculated):

{brdocs_validation-0.4.0 → brdocs_validation-0.5.0}/br_docs/validators/cert.py

@@ -5,7 +5,7 @@ from br_docs.validators import CheckDigits
 
 class CERTv(CheckDigits):
     """ Certidões de casamento, nascimento e óbito """
-    Patterns = re.compile(r"^\d{32}$"),
+    Patterns = re.compile(r'^\d{32}$'),
     CHECK_DIGITS = 2
     CertAlgarismsMultipliers = 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
 

{brdocs_validation-0.4.0 → brdocs_validation-0.5.0}/br_docs/validators/cnh.py

@@ -4,7 +4,7 @@ from br_docs.validators import CheckDigits
 
 
 class CNHv(CheckDigits):
-    Patterns = re.compile(r"^\d{11}$"),
+    Patterns = re.compile(r'^\d{11}$'),
     CHECK_DIGITS = 2
 
     @classmethod

brdocs_validation-0.5.0/br_docs/validators/cnpj.py

@@ -0,0 +1,77 @@
+import re
+from math import ceil
+
+from pydantic_core import PydanticCustomError
+
+from br_docs.validators import CheckDigits
+
+
+class CNPJv(CheckDigits):
+    """
+    CNPJ validator supporting both numeric (legacy) and alphanumeric (2026+) formats.
+    Algorithm: https://www.serpro.gov.br/ (calculodvcnpjalfanaumerico.pdf)
+    """
+
+    Patterns = (
+        re.compile(r'^\d{14}$'),  # Numeric unformatted
+        re.compile(
+            r'^[0-9]{2}\.[0-9]{3}\.[0-9]{3}/[0-9]{4}-[0-9]{2}$'
+        ),  # Numeric formatted
+        re.compile(r'^[0-9A-Z]{12}\d{2}$', re.IGNORECASE),  # Alphanumeric unformatted
+        re.compile(
+            r'^[0-9A-Z]{2}\.[0-9A-Z]{3}\.[0-9A-Z]{3}/[0-9A-Z]{4}-\d{2}$', re.IGNORECASE
+        ),  # Alphanumeric formatted
+    )
+    CHECK_DIGITS = 2
+    CnpjAlgarismsMultipliers = 6, 5, 4, 3, 2, 9, 8, 7, 6, 5, 4, 3, 2
+
+    def validate(self, value: str):
+        """Validate CNPJ with alphanumeric support."""
+        clean = value.upper().replace('.', '').replace('/', '').replace('-', '')
+        base_chars = clean[:-2]
+        check_str = clean[-2:]
+        try:
+            check_1, check_2 = int(check_str[0]), int(check_str[1])
+        except ValueError:
+            raise PydanticCustomError('invalid', 'Invalid value')
+        calc_1, calc_2 = self.calculate_digits_alphanumeric(base_chars)
+        if check_1 != calc_1 or check_2 != calc_2:
+            raise PydanticCustomError('invalid', 'Invalid value')
+
+    @staticmethod
+    def char_to_value(char: str) -> int:
+        return ord(char) - 48
+
+    @classmethod
+    def calculate_digits_alphanumeric(cls, base_chars: str) -> tuple[int, int]:
+        values = [cls.char_to_value(c) for c in base_chars]
+        d1 = cls._calc_digit(values)
+        d2 = cls._calc_digit(values + [d1])
+        return d1, d2
+
+    @staticmethod
+    def _calc_digit(values: list[int]) -> int:
+        n = len(values)
+        weights = []
+        for _ in range(ceil(n / 8)):
+            weights.extend(range(2, 10))
+        weights = weights[:n]
+        weights.reverse()
+        total = sum(v * w for v, w in zip(values, weights))
+        rem = total % 11
+        return 0 if rem < 2 else 11 - rem
+
+    @classmethod
+    def calculate_digits(cls, non_digits: list[int]) -> tuple[int, int]:
+        """Legacy method for backward compatibility."""
+        calc = (
+            sum(x * y for x, y in zip(non_digits, cls.CnpjAlgarismsMultipliers[1:]))
+            % 11
+        )
+        d1 = 0 if calc < 2 else 11 - calc
+        non_digits.append(d1)
+        calc2 = (
+            sum(x * y for x, y in zip(non_digits, cls.CnpjAlgarismsMultipliers)) % 11
+        )
+        d2 = 0 if calc2 < 2 else 11 - calc2
+        return d1, d2

{brdocs_validation-0.4.0 → brdocs_validation-0.5.0}/br_docs/validators/cns.py

@@ -6,7 +6,7 @@ from br_docs.validators import CheckDigits
 
 
 class CNSv(CheckDigits):
-    Patterns = re.compile(r"^\d{15}$"),
+    Patterns = re.compile(r'^\d{15}$'),
 
     def validate(self, value: str):
         valid_value = self.calculate_digits(list(map(int, value)))[0]

{brdocs_validation-0.4.0 → brdocs_validation-0.5.0}/br_docs/validators/cpf.py

@@ -4,7 +4,7 @@ from br_docs.validators import CheckDigits
 
 
 class CPFv(CheckDigits):
-    Patterns = re.compile(r"^(?!(\d)\1{10}$)\d{11}$"), re.compile(r"^[0-9]{3}\.[0-9]{3}\.[0-9]{3}-[0-9]{2}$")
+    Patterns = re.compile(r'^(?!(\d)\1{10}$)\d{11}$'), re.compile(r'^[0-9]{3}\.[0-9]{3}\.[0-9]{3}-[0-9]{2}$')
     CHECK_DIGITS = 2
 
     @staticmethod

{brdocs_validation-0.4.0 → brdocs_validation-0.5.0}/br_docs/validators/nis.py

@@ -6,7 +6,7 @@ from br_docs.validators import CheckDigits
 class NISv(CheckDigits):
     """ NIS is the number of NIT, PIS, PASEP and NIS itself. """
 
-    Patterns = re.compile(r"^\d{11}$"), re.compile(r"^[0-9]{3}\.[0-9]{5}\.[0-9]{2}-[0-9]$")
+    Patterns = re.compile(r'^\d{11}$'), re.compile(r'^[0-9]{3}\.[0-9]{5}\.[0-9]{2}-[0-9]$')
     NisAlgarismsMultipliers = 3, 2, 9, 8, 7, 6, 5, 4, 3, 2
     CHECK_DIGITS = 1
 

{brdocs_validation-0.4.0 → brdocs_validation-0.5.0}/br_docs/validators/renavam.py

@@ -4,7 +4,7 @@ from br_docs.validators import CheckDigits
 
 
 class RENAVAMv(CheckDigits):
-    Patterns = re.compile(r"^\d{9,11}$"),
+    Patterns = re.compile(r'^\d{9,11}$'),
     CHECK_DIGITS = 1
 
     @staticmethod

{brdocs_validation-0.4.0 → brdocs_validation-0.5.0}/br_docs/validators/te.py

@@ -7,7 +7,7 @@ from br_docs.validators import CheckDigits
 
 class TEv(CheckDigits):
     """ Titulo de eleitor """
-    Patterns = re.compile(r"^\d{12}$"),
+    Patterns = re.compile(r'^\d{12}$'),
 
     def validate(self, value: str):
         valid_value = self.calculate_digits(list(map(int, value)))[0]

{brdocs_validation-0.4.0 → brdocs_validation-0.5.0}/br_docs/validators/types/format.py

@@ -13,6 +13,6 @@ class ValuesRegex:
             next(filter(lambda x: x.match(value), self.Patterns))
         except StopIteration:
             raise PydanticCustomError(
-                "format",
+                'format',
                 "Invalid value's format"
             )

{brdocs_validation-0.4.0 → brdocs_validation-0.5.0/brdocs_validation.egg-info}/PKG-INFO

@@ -1,9 +1,9 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: brdocs-validation
-Version: 0.4.0
+Version: 0.5.0
 Summary: Validate brazilian documents using Type Hints in classes inheriting Pydantic's (V2) BaseModel
-Author-email: Vinícius Aguiar <vaguiararqdevsoftware@proton.me>
-Maintainer-email: Vinícius Aguiar <vaguiararqdevsoftware@proton.me>
+Author-email: Vinícius Aguiar <vaguiararqdevsoftware@proton.me>, Rafael Kamimura <rafael.kamimura@proton.me>
+Maintainer-email: Vinícius Aguiar <vaguiararqdevsoftware@proton.me>, Rafael Kamimura <rafael.kamimura@proton.me>
 Project-URL: Repository, https://github.com/vinicius-oa/BRdocs-validation
 Keywords: pydantic-v2,cpf-validador,cnpj-validador,validador-pispasep,validador-titulo-eleitor
 Classifier: Development Status :: 5 - Production/Stable
@@ -29,6 +29,7 @@ Requires-Dist: wheel; extra == "dev"
 Requires-Dist: twine; extra == "dev"
 Requires-Dist: tox; extra == "dev"
 Requires-Dist: ruff; extra == "dev"
+Dynamic: license-file
 
 ![Test](https://github.com/vinicius-oa/BRdocs-validation/actions/workflows/test.yml/badge.svg)
 ![codecov](https://codecov.io/gh/vinicius-oa/BRdocs-validation/graph/badge.svg?token=Z211YIKO8L)

{brdocs_validation-0.4.0 → brdocs_validation-0.5.0}/pyproject.toml

@@ -4,16 +4,18 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "brdocs-validation"
-version = "0.4.0"
+version = "0.5.0"
 dependencies = [
   "pydantic>=2.0"
 ]
 requires-python = ">= 3.10"
 authors = [
   {name = "Vinícius Aguiar", email = "vaguiararqdevsoftware@proton.me"},
+  {name = "Rafael Kamimura", email = "rafael.kamimura@proton.me"},
 ]
 maintainers = [
-  {name = "Vinícius Aguiar", email = "vaguiararqdevsoftware@proton.me"}
+  {name = "Vinícius Aguiar", email = "vaguiararqdevsoftware@proton.me"},
+  {name = "Rafael Kamimura", email = "rafael.kamimura@proton.me"},
 ]
 description = "Validate brazilian documents using Type Hints in classes inheriting Pydantic's (V2) BaseModel"
 readme = "README.md"
@@ -46,6 +48,33 @@ dev = [
     "ruff"
 ]
 
+[tool.ruff]
+target-version = "py310"
+line-length = 88
+
+[tool.ruff.lint]
+select = ["E", "F", "I", "W", "UP", "B", "C4", "Q"]
+ignore = ["E501", "B905", "B904"]
+
+[tool.ruff.lint.flake8-quotes]
+inline-quotes = "single"
+docstring-quotes = "double"
+
+[tool.ruff.format]
+quote-style = "single"
+
+[tool.uv]
+dev-dependencies = [
+    "build",
+    "mypy",
+    "pytest>=8",
+    "pytest-sugar",
+    "wheel",
+    "twine",
+    "tox>=4",
+    "ruff",
+]
+
 [tool.tox]
 legacy_tox_ini = """
 [tox]

{brdocs_validation-0.4.0 → brdocs_validation-0.5.0}/tests/test_brdocs.py

@@ -4,7 +4,7 @@ import pytest
 from pydantic import create_model
 from pydantic_core import ValidationError
 
-from br_docs import CNH, CPF, CNPJ, NIS, CNS, RENAVAM, TE, CERT, SEI
+from br_docs import CERT, CNH, CNPJ, CNS, CPF, NIS, RENAVAM, SEI, TE
 
 
 @contextmanager
@@ -74,3 +74,12 @@ def test_invalid_sei(invalid_sei_list):
             value_type=SEI,
         ):
             pass
+
+
+def test_alphanumeric_cnpj(alphanumeric_cnpj_list):
+    with validate(
+        model_name='TestAlphanumericCNPJ',
+        values=alphanumeric_cnpj_list,
+        value_type=CNPJ,
+    ):
+        pass

{brdocs_validation-0.4.0 → brdocs_validation-0.5.0}/tests/test_format.py

@@ -11,8 +11,8 @@ from tests import DUMMY_VALUES
 def test_check_format(value):
     # Arrange
     class Dummy(ValuesRegex):
-        Patterns = re.compile(r"^\d{4}$"),
+        Patterns = re.compile(r'^\d{4}$'),
 
     # Assert
-    with pytest.raises(PydanticCustomError, match='Invalid value\'s format'):
+    with pytest.raises(PydanticCustomError, match="Invalid value's format"):
         Dummy().check_format(value)

brdocs_validation-0.4.0/br_docs/validators/cnpj.py

@@ -1,25 +0,0 @@
-import re
-
-from br_docs.validators import CheckDigits
-
-
-class CNPJv(CheckDigits):
-    Patterns = re.compile(r"^\d{14}$"), re.compile(r"^[0-9]{2}\.[0-9]{3}\.[0-9]{3}/[0-9]{4}-[0-9]{2}$"),
-    CnpjAlgarismsMultipliers = 6, 5, 4, 3, 2, 9, 8, 7, 6, 5, 4, 3, 2,
-    CHECK_DIGITS = 2
-
-    @classmethod
-    def calculate_digits(cls, non_digits: list[int]) -> tuple[int, int]:
-        """ https://web.archive.org/web/20240222180515/https://www.macoratti.net/alg_cnpj.htm """
-        calc = sum(x*y for x, y in zip(non_digits, cls.CnpjAlgarismsMultipliers[1:])) % 11
-        if calc < 2:
-            digit_one = 0
-        else:
-            digit_one = 11 - calc
-        non_digits.append(digit_one)
-        calc_2 = sum(x*y for x, y in zip(non_digits, cls.CnpjAlgarismsMultipliers)) % 11
-        if calc_2 < 2:
-            digit_two = 0
-        else:
-            digit_two = 11 - calc_2
-        return digit_one, digit_two