cuenca 2.0.0.dev6__py3-none-any.whl → 2.0.1__py3-none-any.whl

cuenca/__init__.py

@@ -44,8 +44,6 @@ __all__ = [
     'get_balance',
 ]
 
-from typing import cast
-
 from . import http
 from .resources import (
     Account,
@@ -96,5 +94,5 @@ session = http.session
 
 
 def get_balance(session: http.Session = session) -> int:
-    balance_entry = cast('BalanceEntry', BalanceEntry.first(session=session))
+    balance_entry = BalanceEntry.first(session=session)
     return balance_entry.rolling_balance if balance_entry else 0

cuenca/resources/__init__.py

@@ -38,7 +38,6 @@ __all__ = [
     'WalletTransaction',
     'Webhook',
     'WhatsappTransfer',
-    'Jwt',
 ]
 
 from .accounts import Account
@@ -60,7 +59,6 @@ from .file_batches import FileBatch
 from .files import File
 from .identities import Identity
 from .identity_events import IdentityEvent
-from .jwt import Jwt
 from .kyc_validations import KYCValidation
 from .kyc_verifications import KYCVerification
 from .limited_wallets import LimitedWallet

cuenca/resources/api_keys.py

@@ -1,8 +1,8 @@
 import datetime as dt
-from typing import ClassVar, Optional, cast
+from typing import ClassVar, Optional
 
 from cuenca_validations.types import ApiKeyQuery, ApiKeyUpdateRequest
-from pydantic import ConfigDict, SecretStr
+from pydantic import ConfigDict
 
 from ..http import Session, session as global_session
 from .base import Creatable, Queryable, Retrievable, Updateable
@@ -12,7 +12,7 @@ class ApiKey(Creatable, Queryable, Retrievable, Updateable):
     _resource: ClassVar = 'api_keys'
     _query_params: ClassVar = ApiKeyQuery
 
-    secret: SecretStr
+    secret: str
     deactivated_at: Optional[dt.datetime] = None
     user_id: Optional[str] = None
     model_config = ConfigDict(
@@ -37,7 +37,7 @@ class ApiKey(Creatable, Queryable, Retrievable, Updateable):
 
     @classmethod
     def create(cls, *, session: Session = global_session) -> 'ApiKey':
-        return cast('ApiKey', cls._create(session=session))
+        return cls._create(session=session)
 
     @classmethod
     def deactivate(
@@ -56,7 +56,7 @@ class ApiKey(Creatable, Queryable, Retrievable, Updateable):
         """
         url = cls._resource + f'/{api_key_id}'
         resp = session.delete(url, dict(minutes=minutes))
-        return cast('ApiKey', cls._from_dict(resp))
+        return cls(**resp)
 
     @classmethod
     def update(
@@ -75,5 +75,4 @@ class ApiKey(Creatable, Queryable, Retrievable, Updateable):
         req = ApiKeyUpdateRequest(
             metadata=metadata, user_id=user_id, platform_id=platform_id
         )
-        resp = cls._update(api_key_id, **req.model_dump(), session=session)
-        return cast('ApiKey', resp)
+        return cls._update(api_key_id, **req.model_dump(), session=session)

cuenca/resources/arpc.py

@@ -1,7 +1,6 @@
 import datetime as dt
-from typing import ClassVar, Optional, cast
+from typing import ClassVar, Optional
 
-from cuenca_validations.types.enums import TrackDataMethod
 from cuenca_validations.types.requests import ARPCRequest
 
 from ..http import Session, session as global_session
@@ -51,6 +50,6 @@ class Arpc(Creatable):
             transaction_counter=transaction_counter,
             pan_sequence=pan_sequence,
             unique_number=unique_number,
-            track_data_method=cast(TrackDataMethod, track_data_method),
+            track_data_method=track_data_method,
         )
-        return cast('Arpc', cls._create(session=session, **req.model_dump()))
+        return cls._create(session=session, **req.model_dump())

cuenca/resources/base.py

@@ -2,7 +2,7 @@ import base64
 import datetime as dt
 import json
 from io import BytesIO
-from typing import Any, ClassVar, Generator, Optional
+from typing import Any, ClassVar, Generator, Optional, Type, TypeVar, cast
 from urllib.parse import urlencode
 
 from cuenca_validations.types import (
@@ -12,34 +12,22 @@ from cuenca_validations.types import (
     TransactionQuery,
     TransactionStatus,
 )
-from pydantic import BaseModel
+from pydantic import BaseModel, ConfigDict
 
 from ..exc import MultipleResultsFound, NoResultFound
 from ..http import Session, session as global_session
 
+R_co = TypeVar('R_co', bound='Resource', covariant=True)
+
 
 class Resource(BaseModel):
     _resource: ClassVar[str]
 
     id: str
 
-    @classmethod
-    def _from_dict(cls, obj_dict: dict[str, Any]) -> 'Resource':
-        cls._filter_excess_fields(obj_dict)
-        return cls(**obj_dict)
-
-    @classmethod
-    def _filter_excess_fields(cls, obj_dict):
-        """
-        dataclasses don't allow __init__ to be called with excess fields. This
-        method allows the API to add fields in the response body without
-        breaking the client
-        """
-        excess = set(obj_dict.keys()) - set(
-            cls.schema().get("properties").keys()
-        )
-        for f in excess:
-            del obj_dict[f]
+    model_config = ConfigDict(
+        extra="ignore",
+    )
 
     def to_dict(self):
         return SantizedDict(self.model_dump())
@@ -48,12 +36,15 @@ class Resource(BaseModel):
 class Retrievable(Resource):
     @classmethod
     def retrieve(
-        cls, id: str, *, session: Session = global_session
-    ) -> Resource:
+        cls: Type[R_co],
+        id: str,
+        *,
+        session: Session = global_session,
+    ) -> R_co:
         resp = session.get(f'/{cls._resource}/{id}')
-        return cls._from_dict(resp)
+        return cls(**resp)
 
-    def refresh(self, *, session: Session = global_session):
+    def refresh(self, *, session: Session = global_session) -> None:
         new = self.retrieve(self.id, session=session)
         for attr, value in new.__dict__.items():
             setattr(self, attr, value)
@@ -61,9 +52,14 @@ class Retrievable(Resource):
 
 class Creatable(Resource):
     @classmethod
-    def _create(cls, *, session: Session = global_session, **data) -> Resource:
+    def _create(
+        cls: Type[R_co],
+        *,
+        session: Session = global_session,
+        **data: Any,
+    ) -> R_co:
         resp = session.post(cls._resource, data)
-        return cls._from_dict(resp)
+        return cls(**resp)
 
 
 class Updateable(Resource):
@@ -72,10 +68,14 @@ class Updateable(Resource):
 
     @classmethod
     def _update(
-        cls, id: str, *, session: Session = global_session, **data
-    ) -> Resource:
+        cls: Type[R_co],
+        id: str,
+        *,
+        session: Session = global_session,
+        **data: Any,
+    ) -> R_co:
         resp = session.patch(f'/{cls._resource}/{id}', data)
-        return cls._from_dict(resp)
+        return cls(**resp)
 
 
 class Deactivable(Resource):
@@ -83,20 +83,24 @@ class Deactivable(Resource):
 
     @classmethod
     def deactivate(
-        cls, id: str, *, session: Session = global_session, **data
-    ) -> Resource:
+        cls: Type[R_co],
+        id: str,
+        *,
+        session: Session = global_session,
+        **data: Any,
+    ) -> R_co:
         resp = session.delete(f'/{cls._resource}/{id}', data)
-        return cls._from_dict(resp)
+        return cls(**resp)
 
     @property
-    def is_active(self):
+    def is_active(self) -> bool:
         return not self.deactivated_at
 
 
 class Downloadable(Resource):
     @classmethod
     def download(
-        cls,
+        cls: Type[R_co],
         id: str,
         file_format: FileFormat = FileFormat.any,
         *,
@@ -121,13 +125,13 @@ class Downloadable(Resource):
 class Uploadable(Resource):
     @classmethod
     def _upload(
-        cls,
+        cls: Type[R_co],
         file: bytes,
         user_id: str,
         *,
         session: Session = global_session,
-        **data,
-    ) -> Resource:
+        **data: Any,
+    ) -> R_co:
         encoded_file = base64.b64encode(file)
         resp = session.request(
             'post',
@@ -138,7 +142,7 @@ class Uploadable(Resource):
                 **{k: (None, v) for k, v in data.items()},
             ),
         )
-        return cls._from_dict(json.loads(resp))
+        return cls(**json.loads(resp))
 
 
 class Queryable(Resource):
@@ -148,9 +152,12 @@ class Queryable(Resource):
 
     @classmethod
     def one(
-        cls, *, session: Session = global_session, **query_params
-    ) -> Resource:
-        q = cls._query_params(limit=2, **query_params)
+        cls: Type[R_co],
+        *,
+        session: Session = global_session,
+        **query_params: Any,
+    ) -> R_co:
+        q = cast(Queryable, cls)._query_params(limit=2, **query_params)
         resp = session.get(cls._resource, q.model_dump())
         items = resp['items']
         len_items = len(items)
@@ -158,40 +165,49 @@ class Queryable(Resource):
             raise NoResultFound
         if len_items > 1:
             raise MultipleResultsFound
-        return cls._from_dict(items[0])
+        return cls(**items[0])
 
     @classmethod
     def first(
-        cls, *, session: Session = global_session, **query_params
-    ) -> Optional[Resource]:
-        q = cls._query_params(limit=1, **query_params)
+        cls: Type[R_co],
+        *,
+        session: Session = global_session,
+        **query_params: Any,
+    ) -> Optional[R_co]:
+        q = cast(Queryable, cls)._query_params(limit=1, **query_params)
         resp = session.get(cls._resource, q.model_dump())
         try:
             item = resp['items'][0]
         except IndexError:
             rv = None
         else:
-            rv = cls._from_dict(item)
+            rv = cls(**item)
         return rv
 
     @classmethod
     def count(
-        cls, *, session: Session = global_session, **query_params
+        cls: Type[R_co],
+        *,
+        session: Session = global_session,
+        **query_params: Any,
     ) -> int:
-        q = cls._query_params(count=True, **query_params)
+        q = cast(Queryable, cls)._query_params(count=True, **query_params)
         resp = session.get(cls._resource, q.model_dump())
         return resp['count']
 
     @classmethod
     def all(
-        cls, *, session: Session = global_session, **query_params
-    ) -> Generator[Resource, None, None]:
+        cls: Type[R_co],
+        *,
+        session: Session = global_session,
+        **query_params: Any,
+    ) -> Generator[R_co, None, None]:
         session = session or global_session
-        q = cls._query_params(**query_params)
+        q = cast(Queryable, cls)._query_params(**query_params)
         next_page_uri = f'{cls._resource}?{urlencode(q.model_dump())}'
         while next_page_uri:
             page = session.get(next_page_uri)
-            yield from (cls._from_dict(item) for item in page['items'])
+            yield from (cls(**item) for item in page['items'])
             next_page_uri = page['next_page_uri']
 
 

cuenca/resources/card_activations.py

@@ -2,7 +2,6 @@ import datetime as dt
 from typing import ClassVar, Optional, cast
 
 from cuenca_validations.types.requests import CardActivationRequest
-from pydantic_extra_types.payment import PaymentCardNumber
 
 from ..http import Session, session as global_session
 from .base import Creatable
@@ -22,7 +21,7 @@ class CardActivation(Creatable):
     @classmethod
     def create(
         cls,
-        number: PaymentCardNumber,
+        number: str,
         exp_month: int,
         exp_year: int,
         cvv2: str,
@@ -43,9 +42,7 @@ class CardActivation(Creatable):
             exp_year=exp_year,
             cvv2=cvv2,
         )
-        return cast(
-            'CardActivation', cls._create(session=session, **req.model_dump())
-        )
+        return cls._create(session=session, **req.model_dump())
 
     @property
     def card(self) -> Optional[Card]:

cuenca/resources/card_transactions.py

@@ -14,7 +14,6 @@ from .resources import retrieve_uri, retrieve_uris
 
 
 class CardTransaction(Transaction):
-
     _resource: ClassVar = 'card_transactions'
     _query_params: ClassVar = CardTransactionQuery
 

cuenca/resources/card_validations.py

@@ -37,7 +37,7 @@ class CardValidation(Creatable):
         exp_month: Optional[int] = None,
         exp_year: Optional[int] = None,
         pin_block: Optional[str] = None,
-        pin_attempts_exceeded: Optional[bool] = None,
+        pin_attempts_exceeded: Optional[str] = None,
         *,
         session: Session = global_session,
     ) -> 'CardValidation':
@@ -51,9 +51,7 @@ class CardValidation(Creatable):
             pin_block=pin_block,
             pin_attempts_exceeded=pin_attempts_exceeded,
         )
-        return cast(
-            'CardValidation', cls._create(session=session, **req.model_dump())
-        )
+        return cls._create(session=session, **req.model_dump())
 
     @property
     def card(self) -> Card:

cuenca/resources/cards.py

@@ -1,5 +1,5 @@
 import datetime as dt
-from typing import ClassVar, Optional, cast
+from typing import ClassVar, Optional
 
 from cuenca_validations.types import (
     CardFundingType,
@@ -81,7 +81,7 @@ class Card(Retrievable, Queryable, Creatable, Updateable):
             card_holder_user_id=card_holder_user_id,
             is_dynamic_cvv=is_dynamic_cvv,
         )
-        return cast('Card', cls._create(session=session, **req.model_dump()))
+        return cls._create(session=session, **req.model_dump())
 
     @classmethod
     def update(
@@ -106,8 +106,7 @@ class Card(Retrievable, Queryable, Creatable, Updateable):
         req = CardUpdateRequest(
             status=status, pin_block=pin_block, is_dynamic_cvv=is_dynamic_cvv
         )
-        resp = cls._update(card_id, session=session, **req.model_dump())
-        return cast('Card', resp)
+        return cls._update(card_id, session=session, **req.model_dump())
 
     @classmethod
     def deactivate(
@@ -118,4 +117,4 @@ class Card(Retrievable, Queryable, Creatable, Updateable):
         """
         url = f'{cls._resource}/{card_id}'
         resp = session.delete(url)
-        return cast('Card', cls._from_dict(resp))
+        return cls(**resp)

cuenca/resources/clabes.py

@@ -1,4 +1,4 @@
-from typing import ClassVar, cast
+from typing import ClassVar
 
 from ..http import Session, session as global_session
 from .base import Creatable, Queryable, Retrievable
@@ -11,4 +11,4 @@ class Clabe(Creatable, Queryable, Retrievable):
 
     @classmethod
     def create(cls, session: Session = global_session):
-        return cast('Clabe', cls._create(session=session))
+        return cls._create(session=session)

cuenca/resources/curp_validations.py

@@ -1,5 +1,5 @@
 import datetime as dt
-from typing import ClassVar, Optional, cast
+from typing import ClassVar, Optional
 
 from cuenca_validations.types import (
     Country,
@@ -7,7 +7,7 @@ from cuenca_validations.types import (
     Gender,
     State,
 )
-from cuenca_validations.types.identities import CurpField
+from cuenca_validations.types.identities import Curp
 from pydantic import ConfigDict, Field
 
 from ..http import Session, session as global_session
@@ -36,20 +36,19 @@ class CurpValidation(Creatable, Retrievable):
     nationality: Optional[Country] = Field(
         None, description='In format ISO 3166 Alpha-2'
     )
-    manual_curp: Optional[CurpField] = Field(
+    manual_curp: Optional[Curp] = Field(
         None, description='curp provided in request'
     )
-    calculated_curp: CurpField = Field(
-        ..., description='Calculated CURP based on request data'
+    calculated_curp: Curp = Field(
+        description='Calculated CURP based on request data'
     )
-    validated_curp: Optional[CurpField] = Field(
+    validated_curp: Optional[Curp] = Field(
         None, description='CURP validated in Renapo, null if not exists'
     )
     renapo_curp_match: bool = Field(
-        ..., description='True if CURP exists and is valid'
+        description='True if CURP exists and is valid'
     )
     renapo_full_match: bool = Field(
-        ...,
         description='True if all fields provided match the response from '
         'RENAPO. Accents in names are ignored',
     )
@@ -85,7 +84,7 @@ class CurpValidation(Creatable, Retrievable):
         state_of_birth: Optional[State] = None,
         gender: Optional[Gender] = None,
         second_surname: Optional[str] = None,
-        manual_curp: Optional[CurpField] = None,
+        manual_curp: Optional[Curp] = None,
         *,
         session: Session = global_session,
     ) -> 'CurpValidation':
@@ -95,11 +94,8 @@ class CurpValidation(Creatable, Retrievable):
             second_surname=second_surname,
             date_of_birth=date_of_birth,
             state_of_birth=state_of_birth,
-            country_of_birth=cast(Country, country_of_birth),
+            country_of_birth=country_of_birth,
             gender=gender,
             manual_curp=manual_curp,
         )
-        return cast(
-            'CurpValidation',
-            cls._create(session=session, **req.model_dump()),
-        )
+        return cls._create(session=session, **req.model_dump())

cuenca/resources/endpoints.py

@@ -1,12 +1,12 @@
-from typing import ClassVar, Optional, cast
+from typing import ClassVar, Optional
 
-from cuenca_validations.types import HttpUrlString
 from cuenca_validations.types.enums import WebhookEvent
+from cuenca_validations.types.general import SerializableHttpUrl
 from cuenca_validations.types.requests import (
     EndpointRequest,
     EndpointUpdateRequest,
 )
-from pydantic import ConfigDict, Field, HttpUrl
+from pydantic import ConfigDict, Field
 
 from ..http import Session, session as global_session
 from .base import Creatable, Deactivable, Queryable, Retrievable, Updateable
@@ -15,19 +15,16 @@ from .base import Creatable, Deactivable, Queryable, Retrievable, Updateable
 class Endpoint(Creatable, Deactivable, Retrievable, Queryable, Updateable):
     _resource: ClassVar = 'endpoints'
 
-    url: HttpUrlString = Field(..., description='HTTPS url to send webhooks')
+    url: SerializableHttpUrl = Field(description='HTTPS url to send webhooks')
     secret: str = Field(
-        ...,
         description='token to verify the webhook is sent by Cuenca '
         'using HMAC algorithm',
     )
     is_enable: bool = Field(
-        ...,
         description='Allows user to turn-off the endpoint without the '
         'need of deleting it',
     )
     events: list[WebhookEvent] = Field(
-        ...,
         description='list of enabled events. If None, all events will '
         'be enabled for this Endpoint',
     )
@@ -55,7 +52,7 @@ class Endpoint(Creatable, Deactivable, Retrievable, Queryable, Updateable):
     @classmethod
     def create(
         cls,
-        url: HttpUrl,
+        url: SerializableHttpUrl,
         events: Optional[list[WebhookEvent]] = None,
         *,
         session: Session = global_session,
@@ -70,15 +67,13 @@ class Endpoint(Creatable, Deactivable, Retrievable, Queryable, Updateable):
         :return: New active endpoint
         """
         req = EndpointRequest(url=url, events=events)
-        return cast(
-            'Endpoint', cls._create(session=session, **req.model_dump())
-        )
+        return cls._create(session=session, **req.model_dump())
 
     @classmethod
     def update(
         cls,
         endpoint_id: str,
-        url: Optional[HttpUrl] = None,
+        url: Optional[SerializableHttpUrl] = None,
         events: Optional[list[WebhookEvent]] = None,
         is_enable: Optional[bool] = None,
         *,
@@ -89,6 +84,7 @@ class Endpoint(Creatable, Deactivable, Retrievable, Queryable, Updateable):
         like url and is_active.
         :param endpoint_id: existing endpoint_id
         :param url
+        :param events: Optional list of enabled events to update
         :param is_enable
         :param session
         :return: Updated endpoint object
@@ -96,5 +92,4 @@ class Endpoint(Creatable, Deactivable, Retrievable, Queryable, Updateable):
         req = EndpointUpdateRequest(
             url=url, is_enable=is_enable, events=events
         )
-        resp = cls._update(endpoint_id, session=session, **req.model_dump())
-        return cast('Endpoint', resp)
+        return cls._update(endpoint_id, session=session, **req.model_dump())

cuenca/resources/file_batches.py

@@ -1,4 +1,4 @@
-from typing import ClassVar, cast
+from typing import ClassVar
 
 from cuenca_validations.types import (
     BatchFileMetadata,
@@ -26,8 +26,7 @@ class FileBatch(Creatable, Queryable):
         session: Session = global_session,
     ) -> 'FileBatch':
         req = FileBatchUploadRequest(
-            files=cast(list[FileRequest], files), user_id=user_id
-        )
-        return cast(
-            'FileBatch', cls._create(session=session, **req.model_dump())
+            files=[FileRequest(**f) for f in files],
+            user_id=user_id,
         )
+        return cls._create(session=session, **req.model_dump())

cuenca/resources/files.py

@@ -1,13 +1,8 @@
 from io import BytesIO
-from typing import ClassVar, Optional, cast
+from typing import ClassVar, Optional
 
-from cuenca_validations.types import (
-    FileExtension,
-    FileQuery,
-    FileUploadRequest,
-    KYCFileType,
-)
-from pydantic import HttpUrl
+from cuenca_validations.types import FileQuery, FileUploadRequest, KYCFileType
+from cuenca_validations.types.general import SerializableHttpUrl
 
 from ..http import Session, session as global_session
 from .base import Downloadable, Queryable, Uploadable
@@ -19,7 +14,7 @@ class File(Downloadable, Queryable, Uploadable):
 
     extension: str
     type: KYCFileType
-    url: HttpUrl
+    url: SerializableHttpUrl
     user_id: str
 
     @classmethod
@@ -45,17 +40,11 @@ class File(Downloadable, Queryable, Uploadable):
         req = FileUploadRequest(
             file=file.read(),
             type=file_type,
-            extension=cast(FileExtension, extension),
+            extension=extension,
             is_back=is_back,
             user_id=user_id,
         )
-        return cast(
-            'File',
-            cls._upload(
-                session=session,
-                **req.model_dump(),
-            ),
-        )
+        return cls._upload(session=session, **req.model_dump())
 
     @property
     def file(self) -> bytes:

cuenca/resources/identities.py

@@ -11,7 +11,7 @@ from cuenca_validations.types import (
     UserStatus,
     VerificationStatus,
 )
-from cuenca_validations.types.identities import CurpField
+from cuenca_validations.types.identities import Curp
 
 from .base import Queryable, Retrievable
 
@@ -24,7 +24,7 @@ class Identity(Retrievable, Queryable):
     names: str
     first_surname: str
     second_surname: Optional[str] = None
-    curp: Optional[CurpField] = None
+    curp: Optional[Curp] = None
     rfc: Optional[str] = None
     gender: Gender
     date_of_birth: Optional[dt.date] = None

cuenca/resources/kyc_validations.py

@@ -1,4 +1,4 @@
-from typing import ClassVar, Optional, cast
+from typing import ClassVar, Optional
 
 from cuenca_validations.types import KYCFile, KYCValidationRequest
 from pydantic import ConfigDict
@@ -13,6 +13,7 @@ class KYCValidation(Creatable, Retrievable, Queryable):
     attemps: Optional[int] = None
     verification_id: Optional[str] = None
     files_uri: Optional[list[str]] = None
+
     model_config = ConfigDict(
         json_schema_extra={
             'example': {
@@ -39,6 +40,4 @@ class KYCValidation(Creatable, Retrievable, Queryable):
             force=force,
             documents=documents,
         )
-        return cast(
-            'KYCValidation', cls._create(**req.model_dump(), session=session)
-        )
+        return cls._create(**req.model_dump(), session=session)