cuenca-validations 2.1.6.dev2__tar.gz → 2.1.7__tar.gz

{cuenca_validations-2.1.6.dev2 → cuenca_validations-2.1.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cuenca_validations
-Version: 2.1.6.dev2
+Version: 2.1.7
 Summary: Cuenca common validations
 Home-page: https://github.com/cuenca-mx/cuenca-validations
 Author: Cuenca

{cuenca_validations-2.1.6.dev2 → cuenca_validations-2.1.7}/cuenca_validations/types/__init__.py

@@ -55,6 +55,7 @@ __all__ = [
     'PlatformRequest',
     'PlatformType',
     'PosCapability',
+    'Profession',
     'QueryParams',
     'Rfc',
     'QuestionnairesRequest',
@@ -134,6 +135,7 @@ from .enums import (
     Language,
     PlatformType,
     PosCapability,
+    Profession,
     SATRegimeCode,
     SavingCategory,
     ServiceProviderCategory,

{cuenca_validations-2.1.6.dev2 → cuenca_validations-2.1.7}/cuenca_validations/types/enums.py

@@ -688,3 +688,19 @@ class SATRegimeCode(str, Enum):
     ING_PREM = "615"  # Régimen de los ingresos por obtención de premios
     AE_PLAT_TEC = "625"  # Régimen de las Actividades Empresariales con ingresos a través de Plataformas Tecnológicas # noqa: E501
     RS_CONF = "626"  # Régimen Simplificado de Confianza
+
+
+class Profession(str, Enum):
+    artisticas = 'Actividades Artísticas'
+    agropecuario = 'Agricultura, Ganadería o Pesca'
+    comercio = 'Comercio'
+    estudiante = 'Estudiante'
+    empleado = 'Empleado(a/e)'
+    emprendimiento = 'Emprendimiento'
+    hogar = 'Hogar'
+    profesor = 'Profesor(a/e)'
+    profesionista = 'Profesionista'
+    servidor_publico = 'Servidor(a/e) Público'
+    sistemas = 'Sistemas y Comunicaciones'
+    independiente = 'Trabajador(a/e) Independiente'
+    oficios = 'Oficios Varios'

{cuenca_validations-2.1.6.dev2 → cuenca_validations-2.1.7}/cuenca_validations/types/identities.py

@@ -1,18 +1,11 @@
 import datetime as dt
-from typing import Annotated, Any, Optional
+from typing import Annotated, Optional
 
-from pydantic import (
-    BaseModel,
-    ConfigDict,
-    Field,
-    SecretStr,
-    StringConstraints,
-    model_validator,
-)
+from pydantic import BaseModel, ConfigDict, Field, SecretStr, StringConstraints
 from pydantic_extra_types.phone_numbers import PhoneNumber
 
 from .enums import Country, KYCFileType, State, VerificationStatus
-from .general import SerializableIPvAnyAddress
+from .general import NonEmptyStr, SerializableIPvAnyAddress
 
 Password = Annotated[
     SecretStr,
@@ -43,6 +36,13 @@ Rfc = Annotated[
     ),
 ]
 
+# NOTE:
+# The Address model is kept for compatibility with legacy models and data
+# that expect all address fields to be optional. This allows older systems
+# or stored data using Address to continue working without breaking changes.
+# For new request validation, use AddressRequest, which enforces required
+# fields and is intended for validating incoming data.
+
 
 class Address(BaseModel):
     street: Optional[str] = None
@@ -69,16 +69,32 @@ class Address(BaseModel):
         }
     )
 
-    @model_validator(mode='before')
-    @classmethod
-    def full_name_complete(cls, values: dict[str, Any]) -> dict[str, Any]:
-        if values.get('full_name'):
-            return values
-        if not values.get('street'):
-            raise ValueError('required street')
-        if not values.get('ext_number'):
-            raise ValueError('required ext_number')
-        return values
+
+class AddressRequest(BaseModel):
+    # This model is mainly for request validation, enforcing required fields.
+    street: NonEmptyStr
+    ext_number: NonEmptyStr
+    int_number: Optional[NonEmptyStr] = None
+    colonia: NonEmptyStr
+    postal_code: NonEmptyStr
+    state: Optional[State] = None
+    country: Country
+    city: NonEmptyStr
+
+    model_config = ConfigDict(
+        json_schema_extra={
+            "example": {
+                "street": "Reforma",
+                "ext_number": "265",
+                "int_number": "5",
+                "colonia": "Cuauhtémoc",
+                "postal_code": "06500",
+                "state": "DF",
+                "country": "MX",
+                "city": "Cuauhtémoc",
+            }
+        }
+    )
 
 
 class Beneficiary(BaseModel):
@@ -86,7 +102,7 @@ class Beneficiary(BaseModel):
     birth_date: dt.date
     phone_number: PhoneNumber
     user_relationship: str
-    percentage: int
+    percentage: Annotated[int, Field(ge=1, le=100)]
     model_config = ConfigDict(
         json_schema_extra={
             "example": {

{cuenca_validations-2.1.6.dev2 → cuenca_validations-2.1.7}/cuenca_validations/types/requests.py

@@ -32,6 +32,7 @@ from ..types.enums import (
     KYCValidationSource,
     PlatformType,
     PosCapability,
+    Profession,
     SavingCategory,
     SessionType,
     State,
@@ -39,7 +40,6 @@ from ..types.enums import (
     TrackDataMethod,
     TransactionTokenValidationStatus,
     UserCardNotification,
-    UserStatus,
     VerificationType,
     WalletTransactionType,
     WebhookEvent,
@@ -64,14 +64,13 @@ from .general import (
     StrictPositiveInt,
 )
 from .identities import (
-    Address,
+    AddressRequest,
     Beneficiary,
     Curp,
     KYCFile,
     Password,
     PhoneNumber,
     Rfc,
-    TOSAgreement,
 )
 from .morals import (
     AuditDetails,
@@ -410,43 +409,25 @@ class UserTOSAgreementRequest(BaseModel):
 
 
 class UserRequest(BaseModel):
-    id: Optional[str] = Field(
-        None, description='if you want to create with specific `id`'
-    )
     curp: Curp = Field(
-        description='Previously validated in `curp_validations`'
-    )
-    phone_number: Optional[PhoneNumber] = Field(
-        None, description='Only if you validated previously on your side'
-    )
-    email_address: Optional[EmailStr] = Field(
-        None, description='Only if you validated previously on your side'
-    )
-    profession: Optional[str] = None
-    address: Optional[Address] = None
-    status: Optional[UserStatus] = Field(
-        None,
-        description='Status that the user will have when created. '
-        'Defined by platform',
+        description=(
+            'Mexican government ID (18 characters). ' 'Must be pre-validated.'
+        )
     )
-    required_level: Optional[int] = Field(
-        None,
-        ge=1,
-        le=3,
-        description='Maximum level a User can reach. Defined by platform',
+
+    profession: Profession = Field(description='User profession or occupation')
+    address: AddressRequest = Field(
+        description='User residential address information'
     )
-    phone_verification_id: Optional[str] = Field(
-        None,
-        description='Only if you validated it previously with the '
-        'resource `verifications`',
+    phone_verification_id: str = Field(
+        ...,
+        description='ID of previously validated phone verification',
     )
-    email_verification_id: Optional[str] = Field(
-        None,
-        description='Only if you validated it previously with the '
-        'resource `verifications`',
+    email_verification_id: str = Field(
+        ...,
+        description='ID of previously validated email verification',
     )
-    terms_of_service: Optional[TOSRequest] = None
-    signature: Optional[KYCFile] = None
+
     model_config = ConfigDict(
         json_schema_extra={
             'example': {
@@ -454,7 +435,7 @@ class UserRequest(BaseModel):
                 'phone_number': '+525511223344',
                 'email_address': 'user@example.com',
                 'profession': 'engineer',
-                'address': Address.schema().get('example'),
+                'address': AddressRequest.model_json_schema().get('example'),
             }
         },
     )
@@ -479,21 +460,16 @@ class UserRequest(BaseModel):
 
 
 class UserUpdateRequest(BaseModel):
-    phone_number: Optional[PhoneNumber] = None
-    email_address: Optional[EmailStr] = None
-    profession: Optional[str] = None
+    profession: Optional[Profession] = None
     verification_id: Optional[str] = None
     email_verification_id: Optional[str] = None
     phone_verification_id: Optional[str] = None
-    address: Optional[Address] = None
+    address: Optional[AddressRequest] = None
     beneficiaries: Optional[list[Beneficiary]] = None
     govt_id: Optional[KYCFile] = None
     proof_of_address: Optional[KYCFile] = None
     proof_of_life: Optional[KYCFile] = None
     signature: Optional[KYCFile] = None
-    status: Optional[UserStatus] = None
-    terms_of_service: Optional[TOSRequest] = None
-    platform_terms_of_service: Optional[TOSAgreement] = None
     curp_document_uri: Optional[SerializableHttpUrl] = None
 
     @field_validator('beneficiaries')
@@ -501,8 +477,8 @@ class UserUpdateRequest(BaseModel):
     def beneficiary_percentage(
         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.')
+        if beneficiaries and sum(b.percentage for b in beneficiaries) != 100:
+            raise ValueError('The total percentage should be 100%')
         return beneficiaries
 
 
@@ -709,7 +685,7 @@ class PartnerRequest(BaseRequest):
     web_site: str
     phone_number: PhoneNumber
     email_address: EmailStr
-    address: Address
+    address: AddressRequest
 
 
 class PartnerUpdateRequest(BaseRequest):
@@ -723,7 +699,7 @@ class PartnerUpdateRequest(BaseRequest):
     web_site: Optional[str] = None
     phone_number: Optional[PhoneNumber] = None
     email_address: Optional[EmailStr] = None
-    address: Optional[Address] = None
+    address: Optional[AddressRequest] = None
     business_details: Optional[BusinessDetails] = None
     transactional_profile: Optional[TransactionalProfile] = None
     external_account: Optional[Clabe] = None

cuenca_validations-2.1.7/cuenca_validations/version.py

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

{cuenca_validations-2.1.6.dev2 → cuenca_validations-2.1.7}/cuenca_validations.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cuenca_validations
-Version: 2.1.6.dev2
+Version: 2.1.7
 Summary: Cuenca common validations
 Home-page: https://github.com/cuenca-mx/cuenca-validations
 Author: Cuenca

{cuenca_validations-2.1.6.dev2 → cuenca_validations-2.1.7}/tests/test_types.py

@@ -10,7 +10,6 @@ from pydantic import AfterValidator, BaseModel, SecretStr, ValidationError
 from pydantic.fields import FieldInfo
 
 from cuenca_validations.types import (
-    Address,
     CardQuery,
     JSONEncoder,
     QueryParams,
@@ -23,6 +22,7 @@ from cuenca_validations.types import (
 from cuenca_validations.types.enums import (
     Country,
     EcommerceIndicator,
+    Profession,
     SessionType,
     State,
 )
@@ -303,60 +303,50 @@ def test_saving_update_request():
         SavingUpdateRequest(**data)
 
 
-def test_address_validation():
-    data = dict(
-        full_name='Varsovia 36, Col Cuahutemoc',
-    )
-    assert Address(**data)
-    with pytest.raises(ValueError) as v:
-        Address(**dict())
-    assert 'required street' in str(v)
-    data = dict(street='somestreet')
-    with pytest.raises(ValueError) as v:
-        Address(**data)
-    assert 'required ext_number' in str(v)
-    data = dict(
-        street='varsovia',
-        ext_number='36',
-        state=State.DF,
-        country=Country.MX,
+@freeze_time('2022-01-01')
+def test_user_request():
+    request = dict(
+        curp='ABCD920604HDFSRN03',
+        profession=Profession.empleado,
+        address=dict(
+            street='calle 1',
+            ext_number='2',
+            int_number='3',
+            colonia='Juarez',
+            postal_code='09900',
+            state=State.DF,
+            country=Country.MX,
+            city='Obrera',
+        ),
+        phone_verification_id='VE12345678',
+        email_verification_id='VE0987654321',
     )
-    assert Address(**data)
+    assert UserRequest(**request).model_dump() == request
 
 
 @freeze_time('2022-01-01')
-def test_user_request():
+def test_user_request_underage():
     request = dict(
-        id=None,
-        curp='ABCD920604HDFSRN03',
-        phone_number='+525555555555',
-        email_address='email@email.com',
+        curp='ABCD060604HDFSRN03',  # underage CURP
         profession='worker',
-        status='active',
         address=dict(
             street='calle 1',
             ext_number='2',
             int_number='3',
             colonia='Juarez',
             postal_code='09900',
-            state=State.DF.value,
+            state=State.DF,
             country=Country.MX,
             city='Obrera',
-            full_name=None,
         ),
         phone_verification_id='VE12345678',
         email_verification_id='VE0987654321',
-        required_level=3,
-        terms_of_service=None,
-        signature=None,
     )
-    assert UserRequest(**request).model_dump() == request
 
-    # changing curp so user is underage
-    request['curp'] = 'ABCD060604HDFSRN03'
     with pytest.raises(ValueError) as v:
         UserRequest(**request)
-        assert 'User does not meet age requirement.' in str(v)
+
+    assert 'User does not meet age requirement.' in str(v)
 
 
 @freeze_time('2022-01-01')
@@ -438,7 +428,7 @@ def test_user_update_request():
             birth_date=dt.date(2020, 1, 1).isoformat(),
             phone_number='+525555555555',
             user_relationship='brother',
-            percentage=50,
+            percentage=100,
         ),
     ]
     assert UserUpdateRequest(**request)
@@ -449,12 +439,21 @@ def test_user_update_request():
             birth_date=dt.date(2020, 1, 1).isoformat(),
             phone_number='+525555555555',
             user_relationship='brother',
-            percentage=101,
+            percentage=50,
+        ),
+        dict(
+            name='José Pérez',
+            birth_date=dt.date(2020, 1, 2).isoformat(),
+            phone_number='+525544444444',
+            user_relationship='brother',
+            percentage=51,
         ),
     ]
-    with pytest.raises(ValueError) as v:
+    with pytest.raises(ValidationError) as v:
         UserUpdateRequest(**request)
-        assert 'The total percentage is more than 100.' in str(v)
+
+    assert 'The total percentage should be 100%' in str(v)
+    request.pop('beneficiaries')
 
     tos_request = dict(
         terms_of_service=dict(
@@ -485,12 +484,6 @@ def test_user_update_request():
     )
     UserUpdateRequest(**kyc_request)
 
-    # chagning to invalid request
-    tos_request['terms_of_service']['ip'] = 'not valid ip'
-    with pytest.raises(ValueError) as v:
-        UserUpdateRequest(**tos_request)
-    assert 'not valid ip' in str(v.value)
-
 
 def test_session_request():
     data = dict(

cuenca_validations-2.1.6.dev2/cuenca_validations/version.py

@@ -1 +0,0 @@
-__version__ = '2.1.6.dev2'