cuenca-validations 2.1.8.dev2__tar.gz → 2.1.8.dev5__tar.gz

{cuenca_validations-2.1.8.dev2 → cuenca_validations-2.1.8.dev5}/PKG-INFO

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

{cuenca_validations-2.1.8.dev2 → cuenca_validations-2.1.8.dev5}/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,
@@ -45,15 +38,14 @@ Rfc = Annotated[
 
 
 class Address(BaseModel):
-    street: Optional[str] = None
-    ext_number: Optional[str] = None
-    int_number: Optional[str] = None
-    colonia: Optional[str] = None
-    postal_code: Optional[str] = None
+    street: NonEmptyStr
+    ext_number: NonEmptyStr
+    int_number: Optional[NonEmptyStr] = None
+    colonia: Optional[NonEmptyStr] = None
+    postal_code: Optional[NonEmptyStr] = None
     state: Optional[State] = None
     country: Optional[Country] = None
-    city: Optional[str] = None
-    full_name: Optional[str] = None
+    city: Optional[NonEmptyStr] = None
     model_config = ConfigDict(
         json_schema_extra={
             "example": {
@@ -69,17 +61,6 @@ 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-2.1.8.dev2 → cuenca_validations-2.1.8.dev5}/cuenca_validations/types/requests.py

@@ -64,7 +64,6 @@ from .general import (
     StrictPositiveInt,
 )
 from .identities import (
-    Address,
     Beneficiary,
     Curp,
     KYCFile,
@@ -84,6 +83,24 @@ 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")
 
@@ -423,7 +440,7 @@ class UserRequest(BaseModel):
         None, description='Only if you validated previously on your side'
     )
     profession: Optional[str] = None
-    address: Optional[Address] = None
+    address: AddressRequest
     status: Optional[UserStatus] = Field(
         None,
         description='Status that the user will have when created. '
@@ -454,7 +471,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'),
             }
         },
     )
@@ -485,7 +502,7 @@ class UserUpdateRequest(BaseModel):
     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
@@ -709,7 +726,7 @@ class PartnerRequest(BaseRequest):
     web_site: str
     phone_number: PhoneNumber
     email_address: EmailStr
-    address: Address
+    address: AddressRequest
 
 
 class PartnerUpdateRequest(BaseRequest):
@@ -723,7 +740,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.8.dev5/cuenca_validations/version.py

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

{cuenca_validations-2.1.8.dev2 → cuenca_validations-2.1.8.dev5}/cuenca_validations.egg-info/PKG-INFO

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

{cuenca_validations-2.1.8.dev2 → cuenca_validations-2.1.8.dev5}/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,
@@ -21,7 +20,6 @@ from cuenca_validations.types import (
     get_state_name,
 )
 from cuenca_validations.types.enums import (
-    Country,
     EcommerceIndicator,
     SessionType,
     State,
@@ -303,27 +301,6 @@ 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(
@@ -337,12 +314,7 @@ def test_user_request():
             street='calle 1',
             ext_number='2',
             int_number='3',
-            colonia='Juarez',
-            postal_code='09900',
-            state=State.DF.value,
-            country=Country.MX,
-            city='Obrera',
-            full_name=None,
+            postal_code_id='PC2ygq9j2bS9-9tsuVawzErA',
         ),
         phone_verification_id='VE12345678',
         email_verification_id='VE0987654321',

cuenca_validations-2.1.8.dev2/cuenca_validations/version.py

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