refactor: update type hints to use built-in list and dict

Author: gabino

cuenca/resources/base.py

@@ -2,7 +2,7 @@
 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)
 

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,
@@ -20,19 +20,19 @@ class CardTransaction(Transaction):
 
     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] = 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/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 @@
 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/resources/resources.py

@@ -1,10 +1,10 @@
 import re
-from typing import Dict, List, cast
+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
+RESOURCES: dict[str, Retrievable] = {}  # set in ./__init__.py after imports
 
 
 def retrieve_uri(uri: str) -> Retrievable:
@@ -15,7 +15,7 @@ def retrieve_uri(uri: str) -> Retrievable:
     return cast(Retrievable, RESOURCES[resource].retrieve(id_))
 
 
-def retrieve_uris(uris: List[str]) -> List[Retrievable]:
+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

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/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 @@ def update(
         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/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 @@
 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(

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',

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 @@
 
 
 @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)