Update/pydantic v2

.github/workflows/release.yml

@@ -6,11 +6,11 @@ jobs:
   publish-pypi:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2.4.0
-      - name: Set up Python 3.8
-        uses: actions/setup-python@v2.3.1
+      - uses: actions/checkout@v4
+      - name: Set up Python 3.13
+        uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version: 3.13
       - name: Install dependencies
         run: pip install -qU setuptools wheel twine
       - name: Generating distribution archives

.github/workflows/test.yml

@@ -7,10 +7,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up Python
-        uses: actions/setup-python@v5.1.0
+      - name: Set up Python 3.13
+        uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version: 3.13
       - name: Install dependencies
         run: make install-test
       - name: Lint
@@ -20,11 +20,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.8', '3.9', '3.10']
+        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5.1.0
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
@@ -36,16 +36,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Setup Python
-        uses: actions/setup-python@v5.1.0
+      - name: Setup Python 3.13
+        uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version: 3.13
       - name: Install dependencies
         run: make install-test
       - name: Generate coverage report
         run: pytest --cov-report=xml
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v4.1.1
+        uses: codecov/codecov-action@v5
         with:
           file: ./coverage.xml
           flags: unittests

Makefile

@@ -1,9 +1,9 @@
 SHELL := bash
 PATH := ./venv/bin:${PATH}
-PYTHON = python3.8
+PYTHON = python3.13
 PROJECT = cuenca
 isort = isort $(PROJECT) tests setup.py examples
-black = black -S -l 79 --target-version py38 $(PROJECT) tests setup.py examples
+black = black -S -l 79 --target-version py313 $(PROJECT) tests setup.py examples
 
 
 all: test

cuenca/resources/api_keys.py

@@ -2,6 +2,7 @@
 from typing import ClassVar, Optional, cast
 
 from cuenca_validations.types import ApiKeyQuery, ApiKeyUpdateRequest
+from pydantic import ConfigDict
 
 from ..http import Session, session as global_session
 from .base import Creatable, Queryable, Retrievable, Updateable
@@ -12,11 +13,10 @@ class ApiKey(Creatable, Queryable, Retrievable, Updateable):
     _query_params: ClassVar = ApiKeyQuery
 
     secret: str
-    deactivated_at: Optional[dt.datetime]
-    user_id: Optional[str]
-
-    class Config:
-        schema_extra = {
+    deactivated_at: Optional[dt.datetime] = None
+    user_id: Optional[str] = None
+    model_config = ConfigDict(
+        json_schema_extra={
             'example': {
                 'id': 'AKNEUInh69SuKXXmK95sROwQ',
                 'updated_at': '2021-08-24T14:15:22Z',
@@ -26,6 +26,7 @@ class Config:
                 'user_id': 'USWqY5cvkISJOxHyEKjAKf8w',
             }
         }
+    )
 
     @property
     def active(self) -> bool:
@@ -74,5 +75,5 @@ def update(
         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/resources/arpc.py

@@ -1,7 +1,9 @@
 import datetime as dt
 from typing import ClassVar, Optional, cast
 
+from cuenca_validations.types.enums import TrackDataMethod
 from cuenca_validations.types.requests import ARPCRequest
+from pydantic_extra_types.payment import PaymentCardNumber
 
 from ..http import Session, session as global_session
 from .base import Creatable
@@ -23,13 +25,13 @@ class Arpc(Creatable):
 
     created_at: dt.datetime
     card_uri: str
-    is_valid_arqc: Optional[bool]
-    arpc: Optional[str]
+    is_valid_arqc: Optional[bool] = None
+    arpc: Optional[str] = None
 
     @classmethod
     def create(
         cls,
-        number: str,
+        number: PaymentCardNumber,
         arqc: str,
         arpc_method: str,
         transaction_data: str,
@@ -50,6 +52,6 @@ def create(
             transaction_counter=transaction_counter,
             pan_sequence=pan_sequence,
             unique_number=unique_number,
-            track_data_method=track_data_method,
+            track_data_method=cast(TrackDataMethod, track_data_method),
         )
-        return cast('Arpc', cls._create(session=session, **req.dict()))
+        return cast('Arpc', cls._create(session=session, **req.model_dump()))

cuenca/resources/balance_entries.py

@@ -1,4 +1,4 @@
-from typing import ClassVar, TypeVar, cast
+from typing import ClassVar, Union, cast
 
 from cuenca_validations.types import BalanceEntryQuery, EntryType
 
@@ -8,9 +8,7 @@
 from .resources import retrieve_uri
 from .service_providers import ServiceProvider
 
-FundingInstrument = TypeVar(
-    'FundingInstrument', Account, ServiceProvider, Card
-)
+FundingInstrument = Union[Account, ServiceProvider, Card]
 
 
 class BalanceEntry(Retrievable, Queryable):

cuenca/resources/base.py

@@ -2,7 +2,7 @@
 import datetime as dt
 import json
 from io import BytesIO
-from typing import ClassVar, Dict, Generator, Optional, Union
+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, Union[str, int]]) -> 'Resource':
+    def _from_dict(cls, obj_dict: dict[str, Any]) -> 'Resource':
         cls._filter_excess_fields(obj_dict)
         return cls(**obj_dict)
 
@@ -42,7 +42,7 @@ def _filter_excess_fields(cls, obj_dict):
             del obj_dict[f]
 
     def to_dict(self):
-        return SantizedDict(self.dict())
+        return SantizedDict(self.model_dump())
 
 
 class Retrievable(Resource):
@@ -79,7 +79,7 @@ def _update(
 
 
 class Deactivable(Resource):
-    deactivated_at: Optional[dt.datetime]
+    deactivated_at: Optional[dt.datetime] = None
 
     @classmethod
     def deactivate(
@@ -151,7 +151,7 @@ def one(
         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 @@ def first(
         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 @@ def count(
         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 @@ def all(
     ) -> 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/resources/card_activations.py

@@ -2,6 +2,7 @@
 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
@@ -15,13 +16,13 @@ class CardActivation(Creatable):
     created_at: dt.datetime
     user_id: str
     ip_address: str
-    card_uri: Optional[str]
+    card_uri: Optional[str] = None
     success: bool
 
     @classmethod
     def create(
         cls,
-        number: str,
+        number: PaymentCardNumber,
         exp_month: int,
         exp_year: int,
         cvv2: str,
@@ -43,7 +44,7 @@ def create(
             cvv2=cvv2,
         )
         return cast(
-            'CardActivation', cls._create(session=session, **req.dict())
+            'CardActivation', cls._create(session=session, **req.model_dump())
         )
 
     @property

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,24 +14,25 @@
 
 
 class CardTransaction(Transaction):
+
     _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
     metadata: dict
-    error_type: Optional[CardErrorType]
+    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/resources/card_validations.py

@@ -3,6 +3,7 @@
 
 from cuenca_validations.types import CardStatus, CardType
 from cuenca_validations.types.requests import CardValidationRequest
+from pydantic_extra_types.payment import PaymentCardNumber
 
 from ..http import Session, session as global_session
 from .base import Creatable
@@ -18,26 +19,26 @@ class CardValidation(Creatable):
     user_id: str
     card_status: CardStatus
     card_type: CardType
-    is_valid_cvv: Optional[bool]
-    is_valid_cvv2: Optional[bool]
-    is_valid_icvv: Optional[bool]
-    is_valid_pin_block: Optional[bool]
-    is_valid_exp_date: Optional[bool]
+    is_valid_cvv: Optional[bool] = None
+    is_valid_cvv2: Optional[bool] = None
+    is_valid_icvv: Optional[bool] = None
+    is_valid_pin_block: Optional[bool] = None
+    is_valid_exp_date: Optional[bool] = None
     is_pin_attempts_exceeded: bool
     is_expired: bool
     platform_id: Optional[str] = None
 
     @classmethod
     def create(
         cls,
-        number: str,
+        number: PaymentCardNumber,
         cvv: Optional[str] = None,
         cvv2: Optional[str] = None,
         icvv: Optional[str] = None,
         exp_month: Optional[int] = None,
         exp_year: Optional[int] = None,
         pin_block: Optional[str] = None,
-        pin_attempts_exceeded: Optional[str] = None,
+        pin_attempts_exceeded: Optional[bool] = None,
         *,
         session: Session = global_session,
     ) -> 'CardValidation':
@@ -52,7 +53,7 @@ def create(
             pin_attempts_exceeded=pin_attempts_exceeded,
         )
         return cast(
-            'CardValidation', cls._create(session=session, **req.dict())
+            'CardValidation', cls._create(session=session, **req.model_dump())
         )
 
     @property

cuenca/resources/cards.py

@@ -21,12 +21,12 @@ class Card(Retrievable, Queryable, Creatable, Updateable):
     _resource: ClassVar = 'cards'
     _query_params: ClassVar = CardQuery
 
-    user_id: Optional[str]
+    user_id: Optional[str] = None
     number: str
     exp_month: int
     exp_year: int
     cvv2: str
-    pin: Optional[str]
+    pin: Optional[str] = None
     type: CardType
     status: CardStatus
     issuer: CardIssuer
@@ -81,7 +81,7 @@ def create(
             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 @@ def update(
         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