Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions cuenca_validations/types/general.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,25 @@
from dataclasses import dataclass
from typing import Annotated, Any, Optional

from pydantic import AnyUrl, Field, HttpUrl, PlainSerializer, StringConstraints
from pydantic import (
AnyUrl,
Field,
HttpUrl,
IPvAnyAddress,
PlainSerializer,
StringConstraints,
)

from ..validators import sanitize_dict, sanitize_item
from .enums import State

# We use custom serializers for IP addresses and URLs because
# Pydantic's IPvAnyAddress, AnyUrl, HttpUrl types are not JSON serializable.
SerializableHttpUrl = Annotated[HttpUrl, PlainSerializer(str, return_type=str)]

SerializableAnyUrl = Annotated[AnyUrl, PlainSerializer(str, return_type=str)]
SerializableIPvAnyAddress = Annotated[
IPvAnyAddress, PlainSerializer(str, return_type=str)
]


class SantizedDict(dict):
Expand Down
4 changes: 2 additions & 2 deletions cuenca_validations/types/identities.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
BaseModel,
ConfigDict,
Field,
IPvAnyAddress,
SecretStr,
StringConstraints,
model_validator,
)
from pydantic_extra_types.phone_numbers import PhoneNumber

from .enums import Country, KYCFileType, State, VerificationStatus
from .general import SerializableIPvAnyAddress

Password = Annotated[
SecretStr,
Expand Down Expand Up @@ -165,7 +165,7 @@ class KYCFile(BaseModel):

class TOSAgreement(BaseModel):
version: str
ip: IPvAnyAddress
ip: SerializableIPvAnyAddress
location: Optional[str] = None
model_config = ConfigDict(
json_schema_extra={
Expand Down
4 changes: 2 additions & 2 deletions cuenca_validations/types/requests.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
field_validator,
model_validator,
)
from pydantic.networks import IPvAnyAddress

from ..types.enums import (
AuthorizerTransaction,
Expand Down Expand Up @@ -58,6 +57,7 @@
LogConfig,
SerializableAnyUrl,
SerializableHttpUrl,
SerializableIPvAnyAddress,
StrictPositiveInt,
)
from .identities import (
Expand Down Expand Up @@ -398,7 +398,7 @@ class TOSRequest(BaseModel):
type: TermsOfService
version: str
location: Optional[str] = None
ip: Optional[IPvAnyAddress] = None
ip: Optional[SerializableIPvAnyAddress] = None


class UserRequest(BaseModel):
Expand Down
2 changes: 1 addition & 1 deletion cuenca_validations/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '2.1.1'
__version__ = '2.1.2'