cuenca-validations 2.0.0.dev5__tar.gz → 2.0.0.dev8__tar.gz

{cuenca_validations-2.0.0.dev5 → cuenca_validations-2.0.0.dev8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cuenca_validations
-Version: 2.0.0.dev5
+Version: 2.0.0.dev8
 Summary: Cuenca common validations
 Home-page: https://github.com/cuenca-mx/cuenca-validations
 Author: Cuenca
@@ -14,6 +14,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: clabe>=2.0.0.dev0
 Requires-Dist: pydantic[email]>=2.0
+Requires-Dist: pydantic-extra-types==2.10.1
 Requires-Dist: dataclasses>=0.6; python_version < "3.7"
 Requires-Dist: python-dateutil>=2.7.0
 

{cuenca_validations-2.0.0.dev5 → cuenca_validations-2.0.0.dev8}/cuenca_validations/types/card.py

@@ -13,7 +13,11 @@ class StrictPaymentCardNumber(BaseModel):
     def validate_bin(cls, card_number: PaymentCardNumber) -> PaymentCardNumber:
         if card_number.bin not in CARD_BINS:
             raise PydanticCustomError(
-                'payment_card_number.bin', 'Invalid BIN: Bank code not found.'
+                '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
 

{cuenca_validations-2.0.0.dev5 → cuenca_validations-2.0.0.dev8}/cuenca_validations/types/files.py

@@ -1,6 +1,6 @@
 from typing import Optional
 
-from pydantic import AnyHttpUrl, BaseModel
+from pydantic import BaseModel, HttpUrl
 
 from .enums import KYCFileType
 
@@ -9,4 +9,4 @@ class BatchFileMetadata(BaseModel):
     id: Optional[str] = None
     is_back: bool
     type: KYCFileType
-    url: AnyHttpUrl
+    url: HttpUrl

{cuenca_validations-2.0.0.dev5 → cuenca_validations-2.0.0.dev8}/cuenca_validations/types/general.py

@@ -19,32 +19,10 @@ class JSONEncoder(json.JSONEncoder):
         return sanitize_item(o, default=super().default)
 
 
-def validate_strict_positive_int(value: int) -> int:
-    if not isinstance(value, int):
-        raise ValueError("Value must be an integer")
-    if value <= 0:
-        raise ValueError("Value must be greater than 0")
-    if value > 21_474_836_47:
-        raise ValueError("Value must be less than 21_474_836_47")
-    return value
-
-
-StrictPositiveInt = Annotated[
-    int, BeforeValidator(validate_strict_positive_int)
-]
-
-
-def validate_strict_positive_float(value: float) -> float:
-    if not isinstance(value, float):
-        raise ValueError("Value must be a float")
-    if value <= 0:
-        raise ValueError("Value must be greater than 0")
-    return value
+StrictPositiveInt = Annotated[int, Field(strict=True, gt=0, le=21_474_836_47)]
 
 
-StrictPositiveFloat = Annotated[
-    float, BeforeValidator(validate_strict_positive_float)
-]
+StrictPositiveFloat = Annotated[float, Field(strict=True, gt=0)]
 
 
 def validate_only_digits(value: str) -> str:

{cuenca_validations-2.0.0.dev5 → cuenca_validations-2.0.0.dev8}/cuenca_validations/types/morals.py

@@ -49,8 +49,6 @@ class VulnerableActivityDetails(BaseModel):
 
 
 class PhysicalPerson(BaseModel):
-    model_config = dict(arbitrary_types_allowed=True)
-
     names: str
     first_surname: str
     second_surname: Optional[str] = None

{cuenca_validations-2.0.0.dev5 → cuenca_validations-2.0.0.dev8}/cuenca_validations/types/queries.py

@@ -5,10 +5,11 @@ from pydantic import (
     BaseModel,
     ConfigDict,
     EmailStr,
+    Field,
     PositiveInt,
-    conint,
     field_validator,
 )
+from typing_extensions import Annotated
 
 from ..typing import DictStrAny
 from ..validators import sanitize_dict
@@ -31,9 +32,9 @@ MAX_PAGE_SIZE = 100
 
 class QueryParams(BaseModel):
     count: bool = False
-    page_size: conint(  # type: ignore[valid-type]
-        gt=0, le=MAX_PAGE_SIZE
-    ) = MAX_PAGE_SIZE  # Add default value
+    page_size: Annotated[
+        int, Field(strict=True, gt=0, le=MAX_PAGE_SIZE, default=MAX_PAGE_SIZE)
+    ]
     limit: Optional[PositiveInt] = None
     user_id: Optional[str] = None
     created_before: Optional[dt.datetime] = None
@@ -105,21 +106,6 @@ class ApiKeyQuery(QueryParams):
                     'description': 'Set `true` value to fetch active keys or '
                     '`false` to fetch deactivated keys'
                 },
-                'count': {
-                    'description': 'Set `true` value to get only a counter'
-                },
-                'page_size': {'description': 'Number of items per page'},
-                'limit': {'description': 'Limit of items to query'},
-                'created_before': {
-                    'description': 'Filtered items have a `created_at` '
-                    'date equal or lower than this value, this field '
-                    'represents the max creation date.'
-                },
-                'created_after': {
-                    'description': 'Filtered items have a `created_at` '
-                    'date equal or greater than this value, this field '
-                    'represents the min creation date.'
-                },
             }
         },
     )
@@ -139,14 +125,9 @@ class CardQuery(QueryParams):
     type: Optional[CardType] = None
 
     @field_validator('exp_month', 'exp_year', 'cvv2', 'cvv')
-    def query_by_exp_cvv_if_number_set(cls, v, info):
-        if not info.data.get('number'):
-            raise ValueError(
-                '''
-                exp_month, exp_year, cvv and cvv2 can
-                only be set when number is provided
-                '''
-            )
+    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
 
 
@@ -155,8 +136,8 @@ class StatementQuery(QueryParams):
     month: int
 
     @field_validator('month')
-    def validate_year_month(cls, month, info):
-        year = info.data['year']
+    def validate_year_month(cls, month, values):
+        year = values.data['year']
         month_now = dt.date.today().replace(day=1)
         month_set = dt.date(year, month, 1)
         if month_set >= month_now:
@@ -190,8 +171,6 @@ class UserQuery(QueryParams):
 
 
 class IdentityQuery(QueryParams):
-    model_config = dict(arbitrary_types_allowed=True)
-
     curp: Optional[CurpField] = None
     rfc: Optional[str] = None
     status: Optional[UserStatus] = None

{cuenca_validations-2.0.0.dev5 → cuenca_validations-2.0.0.dev8}/cuenca_validations/types/requests.py

@@ -112,8 +112,8 @@ class TransferRequest(BaseRequest):
     )
 
 
-class StrictTransferRequest(BaseRequest):
-    account_number: Union[Clabe, StrictPaymentCardNumber]
+class StrictTransferRequest(TransferRequest):
+    account_number: Union[Clabe, StrictPaymentCardNumber]  # type: ignore
 
 
 class CardUpdateRequest(BaseRequest):
@@ -140,8 +140,8 @@ class CardActivationRequest(BaseModel):
             pattern=r'\d{16}',
         ),
     ]
-    exp_month: Annotated[int, Field(strict=True, ge=1, le=12)]  # type: ignore
-    exp_year: Annotated[int, Field(strict=True, ge=18, le=99)]  # type: ignore
+    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(
@@ -207,7 +207,7 @@ class CardValidationRequest(BaseModel):
     ]
     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[  # type: ignore
+    cvv: Optional[
         Annotated[
             str,
             StringConstraints(
@@ -215,7 +215,7 @@ class CardValidationRequest(BaseModel):
             ),
         ]
     ] = None
-    cvv2: Optional[  # type: ignore
+    cvv2: Optional[
         Annotated[
             str,
             StringConstraints(
@@ -223,7 +223,7 @@ class CardValidationRequest(BaseModel):
             ),
         ]
     ] = None
-    icvv: Optional[  # type: ignore
+    icvv: Optional[
         Annotated[
             str,
             StringConstraints(
@@ -272,7 +272,7 @@ class CardTransactionRequest(BaseModel):
     card_id: str
     user_id: str
     # In some card_validations amount is equal to 0
-    amount: Annotated[int, Field(strict=True, ge=0)]  # type: ignore
+    amount: Annotated[int, Field(strict=True, ge=0)]
     merchant_name: str
     merchant_type: str
     merchant_data: str

cuenca_validations-2.0.0.dev8/cuenca_validations/version.py

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

{cuenca_validations-2.0.0.dev5 → cuenca_validations-2.0.0.dev8}/cuenca_validations.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cuenca_validations
-Version: 2.0.0.dev5
+Version: 2.0.0.dev8
 Summary: Cuenca common validations
 Home-page: https://github.com/cuenca-mx/cuenca-validations
 Author: Cuenca
@@ -14,6 +14,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: clabe>=2.0.0.dev0
 Requires-Dist: pydantic[email]>=2.0
+Requires-Dist: pydantic-extra-types==2.10.1
 Requires-Dist: dataclasses>=0.6; python_version < "3.7"
 Requires-Dist: python-dateutil>=2.7.0
 

{cuenca_validations-2.0.0.dev5 → cuenca_validations-2.0.0.dev8}/cuenca_validations.egg-info/requires.txt

@@ -1,5 +1,6 @@
 clabe>=2.0.0.dev0
 pydantic[email]>=2.0
+pydantic-extra-types==2.10.1
 python-dateutil>=2.7.0
 
 [:python_version < "3.7"]

{cuenca_validations-2.0.0.dev5 → cuenca_validations-2.0.0.dev8}/setup.py

@@ -27,6 +27,7 @@ setup(
     install_requires=[
         'clabe>=2.0.0.dev0',
         'pydantic[email]>=2.0',
+        'pydantic-extra-types==2.10.1',
         'dataclasses>=0.6;python_version<"3.7"',
         'python-dateutil>=2.7.0',
     ],

{cuenca_validations-2.0.0.dev5 → cuenca_validations-2.0.0.dev8}/tests/test_card.py

@@ -11,7 +11,11 @@ INVALID_BIN = '4050000000000001'
 def test_invalid_bin_strict_payment():
     with pytest.raises(ValidationError) as exc_info:
         StrictPaymentCardNumber(card_number=INVALID_BIN)
-    assert 'Invalid BIN: Bank code not found.' in str(exc_info.value)
+    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
+    )
 
 
 def test_valid_bin_strict_payment():

{cuenca_validations-2.0.0.dev5 → cuenca_validations-2.0.0.dev8}/tests/test_errors.py

@@ -1,7 +1,4 @@
-import pytest
-
 from cuenca_validations.errors import (
-    ERROR_CODES,
     ApiError,
     AuthMethodNotAllowedError,
     CuencaError,
@@ -35,25 +32,3 @@ def test_error_codes_and_status():
     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_messages():
-    test_message = "Mensaje de prueba"
-
-    for error_class in ERROR_CODES.values():
-        with pytest.raises(error_class) as exc_info:
-            raise error_class(test_message)
-        assert str(exc_info.value) == test_message
-
-
-def test_error_codes_mapping():
-    for error_class in ERROR_CODES.values():
-        assert ERROR_CODES[error_class.code] == error_class
-
-
-def test_api_error():
-    with pytest.raises(ApiError) as exc_info:
-        raise ApiError("Error interno")
-    assert str(exc_info.value) == "Error interno"
-    assert exc_info.value.code == 500
-    assert exc_info.value.status_code == 500

{cuenca_validations-2.0.0.dev5 → cuenca_validations-2.0.0.dev8}/tests/test_types.py

@@ -551,7 +551,7 @@ def test_verification_attempt_request():
 
 def test_limited_wallet_request():
     curp = 'TAXM840916HNEMXT02'
-    rfc = Rfc('TAXM840916123')
+    rfc = 'TAXM840916123'
     # Not valid format
     with pytest.raises(ValidationError):
         LimitedWalletRequest(allowed_curp='123', allowed_rfc='123')
@@ -594,14 +594,10 @@ def test_strict_positive_float_valid():
 
 
 def test_strict_positive_float_invalid():
-    with pytest.raises(ValueError, match="Value must be greater than 0"):
+    with pytest.raises(ValueError, match="Input should be greater than 0"):
         TestFloatModel(value=0.0)
-    with pytest.raises(ValueError, match="Value must be greater than 0"):
+    with pytest.raises(ValueError, match="Input should be greater than 0"):
         TestFloatModel(value=-1.5)
-    with pytest.raises(ValueError, match="Value must be a float"):
-        TestFloatModel(value=5)
-    with pytest.raises(ValueError, match="Value must be a float"):
-        TestFloatModel(value="10.5")
 
 
 class TestIntModel(BaseModel):
@@ -620,19 +616,19 @@ def test_strict_positive_int_valid():
 
 
 def test_strict_positive_int_invalid():
-    with pytest.raises(ValueError, match="Value must be greater than 0"):
+    with pytest.raises(ValueError, match="Input should be greater than 0"):
         TestIntModel(value=0)
 
-    with pytest.raises(ValueError, match="Value must be greater than 0"):
+    with pytest.raises(ValueError, match="Input should be greater than 0"):
         TestIntModel(value=-5)
 
     with pytest.raises(
-        ValueError, match="Value must be less than 21_474_836_47"
+        ValueError, match="Input should be less than or equal to 2147483647"
     ):
         TestIntModel(value=21_474_836_48)
 
-    with pytest.raises(ValueError, match="Value must be an integer"):
+    with pytest.raises(ValueError, match="Input should be a valid integer"):
         TestIntModel(value=5.5)
 
-    with pytest.raises(ValueError, match="Value must be an integer"):
+    with pytest.raises(ValueError, match="Input should be a valid integer"):
         TestIntModel(value="10")

cuenca_validations-2.0.0.dev5/cuenca_validations/version.py

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