cuenca-validations 2.0.0.dev9__tar.gz → 2.0.0.dev11__tar.gz

{cuenca_validations-2.0.0.dev9 → cuenca_validations-2.0.0.dev11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cuenca_validations
-Version: 2.0.0.dev9
+Version: 2.0.0.dev11
 Summary: Cuenca common validations
 Home-page: https://github.com/cuenca-mx/cuenca-validations
 Author: Cuenca
@@ -19,7 +19,7 @@ License-File: LICENSE
 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.8.0
+Requires-Dist: python-dateutil>=2.9.0
 
 # Cuenca - validations
 

{cuenca_validations-2.0.0.dev9 → cuenca_validations-2.0.0.dev11}/cuenca_validations/types/__init__.py

@@ -49,7 +49,6 @@ __all__ = [
     'KYCVerificationUpdateRequest',
     'Language',
     'LimitedWalletRequest',
-    'PageSize',
     'PartnerRequest',
     'PartnerUpdateRequest',
     'PhoneNumber',
@@ -103,8 +102,10 @@ __all__ = [
     'WalletQuery',
     'WalletTransactionQuery',
     'WebhookEvent',
-    'digits',
+    'Digits',
     'get_state_name',
+    'HttpUrlString',
+    'AnyUrlString',
 ]
 
 from .card import StrictPaymentCardNumber
@@ -152,11 +153,13 @@ from .enums import (
 )
 from .files import BatchFileMetadata
 from .general import (
+    AnyUrlString,
+    Digits,
+    HttpUrlString,
     JSONEncoder,
     SantizedDict,
     StrictPositiveFloat,
     StrictPositiveInt,
-    digits,
     get_state_name,
 )
 from .identities import (

cuenca_validations-2.0.0.dev11/cuenca_validations/types/card.py

@@ -0,0 +1,38 @@
+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.dev9 → cuenca_validations-2.0.0.dev11}/cuenca_validations/types/files.py

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

{cuenca_validations-2.0.0.dev9 → cuenca_validations-2.0.0.dev11}/cuenca_validations/types/general.py

@@ -1,12 +1,20 @@
 import json
-from typing import Any, Optional
+from typing import Annotated, Any, Optional
 
-from pydantic import BeforeValidator, Field
-from typing_extensions import Annotated
+from pydantic import AfterValidator, AnyUrl, BeforeValidator, Field, HttpUrl
 
 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):
@@ -19,19 +27,24 @@ class JSONEncoder(json.JSONEncoder):
         return sanitize_item(o, default=super().default)
 
 
-StrictPositiveInt = Annotated[int, Field(strict=True, gt=0, le=21_474_836_47)]
+MAX_VALUE_IN_DB = 21_474_836_47
+
+StrictPositiveInt = Annotated[
+    int, Field(strict=True, gt=0, le=MAX_VALUE_IN_DB)
+]
 
 
 StrictPositiveFloat = Annotated[float, Field(strict=True, gt=0)]
 
 
-def validate_only_digits(value: str) -> str:
-    if not value.isdigit():
+def validate_only_digits(value: Any) -> str:
+    v_str = str(value)
+    if not v_str.isdigit():
         raise ValueError("Value must contain only digits")
-    return value
+    return v_str
 
 
-def digits(
+def Digits(
     min_length: Optional[int] = None, max_length: Optional[int] = None
 ) -> Any:
     return Annotated[

{cuenca_validations-2.0.0.dev9 → cuenca_validations-2.0.0.dev11}/cuenca_validations/types/identities.py

@@ -1,51 +1,34 @@
 import datetime as dt
-import re
-from typing import Any, Dict, List, Optional
+from typing import Annotated, Any, Optional
 
 from pydantic import (
     BaseModel,
     ConfigDict,
     Field,
     IPvAnyAddress,
+    StringConstraints,
     model_validator,
 )
 from pydantic.types import StrictStr
 
 from .enums import Country, KYCFileType, State, VerificationStatus
 
+PhoneNumber = Annotated[
+    str,
+    StringConstraints(
+        min_length=10, max_length=15, pattern=r'^\+?[0-9]{10,14}$'
+    ),
+]
 
-class PhoneNumber(StrictStr):
-    min_length = 10
-    max_length = 15
-    regex = re.compile(r'^\+?[0-9]{10,14}$')
 
-    @classmethod
-    def __get_pydantic_core_schema__(
-        cls, source_type: Any, handler: Any
-    ) -> Dict[str, Any]:
-        return {
-            'type': 'str',
-            'pattern': cls.regex.pattern,
-            'min_length': cls.min_length,
-            'max_length': cls.max_length,
-        }
-
-
-class CurpField(StrictStr):
-    min_length = 18
-    max_length = 18
-    regex = re.compile(r'^[A-Z]{4}[0-9]{6}[A-Z]{6}[A-Z|0-9][0-9]$')
-
-    @classmethod
-    def __get_pydantic_core_schema__(
-        cls, source_type: Any, handler: Any
-    ) -> Dict[str, Any]:
-        return {
-            'type': 'str',
-            'pattern': cls.regex.pattern,
-            'min_length': cls.min_length,
-            'max_length': cls.max_length,
-        }
+CurpField = Annotated[
+    str,
+    StringConstraints(
+        min_length=18,
+        max_length=18,
+        pattern=r'^[A-Z]{4}[0-9]{6}[A-Z]{6}[A-Z|0-9][0-9]$',
+    ),
+]
 
 
 class Rfc(StrictStr):
@@ -61,7 +44,7 @@ class Rfc(StrictStr):
     @classmethod
     def __get_pydantic_core_schema__(
         cls, source_type: Any, handler: Any
-    ) -> Dict[str, Any]:
+    ) -> dict[str, Any]:
         return {
             'type': 'str',
             'min_length': cls.min_length,
@@ -96,7 +79,7 @@ class Address(BaseModel):
 
     @model_validator(mode='before')
     @classmethod
-    def full_name_complete(cls, values: Dict[str, Any]) -> Dict[str, Any]:
+    def full_name_complete(cls, values: dict[str, Any]) -> dict[str, Any]:
         if values.get('full_name'):
             return values
         if not values.get('street'):
@@ -162,7 +145,7 @@ class KYCFile(BaseModel):
     status: Optional[VerificationStatus] = Field(
         None, description='The status of the file depends on KYCValidation'
     )
-    errors: Optional[List[VerificationErrors]] = Field(
+    errors: Optional[list[VerificationErrors]] = Field(
         None, description='List of document errors found during kyc validation'
     )
     verification_id: Optional[str] = Field(

{cuenca_validations-2.0.0.dev9 → cuenca_validations-2.0.0.dev11}/cuenca_validations/types/morals.py

@@ -1,5 +1,5 @@
 import datetime as dt
-from typing import List, Optional
+from typing import Optional
 
 from pydantic import BaseModel, EmailStr
 
@@ -70,5 +70,5 @@ class ShareholderPhysical(PhysicalPerson):
 class Shareholder(BaseModel):
     name: str
     percentage: int
-    shareholders: List[ShareholderPhysical]
-    legal_representatives: List[LegalRepresentative]
+    shareholders: list[ShareholderPhysical]
+    legal_representatives: list[LegalRepresentative]

{cuenca_validations-2.0.0.dev9 → cuenca_validations-2.0.0.dev11}/cuenca_validations/types/queries.py

@@ -1,5 +1,5 @@
 import datetime as dt
-from typing import Optional
+from typing import Annotated, Optional
 
 from pydantic import (
     BaseModel,
@@ -9,7 +9,6 @@ from pydantic import (
     PositiveInt,
     field_validator,
 )
-from typing_extensions import Annotated
 
 from ..typing import DictStrAny
 from ..validators import sanitize_dict
@@ -32,9 +31,7 @@ MAX_PAGE_SIZE = 100
 
 class QueryParams(BaseModel):
     count: bool = False
-    page_size: Annotated[
-        int, Field(gt=0, le=MAX_PAGE_SIZE, default=MAX_PAGE_SIZE)
-    ]
+    page_size: Optional[Annotated[int, Field(gt=0, le=MAX_PAGE_SIZE)]] = None
     limit: Optional[PositiveInt] = None
     user_id: Optional[str] = None
     created_before: Optional[dt.datetime] = None
@@ -61,10 +58,10 @@ class QueryParams(BaseModel):
         },
     )
 
-    def dict(self, *args, **kwargs) -> DictStrAny:
+    def model_dump(self, *args, **kwargs) -> DictStrAny:
         kwargs.setdefault('exclude_none', True)
         kwargs.setdefault('exclude_unset', True)
-        d = super().dict(*args, **kwargs)
+        d = super().model_dump(*args, **kwargs)
         if self.count:
             d['count'] = 1
         sanitize_dict(d)

{cuenca_validations-2.0.0.dev9 → cuenca_validations-2.0.0.dev11}/cuenca_validations/types/requests.py

@@ -1,21 +1,18 @@
 import datetime as dt
-from typing import List, Optional, Union
+from typing import Annotated, Optional, Union
 
 from clabe import Clabe
 from pydantic import (
-    AnyUrl,
     BaseModel,
     ConfigDict,
     EmailStr,
     Field,
-    HttpUrl,
     StrictStr,
     StringConstraints,
     field_validator,
     model_validator,
 )
 from pydantic.networks import IPvAnyAddress
-from typing_extensions import Annotated
 
 from ..types.enums import (
     AuthorizerTransaction,
@@ -51,7 +48,7 @@ from ..types.enums import (
 from ..typing import DictStrAny
 from ..validators import validate_age_requirement
 from .card import PaymentCardNumber, StrictPaymentCardNumber
-from .general import StrictPositiveInt
+from .general import AnyUrlString, HttpUrlString, StrictPositiveInt
 from .identities import (
     Address,
     Beneficiary,
@@ -75,17 +72,14 @@ from .morals import (
 class BaseRequest(BaseModel):
     model_config = ConfigDict(extra="forbid")
 
-    def dict(self, *args, **kwargs) -> DictStrAny:
+    def model_dump(self, *args, **kwargs) -> DictStrAny:
         kwargs.setdefault('exclude_none', True)
         kwargs.setdefault('exclude_unset', True)
-        return super().dict(*args, **kwargs)
+        return super().model_dump(*args, **kwargs)
 
 
-class TransferRequest(BaseRequest):
+class BaseTransferRequest(BaseRequest):
     recipient_name: StrictStr
-    account_number: Union[Clabe, PaymentCardNumber] = Field(
-        ..., description='Destination Clabe or Card number'
-    )
     amount: StrictPositiveInt = Field(
         ..., description='Always in cents, not in MXN pesos'
     )
@@ -112,8 +106,16 @@ class TransferRequest(BaseRequest):
     )
 
 
-class StrictTransferRequest(TransferRequest):
-    account_number: Union[Clabe, StrictPaymentCardNumber]  # type: ignore
+class TransferRequest(BaseTransferRequest):
+    account_number: Union[Clabe, PaymentCardNumber] = Field(
+        ..., description='Destination Clabe or Card number'
+    )
+
+
+class StrictTransferRequest(BaseTransferRequest):
+    account_number: Union[Clabe, StrictPaymentCardNumber] = Field(
+        ..., description='Destination Clabe or Card number'
+    )
 
 
 class CardUpdateRequest(BaseRequest):
@@ -131,15 +133,7 @@ class CardRequest(BaseRequest):
 
 
 class CardActivationRequest(BaseModel):
-    number: Annotated[
-        str,
-        StringConstraints(
-            strip_whitespace=True,
-            min_length=16,
-            max_length=16,
-            pattern=r'\d{16}',
-        ),
-    ]
+    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[
@@ -170,9 +164,9 @@ class UserCredentialUpdateRequest(BaseRequest):
         ),
     )
 
-    def dict(self, *args, **kwargs) -> DictStrAny:
+    def model_dump(self, *args, **kwargs) -> DictStrAny:
         # Password can be None but BaseRequest excludes None
-        return BaseModel.dict(self, *args, **kwargs)
+        return BaseModel.model_dump(self, *args, **kwargs)
 
     @model_validator(mode="before")
     @classmethod
@@ -250,9 +244,7 @@ class ARPCRequest(BaseModel):
     arqc: StrictStr
     arpc_method: Annotated[
         str,
-        StringConstraints(  # type: ignore
-            strict=True, min_length=1, max_length=1
-        ),
+        StringConstraints(strict=True, min_length=1, max_length=1),
     ]
     transaction_data: StrictStr
     response_code: StrictStr
@@ -356,10 +348,10 @@ class FraudValidationRequest(BaseModel):
         None
     )
     ecommerce_indicator: Optional[EcommerceIndicator] = None
-    card_id: Optional[str] = None  # type: ignore
-    user_id: Optional[str] = None  # type: ignore
-    card_type: Optional[CardType] = None  # type: ignore
-    card_status: Optional[CardStatus] = None  # type: ignore
+    card_id: Optional[str] = None
+    user_id: Optional[str] = None
+    card_type: Optional[CardType] = None
+    card_status: Optional[CardStatus] = None
 
 
 class TransactionTokenValidationUpdateRequest(BaseRequest):
@@ -532,19 +524,19 @@ class UserUpdateRequest(BaseModel):
     email_verification_id: Optional[str] = None
     phone_verification_id: Optional[str] = None
     address: Optional[Address] = None
-    beneficiaries: Optional[List[Beneficiary]] = None
+    beneficiaries: Optional[list[Beneficiary]] = None
     govt_id: Optional[KYCFile] = None
     proof_of_address: Optional[KYCFile] = None
     proof_of_life: Optional[KYCFile] = None
     status: Optional[UserStatus] = None
     terms_of_service: Optional[TOSRequest] = None
     platform_terms_of_service: Optional[TOSAgreement] = None
-    curp_document_uri: Optional[HttpUrl] = None
+    curp_document_uri: Optional[HttpUrlString] = None
 
     @field_validator('beneficiaries')
     @classmethod
     def beneficiary_percentage(
-        cls, beneficiaries: Optional[List[Beneficiary]] = None
+        cls, beneficiaries: Optional[list[Beneficiary]] = None
     ):
         if beneficiaries and sum(b.percentage for b in beneficiaries) > 100:
             raise ValueError('The total percentage is more than 100.')
@@ -569,8 +561,8 @@ class UserLoginRequest(BaseRequest):
 class SessionRequest(BaseRequest):
     user_id: str
     type: SessionType
-    success_url: Optional[AnyUrl] = None
-    failure_url: Optional[AnyUrl] = None
+    success_url: Optional[AnyUrlString] = None
+    failure_url: Optional[AnyUrlString] = None
     model_config = ConfigDict(
         json_schema_extra={
             'example': {
@@ -584,15 +576,15 @@ class SessionRequest(BaseRequest):
 
 
 class EndpointRequest(BaseRequest):
-    url: HttpUrl
-    events: Optional[List[WebhookEvent]] = None
+    url: HttpUrlString
+    events: Optional[list[WebhookEvent]] = None
     user_id: Optional[str] = None
 
 
 class EndpointUpdateRequest(BaseRequest):
-    url: Optional[HttpUrl] = None
+    url: Optional[HttpUrlString] = None
     is_enable: Optional[bool] = None
-    events: Optional[List[WebhookEvent]] = None
+    events: Optional[list[WebhookEvent]] = None
 
 
 class FileUploadRequest(BaseRequest):
@@ -605,12 +597,12 @@ class FileUploadRequest(BaseRequest):
 
 class FileRequest(BaseModel):
     is_back: Optional[bool] = False
-    url: HttpUrl
+    url: HttpUrlString
     type: KYCFileType
 
 
 class FileBatchUploadRequest(BaseModel):
-    files: List[FileRequest]
+    files: list[FileRequest]
     user_id: str
 
 
@@ -652,8 +644,6 @@ class VerificationAttemptRequest(BaseModel):
 
 
 class LimitedWalletRequest(BaseRequest):
-    model_config = dict(arbitrary_types_allowed=True)
-
     allowed_curp: CurpField
     allowed_rfc: Optional[Rfc] = None
 
@@ -663,7 +653,6 @@ class KYCVerificationUpdateRequest(BaseRequest):
 
 
 class PlatformRequest(BaseModel):
-    model_config = dict(arbitrary_types_allowed=True)
     name: str
     rfc: Optional[str] = None
     establishment_date: Optional[dt.date] = None
@@ -685,7 +674,7 @@ class WebhookRequest(BaseModel):
 class KYCValidationRequest(BaseRequest):
     user_id: str
     force: bool = False
-    documents: List[KYCFile] = []
+    documents: list[KYCFile] = []
 
 
 class BankAccountValidationRequest(BaseModel):
@@ -739,8 +728,6 @@ class QuestionnairesRequest(BaseModel):
 
 
 class PartnerRequest(BaseRequest):
-    model_config = dict(arbitrary_types_allowed=True)
-
     legal_name: str
     business_name: str
     nationality: Country
@@ -755,8 +742,6 @@ class PartnerRequest(BaseRequest):
 
 
 class PartnerUpdateRequest(BaseRequest):
-    model_config = dict(arbitrary_types_allowed=True)
-
     legal_name: Optional[str] = None
     business_name: Optional[str] = None
     nationality: Optional[Country] = None
@@ -774,5 +759,5 @@ class PartnerUpdateRequest(BaseRequest):
     license: Optional[LicenseDetails] = None
     audit: Optional[AuditDetails] = None
     vulnerable_activity: Optional[VulnerableActivityDetails] = None
-    legal_representatives: Optional[List[LegalRepresentative]] = None
-    shareholders: Optional[List[Shareholder]] = None
+    legal_representatives: Optional[list[LegalRepresentative]] = None
+    shareholders: Optional[list[Shareholder]] = None

cuenca_validations-2.0.0.dev11/cuenca_validations/typing.py

@@ -0,0 +1,5 @@
+from typing import Any, MutableMapping, Optional, Union
+
+ClientRequestParams = Union[None, bytes, MutableMapping[str, str]]
+DictStrAny = dict[str, Any]
+OptionalDict = Optional[dict[str, Union[int, str]]]

{cuenca_validations-2.0.0.dev9 → cuenca_validations-2.0.0.dev11}/cuenca_validations/validators.py

@@ -1,10 +1,9 @@
 import base64
 import datetime as dt
 from enum import Enum
-from typing import Any, Callable, List, Optional, Union
+from typing import Any, Callable, Optional, Union
 
 from dateutil.relativedelta import relativedelta
-from pydantic import AnyUrl, HttpUrl
 
 
 def sanitize_dict(d: dict) -> dict:
@@ -21,16 +20,12 @@ def sanitize_item(
     :param default: Optional function to be used when there is no case
     for this type of item, default `None` it returns the item as is.
     """
-    rv: Union[str, List[Any]]
+    rv: Union[str, list[Any]]
     if isinstance(item, dt.date):
         if isinstance(item, dt.datetime) and not item.tzinfo:
             rv = item.astimezone(dt.timezone.utc).isoformat()
         else:
             rv = item.isoformat()
-    elif isinstance(item, HttpUrl):
-        rv = str(item)
-    elif isinstance(item, AnyUrl):
-        rv = str(item)
     elif isinstance(item, list):
         rv = [
             sanitize_dict(e) if isinstance(e, dict) else sanitize_item(e)

cuenca_validations-2.0.0.dev11/cuenca_validations/version.py

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

{cuenca_validations-2.0.0.dev9 → cuenca_validations-2.0.0.dev11}/cuenca_validations.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cuenca_validations
-Version: 2.0.0.dev9
+Version: 2.0.0.dev11
 Summary: Cuenca common validations
 Home-page: https://github.com/cuenca-mx/cuenca-validations
 Author: Cuenca
@@ -19,7 +19,7 @@ License-File: LICENSE
 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.8.0
+Requires-Dist: python-dateutil>=2.9.0
 
 # Cuenca - validations
 

{cuenca_validations-2.0.0.dev9 → cuenca_validations-2.0.0.dev11}/cuenca_validations.egg-info/requires.txt

@@ -1,4 +1,4 @@
 clabe>=2.0.0
 pydantic[email]>=2.10.0
 pydantic-extra-types>=2.10.0
-python-dateutil>=2.8.0
+python-dateutil>=2.9.0

{cuenca_validations-2.0.0.dev9 → cuenca_validations-2.0.0.dev11}/setup.py

@@ -28,7 +28,7 @@ setup(
         'clabe>=2.0.0',
         'pydantic[email]>=2.10.0',
         'pydantic-extra-types>=2.10.0',
-        'python-dateutil>=2.8.0',
+        'python-dateutil>=2.9.0',
     ],
     classifiers=[
         'Programming Language :: Python :: 3',

{cuenca_validations-2.0.0.dev9 → cuenca_validations-2.0.0.dev11}/tests/test_card.py

@@ -1,5 +1,5 @@
 import pytest
-from pydantic import ValidationError
+from pydantic import BaseModel, ValidationError
 from pydantic_extra_types.payment import PaymentCardBrand
 
 from cuenca_validations.types import StrictPaymentCardNumber
@@ -8,9 +8,13 @@ VALID_BBVA = '4772130000000003'
 INVALID_BIN = '4050000000000001'
 
 
+class CardModel(BaseModel):
+    card_number: StrictPaymentCardNumber
+
+
 def test_invalid_bin_strict_payment():
     with pytest.raises(ValidationError) as exc_info:
-        StrictPaymentCardNumber(card_number=INVALID_BIN)
+        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(
@@ -19,9 +23,9 @@ def test_invalid_bin_strict_payment():
 
 
 def test_valid_bin_strict_payment():
-    card = StrictPaymentCardNumber(card_number=VALID_BBVA)
-    assert card.brand == PaymentCardBrand.visa
-    assert card.bin == '477213'
-    assert card.last4 == '0003'
-    assert card.masked == '477213******0003'
-    assert card.bank_code == '40012'
+    card = CardModel(card_number=VALID_BBVA)
+    assert card.card_number.brand == PaymentCardBrand.visa
+    assert card.card_number.bin == '477213'
+    assert card.card_number.last4 == '0003'
+    assert card.card_number.masked == '477213******0003'
+    assert card.card_number.bank_code == '40012'

{cuenca_validations-2.0.0.dev9 → cuenca_validations-2.0.0.dev11}/tests/test_errors.py

@@ -1,3 +1,5 @@
+import pytest
+
 from cuenca_validations.errors import (
     ApiError,
     AuthMethodNotAllowedError,
@@ -16,8 +18,9 @@ def test_cuenca_error_base():
     assert issubclass(CuencaError, Exception)
 
 
-def test_error_codes_and_status():
-    test_cases = [
+@pytest.mark.parametrize(
+    "error_class, expected_code, expected_status",
+    [
         (WrongCredsError, 101, 401),
         (MissingAuthorizationHeaderError, 102, 401),
         (UserNotLoggedInError, 103, 401),
@@ -27,8 +30,8 @@ def test_error_codes_and_status():
         (UserLocationError, 108, 401),
         (InvalidOTPCodeError, 109, 401),
         (ApiError, 500, 500),
-    ]
-
-    for error_class, expected_code, expected_status in test_cases:
-        assert error_class.code == expected_code
-        assert error_class.status_code == expected_status
+    ],
+)
+def test_error_codes_and_status(error_class, expected_code, expected_status):
+    assert error_class.code == expected_code
+    assert error_class.status_code == expected_status

{cuenca_validations-2.0.0.dev9 → cuenca_validations-2.0.0.dev11}/tests/test_types.py

@@ -5,18 +5,18 @@ from enum import Enum
 
 import pytest
 from freezegun import freeze_time
-from pydantic import AnyUrl, BaseModel, HttpUrl, ValidationError
+from pydantic import BaseModel, 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 (
@@ -67,19 +67,21 @@ class TestClass:
 
 def test_dict():
     model = QueryParams(count=1, created_before=now)
-    assert model.dict() == dict(count=1, created_before=utcnow.isoformat())
+    assert model.model_dump() == dict(
+        count=1, created_before=utcnow.isoformat()
+    )
 
 
 def test_dict_with_exclude():
     model = QueryParams(count=1, created_before=now, user_id='USXXXX')
-    assert model.dict(exclude={'user_id'}) == dict(
+    assert model.model_dump(exclude={'user_id'}) == dict(
         count=1, created_before=utcnow.isoformat()
     )
 
 
 def test_dict_with_exclude_unset():
-    model = QueryParams(count=1, created_before=now)
-    assert model.dict(exclude_unset=False) == dict(
+    model = QueryParams(count=1, created_before=now, page_size=100)
+    assert model.model_dump(exclude_unset=False) == dict(
         count=1, created_before=utcnow.isoformat(), page_size=100
     )
 
@@ -132,17 +134,6 @@ def test_json_encoder(value, result):
     assert decoded['value'] == result
 
 
-def test_sanitized_dict_with_urls():
-    data = SantizedDict(
-        api_url=HttpUrl('https://api.cuenca.com/v1'),
-        ftp_url=AnyUrl('ftp://files.example.com/'),
-    )
-    assert data == {
-        'api_url': 'https://api.cuenca.com/v1',
-        'ftp_url': 'ftp://files.example.com/',
-    }
-
-
 def test_invalid_class():
     """
     For a class that doesn't have a `to_dict` method and it is not a type of
@@ -158,12 +149,20 @@ def test_invalid_class():
 
 
 class Accounts(BaseModel):
-    number: digits(5, 8)  # type: ignore
+    number: Digits(5, 8)  # type: ignore
 
 
-def test_only_digits():
-    acc = Accounts(number='123456')
-    assert acc.number == '123456'
+@pytest.mark.parametrize(
+    "input_number, expected",
+    [
+        ('123456', '123456'),
+        (123456, '123456'),
+        ('0012312', '0012312'),
+    ],
+)
+def test_only_digits(input_number, expected):
+    acc = Accounts(number=input_number)
+    assert acc.number == expected
 
 
 @pytest.mark.parametrize(
@@ -204,7 +203,7 @@ def test_card_query_exp_cvv_if_number_not_set(input_value):
 
 def test_exclude_none_in_dict():
     request = ApiKeyUpdateRequest(user_id='US123')
-    assert request.dict() == dict(user_id='US123')
+    assert request.model_dump() == dict(user_id='US123')
 
 
 def test_update_one_property_at_a_time_request():
@@ -228,7 +227,7 @@ def test_update_one_property_at_a_time_request():
 )
 def test_update_credential_update_request_dict(data, expected_dict):
     req = UserCredentialUpdateRequest(**data)
-    assert req.dict() == expected_dict
+    assert req.model_dump() == expected_dict
 
 
 def test_card_transaction_requests():
@@ -355,7 +354,7 @@ def test_user_request():
         required_level=3,
         terms_of_service=None,
     )
-    assert UserRequest(**request).dict() == request
+    assert UserRequest(**request).model_dump() == request
 
     # changing curp so user is underage
     request['curp'] = 'ABCD060604HDFSRN03'
@@ -392,7 +391,7 @@ def test_curp_validation_request():
     assert all(field in error_msg for field in required_fields)
 
     req_curp = CurpValidationRequest(**request)
-    assert req_curp.dict() == request
+    assert req_curp.model_dump() == request
 
     request['date_of_birth'] = dt.date(2006, 5, 17)
 
@@ -430,9 +429,9 @@ def test_user_update_request():
         curp_document_uri='https://sandbox.cuenca.com/files/EF123',
     )
     update_req = UserUpdateRequest(**request)
-    beneficiaries = [b.dict() for b in update_req.beneficiaries]
+    beneficiaries = [b.model_dump() for b in update_req.beneficiaries]
     assert beneficiaries == request['beneficiaries']
-    assert str(update_req.curp_document_uri) == request['curp_document_uri']
+    assert update_req.curp_document_uri == request['curp_document_uri']
 
     request['beneficiaries'] = [
         dict(
@@ -585,49 +584,42 @@ class TestFloatModel(BaseModel):
     value: StrictPositiveFloat
 
 
-def test_strict_positive_float_valid():
-    model = TestFloatModel(value=10.5)
-    assert model.value == 10.5
-    model = TestFloatModel(value=0.000001)
-    assert model.value == 0.000001
+@pytest.mark.parametrize("value", [10.5, 0.000001])
+def test_strict_positive_float_valid(value):
+    model = TestFloatModel(value=value)
+    assert model.value == value
 
 
-def test_strict_positive_float_invalid():
-    with pytest.raises(ValueError, match="Input should be greater than 0"):
-        TestFloatModel(value=0.0)
+@pytest.mark.parametrize("value", [0.0, -1.5])
+def test_strict_positive_float_invalid(value):
     with pytest.raises(ValueError, match="Input should be greater than 0"):
-        TestFloatModel(value=-1.5)
+        TestFloatModel(value=value)
 
 
 class TestIntModel(BaseModel):
     value: StrictPositiveInt
 
 
-def test_strict_positive_int_valid():
-    model = TestIntModel(value=100)
-    assert model.value == 100
-
-    model = TestIntModel(value=1)
-    assert model.value == 1
+@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
 
-    model = TestIntModel(value=21_474_836_47)
-    assert model.value == 21_474_836_47
 
-
-def test_strict_positive_int_invalid():
-    with pytest.raises(ValueError, match="Input should be greater than 0"):
-        TestIntModel(value=0)
-
-    with pytest.raises(ValueError, match="Input should be greater than 0"):
-        TestIntModel(value=-5)
-
-    with pytest.raises(
-        ValueError, match="Input should be less than or equal to 2147483647"
-    ):
-        TestIntModel(value=21_474_836_48)
-
-    with pytest.raises(ValueError, match="Input should be a valid integer"):
-        TestIntModel(value=5.5)
-
-    with pytest.raises(ValueError, match="Input should be a valid integer"):
-        TestIntModel(value="10")
+@pytest.mark.parametrize(
+    "value, expected_error, expected_message",
+    [
+        (0, ValueError, "Input should be greater than 0"),
+        (-5, ValueError, "Input should be greater than 0"),
+        (
+            21_474_836_48,
+            ValueError,
+            "Input should be less than or equal to 2147483647",
+        ),
+        (5.5, ValueError, "Input should be a valid integer"),
+        ("10", ValueError, "Input should be a valid integer"),
+    ],
+)
+def test_strict_positive_int_invalid(value, expected_error, expected_message):
+    with pytest.raises(expected_error, match=expected_message):
+        TestIntModel(value=value)

cuenca_validations-2.0.0.dev9/cuenca_validations/types/card.py

@@ -1,42 +0,0 @@
-from pydantic import BaseModel, field_validator
-from pydantic_core import PydanticCustomError
-from pydantic_extra_types.payment import PaymentCardBrand, PaymentCardNumber
-
-from ..card_bins import CARD_BINS
-
-
-class StrictPaymentCardNumber(BaseModel):
-
-    card_number: PaymentCardNumber
-
-    @field_validator('card_number')
-    def validate_bin(cls, card_number: PaymentCardNumber) -> PaymentCardNumber:
-        if card_number.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 card_number
-
-    @property
-    def brand(self) -> PaymentCardBrand:
-        return self.card_number.brand
-
-    @property
-    def last4(self) -> str:
-        return self.card_number.last4
-
-    @property
-    def masked(self) -> str:
-        return self.card_number.masked
-
-    @property
-    def bin(self) -> str:
-        return self.card_number.bin
-
-    @property
-    def bank_code(self) -> str:
-        return CARD_BINS[self.card_number.bin]

cuenca_validations-2.0.0.dev9/cuenca_validations/typing.py

@@ -1,5 +0,0 @@
-from typing import Any, Dict, MutableMapping, Optional, Union
-
-ClientRequestParams = Union[None, bytes, MutableMapping[str, str]]
-DictStrAny = Dict[str, Any]
-OptionalDict = Optional[Dict[str, Union[int, str]]]

cuenca_validations-2.0.0.dev9/cuenca_validations/version.py

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