cuenca-validations 2.1.8.dev5__py3-none-any.whl → 2.1.9.dev1__py3-none-any.whl

cuenca_validations/types/__init__.py

@@ -7,7 +7,6 @@ __all__ = [
     'BalanceEntryQuery',
     'BankAccountValidationQuery',
     'BankAccountValidationRequest',
-    'PostalCodeQuery',
     'BankAccountStatus',
     'BatchFileMetadata',
     'Beneficiary',
@@ -184,7 +183,6 @@ from .queries import (
     EventQuery,
     FileQuery,
     IdentityQuery,
-    PostalCodeQuery,
     QueryParams,
     SessionQuery,
     StatementQuery,

cuenca_validations/types/identities.py

@@ -1,11 +1,18 @@
 import datetime as dt
-from typing import Annotated, Optional
+from typing import Annotated, Any, Optional
 
-from pydantic import BaseModel, ConfigDict, Field, SecretStr, StringConstraints
+from pydantic import (
+    BaseModel,
+    ConfigDict,
+    Field,
+    SecretStr,
+    StringConstraints,
+    model_validator,
+)
 from pydantic_extra_types.phone_numbers import PhoneNumber
 
 from .enums import Country, KYCFileType, State, VerificationStatus
-from .general import NonEmptyStr, SerializableIPvAnyAddress
+from .general import SerializableIPvAnyAddress
 
 Password = Annotated[
     SecretStr,
@@ -38,14 +45,15 @@ Rfc = Annotated[
 
 
 class Address(BaseModel):
-    street: NonEmptyStr
-    ext_number: NonEmptyStr
-    int_number: Optional[NonEmptyStr] = None
-    colonia: Optional[NonEmptyStr] = None
-    postal_code: Optional[NonEmptyStr] = None
+    street: Optional[str] = None
+    ext_number: Optional[str] = None
+    int_number: Optional[str] = None
+    colonia: Optional[str] = None
+    postal_code: Optional[str] = None
     state: Optional[State] = None
     country: Optional[Country] = None
-    city: Optional[NonEmptyStr] = None
+    city: Optional[str] = None
+    full_name: Optional[str] = None
     model_config = ConfigDict(
         json_schema_extra={
             "example": {
@@ -61,6 +69,17 @@ 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 Beneficiary(BaseModel):
     name: str

cuenca_validations/types/queries.py

@@ -179,7 +179,3 @@ class FileQuery(QueryParams):
 class BankAccountValidationQuery(QueryParams):
     account_number: Optional[str] = None
     status: Optional[BankAccountStatus] = None
-
-
-class PostalCodeQuery(QueryParams):
-    postal_code: str

cuenca_validations/types/requests.py

@@ -64,6 +64,7 @@ from .general import (
     StrictPositiveInt,
 )
 from .identities import (
+    Address,
     Beneficiary,
     Curp,
     KYCFile,
@@ -83,24 +84,6 @@ from .morals import (
 )
 
 
-class AddressRequest(BaseModel):
-    street: NonEmptyStr
-    ext_number: NonEmptyStr
-    int_number: Optional[NonEmptyStr] = None
-    postal_code_id: NonEmptyStr
-
-    model_config = ConfigDict(
-        json_schema_extra={
-            "example": {
-                "street": "Reforma",
-                "ext_number": "265",
-                "int_number": "5",
-                "postal_code_id": "PC2ygq9j2bS9-9tsuVawzErA",
-            }
-        }
-    )
-
-
 class BaseRequest(BaseModel):
     model_config = ConfigDict(extra="forbid")
 
@@ -424,6 +407,7 @@ class TOSRequest(BaseModel):
 class UserTOSAgreementRequest(BaseModel):
     tos_id: str
     location: Coordinate
+    signature: SerializableHttpUrl | None = None
 
 
 class UserRequest(BaseModel):
@@ -440,7 +424,7 @@ class UserRequest(BaseModel):
         None, description='Only if you validated previously on your side'
     )
     profession: Optional[str] = None
-    address: AddressRequest
+    address: Optional[Address] = None
     status: Optional[UserStatus] = Field(
         None,
         description='Status that the user will have when created. '
@@ -471,7 +455,7 @@ class UserRequest(BaseModel):
                 'phone_number': '+525511223344',
                 'email_address': 'user@example.com',
                 'profession': 'engineer',
-                'address': AddressRequest.model_json_schema().get('example'),
+                'address': Address.schema().get('example'),
             }
         },
     )
@@ -502,7 +486,7 @@ class UserUpdateRequest(BaseModel):
     verification_id: Optional[str] = None
     email_verification_id: Optional[str] = None
     phone_verification_id: Optional[str] = None
-    address: Optional[AddressRequest] = None
+    address: Optional[Address] = None
     beneficiaries: Optional[list[Beneficiary]] = None
     govt_id: Optional[KYCFile] = None
     proof_of_address: Optional[KYCFile] = None
@@ -726,7 +710,7 @@ class PartnerRequest(BaseRequest):
     web_site: str
     phone_number: PhoneNumber
     email_address: EmailStr
-    address: AddressRequest
+    address: Address
 
 
 class PartnerUpdateRequest(BaseRequest):
@@ -740,7 +724,7 @@ class PartnerUpdateRequest(BaseRequest):
     web_site: Optional[str] = None
     phone_number: Optional[PhoneNumber] = None
     email_address: Optional[EmailStr] = None
-    address: Optional[AddressRequest] = None
+    address: Optional[Address] = None
     business_details: Optional[BusinessDetails] = None
     transactional_profile: Optional[TransactionalProfile] = None
     external_account: Optional[Clabe] = None

cuenca_validations/version.py

@@ -1 +1 @@
-__version__ = '2.1.8.dev5'
+__version__ = '2.1.9.dev1'

{cuenca_validations-2.1.8.dev5.dist-info → cuenca_validations-2.1.9.dev1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cuenca_validations
-Version: 2.1.8.dev5
+Version: 2.1.9.dev1
 Summary: Cuenca common validations
 Home-page: https://github.com/cuenca-mx/cuenca-validations
 Author: Cuenca

{cuenca_validations-2.1.8.dev5.dist-info → cuenca_validations-2.1.9.dev1.dist-info}/RECORD

@@ -4,25 +4,25 @@ cuenca_validations/errors.py,sha256=OtM8EgiKqYdz9Hn66AbBO96orL1or7efkyt0vh0Zxbs,
 cuenca_validations/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cuenca_validations/typing.py,sha256=1QCu81IbVZZpyInjyeAuO-nF36gpT5Gi4o6V9PozuOU,204
 cuenca_validations/validators.py,sha256=wzwLnJ4wHggZvqp3mearbFkzvDERGeTNvJkuofQnuMc,1484
-cuenca_validations/version.py,sha256=duU_AdKadD1ZARK_F3KZT5u5R_p3hMMNhAyc7s5vM7I,27
-cuenca_validations/types/__init__.py,sha256=jSc37T7oFYbaJFQhES7AQSWnMsgJtc21oPXb39V9SNg,4809
+cuenca_validations/version.py,sha256=K0tGeUKZQpqxelTLpDhoi_2JCO1-4RT69FepccoTGao,27
+cuenca_validations/types/__init__.py,sha256=UNb7auBcD0qp-x9TX7TNNj8IKo7uaI7xHaf9PYmaziY,4765
 cuenca_validations/types/card.py,sha256=UGzz8NTFAverUmdUKAK1oGHnOnjSNTpIRUm93vKSSGY,1295
 cuenca_validations/types/enums.py,sha256=Vm9HGf83jPkEp8iZ-KGtKGWQGx5q-cIUuQj32y_QcvU,18997
 cuenca_validations/types/files.py,sha256=2CszbwF9ytXV9suFFwyDjYG4XxY8UhCjRw3HttVXXNw,269
 cuenca_validations/types/general.py,sha256=vJmQBD_Iv_hsxD8x3_Bip-NlYAiE2rmXSPQKj4kTtto,2621
 cuenca_validations/types/helpers.py,sha256=6rHUhwoQ7jJZtGcW3LX-W5ZDl42PWE1RoBpGme7KCkk,610
-cuenca_validations/types/identities.py,sha256=y8ywi2qvp6X1GrfZ8vRbFvOi3PxqRaOuoj1bwU-eOb8,4505
+cuenca_validations/types/identities.py,sha256=-TWRDRpmIaCI4nE4hVy1FQtQtlxuErtmEtzJW1FBzec,4956
 cuenca_validations/types/morals.py,sha256=m8kAedevmwfSPTA9GYe03l7pkgipynwYgKfejyVtnuI,1813
-cuenca_validations/types/queries.py,sha256=fDXm2LIpM4IrkaANTDTr3_tqqAK6nvs5-CGCTjjK9Oo,4759
-cuenca_validations/types/requests.py,sha256=fXk1O3oX4MosBv1C0xGmkVGPgYSUFuOifk8n6wPcE6w,21804
-cuenca_validations-2.1.8.dev5.dist-info/licenses/LICENSE,sha256=wR76FmxBbfnQpwELkkE5iMF8sFIafEMgXLTE4N4WPTc,1063
+cuenca_validations/types/queries.py,sha256=KCRx0sPzWDtDDbZysmFGVgANgfqil17EITWaG7tGQ-A,4700
+cuenca_validations/types/requests.py,sha256=zGlKCy5o2FbPvU49znxspCA8fIihG0rRwWA-mvPOw6c,21387
+cuenca_validations-2.1.9.dev1.dist-info/licenses/LICENSE,sha256=wR76FmxBbfnQpwELkkE5iMF8sFIafEMgXLTE4N4WPTc,1063
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/test_card.py,sha256=QAfRz7e11gWICPnFJZ2tiYgUsFV3C9TwzJXrDnDNXFw,1202
 tests/test_errors.py,sha256=ixiIgEuBuzfsL5p4uCFdF32XqFRtTPF6EVhGJ0keOrI,930
 tests/test_helpers.py,sha256=ubzpi1UXCryLQdgsT_Zm2IX-XE_4L0dnHnhLwH06xK8,748
 tests/test_statement.py,sha256=IOE0rRRBgBZSJv_FLaETEyn5NzzXKMNTqgjv99GX-68,1436
-tests/test_types.py,sha256=peD5U1PIS7wZvdF1hTXNoStrYc3CkJbZnKPGJaXZz70,18656
-cuenca_validations-2.1.8.dev5.dist-info/METADATA,sha256=2Z9W6wfeMX284M4uf4pw9h4KdO0VomylaflNPQZdkbw,1599
-cuenca_validations-2.1.8.dev5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cuenca_validations-2.1.8.dev5.dist-info/top_level.txt,sha256=4233xdOs2HtuT-GFRjcDcwK0IwdwvWdczOtk0fPB6Gw,25
-cuenca_validations-2.1.8.dev5.dist-info/RECORD,,
+tests/test_types.py,sha256=K_YNFz0Kac3k8fJNeXuYGkL1hjXDQu084jCX6xEMEE4,19348
+cuenca_validations-2.1.9.dev1.dist-info/METADATA,sha256=LObUZJhrJ7mM1z8eUTy8Wl7-iHDOSIj5RgPUrlNBBfc,1599
+cuenca_validations-2.1.9.dev1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cuenca_validations-2.1.9.dev1.dist-info/top_level.txt,sha256=4233xdOs2HtuT-GFRjcDcwK0IwdwvWdczOtk0fPB6Gw,25
+cuenca_validations-2.1.9.dev1.dist-info/RECORD,,

tests/test_types.py

@@ -10,6 +10,7 @@ from pydantic import AfterValidator, BaseModel, SecretStr, ValidationError
 from pydantic.fields import FieldInfo
 
 from cuenca_validations.types import (
+    Address,
     CardQuery,
     JSONEncoder,
     QueryParams,
@@ -20,6 +21,7 @@ from cuenca_validations.types import (
     get_state_name,
 )
 from cuenca_validations.types.enums import (
+    Country,
     EcommerceIndicator,
     SessionType,
     State,
@@ -301,6 +303,27 @@ 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,
+    )
+    assert Address(**data)
+
+
 @freeze_time('2022-01-01')
 def test_user_request():
     request = dict(
@@ -314,7 +337,12 @@ def test_user_request():
             street='calle 1',
             ext_number='2',
             int_number='3',
-            postal_code_id='PC2ygq9j2bS9-9tsuVawzErA',
+            colonia='Juarez',
+            postal_code='09900',
+            state=State.DF.value,
+            country=Country.MX,
+            city='Obrera',
+            full_name=None,
         ),
         phone_verification_id='VE12345678',
         email_verification_id='VE0987654321',