cuenca-validations 2.0.0.dev14__tar.gz → 2.0.1.dev1__tar.gz

{cuenca_validations-2.0.0.dev14 → cuenca_validations-2.0.1.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: cuenca_validations
-Version: 2.0.0.dev14
+Version: 2.0.1.dev1
 Summary: Cuenca common validations
 Home-page: https://github.com/cuenca-mx/cuenca-validations
 Author: Cuenca

{cuenca_validations-2.0.0.dev14 → cuenca_validations-2.0.1.dev1}/cuenca_validations/errors.py

@@ -1,9 +1,6 @@
-from pydantic_core import PydanticCustomError
-
 __all__ = [
     'ApiError',
     'AuthMethodNotAllowedError',
-    'CardBinValidationError',
     'CuencaError',
     'ERROR_CODES',
     'InvalidOTPCodeError',
@@ -16,23 +13,6 @@ __all__ = [
 ]
 
 
-class CardBinValidationError(PydanticCustomError):
-    code = 'payment_card_number.bin'
-    msg_template = (
-        'The card number contains a BIN (first six digits) that does not have'
-        'a known association with a Mexican bank. To add the association,'
-        'please file an issue:'
-        'https://github.com/cuenca-mx/cuenca-validations/issues'
-    )
-
-    def __new__(cls):
-        return super().__new__(
-            cls,
-            error_type=cls.code,
-            message_template=cls.msg_template,
-        )
-
-
 class CuencaError(Exception):
     """Exceptions related to ApiKeys, Login, Password, etc"""
 

{cuenca_validations-2.0.0.dev14 → cuenca_validations-2.0.1.dev1}/cuenca_validations/types/__init__.py

@@ -22,7 +22,7 @@ __all__ = [
     'CardTransactionType',
     'CardType',
     'Country',
-    'CurpField',
+    'Curp',
     'CurpValidationRequest',
     'CommissionType',
     'DepositNetwork',
@@ -159,7 +159,7 @@ from .general import (
 from .identities import (
     Address,
     Beneficiary,
-    CurpField,
+    Curp,
     KYCFile,
     PhoneNumber,
     Rfc,

{cuenca_validations-2.0.0.dev14 → cuenca_validations-2.0.1.dev1}/cuenca_validations/types/card.py

@@ -1,15 +1,14 @@
 from typing import Annotated
 
 from pydantic import Field, StringConstraints
-from pydantic_core import core_schema
+from pydantic_core import PydanticCustomError, core_schema
 from pydantic_extra_types.payment import PaymentCardNumber
 
 from ..card_bins import CARD_BINS
-from ..errors import CardBinValidationError
 
 ExpMonth = Annotated[int, Field(strict=True, ge=1, le=12)]
-ExpYear = Annotated[int, Field(strict=True, ge=18, le=99)]
-Cvv2 = Annotated[
+ExpYear = Annotated[int, Field(strict=True, ge=1, le=99)]
+Cvv = Annotated[
     str,
     StringConstraints(
         strip_whitespace=True,
@@ -28,7 +27,13 @@ class StrictPaymentCardNumber(PaymentCardNumber):
     ) -> 'StrictPaymentCardNumber':
         card = super().validate(card_number, validation_info)
         if card.bin not in CARD_BINS:
-            raise CardBinValidationError
+            raise PydanticCustomError(
+                'payment_card_number.bin',
+                'The card number contains a BIN (first six digits) that '
+                'does not have a known association with a Mexican bank. '
+                'To add the association, please file an issue: '
+                'https://github.com/cuenca-mx/cuenca-validations/issues',
+            )
         return cls(card)
 
     @property

{cuenca_validations-2.0.0.dev14 → cuenca_validations-2.0.1.dev1}/cuenca_validations/types/identities.py

@@ -6,6 +6,7 @@ from pydantic import (
     ConfigDict,
     Field,
     IPvAnyAddress,
+    SecretStr,
     StringConstraints,
     model_validator,
 )
@@ -14,7 +15,7 @@ from pydantic_extra_types.phone_numbers import PhoneNumber
 from .enums import Country, KYCFileType, State, VerificationStatus
 
 Password = Annotated[
-    str,
+    SecretStr,
     Field(
         min_length=6,
         max_length=128,
@@ -24,7 +25,7 @@ Password = Annotated[
     ),
 ]
 
-CurpField = Annotated[
+Curp = Annotated[
     str,
     StringConstraints(
         min_length=18,

{cuenca_validations-2.0.0.dev14 → cuenca_validations-2.0.1.dev1}/cuenca_validations/types/morals.py

@@ -3,7 +3,7 @@ from typing import Optional
 
 from pydantic import BaseModel, EmailStr
 
-from cuenca_validations.types import Address, CurpField, PhoneNumber, Rfc
+from cuenca_validations.types import Address, Curp, PhoneNumber, Rfc
 
 
 class BusinessDetails(BaseModel):
@@ -52,7 +52,7 @@ class PhysicalPerson(BaseModel):
     names: str
     first_surname: str
     second_surname: Optional[str] = None
-    curp: Optional[CurpField] = None
+    curp: Optional[Curp] = None
     rfc: Optional[Rfc] = None
 
 

{cuenca_validations-2.0.0.dev14 → cuenca_validations-2.0.1.dev1}/cuenca_validations/types/queries.py

@@ -24,7 +24,7 @@ from .enums import (
     TransferNetwork,
     UserStatus,
 )
-from .identities import CurpField
+from .identities import Curp
 
 MAX_PAGE_SIZE = 100
 
@@ -158,7 +158,7 @@ class UserQuery(QueryParams):
 
 
 class IdentityQuery(QueryParams):
-    curp: Optional[CurpField] = None
+    curp: Optional[Curp] = None
     rfc: Optional[str] = None
     status: Optional[UserStatus] = None
 

{cuenca_validations-2.0.0.dev14 → cuenca_validations-2.0.1.dev1}/cuenca_validations/types/requests.py

@@ -50,7 +50,7 @@ from ..types.enums import (
 from ..typing import DictStrAny
 from ..validators import validate_age_requirement
 from .card import (
-    Cvv2,
+    Cvv,
     ExpMonth,
     ExpYear,
     PaymentCardNumber,
@@ -60,7 +60,7 @@ from .general import StrictPositiveInt
 from .identities import (
     Address,
     Beneficiary,
-    CurpField,
+    Curp,
     KYCFile,
     Password,
     PhoneNumber,
@@ -145,7 +145,7 @@ class CardActivationRequest(BaseModel):
     number: PaymentCardNumber
     exp_month: ExpMonth
     exp_year: ExpYear
-    cvv2: Cvv2
+    cvv2: Cvv
 
 
 class ApiKeyUpdateRequest(BaseRequest):
@@ -180,9 +180,9 @@ class CardValidationRequest(BaseModel):
     number: PaymentCardNumber
     exp_month: Optional[ExpMonth] = None
     exp_year: Optional[ExpYear] = None
-    cvv: Optional[Cvv2] = None
-    cvv2: Optional[Cvv2] = None
-    icvv: Optional[Cvv2] = None
+    cvv: Optional[Cvv] = None
+    cvv2: Optional[Cvv] = None
+    icvv: Optional[Cvv] = None
     pin_block: Optional[
         Annotated[str, StringConstraints(strip_whitespace=True)]
     ] = None
@@ -327,7 +327,7 @@ class CurpValidationRequest(BaseModel):
         None, description='In format ISO 3166 Alpha-2'
     )
     gender: Optional[Gender] = None
-    manual_curp: Optional[CurpField] = Field(
+    manual_curp: Optional[Curp] = Field(
         None,
         description='Force to validate this curp instead of use '
         'the one we calculate',
@@ -402,7 +402,7 @@ class UserRequest(BaseModel):
     id: Optional[str] = Field(
         None, description='if you want to create with specific `id`'
     )
-    curp: CurpField = Field(
+    curp: Curp = Field(
         description='Previously validated in `curp_validations`'
     )
     phone_number: Optional[PhoneNumber] = Field(
@@ -447,9 +447,7 @@ class UserRequest(BaseModel):
 
     @field_validator('curp')
     @classmethod
-    def validate_birth_date(
-        cls, curp: Optional[CurpField]
-    ) -> Optional[CurpField]:
+    def validate_birth_date(cls, curp: Optional[Curp]) -> Optional[Curp]:
         if curp:
             current_date = dt.datetime.utcnow()
             curp_date = curp[4:10]
@@ -587,12 +585,12 @@ class VerificationAttemptRequest(BaseModel):
 
 
 class LimitedWalletRequest(BaseRequest):
-    allowed_curp: CurpField
+    allowed_curp: Curp
     allowed_rfc: Optional[Rfc] = None
 
 
 class KYCVerificationUpdateRequest(BaseRequest):
-    curp: CurpField
+    curp: Curp
 
 
 class PlatformRequest(BaseModel):
@@ -625,9 +623,7 @@ class BankAccountValidationRequest(BaseModel):
 
 
 class UserListsRequest(BaseModel):
-    curp: Optional[CurpField] = Field(
-        None, description='Curp to review on lists'
-    )
+    curp: Optional[Curp] = Field(None, description='Curp to review on lists')
     account_number: Optional[Union[Clabe, PaymentCardNumber]] = Field(
         None, description='Account to review on lists'
     )

cuenca_validations-2.0.1.dev1/cuenca_validations/version.py

@@ -0,0 +1 @@
+__version__ = '2.0.1.dev1'

{cuenca_validations-2.0.0.dev14 → cuenca_validations-2.0.1.dev1}/cuenca_validations.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: cuenca_validations
-Version: 2.0.0.dev14
+Version: 2.0.1.dev1
 Summary: Cuenca common validations
 Home-page: https://github.com/cuenca-mx/cuenca-validations
 Author: Cuenca

{cuenca_validations-2.0.0.dev14 → cuenca_validations-2.0.1.dev1}/tests/test_card.py

@@ -2,7 +2,6 @@ import pytest
 from pydantic import BaseModel, ValidationError
 from pydantic_extra_types.payment import PaymentCardBrand
 
-from cuenca_validations.errors import CardBinValidationError
 from cuenca_validations.types import StrictPaymentCardNumber
 
 VALID_BBVA = '4772130000000003'
@@ -18,8 +17,11 @@ def test_invalid_bin_strict_payment():
         CardModel(card_number=INVALID_BIN)
     assert exc_info.value.errors()[0] == dict(
         loc=('card_number',),
-        type=CardBinValidationError.code,
-        msg=CardBinValidationError.msg_template,
+        type='payment_card_number.bin',
+        msg='The card number contains a BIN (first six digits) that does '
+        'not have a known association with a Mexican bank. To add the '
+        'association, please file an issue: '
+        'https://github.com/cuenca-mx/cuenca-validations/issues',
         input=INVALID_BIN,
     )
 

{cuenca_validations-2.0.0.dev14 → cuenca_validations-2.0.1.dev1}/tests/test_errors.py

@@ -3,7 +3,6 @@ import pytest
 from cuenca_validations.errors import (
     ApiError,
     AuthMethodNotAllowedError,
-    CuencaError,
     InvalidOTPCodeError,
     MissingAuthorizationHeaderError,
     NoPasswordFoundError,
@@ -14,10 +13,6 @@ from cuenca_validations.errors import (
 )
 
 
-def test_cuenca_error_base():
-    assert issubclass(CuencaError, Exception)
-
-
 @pytest.mark.parametrize(
     "error_class, expected_code, expected_status",
     [

{cuenca_validations-2.0.0.dev14 → cuenca_validations-2.0.1.dev1}/tests/test_types.py

@@ -5,14 +5,13 @@ from enum import Enum
 
 import pytest
 from freezegun import freeze_time
-from pydantic import BaseModel, ValidationError
+from pydantic import BaseModel, SecretStr, ValidationError
 
 from cuenca_validations.types import (
     Address,
     CardQuery,
     JSONEncoder,
     QueryParams,
-    Rfc,
     SantizedDict,
     SessionRequest,
     TransactionStatus,
@@ -50,12 +49,12 @@ now = dt.datetime.now()
 utcnow = now.astimezone(dt.timezone.utc)
 
 
-class TestEnum(Enum):
+class EnumModel(Enum):
     zero = 0
 
 
 @dataclass
-class TestClass:
+class DictModel:
     uno: str
 
     def to_dict(self):
@@ -116,10 +115,10 @@ def test_count(count, truth):
 @pytest.mark.parametrize(
     'value, result',
     [
-        (TestEnum.zero, 0),
+        (EnumModel.zero, 0),
         (today, today.isoformat()),
         (now, utcnow.isoformat()),
-        (TestClass(uno='uno'), dict(uno='uno', dos='dos')),
+        (DictModel(uno='uno'), dict(uno='uno', dos='dos')),
         (b'test', 'dGVzdA=='),  # b64 encode
     ],
 )
@@ -158,7 +157,6 @@ class Accounts(BaseModel):
 )
 def test_only_digits(input_number, expected):
     acc = Accounts(number=input_number)
-    print(acc.model_dump())
     assert acc.number == expected
 
 
@@ -201,7 +199,7 @@ def test_update_one_property_at_a_time_request():
         UserCredentialUpdateRequest(user_id='US123', password='123456')
 
     req = UserCredentialUpdateRequest(password='123456')
-    assert not req.is_active and req.password == '123456'
+    assert not req.is_active and req.password.get_secret_value() == '123456'
 
     req = UserCredentialUpdateRequest(is_active=True)
     assert req.is_active and not req.password
@@ -210,7 +208,10 @@ def test_update_one_property_at_a_time_request():
 @pytest.mark.parametrize(
     'data,expected_dict',
     [
-        (dict(password='123456'), dict(password='123456', is_active=None)),
+        (
+            dict(password='123456'),
+            dict(password=SecretStr('123456'), is_active=None),
+        ),
         (dict(is_active=True), dict(password=None, is_active=True)),
         (dict(), dict(password=None, is_active=None)),
     ],
@@ -558,35 +559,16 @@ def test_bank_account_validation_clabe_request():
     assert BankAccountValidationRequest(account_number='646180157098510917')
 
 
-class TestRfc(BaseModel):
-    rfc: Rfc
-
-
-def test_rfc_field():
-    with pytest.raises(ValueError):
-        TestRfc(rfc='')
-        TestRfc(rfc='invalid')
-        TestRfc(rfc='ThisValueIsTooLongForRFC')
-
-    assert TestRfc(rfc='TAXM840916123')
-
-
 def test_user_lists_request():
     UserListsRequest(names='Pedro', first_surname='Paramo')
     with pytest.raises(ValueError):
         UserListsRequest()
 
 
-class TestIntModel(BaseModel):
+class IntModel(BaseModel):
     value: StrictPositiveInt
 
 
-@pytest.mark.parametrize("value", [100, 1, 21_474_836_47])
-def test_strict_positive_int_valid(value):
-    model = TestIntModel(value=value)
-    assert model.value == value
-
-
 @pytest.mark.parametrize(
     "value, expected_error, expected_message",
     [
@@ -603,4 +585,4 @@ def test_strict_positive_int_valid(value):
 )
 def test_strict_positive_int_invalid(value, expected_error, expected_message):
     with pytest.raises(expected_error, match=expected_message):
-        TestIntModel(value=value)
+        IntModel(value=value)

cuenca_validations-2.0.0.dev14/cuenca_validations/version.py

@@ -1 +0,0 @@
-__version__ = '2.0.0.dev14'