cuenca 2.0.0.dev3__tar.gz → 2.0.0.dev5__tar.gz

{cuenca-2.0.0.dev3 → cuenca-2.0.0.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: cuenca
-Version: 2.0.0.dev3
+Version: 2.0.0.dev5
 Summary: Cuenca API Client
 Home-page: https://github.com/cuenca-mx/cuenca-python
 Author: Cuenca
@@ -16,8 +16,17 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: requests>=2.32.3
-Requires-Dist: cuenca-validations==2.0.0.dev9
+Requires-Dist: cuenca-validations==2.0.0.dev12
 Requires-Dist: pydantic-extra-types>=2.10.1
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # Cuenca – Python client library
 

{cuenca-2.0.0.dev3 → cuenca-2.0.0.dev5}/cuenca/exc.py

@@ -1,3 +1,5 @@
+from dataclasses import dataclass
+
 from cuenca_validations.typing import DictStrAny
 
 
@@ -17,11 +19,10 @@ class MultipleResultsFound(CuencaException):
     """One result was expected but multiple were returned"""
 
 
+@dataclass
 class CuencaResponseException(CuencaException):
-    def __init__(self, json: DictStrAny, status_code: int) -> None:
-        self.json = json
-        self.status_code = status_code
-        super().__init__()
+    json: DictStrAny
+    status_code: int
 
     def __str__(self) -> str:
         return repr(self)

{cuenca-2.0.0.dev3 → cuenca-2.0.0.dev5}/cuenca/resources/__init__.py

@@ -38,6 +38,7 @@ __all__ = [
     'WalletTransaction',
     'Webhook',
     'WhatsappTransfer',
+    'Jwt',
 ]
 
 from .accounts import Account
@@ -59,6 +60,7 @@ 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-2.0.0.dev3 → cuenca-2.0.0.dev5}/cuenca/resources/api_keys.py

@@ -2,7 +2,7 @@ import datetime as dt
 from typing import ClassVar, Optional, cast
 
 from cuenca_validations.types import ApiKeyQuery, ApiKeyUpdateRequest
-from pydantic import ConfigDict
+from pydantic import ConfigDict, SecretStr
 
 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: str
+    secret: SecretStr
     deactivated_at: Optional[dt.datetime] = None
     user_id: Optional[str] = None
     model_config = ConfigDict(
@@ -75,5 +75,5 @@ 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.dict(), session=session)
+        resp = cls._update(api_key_id, **req.model_dump(), session=session)
         return cast('ApiKey', resp)

{cuenca-2.0.0.dev3 → cuenca-2.0.0.dev5}/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, Dict, Generator, Optional
+from typing import Any, ClassVar, Generator, Optional
 from urllib.parse import urlencode
 
 from cuenca_validations.types import (
@@ -24,7 +24,7 @@ class Resource(BaseModel):
     id: str
 
     @classmethod
-    def _from_dict(cls, obj_dict: Dict[str, Any]) -> 'Resource':
+    def _from_dict(cls, obj_dict: dict[str, Any]) -> 'Resource':
         cls._filter_excess_fields(obj_dict)
         return cls(**obj_dict)
 
@@ -151,7 +151,7 @@ class Queryable(Resource):
         cls, *, session: Session = global_session, **query_params
     ) -> Resource:
         q = cls._query_params(limit=2, **query_params)
-        resp = session.get(cls._resource, q.dict())
+        resp = session.get(cls._resource, q.model_dump())
         items = resp['items']
         len_items = len(items)
         if not len_items:
@@ -165,7 +165,7 @@ class Queryable(Resource):
         cls, *, session: Session = global_session, **query_params
     ) -> Optional[Resource]:
         q = cls._query_params(limit=1, **query_params)
-        resp = session.get(cls._resource, q.dict())
+        resp = session.get(cls._resource, q.model_dump())
         try:
             item = resp['items'][0]
         except IndexError:
@@ -179,7 +179,7 @@ class Queryable(Resource):
         cls, *, session: Session = global_session, **query_params
     ) -> int:
         q = cls._query_params(count=True, **query_params)
-        resp = session.get(cls._resource, q.dict())
+        resp = session.get(cls._resource, q.model_dump())
         return resp['count']
 
     @classmethod
@@ -188,7 +188,7 @@ class Queryable(Resource):
     ) -> Generator[Resource, None, None]:
         session = session or global_session
         q = cls._query_params(**query_params)
-        next_page_uri = f'{cls._resource}?{urlencode(q.dict())}'
+        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'])

{cuenca-2.0.0.dev3 → cuenca-2.0.0.dev5}/cuenca/resources/card_activations.py

@@ -2,6 +2,7 @@ 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
@@ -21,7 +22,7 @@ class CardActivation(Creatable):
     @classmethod
     def create(
         cls,
-        number: str,
+        number: PaymentCardNumber,
         exp_month: int,
         exp_year: int,
         cvv2: str,

{cuenca-2.0.0.dev3 → cuenca-2.0.0.dev5}/cuenca/resources/card_transactions.py

@@ -1,4 +1,4 @@
-from typing import ClassVar, List, Optional, cast
+from typing import ClassVar, Optional, cast
 
 from cuenca_validations.types import (
     CardErrorType,
@@ -14,15 +14,13 @@ from .resources import retrieve_uri, retrieve_uris
 
 
 class CardTransaction(Transaction):
-    def __init__(self, *args, **kwargs):
-        super(CardTransaction, self).__init__(*args, **kwargs)
 
     _resource: ClassVar = 'card_transactions'
     _query_params: ClassVar = CardTransactionQuery
 
     type: CardTransactionType
     network: CardNetwork
-    related_card_transaction_uris: List[str]
+    related_card_transaction_uris: list[str]
     card_uri: str
     card_last4: str
     card_type: CardType
@@ -30,11 +28,11 @@ class CardTransaction(Transaction):
     error_type: Optional[CardErrorType] = None
 
     @property  # type: ignore
-    def related_card_transactions(self) -> Optional[List['CardTransaction']]:
+    def related_card_transactions(self) -> Optional[list['CardTransaction']]:
         if not self.related_card_transaction_uris:
             return []
         return cast(
-            List['CardTransaction'],
+            list['CardTransaction'],
             retrieve_uris(self.related_card_transaction_uris),
         )
 

{cuenca-2.0.0.dev3 → cuenca-2.0.0.dev5}/cuenca/resources/cards.py

@@ -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.dict()))
+        return cast('Card', cls._create(session=session, **req.model_dump()))
 
     @classmethod
     def update(
@@ -106,7 +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.dict())
+        resp = cls._update(card_id, session=session, **req.model_dump())
         return cast('Card', resp)
 
     @classmethod

{cuenca-2.0.0.dev3 → cuenca-2.0.0.dev5}/cuenca/resources/endpoints.py

@@ -1,5 +1,6 @@
-from typing import ClassVar, List, Optional, cast
+from typing import ClassVar, Optional, cast
 
+from cuenca_validations.types import HttpUrlString
 from cuenca_validations.types.enums import WebhookEvent
 from cuenca_validations.types.requests import (
     EndpointRequest,
@@ -14,7 +15,7 @@ from .base import Creatable, Deactivable, Queryable, Retrievable, Updateable
 class Endpoint(Creatable, Deactivable, Retrievable, Queryable, Updateable):
     _resource: ClassVar = 'endpoints'
 
-    url: HttpUrl = Field(..., description='HTTPS url to send webhooks')
+    url: HttpUrlString = Field(..., description='HTTPS url to send webhooks')
     secret: str = Field(
         ...,
         description='token to verify the webhook is sent by Cuenca '
@@ -25,7 +26,7 @@ class Endpoint(Creatable, Deactivable, Retrievable, Queryable, Updateable):
         description='Allows user to turn-off the endpoint without the '
         'need of deleting it',
     )
-    events: List[WebhookEvent] = Field(
+    events: list[WebhookEvent] = Field(
         ...,
         description='list of enabled events. If None, all events will '
         'be enabled for this Endpoint',
@@ -55,7 +56,7 @@ class Endpoint(Creatable, Deactivable, Retrievable, Queryable, Updateable):
     def create(
         cls,
         url: HttpUrl,
-        events: Optional[List[WebhookEvent]] = None,
+        events: Optional[list[WebhookEvent]] = None,
         *,
         session: Session = global_session,
     ) -> 'Endpoint':
@@ -69,14 +70,16 @@ 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.dict()))
+        return cast(
+            'Endpoint', cls._create(session=session, **req.model_dump())
+        )
 
     @classmethod
     def update(
         cls,
         endpoint_id: str,
         url: Optional[HttpUrl] = None,
-        events: Optional[List[WebhookEvent]] = None,
+        events: Optional[list[WebhookEvent]] = None,
         is_enable: Optional[bool] = None,
         *,
         session: Session = global_session,
@@ -93,5 +96,5 @@ 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.dict())
+        resp = cls._update(endpoint_id, session=session, **req.model_dump())
         return cast('Endpoint', resp)

{cuenca-2.0.0.dev3 → cuenca-2.0.0.dev5}/cuenca/resources/file_batches.py

@@ -1,4 +1,4 @@
-from typing import ClassVar, Dict, List, cast
+from typing import ClassVar, cast
 
 from cuenca_validations.types import (
     BatchFileMetadata,
@@ -13,20 +13,20 @@ from .base import Creatable, Queryable
 class FileBatch(Creatable, Queryable):
     _resource: ClassVar = 'file_batches'
 
-    received_files: List[BatchFileMetadata]
-    uploaded_files: List[BatchFileMetadata]
+    received_files: list[BatchFileMetadata]
+    uploaded_files: list[BatchFileMetadata]
     user_id: str
 
     @classmethod
     def create(
         cls,
-        files: List[Dict],
+        files: list[dict],
         user_id: str,
         *,
         session: Session = global_session,
     ) -> 'FileBatch':
         req = FileBatchUploadRequest(
-            files=cast(List[FileRequest], files), user_id=user_id
+            files=cast(list[FileRequest], files), user_id=user_id
         )
         return cast(
             'FileBatch', cls._create(session=session, **req.model_dump())

{cuenca-2.0.0.dev3 → cuenca-2.0.0.dev5}/cuenca/resources/files.py

@@ -53,7 +53,7 @@ class File(Downloadable, Queryable, Uploadable):
             'File',
             cls._upload(
                 session=session,
-                **req.dict(),
+                **req.model_dump(),
             ),
         )
 

cuenca-2.0.0.dev5/cuenca/resources/jwt.py

@@ -0,0 +1,12 @@
+from typing import ClassVar
+
+from pydantic import SecretStr
+
+from .base import Creatable
+
+
+class Jwt(Creatable):
+    _resource: ClassVar = 'jwt'
+
+    token: SecretStr
+    api_key: str

{cuenca-2.0.0.dev3 → cuenca-2.0.0.dev5}/cuenca/resources/kyc_validations.py

@@ -1,4 +1,4 @@
-from typing import ClassVar, List, Optional, cast
+from typing import ClassVar, Optional, cast
 
 from cuenca_validations.types import KYCFile, KYCValidationRequest
 from pydantic import ConfigDict
@@ -12,7 +12,7 @@ class KYCValidation(Creatable, Retrievable, Queryable):
     platform_id: str
     attemps: Optional[int] = None
     verification_id: Optional[str] = None
-    files_uri: Optional[List[str]] = None
+    files_uri: Optional[list[str]] = None
     model_config = ConfigDict(
         json_schema_extra={
             'example': {
@@ -31,7 +31,7 @@ class KYCValidation(Creatable, Retrievable, Queryable):
         cls,
         user_id: str,
         force: bool = False,
-        documents: List[KYCFile] = [],
+        documents: list[KYCFile] = [],
         session: Session = global_session,
     ) -> 'KYCValidation':
         req = KYCValidationRequest(
@@ -40,5 +40,5 @@ class KYCValidation(Creatable, Retrievable, Queryable):
             documents=documents,
         )
         return cast(
-            'KYCValidation', cls._create(**req.dict(), session=session)
+            'KYCValidation', cls._create(**req.model_dump(), session=session)
         )

{cuenca-2.0.0.dev3 → cuenca-2.0.0.dev5}/cuenca/resources/kyc_verifications.py

@@ -49,4 +49,6 @@ class KYCVerification(Creatable, Retrievable, Updateable):
         curp: CurpField,
     ) -> 'KYCVerification':
         req = KYCVerificationUpdateRequest(curp=curp)
-        return cast('KYCVerification', cls._update(id=kyc_id, **req.dict()))
+        return cast(
+            'KYCVerification', cls._update(id=kyc_id, **req.model_dump())
+        )

{cuenca-2.0.0.dev3 → cuenca-2.0.0.dev5}/cuenca/resources/limited_wallets.py

@@ -37,4 +37,4 @@ class LimitedWallet(Wallet):
             allowed_curp=allowed_curp,
             allowed_rfc=allowed_rfc,
         )
-        return cast('LimitedWallet', cls._create(**request.dict()))
+        return cast('LimitedWallet', cls._create(**request.model_dump()))

{cuenca-2.0.0.dev3 → cuenca-2.0.0.dev5}/cuenca/resources/login_tokens.py

@@ -1,13 +1,19 @@
 from typing import ClassVar, cast
 
-from pydantic import ConfigDict
+from pydantic import ConfigDict, SecretStr
 
 from ..http import Session, session as global_session
 from .base import Creatable
 
 
+# mypy: disable-error-code=override
 class LoginToken(Creatable):
     _resource: ClassVar = 'login_tokens'
+
+    # Override the `id` field to be a `SecretStr`
+    # To ensure sensitive data is not exposed in logs.
+    id: SecretStr  # type: ignore
+
     model_config = ConfigDict(
         json_schema_extra={'example': {'id': 'LTNEUInh69SuKXXmK95sROwQ'}}
     )

{cuenca-2.0.0.dev3 → cuenca-2.0.0.dev5}/cuenca/resources/otps.py

@@ -1,6 +1,6 @@
 from typing import ClassVar, cast
 
-from pydantic import ConfigDict
+from pydantic import ConfigDict, SecretStr
 
 from ..http import Session, session as global_session
 from .base import Creatable
@@ -8,7 +8,7 @@ from .base import Creatable
 
 class Otp(Creatable):
     _resource: ClassVar = 'otps'
-    secret: str
+    secret: SecretStr
     model_config = ConfigDict(
         json_schema_extra={
             'example': {

cuenca-2.0.0.dev5/cuenca/resources/resources.py

@@ -0,0 +1,26 @@
+import re
+from typing import cast
+
+from .base import Retrievable
+
+ENDPOINT_RE = re.compile(r'.*/(?P<resource>[a-z_]+)/(?P<id>.+)$')
+RESOURCES: dict[str, Retrievable] = {}  # set in ./__init__.py after imports
+
+
+def retrieve_uri(uri: str) -> Retrievable:
+    m = ENDPOINT_RE.match(uri)
+    if not m:
+        raise ValueError(f'uri is not a valid format: {uri}')
+    resource, id_ = m.groups()
+    return cast(Retrievable, RESOURCES[resource].retrieve(id_))
+
+
+def retrieve_uris(uris: list[str]) -> list[Retrievable]:
+    # Changed the implementation to use a simple for loop instead of
+    # ThreadPoolExecutor. The list of URIs is small, so the performance
+    # difference is negligible. Additionally, using ThreadPoolExecutor
+    # caused issues with VCR tests, as the recordings were not retrieved
+    # in the correct order, leading to unexpected HTTP calls instead of
+    # using the mocked recordings.
+
+    return [retrieve_uri(uri) for uri in uris]

{cuenca-2.0.0.dev3 → cuenca-2.0.0.dev5}/cuenca/resources/savings.py

@@ -34,7 +34,7 @@ class Saving(Wallet, Updateable):
             goal_amount=goal_amount,
             goal_date=goal_date,
         )
-        return cast('Saving', cls._create(**request.dict()))
+        return cast('Saving', cls._create(**request.model_dump()))
 
     @classmethod
     def update(
@@ -51,4 +51,6 @@ class Saving(Wallet, Updateable):
             goal_amount=goal_amount,
             goal_date=goal_date,
         )
-        return cast('Saving', cls._update(id=saving_id, **request.dict()))
+        return cast(
+            'Saving', cls._update(id=saving_id, **request.model_dump())
+        )

{cuenca-2.0.0.dev3 → cuenca-2.0.0.dev5}/cuenca/resources/service_providers.py

@@ -1,4 +1,4 @@
-from typing import ClassVar, List
+from typing import ClassVar
 
 from cuenca_validations.types import ServiceProviderCategory
 
@@ -10,4 +10,4 @@ class ServiceProvider(Retrievable, Queryable):
 
     name: str
     provider_key: str
-    categories: List[ServiceProviderCategory]
+    categories: list[ServiceProviderCategory]

{cuenca-2.0.0.dev3 → cuenca-2.0.0.dev5}/cuenca/resources/sessions.py

@@ -1,23 +1,26 @@
 import datetime as dt
 from typing import ClassVar, Optional, cast
 
-from cuenca_validations.types import SessionRequest, SessionType
-from pydantic import AnyUrl, ConfigDict
+from cuenca_validations.types import AnyUrlString, SessionRequest, SessionType
+from pydantic import ConfigDict, SecretStr
 
 from .. import http
 from .base import Creatable, Queryable, Retrievable
 
 
+# mypy: disable-error-code=override
 class Session(Creatable, Retrievable, Queryable):
     _resource: ClassVar = 'sessions'
 
-    id: str
+    # Override the `id` field to be a `SecretStr`
+    # To ensure sensitive data is not exposed in logs.
+    id: SecretStr = None  # type: ignore
     created_at: dt.datetime
     user_id: str
     platform_id: str
     expires_at: dt.datetime
-    success_url: Optional[AnyUrl] = None
-    failure_url: Optional[AnyUrl] = None
+    success_url: Optional[AnyUrlString] = None
+    failure_url: Optional[AnyUrlString] = None
     type: Optional[SessionType] = None
     model_config = ConfigDict(
         json_schema_extra={
@@ -39,15 +42,17 @@ class Session(Creatable, Retrievable, Queryable):
         cls,
         user_id: str,
         type: SessionType,
-        success_url=cast(Optional[AnyUrl], success_url),
-        failure_url=cast(Optional[AnyUrl], failure_url),
+        success_url: Optional[str] = None,
+        failure_url: Optional[str] = None,
         *,
         session: http.Session = http.session,
     ) -> 'Session':
         req = SessionRequest(
             user_id=user_id,
             type=type,
-            success_url=success_url,
-            failure_url=failure_url,
+            success_url=success_url,  # type: ignore
+            failure_url=failure_url,  # type: ignore
+        )
+        return cast(
+            'Session', cls._create(session=session, **req.model_dump())
         )
-        return cast('Session', cls._create(session=session, **req.dict()))

{cuenca-2.0.0.dev3 → cuenca-2.0.0.dev5}/cuenca/resources/transfers.py

@@ -1,5 +1,5 @@
 import datetime as dt
-from typing import ClassVar, List, Optional, cast
+from typing import ClassVar, Optional, cast
 
 from clabe import Clabe
 from cuenca_validations.types import (
@@ -70,14 +70,14 @@ class Transfer(Transaction, Creatable):
             idempotency_key=idempotency_key,
             user_id=user_id,
         )
-        return cast('Transfer', cls._create(**req.dict()))
+        return cast('Transfer', cls._create(**req.model_dump()))
 
     @classmethod
-    def create_many(cls, requests: List[TransferRequest]) -> DictStrAny:
+    def create_many(cls, requests: list[TransferRequest]) -> DictStrAny:
         transfers: DictStrAny = dict(submitted=[], errors=[])
         for req in requests:
             try:
-                transfer = cls._create(**req.dict())
+                transfer = cls._create(**req.model_dump())
             except (CuencaException, HTTPError) as e:
                 transfers['errors'].append(dict(request=req, error=e))
             else:

{cuenca-2.0.0.dev3 → cuenca-2.0.0.dev5}/cuenca/resources/user_credentials.py

@@ -26,7 +26,7 @@ class UserCredential(Creatable, Updateable):
     ) -> 'UserCredential':
         req = UserCredentialRequest(password=password, user_id=user_id)
         return cast(
-            'UserCredential', cls._create(**req.dict(), session=session)
+            'UserCredential', cls._create(**req.model_dump(), session=session)
         )
 
     @classmethod
@@ -44,5 +44,5 @@ class UserCredential(Creatable, Updateable):
         )
         return cast(
             'UserCredential',
-            cls._update(id=user_id, **req.dict(), session=session),
+            cls._update(id=user_id, **req.model_dump(), session=session),
         )

{cuenca-2.0.0.dev3 → cuenca-2.0.0.dev5}/cuenca/resources/user_logins.py

@@ -32,7 +32,9 @@ class UserLogin(Creatable):
         session: Session = global_session,
     ) -> 'UserLogin':
         req = UserLoginRequest(password=password, user_id=user_id)
-        login = cast('UserLogin', cls._create(session=session, **req.dict()))
+        login = cast(
+            'UserLogin', cls._create(session=session, **req.model_dump())
+        )
         if login.success:
             session.headers['X-Cuenca-LoginId'] = login.id
         return login

{cuenca-2.0.0.dev3 → cuenca-2.0.0.dev5}/cuenca/resources/users.py

@@ -1,5 +1,5 @@
 import datetime as dt
-from typing import ClassVar, List, Optional, cast
+from typing import ClassVar, Optional, cast
 
 from clabe import Clabe
 from cuenca_validations.types import (
@@ -52,7 +52,7 @@ class User(Creatable, Retrievable, Updateable, Queryable):
     proof_of_life: Optional[KYCFile] = Field(
         None, description='Detail of selfie video validation'
     )
-    beneficiaries: Optional[List[Beneficiary]] = Field(
+    beneficiaries: Optional[list[Beneficiary]] = Field(
         None, description='Beneficiaries of account in case of death'
     )
     platform_id: Optional[str] = None
@@ -140,7 +140,7 @@ class User(Creatable, Retrievable, Updateable, Queryable):
         email_address: Optional[str] = None,
         profession: Optional[str] = None,
         address: Optional[Address] = None,
-        beneficiaries: Optional[List[Beneficiary]] = None,
+        beneficiaries: Optional[list[Beneficiary]] = None,
         govt_id: Optional[KYCFile] = None,
         proof_of_address: Optional[KYCFile] = None,
         proof_of_life: Optional[KYCFile] = None,

{cuenca-2.0.0.dev3 → cuenca-2.0.0.dev5}/cuenca/resources/wallet_transactions.py

@@ -35,4 +35,4 @@ class WalletTransaction(Transaction, Creatable):
             transaction_type=transaction_type,
             amount=amount,
         )
-        return cast('WalletTransaction', cls._create(**request.dict()))
+        return cast('WalletTransaction', cls._create(**request.model_dump()))

{cuenca-2.0.0.dev3 → cuenca-2.0.0.dev5}/cuenca/resources/webhooks.py

@@ -1,4 +1,4 @@
-from typing import Any, ClassVar, Dict
+from typing import Any, ClassVar
 
 from cuenca_validations.types.enums import WebhookEvent
 from pydantic import Field
@@ -9,7 +9,7 @@ from .base import Queryable, Retrievable
 class Webhook(Retrievable, Queryable):
     _resource: ClassVar = 'webhooks'
 
-    payload: Dict[str, Any] = Field(
+    payload: dict[str, Any] = Field(
         ..., description='object sent by the webhook'
     )
     event: WebhookEvent = Field(

{cuenca-2.0.0.dev3 → cuenca-2.0.0.dev5}/cuenca/version.py

@@ -1,3 +1,3 @@
-__version__ = '2.0.0.dev3'
+__version__ = '2.0.0.dev5'
 CLIENT_VERSION = __version__
 API_VERSION = '2020-03-19'

{cuenca-2.0.0.dev3 → cuenca-2.0.0.dev5}/cuenca.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: cuenca
-Version: 2.0.0.dev3
+Version: 2.0.0.dev5
 Summary: Cuenca API Client
 Home-page: https://github.com/cuenca-mx/cuenca-python
 Author: Cuenca
@@ -16,8 +16,17 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: requests>=2.32.3
-Requires-Dist: cuenca-validations==2.0.0.dev9
+Requires-Dist: cuenca-validations==2.0.0.dev12
 Requires-Dist: pydantic-extra-types>=2.10.1
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # Cuenca – Python client library
 

{cuenca-2.0.0.dev3 → cuenca-2.0.0.dev5}/cuenca.egg-info/SOURCES.txt

@@ -35,6 +35,7 @@ cuenca/resources/file_batches.py
 cuenca/resources/files.py
 cuenca/resources/identities.py
 cuenca/resources/identity_events.py
+cuenca/resources/jwt.py
 cuenca/resources/kyc_validations.py
 cuenca/resources/kyc_verifications.py
 cuenca/resources/limited_wallets.py

{cuenca-2.0.0.dev3 → cuenca-2.0.0.dev5}/cuenca.egg-info/requires.txt

@@ -1,3 +1,3 @@
 requests>=2.32.3
-cuenca-validations==2.0.0.dev9
+cuenca-validations==2.0.0.dev12
 pydantic-extra-types>=2.10.1

{cuenca-2.0.0.dev3 → cuenca-2.0.0.dev5}/setup.py

@@ -24,7 +24,7 @@ setup(
     python_requires='>=3.9',
     install_requires=[
         'requests>=2.32.3',
-        'cuenca-validations==2.0.0.dev9',
+        'cuenca-validations==2.0.0.dev12',
         'pydantic-extra-types>=2.10.1',
     ],
     classifiers=[

{cuenca-2.0.0.dev3 → cuenca-2.0.0.dev5}/tests/conftest.py

@@ -1,6 +1,5 @@
 import datetime as dt
 from io import BytesIO
-from typing import Dict
 
 import pytest
 from cuenca_validations.types import Country, Gender, State
@@ -31,7 +30,7 @@ def transfer():
 
 
 @pytest.fixture
-def curp_validation_request() -> Dict:
+def curp_validation_request() -> dict:
     curp_validation = dict(
         names='José',
         first_surname='López',
@@ -45,7 +44,7 @@ def curp_validation_request() -> Dict:
 
 
 @pytest.fixture
-def user_request() -> Dict:
+def user_request() -> dict:
     user_dict = dict(
         curp='LOHJ660606HDFPRS02',
         phone_number='+525511223344',
@@ -64,7 +63,7 @@ def user_request() -> Dict:
 
 
 @pytest.fixture
-def user_lists_request() -> Dict:
+def user_lists_request() -> dict:
     user_dict = dict(
         curp='LOHJ660606HDFPRS02',
         names='Alejandro',

{cuenca-2.0.0.dev3 → cuenca-2.0.0.dev5}/tests/resources/test_api_keys.py

@@ -18,7 +18,7 @@ def test_api_keys_retrieve():
     id_key = 'AKMPSxy2UeSKqU1J6spDNwqA'
     api_key: ApiKey = ApiKey.retrieve(id_key)
     assert api_key.id == id_key
-    assert api_key.secret == '********'
+    assert api_key.secret.get_secret_value() == '********'
 
 
 @pytest.mark.vcr

{cuenca-2.0.0.dev3 → cuenca-2.0.0.dev5}/tests/resources/test_card_activations.py

@@ -8,17 +8,17 @@ from cuenca.resources import CardActivation
 @pytest.mark.vcr
 def test_card_activation():
     values = dict(
-        number='4122943400023502',
+        number='5448750001621241',
         exp_month=11,
         exp_year=24,
-        cvv2='123',
+        cvv2='111',
     )
     card_activation = CardActivation.create(**values)
     assert card_activation.success
-    assert card_activation.user_id == 'US1237'
+    assert card_activation.user_id == 'US1w9BJ0DZ9kSdac39ur14Nf'
     card = card_activation.card
     assert all(getattr(card, key) == value for key, value in values.items())
-    assert card.user_id == 'US1237'
+    assert card.user_id == 'US1w9BJ0DZ9kSdac39ur14Nf'
     assert card.status is CardStatus.active
 
 

{cuenca-2.0.0.dev3 → cuenca-2.0.0.dev5}/tests/resources/test_commissions.py

@@ -17,7 +17,7 @@ def test_commission_retrieve_with_cash_deposit():
     assert commission.id == id_commission
     related_transaction = commission.related_transaction
     assert related_transaction
-    assert type(related_transaction) == Deposit
+    assert isinstance(related_transaction, Deposit)
     assert related_transaction.network == 'cash'
 
 
@@ -28,5 +28,5 @@ def test_commission_retrieve_with_cash_transfer():
     assert commission.id == id_commission
     related_transaction = commission.related_transaction
     assert related_transaction
-    assert type(related_transaction) == Transfer
+    assert isinstance(related_transaction, Transfer)
     assert related_transaction.network == 'spei'

{cuenca-2.0.0.dev3 → cuenca-2.0.0.dev5}/tests/resources/test_endpoints.py

@@ -43,7 +43,7 @@ def test_endpoint_update():
     )
     assert endpoint.id == id_endpoint
     assert len(endpoint.events) == 2
-    assert str(endpoint.url) == 'https://url.io/'
+    assert endpoint.url == 'https://url.io/'
     assert not endpoint.is_enable
     assert endpoint.is_active
 

{cuenca-2.0.0.dev3 → cuenca-2.0.0.dev5}/tests/resources/test_login_tokens.py

@@ -20,5 +20,5 @@ def test_login_token(session):
     UserLogin.create('222222', session=session)
     login_token = LoginToken.create(session=session)
     session.headers.pop('X-Cuenca-LoginId')
-    session.configure(login_token=login_token.id)
+    session.configure(login_token=login_token.id.get_secret_value())
     Transfer.count(session=session)

{cuenca-2.0.0.dev3 → cuenca-2.0.0.dev5}/tests/resources/test_otps.py

@@ -25,4 +25,4 @@ def test_otps(session):
     session.configure(login_token=login_token.id)
     otp = Otp.create()
     assert otp
-    assert type(otp.secret) == str
+    assert isinstance(otp.secret.get_secret_value(), str)

{cuenca-2.0.0.dev3 → cuenca-2.0.0.dev5}/tests/resources/test_sessions.py

@@ -1,5 +1,3 @@
-from typing import Dict
-
 import pytest
 from cuenca_validations.types import SessionType
 from pydantic import ValidationError
@@ -9,7 +7,7 @@ from cuenca.resources import CurpValidation, Session, User
 
 
 @pytest.mark.vcr
-def test_session_create(curp_validation_request: Dict, user_request: Dict):
+def test_session_create(curp_validation_request: dict, user_request: dict):
     curp_valdation = CurpValidation.create(**curp_validation_request)
     user_request['curp'] = curp_valdation.validated_curp
     user = User.create(**user_request)
@@ -34,10 +32,12 @@ def test_session_create(curp_validation_request: Dict, user_request: Dict):
 
     assert user_session.user_id == user.id
     assert user_session.type == SessionType.registration
-    assert str(user_session.success_url) == success_url
-    assert str(user_session.failure_url) == failure_url
+    assert user_session.success_url == success_url
+    assert user_session.failure_url == failure_url
 
     ephimeral_cuenca_session = cuenca.http.Session()
-    ephimeral_cuenca_session.configure(session_token=user_session.id)
+    ephimeral_cuenca_session.configure(
+        session_token=user_session.id.get_secret_value()
+    )
     user = User.update(user.id, email_address='manu@example.com')
     assert user.email_address == 'manu@example.com'

cuenca-2.0.0.dev3/cuenca/resources/resources.py

@@ -1,21 +0,0 @@
-import re
-from concurrent.futures import ThreadPoolExecutor
-from typing import Dict, List, cast
-
-from .base import Retrievable
-
-ENDPOINT_RE = re.compile(r'.*/(?P<resource>[a-z_]+)/(?P<id>.+)$')
-RESOURCES: Dict[str, Retrievable] = {}  # set in ./__init__.py after imports
-
-
-def retrieve_uri(uri: str) -> Retrievable:
-    m = ENDPOINT_RE.match(uri)
-    if not m:
-        raise ValueError(f'uri is not a valid format: {uri}')
-    resource, id_ = m.groups()
-    return cast(Retrievable, RESOURCES[resource].retrieve(id_))
-
-
-def retrieve_uris(uris: List[str]) -> List[Retrievable]:
-    with ThreadPoolExecutor(max_workers=len(uris)) as executor:
-        return [obj for obj in executor.map(retrieve_uri, uris)]