cuenca-validations 2.0.0.dev13__tar.gz → 2.0.1__tar.gz

{cuenca_validations-2.0.0.dev13 → cuenca_validations-2.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: cuenca_validations
-Version: 2.0.0.dev13
+Version: 2.0.1
 Summary: Cuenca common validations
 Home-page: https://github.com/cuenca-mx/cuenca-validations
 Author: Cuenca
@@ -20,6 +20,7 @@ Requires-Dist: clabe>=2.0.0
 Requires-Dist: pydantic[email]>=2.10.0
 Requires-Dist: pydantic-extra-types>=2.10.0
 Requires-Dist: python-dateutil>=2.9.0
+Requires-Dist: phonenumbers>=8.13.0
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{cuenca_validations-2.0.0.dev13 → cuenca_validations-2.0.1}/cuenca_validations/__init__.py

@@ -5,5 +5,9 @@ __all__ = [
     'validators',
 ]
 
+from pydantic_extra_types.phone_numbers import PhoneNumber
+
 from . import types, typing, validators
 from .version import __version__
+
+PhoneNumber.phone_format = 'E164'

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

@@ -22,7 +22,7 @@ __all__ = [
     'CardTransactionType',
     'CardType',
     'Country',
-    'CurpField',
+    'Curp',
     'CurpValidationRequest',
     'CommissionType',
     'DepositNetwork',
@@ -101,10 +101,8 @@ __all__ = [
     'WalletQuery',
     'WalletTransactionQuery',
     'WebhookEvent',
-    'Digits',
+    'digits',
     'get_state_name',
-    'HttpUrlString',
-    'AnyUrlString',
 ]
 
 from .card import StrictPaymentCardNumber
@@ -152,18 +150,16 @@ from .enums import (
 )
 from .files import BatchFileMetadata
 from .general import (
-    AnyUrlString,
-    Digits,
-    HttpUrlString,
     JSONEncoder,
     SantizedDict,
     StrictPositiveInt,
+    digits,
     get_state_name,
 )
 from .identities import (
     Address,
     Beneficiary,
-    CurpField,
+    Curp,
     KYCFile,
     PhoneNumber,
     Rfc,

cuenca_validations-2.0.1/cuenca_validations/types/card.py

@@ -0,0 +1,41 @@
+from typing import Annotated
+
+from pydantic import Field, StringConstraints
+from pydantic_core import PydanticCustomError, core_schema
+from pydantic_extra_types.payment import PaymentCardNumber
+
+from ..card_bins import CARD_BINS
+
+ExpMonth = Annotated[int, Field(strict=True, ge=1, le=12)]
+ExpYear = Annotated[int, Field(strict=True, ge=1, le=99)]
+Cvv = Annotated[
+    str,
+    StringConstraints(
+        strip_whitespace=True,
+        min_length=3,
+        max_length=3,
+        pattern=r'\d{3}',
+    ),
+]
+
+
+class StrictPaymentCardNumber(PaymentCardNumber):
+
+    @classmethod
+    def validate(
+        cls, card_number: str, validation_info: core_schema.ValidationInfo
+    ) -> 'StrictPaymentCardNumber':
+        card = super().validate(card_number, validation_info)
+        if card.bin not in CARD_BINS:
+            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
+    def bank_code(self) -> str:
+        return CARD_BINS[self.bin]

{cuenca_validations-2.0.0.dev13 → cuenca_validations-2.0.1}/cuenca_validations/types/files.py

@@ -1,13 +1,12 @@
 from typing import Optional
 
-from pydantic import BaseModel
+from pydantic import BaseModel, HttpUrl
 
 from .enums import KYCFileType
-from .general import HttpUrlString
 
 
 class BatchFileMetadata(BaseModel):
     id: Optional[str] = None
     is_back: bool
     type: KYCFileType
-    url: HttpUrlString
+    url: HttpUrl

{cuenca_validations-2.0.0.dev13 → cuenca_validations-2.0.1}/cuenca_validations/types/general.py

@@ -1,20 +1,11 @@
 import json
 from typing import Annotated, Any, Optional
 
-from pydantic import AfterValidator, AnyUrl, BeforeValidator, Field, HttpUrl
+from pydantic import Field, StringConstraints
 
 from ..validators import sanitize_dict, sanitize_item
 from .enums import State
 
-# In Pydantic v2, URL fields like `HttpUrl` are stored as internal objects
-# instead of `str`, which can break compatibility with code expecting str.
-# Using `HttpUrlString` ensures the field is validated as a URL but stored as
-# a `str` for compatibility.
-# https://github.com/pydantic/pydantic/discussions/6395
-
-HttpUrlString = Annotated[HttpUrl, AfterValidator(str)]
-AnyUrlString = Annotated[AnyUrl, AfterValidator(str)]
-
 
 class SantizedDict(dict):
     def __init__(self, *args, **kwargs):
@@ -34,20 +25,17 @@ StrictPositiveInt = Annotated[
 ]
 
 
-def validate_only_digits(value: Any) -> str:
-    v_str = str(value)
-    if not v_str.isdigit():
-        raise ValueError("Value must contain only digits")
-    return v_str
-
-
-def Digits(
+def digits(
     min_length: Optional[int] = None, max_length: Optional[int] = None
-) -> Any:
+) -> Annotated[Any, StringConstraints]:
     return Annotated[
         str,
-        BeforeValidator(validate_only_digits),
-        Field(min_length=min_length, max_length=max_length),
+        StringConstraints(
+            strip_whitespace=True,
+            min_length=min_length,
+            max_length=max_length,
+            pattern=r'^\d+$',
+        ),
     ]
 
 

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

@@ -6,22 +6,26 @@ from pydantic import (
     ConfigDict,
     Field,
     IPvAnyAddress,
+    SecretStr,
     StringConstraints,
     model_validator,
 )
-from pydantic.types import StrictStr
+from pydantic_extra_types.phone_numbers import PhoneNumber
 
 from .enums import Country, KYCFileType, State, VerificationStatus
 
-PhoneNumber = Annotated[
-    str,
-    StringConstraints(
-        min_length=10, max_length=15, pattern=r'^\+?[0-9]{10,14}$'
+Password = Annotated[
+    SecretStr,
+    Field(
+        min_length=6,
+        max_length=128,
+        description=(
+            'Any str with at least 6 characters, maximum 128 characters'
+        ),
     ),
 ]
 
-
-CurpField = Annotated[
+Curp = Annotated[
     str,
     StringConstraints(
         min_length=18,
@@ -31,25 +35,13 @@ CurpField = Annotated[
 ]
 
 
-class Rfc(StrictStr):
-    min_length = 12
-    max_length = 13
-
-    @classmethod
-    def validate(cls, rfc: str):
-        if len(rfc) < cls.min_length or len(rfc) > cls.max_length:
-            raise ValueError('Not a valid RFC.')
-        return cls(rfc)
-
-    @classmethod
-    def __get_pydantic_core_schema__(
-        cls, source_type: Any, handler: Any
-    ) -> dict[str, Any]:
-        return {
-            'type': 'str',
-            'min_length': cls.min_length,
-            'max_length': cls.max_length,
-        }
+Rfc = Annotated[
+    str,
+    StringConstraints(
+        min_length=12,
+        max_length=13,
+    ),
+]
 
 
 class Address(BaseModel):
@@ -110,17 +102,14 @@ class Beneficiary(BaseModel):
 
 class VerificationErrors(BaseModel):
     identifier: str = Field(
-        ..., description='Unique identifier for the step validation'
+        description='Unique identifier for the step validation'
     )
     error: str = Field(
-        ...,
         description='Error throwed on validation,'
         ' can be StepError or SystemError in case of '
         'KYCProvider intermittence',
     )
-    code: str = Field(
-        ..., description='Specific code of the failure in the step.'
-    )
+    code: str = Field(description='Specific code of the failure in the step.')
     message: Optional[str] = Field(None, description='Error description')
     model_config = ConfigDict(
         json_schema_extra={
@@ -136,7 +125,7 @@ class VerificationErrors(BaseModel):
 
 class KYCFile(BaseModel):
     type: KYCFileType
-    uri_front: str = Field(..., description='API uri to fetch the file')
+    uri_front: str = Field(description='API uri to fetch the file')
     uri_back: Optional[str] = Field(
         None, description='API uri to fetch the file'
     )

{cuenca_validations-2.0.0.dev13 → cuenca_validations-2.0.1}/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.dev13 → cuenca_validations-2.0.1}/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
 
@@ -112,23 +112,11 @@ class ApiKeyQuery(QueryParams):
 
 class CardQuery(QueryParams):
     number: Optional[str] = None
-    exp_month: Optional[int] = None
-    exp_year: Optional[int] = None
-    cvv: Optional[str] = None
-    cvv2: Optional[str] = None
-    icvv: Optional[str] = None
-    pin_block: Optional[str] = None
     issuer: Optional[CardIssuer] = None
     funding_type: Optional[CardFundingType] = None
     status: Optional[CardStatus] = None
     type: Optional[CardType] = None
 
-    @field_validator('exp_month', 'exp_year', 'cvv2', 'cvv')
-    def query_by_exp_cvv_if_number_set(cls, v, values):
-        if not values.data.get('number'):
-            raise ValueError('Number must be set to query by exp or cvv')
-        return v
-
 
 class StatementQuery(QueryParams):
     year: int
@@ -170,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.dev13 → cuenca_validations-2.0.1}/cuenca_validations/types/requests.py

@@ -3,10 +3,12 @@ from typing import Annotated, Optional, Union
 
 from clabe import Clabe
 from pydantic import (
+    AnyUrl,
     BaseModel,
     ConfigDict,
     EmailStr,
     Field,
+    HttpUrl,
     StrictStr,
     StringConstraints,
     field_validator,
@@ -47,13 +49,20 @@ from ..types.enums import (
 )
 from ..typing import DictStrAny
 from ..validators import validate_age_requirement
-from .card import PaymentCardNumber, StrictPaymentCardNumber
-from .general import AnyUrlString, HttpUrlString, StrictPositiveInt
+from .card import (
+    Cvv,
+    ExpMonth,
+    ExpYear,
+    PaymentCardNumber,
+    StrictPaymentCardNumber,
+)
+from .general import StrictPositiveInt
 from .identities import (
     Address,
     Beneficiary,
-    CurpField,
+    Curp,
     KYCFile,
+    Password,
     PhoneNumber,
     Rfc,
     TOSAgreement,
@@ -81,13 +90,13 @@ class BaseRequest(BaseModel):
 class BaseTransferRequest(BaseRequest):
     recipient_name: StrictStr
     amount: StrictPositiveInt = Field(
-        ..., description='Always in cents, not in MXN pesos'
+        description='Always in cents, not in MXN pesos'
     )
     descriptor: StrictStr = Field(
-        ..., description='Short description for the recipient'
+        description='Short description for the recipient'
     )
     idempotency_key: str = Field(
-        ..., description='Custom Id, must be unique for each transfer'
+        description='Custom Id, must be unique for each transfer'
     )
     user_id: Optional[str] = Field(
         None, description='Source user to take the funds'
@@ -108,13 +117,13 @@ class BaseTransferRequest(BaseRequest):
 
 class TransferRequest(BaseTransferRequest):
     account_number: Union[Clabe, PaymentCardNumber] = Field(
-        ..., description='Destination Clabe or Card number'
+        description='Destination Clabe or Card number'
     )
 
 
 class StrictTransferRequest(BaseTransferRequest):
     account_number: Union[Clabe, StrictPaymentCardNumber] = Field(
-        ..., description='Destination Clabe or Card number'
+        description='Destination Clabe or Card number'
     )
 
 
@@ -134,17 +143,9 @@ class CardRequest(BaseRequest):
 
 class CardActivationRequest(BaseModel):
     number: PaymentCardNumber
-    exp_month: Annotated[int, Field(strict=True, ge=1, le=12)]
-    exp_year: Annotated[int, Field(strict=True, ge=18, le=99)]
-    cvv2: Annotated[
-        str,
-        StringConstraints(
-            strip_whitespace=True,
-            min_length=3,
-            max_length=3,
-            pattern=r'\d{3}',
-        ),
-    ]
+    exp_month: ExpMonth
+    exp_year: ExpYear
+    cvv2: Cvv
 
 
 class ApiKeyUpdateRequest(BaseRequest):
@@ -155,14 +156,7 @@ class ApiKeyUpdateRequest(BaseRequest):
 
 class UserCredentialUpdateRequest(BaseRequest):
     is_active: Optional[bool] = None
-    password: Optional[str] = Field(
-        None,
-        min_length=6,
-        max_length=128,
-        description=(
-            'Any str with at least 6 characters, maximum 128 characters'
-        ),
-    )
+    password: Optional[Password] = None
 
     def model_dump(self, *args, **kwargs) -> DictStrAny:
         # Password can be None but BaseRequest excludes None
@@ -178,53 +172,17 @@ class UserCredentialUpdateRequest(BaseRequest):
 
 
 class UserCredentialRequest(BaseRequest):
-    password: str = Field(
-        ...,
-        min_length=6,
-        max_length=128,
-        description=(
-            'Any str with at least 6 characters, maximum 128 characters'
-        ),
-    )
+    password: Password
     user_id: Optional[str] = None
 
 
 class CardValidationRequest(BaseModel):
-    number: Annotated[
-        str,
-        StringConstraints(
-            min_length=16,
-            max_length=16,
-            pattern=r'\d{16}',
-            strip_whitespace=True,
-        ),
-    ]
-    exp_month: Optional[Annotated[int, Field(strict=True, ge=1, le=12)]] = None
-    exp_year: Optional[Annotated[int, Field(strict=True, ge=18, le=99)]] = None
-    cvv: Optional[
-        Annotated[
-            str,
-            StringConstraints(
-                strip_whitespace=True, strict=True, min_length=3, max_length=3
-            ),
-        ]
-    ] = None
-    cvv2: Optional[
-        Annotated[
-            str,
-            StringConstraints(
-                strip_whitespace=True, strict=True, min_length=3, max_length=3
-            ),
-        ]
-    ] = None
-    icvv: Optional[
-        Annotated[
-            str,
-            StringConstraints(
-                strip_whitespace=True, strict=True, min_length=3, max_length=3
-            ),
-        ]
-    ] = None
+    number: PaymentCardNumber
+    exp_month: Optional[ExpMonth] = None
+    exp_year: Optional[ExpYear] = None
+    cvv: Optional[Cvv] = None
+    cvv2: Optional[Cvv] = None
+    icvv: Optional[Cvv] = None
     pin_block: Optional[
         Annotated[str, StringConstraints(strip_whitespace=True)]
     ] = None
@@ -232,15 +190,7 @@ class CardValidationRequest(BaseModel):
 
 
 class ARPCRequest(BaseModel):
-    number: Annotated[
-        str,
-        StringConstraints(
-            min_length=16,
-            max_length=16,
-            pattern=r'\d{16}',
-            strip_whitespace=True,
-        ),
-    ]
+    number: PaymentCardNumber
     arqc: StrictStr
     arpc_method: Annotated[
         str,
@@ -377,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',
@@ -452,8 +402,8 @@ class UserRequest(BaseModel):
     id: Optional[str] = Field(
         None, description='if you want to create with specific `id`'
     )
-    curp: CurpField = Field(
-        ..., description='Previously validated in `curp_validations`'
+    curp: Curp = Field(
+        description='Previously validated in `curp_validations`'
     )
     phone_number: Optional[PhoneNumber] = Field(
         None, description='Only if you validated previously on your side'
@@ -497,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]
@@ -531,7 +479,7 @@ class UserUpdateRequest(BaseModel):
     status: Optional[UserStatus] = None
     terms_of_service: Optional[TOSRequest] = None
     platform_terms_of_service: Optional[TOSAgreement] = None
-    curp_document_uri: Optional[HttpUrlString] = None
+    curp_document_uri: Optional[HttpUrl] = None
 
     @field_validator('beneficiaries')
     @classmethod
@@ -544,14 +492,7 @@ class UserUpdateRequest(BaseModel):
 
 
 class UserLoginRequest(BaseRequest):
-    password: str = Field(
-        ...,
-        min_length=6,
-        max_length=128,
-        description=(
-            'Any str with at least 6 characters, maximum 128 characters'
-        ),
-    )
+    password: Password
     user_id: Optional[str] = Field(None, description='Deprecated field')
     model_config = ConfigDict(
         json_schema_extra={'example': {'password': 'supersecret'}},
@@ -561,8 +502,8 @@ class UserLoginRequest(BaseRequest):
 class SessionRequest(BaseRequest):
     user_id: str
     type: SessionType
-    success_url: Optional[AnyUrlString] = None
-    failure_url: Optional[AnyUrlString] = None
+    success_url: Optional[AnyUrl] = None
+    failure_url: Optional[AnyUrl] = None
     model_config = ConfigDict(
         json_schema_extra={
             'example': {
@@ -576,13 +517,13 @@ class SessionRequest(BaseRequest):
 
 
 class EndpointRequest(BaseRequest):
-    url: HttpUrlString
+    url: HttpUrl
     events: Optional[list[WebhookEvent]] = None
     user_id: Optional[str] = None
 
 
 class EndpointUpdateRequest(BaseRequest):
-    url: Optional[HttpUrlString] = None
+    url: Optional[HttpUrl] = None
     is_enable: Optional[bool] = None
     events: Optional[list[WebhookEvent]] = None
 
@@ -597,7 +538,7 @@ class FileUploadRequest(BaseRequest):
 
 class FileRequest(BaseModel):
     is_back: Optional[bool] = False
-    url: HttpUrlString
+    url: HttpUrl
     type: KYCFileType
 
 
@@ -644,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):
@@ -682,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.0.dev13 → cuenca_validations-2.0.1}/cuenca_validations/validators.py

@@ -4,7 +4,6 @@ from enum import Enum
 from typing import Any, Callable, Optional, Union
 
 from dateutil.relativedelta import relativedelta
-from pydantic import SecretStr
 
 
 def sanitize_dict(d: dict) -> dict:
@@ -36,8 +35,6 @@ def sanitize_item(
         rv = base64.b64encode(item).decode('utf-8')
     elif isinstance(item, Enum):
         rv = item.value
-    elif isinstance(item, SecretStr):
-        rv = item.get_secret_value()
     elif hasattr(item, 'to_dict'):
         rv = item.to_dict()
     elif default:

cuenca_validations-2.0.1/cuenca_validations/version.py

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: cuenca_validations
-Version: 2.0.0.dev13
+Version: 2.0.1
 Summary: Cuenca common validations
 Home-page: https://github.com/cuenca-mx/cuenca-validations
 Author: Cuenca
@@ -20,6 +20,7 @@ Requires-Dist: clabe>=2.0.0
 Requires-Dist: pydantic[email]>=2.10.0
 Requires-Dist: pydantic-extra-types>=2.10.0
 Requires-Dist: python-dateutil>=2.9.0
+Requires-Dist: phonenumbers>=8.13.0
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{cuenca_validations-2.0.0.dev13 → cuenca_validations-2.0.1}/cuenca_validations.egg-info/requires.txt

@@ -2,3 +2,4 @@ clabe>=2.0.0
 pydantic[email]>=2.10.0
 pydantic-extra-types>=2.10.0
 python-dateutil>=2.9.0
+phonenumbers>=8.13.0

{cuenca_validations-2.0.0.dev13 → cuenca_validations-2.0.1}/setup.py

@@ -29,6 +29,7 @@ setup(
         'pydantic[email]>=2.10.0',
         'pydantic-extra-types>=2.10.0',
         'python-dateutil>=2.9.0',
+        'phonenumbers>=8.13.0',
     ],
     classifiers=[
         'Programming Language :: Python :: 3',

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

@@ -15,10 +15,14 @@ class CardModel(BaseModel):
 def test_invalid_bin_strict_payment():
     with pytest.raises(ValidationError) as exc_info:
         CardModel(card_number=INVALID_BIN)
-    print(exc_info.value)
-    assert 'payment_card_number.bin' in str(exc_info.value)
-    assert 'The card number contains a BIN (first six digits) ' in str(
-        exc_info.value
+    assert exc_info.value.errors()[0] == dict(
+        loc=('card_number',),
+        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.dev13 → cuenca_validations-2.0.1}/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.dev13 → cuenca_validations-2.0.1}/tests/test_types.py

@@ -10,13 +10,12 @@ from pydantic import BaseModel, SecretStr, ValidationError
 from cuenca_validations.types import (
     Address,
     CardQuery,
-    Digits,
     JSONEncoder,
     QueryParams,
-    Rfc,
     SantizedDict,
     SessionRequest,
     TransactionStatus,
+    digits,
     get_state_name,
 )
 from cuenca_validations.types.enums import (
@@ -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):
@@ -89,13 +88,11 @@ def test_sanitized_dict():
         time=now,
         hello='there',
         dates=[now],
-        secret=SecretStr('secret'),
     ) == dict(
         status='succeeded',
         time=utcnow.isoformat(),
         hello='there',
         dates=[utcnow.isoformat()],
-        secret='secret',
     )
 
 
@@ -118,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
     ],
 )
@@ -148,14 +145,13 @@ def test_invalid_class():
 
 
 class Accounts(BaseModel):
-    number: Digits(5, 8)  # type: ignore
+    number: digits(5, 8)  # type: ignore
 
 
 @pytest.mark.parametrize(
     "input_number, expected",
     [
         ('123456', '123456'),
-        (123456, '123456'),
         ('0012312', '0012312'),
     ],
 )
@@ -167,9 +163,10 @@ def test_only_digits(input_number, expected):
 @pytest.mark.parametrize(
     'number, error',
     [
-        ('123', 'Value should have at least 5 items after validation'),
-        ('1234567890', 'Value should have at most 8 items after validation'),
-        ('no_123', 'Value must contain only digits'),
+        (12345, 'Input should be a valid string'),
+        ('123', 'String should have at least 5 characters'),
+        ('1234567890', 'String should have at most 8 characters'),
+        ('no_123', "String should match pattern '^\\d+$'"),
     ],
 )
 def test_invalid_digits(number, error):
@@ -178,14 +175,6 @@ def test_invalid_digits(number, error):
     assert error in str(exception.value)
 
 
-def test_card_query_exp_cvv_if_number_set():
-    values = dict(number='123456', exp_month=1, exp_year=2026)
-    card_query = CardQuery(**values)
-    assert all(
-        getattr(card_query, key) == value for key, value in values.items()
-    )
-
-
 @pytest.mark.parametrize(
     'input_value',
     [
@@ -210,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
@@ -219,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)),
     ],
@@ -430,7 +422,10 @@ def test_user_update_request():
     update_req = UserUpdateRequest(**request)
     beneficiaries = [b.model_dump() for b in update_req.beneficiaries]
     assert beneficiaries == request['beneficiaries']
-    assert update_req.curp_document_uri == request['curp_document_uri']
+    assert (
+        update_req.curp_document_uri.unicode_string()
+        == request['curp_document_uri']
+    )
 
     request['beneficiaries'] = [
         dict(
@@ -564,31 +559,16 @@ def test_bank_account_validation_clabe_request():
     assert BankAccountValidationRequest(account_number='646180157098510917')
 
 
-def test_rfc_field():
-    with pytest.raises(ValueError):
-        Rfc.validate('')
-        Rfc.validate('invalid')
-        Rfc.validate('ThisValueIsTooLongForRFC')
-
-    assert Rfc.validate('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",
     [
@@ -605,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.dev13/cuenca_validations/types/card.py

@@ -1,38 +0,0 @@
-from pydantic_core import PydanticCustomError, core_schema
-from pydantic_extra_types.payment import PaymentCardNumber
-
-from ..card_bins import CARD_BINS
-
-
-class StrictPaymentCardNumber(PaymentCardNumber):
-    """
-    Refactored `StrictPaymentCardNumber` to leverage Pydantic v2's
-    `PaymentCardNumber`, which now natively includes attributes such as
-    brand, bin, last4, and masked.
-
-    Previously, these attributes were manually computed in a custom
-    `PaymentCardNumber` class.
-
-    The `StrictPaymentCardNumber` class now wraps `PaymentCardNumber`
-    as a field, with additional validation to ensure the BIN is associated
-    with a known Mexican bank.
-    """
-
-    @classmethod
-    def validate(
-        cls, __input_value: str, _: core_schema.ValidationInfo
-    ) -> 'StrictPaymentCardNumber':
-        card = super().validate(__input_value, _)
-        if card.bin not in CARD_BINS:
-            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
-    def bank_code(self) -> str:
-        return CARD_BINS[self.bin]

cuenca_validations-2.0.0.dev13/cuenca_validations/version.py

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