airwallex-sdk 0.1.0__py3-none-any.whl → 0.1.1__py3-none-any.whl

airwallex/api/base.py

@@ -19,18 +19,9 @@ from typing import (
     get_args,
     get_origin
 )
-import httpx
 
-from ..models.base import AirwallexModel, PaginatedResponse
-from ..utils import snake_to_pascal_case, serialize, deserialize
-from ..exceptions import (
-    AirwallexAPIError, 
-    AuthenticationError, 
-    RateLimitError, 
-    ResourceNotFoundError, 
-    ValidationError, 
-    ServerError
-)
+from ..models.base import AirwallexModel
+from ..utils import snake_to_pascal_case
 
 logger = logging.getLogger(__name__)
 
@@ -89,7 +80,7 @@ class AirwallexAPIBase(Generic[T]):
                 :param dataframe: If True, return a DataFrame instead of a list of dictionaries.
                 """
                 url = self._build_url(resource_id=self.id, suffix=path_item)
-                if not self.client.__class__.__name__.startswith('Async'):
+                if not str(self.client.__class__.__name__).startswith('Async'):
                     response = self.client._request("GET", url, params=kwargs)
                     data = self._parse_response_data(response.json())
                     return data
@@ -118,12 +109,12 @@ class AirwallexAPIBase(Generic[T]):
         For async clients, returns a coroutine that yields an AsyncGenerator[T, None].
         """
         if resource_id is not None:
-            if not self.client.__class__.__name__.startswith('Async'):
+            if not str(self.client.__class__.__name__).startswith('Async'):
                 return self.fetch(resource_id)
             else:
                 return self.fetch_async(resource_id)
         else:
-            if not self.client.__class__.__name__.startswith('Async'):
+            if not str(self.client.__class__.__name__).startswith('Async'):
                 return self.paginate_generator(**kwargs)
             else:
                 return self.paginate_async_generator(**kwargs)
@@ -195,7 +186,7 @@ class AirwallexAPIBase(Generic[T]):
     
     def fetch(self, resource_id: Any) -> T:
         """Fetch a single resource by ID."""
-        if self.client.__class__.__name__.startswith('Async'):
+        if str(self.client.__class__.__name__).startswith('Async'):
             raise ValueError("This method requires a sync client.")
         url = self._build_url(resource_id)
         response = self.client._request("GET", url)
@@ -207,10 +198,10 @@ class AirwallexAPIBase(Generic[T]):
     
     def list(self, **params: Any) -> List[T]:
         """List resources with optional filtering parameters."""
-        if self.client.__class__.__name__.startswith('Async'):
+        if str(self.client.__class__.__name__).startswith('Async'):
             raise ValueError("This method requires a sync client.")
         url = self._build_url()
-        response = self.client._request("GET", url, params=serialize(params))
+        response = self.client._request("GET", url, params=params)
         data_list = self._parse_response_data(response.json())
         return [self.model_class.from_api_response(item) for item in data_list]
     
@@ -219,11 +210,10 @@ class AirwallexAPIBase(Generic[T]):
         if str(self.client.__class__.__name__).startswith('Async'):
             raise ValueError("This method requires a sync client.")
         
+        payload_dict = payload
         # Convert Pydantic model to dict if needed
         if isinstance(payload, AirwallexModel):
             payload_dict = payload.to_api_dict()
-        else:
-            payload_dict = serialize(payload)
             
         url = self._build_url()
         response = self.client._request("POST", url, json=payload_dict)
@@ -235,14 +225,13 @@ class AirwallexAPIBase(Generic[T]):
     
     def update(self, resource_id: Any, payload: Union[Dict[str, Any], T]) -> T:
         """Update an existing resource."""
-        if self.client.__class__.__name__.startswith('Async'):
+        if str(self.client.__class__.__name__).startswith('Async'):
             raise ValueError("This method requires a sync client.")
-            
+        
+        payload_dict = payload
         # Convert Pydantic model to dict if needed
         if isinstance(payload, AirwallexModel):
             payload_dict = payload.to_api_dict()
-        else:
-            payload_dict = serialize(payload)
             
         url = self._build_url(resource_id)
         response = self.client._request("PUT", url, json=payload_dict)
@@ -254,96 +243,55 @@ class AirwallexAPIBase(Generic[T]):
     
     def delete(self, resource_id: Any) -> None:
         """Delete a resource."""
-        if self.client.__class__.__name__.startswith('Async'):
+        if str(self.client.__class__.__name__).startswith('Async'):
             raise ValueError("This method requires a sync client.")
         url = self._build_url(resource_id)
         self.client._request("DELETE", url)
-    
-    def paginate(self, **params: Any) -> List[T]:
-        """Fetch all pages of data."""
+        
+    def paginate(self, stop_page: Optional[int] = None, **params: Any) -> Generator[T, None, None]:
+        """
+        Generate items one by one from paginated results.
+        
+        Args:
+            stop_page: The page number to stop at (optional).
+            **params: Filter parameters to pass to the API.
+            
+        Yields:
+            T: Each item from the paginated results.
+        """
         if str(self.client.__class__.__name__).startswith('Async'):
             raise ValueError("This method requires a sync client.")
             
-        all_items: List[Dict[str, Any]] = []
-        page = params.get("page", 1)
+        page_num = params.get("page_num", 1)
         page_size = params.get("page_size", 100)
         
         while True:
-            params["page"] = page
+            params["page_num"] = page_num
             params["page_size"] = page_size
             url = self._build_url()
-            response = self.client._request("GET", url, params=serialize(params))
-            response_data = response.json()
+            response = self.client._request("GET", url, params=params)
+            data = response.json()
             
-            # Check if response is paginated
-            if isinstance(response_data, dict) and 'items' in response_data:
-                items = response_data['items']
-                total_pages = response_data.get('total_pages', 1)
-                
-                if not items:
-                    break
-                    
-                all_items.extend(items)
+            items = data.get("items", [])
+            has_more = data.get("has_more", False)
+            
+            for item in items:
+                yield self.model_class.from_api_response(item)
                 
-                if page >= total_pages:
-                    break
-                    
-                page += 1
-            else:
-                # Not paginated, just use the data as is
-                page_data = self._parse_response_data(response_data)
-                if not page_data:
-                    break
-                all_items.extend(page_data)
+            if not has_more or not items:
                 break
                 
-        return [self.model_class.from_api_response(item) for item in all_items]
-    
-    def paginate_generator(self, **params: Any) -> Generator[T, None, None]:
-        """Generate items one by one from paginated results."""
-        if self.client.__class__.__name__.startswith('Async'):
-            raise ValueError("This method requires a sync client.")
+            page_num += 1
             
-        page = params.get("page", 1)
-        page_size = params.get("page_size", 100)
-        
-        while True:
-            params["page"] = page
-            params["page_size"] = page_size
-            url = self._build_url()
-            response = self.client._request("GET", url, params=serialize(params))
-            response_data = response.json()
-            
-            # Check if response is paginated
-            if isinstance(response_data, dict) and 'items' in response_data:
-                items = response_data['items']
-                total_pages = response_data.get('total_pages', 1)
-                
-                if not items:
-                    break
-                    
-                for item in items:
-                    yield self.model_class.from_api_response(item)
-                
-                if page >= total_pages:
-                    break
-                    
-                page += 1
-            else:
-                # Not paginated, just use the data as is
-                page_data = self._parse_response_data(response_data)
-                if not page_data:
-                    break
-                    
-                for item in page_data:
-                    yield self.model_class.from_api_response(item)
+            if stop_page and page_num > stop_page:
                 break
-    
+        
+        
     # Asynchronous API methods
     
     async def fetch_async(self, resource_id: Any) -> T:
         """Fetch a single resource by ID asynchronously."""
-        if not self.client.__class__.__name__.startswith('Async'):
+        if not str(self.client.__class__.__name__).startswith('Async'):
             raise ValueError("This method requires an async client.")
         url = self._build_url(resource_id)
         response = await self.client._request("GET", url)
@@ -355,23 +303,22 @@ class AirwallexAPIBase(Generic[T]):
     
     async def list_async(self, **params: Any) -> List[T]:
         """List resources with optional filtering parameters asynchronously."""
-        if not self.client.__class__.__name__.startswith('Async'):
+        if not str(self.client.__class__.__name__).startswith('Async'):
             raise ValueError("This method requires an async client.")
         url = self._build_url()
-        response = await self.client._request("GET", url, params=serialize(params))
+        response = await self.client._request("GET", url, params=params)
         data_list = self._parse_response_data(response.json())
         return [self.model_class.from_api_response(item) for item in data_list]
     
     async def create_async(self, payload: Union[Dict[str, Any], T]) -> T:
         """Create a new resource asynchronously."""
-        if not self.client.__class__.__name__.startswith('Async'):
+        if not str(self.client.__class__.__name__).startswith('Async'):
             raise ValueError("This method requires an async client.")
-            
+        
+        payload_dict = payload
         # Convert Pydantic model to dict if needed
         if isinstance(payload, AirwallexModel):
             payload_dict = payload.to_api_dict()
-        else:
-            payload_dict = serialize(payload)
             
         url = self._build_url()
         response = await self.client._request("POST", url, json=payload_dict)
@@ -383,14 +330,13 @@ class AirwallexAPIBase(Generic[T]):
     
     async def update_async(self, resource_id: Any, payload: Union[Dict[str, Any], T]) -> T:
         """Update an existing resource asynchronously."""
-        if not self.client.__class__.__name__.startswith('Async'):
+        if not str(self.client.__class__.__name__).startswith('Async'):
             raise ValueError("This method requires an async client.")
-            
+        
+        payload_dict = payload
         # Convert Pydantic model to dict if needed
         if isinstance(payload, AirwallexModel):
             payload_dict = payload.to_api_dict()
-        else:
-            payload_dict = serialize(payload)
             
         url = self._build_url(resource_id)
         response = await self.client._request("PUT", url, json=payload_dict)
@@ -402,87 +348,45 @@ class AirwallexAPIBase(Generic[T]):
     
     async def delete_async(self, resource_id: Any) -> None:
         """Delete a resource asynchronously."""
-        if not self.client.__class__.__name__.startswith('Async'):
+        if not str(self.client.__class__.__name__).startswith('Async'):
             raise ValueError("This method requires an async client.")
         url = self._build_url(resource_id)
         await self.client._request("DELETE", url)
-    
-    async def paginate_async(self, **params: Any) -> List[T]:
-        """Fetch all pages of data asynchronously."""
-        if not self.client.__class__.__name__.startswith('Async'):
-            raise ValueError("This method requires an async client.")
-            
-        all_items: List[Dict[str, Any]] = []
-        page = params.get("page", 1)
-        page_size = params.get("page_size", 100)
+
+    async def paginate_async(self, stop_page: Optional[int] = None, **params: Any) -> AsyncGenerator[T, None]:
+        """
+        Generate items one by one from paginated results, asynchronously.
         
-        while True:
-            params["page"] = page
-            params["page_size"] = page_size
-            url = self._build_url()
-            response = await self.client._request("GET", url, params=serialize(params))
-            response_data = response.json()
+        Args:
+            stop_page: The page number to stop at (optional).
+            **params: Filter parameters to pass to the API.
             
-            # Check if response is paginated
-            if isinstance(response_data, dict) and 'items' in response_data:
-                items = response_data['items']
-                total_pages = response_data.get('total_pages', 1)
-                
-                if not items:
-                    break
-                    
-                all_items.extend(items)
-                
-                if page >= total_pages:
-                    break
-                    
-                page += 1
-            else:
-                # Not paginated, just use the data as is
-                page_data = self._parse_response_data(response_data)
-                if not page_data:
-                    break
-                all_items.extend(page_data)
-                break
-                
-        return [self.model_class.from_api_response(item) for item in all_items]
-    
-    async def paginate_async_generator(self, **params: Any) -> AsyncGenerator[T, None]:
-        """Generate items one by one from paginated results asynchronously."""
-        if not self.client.__class__.__name__.startswith('Async'):
+        Yields:
+            T: Each item from the paginated results.
+        """
+        if not str(self.client.__class__.__name__).startswith('Async'):
             raise ValueError("This method requires an async client.")
             
-        page = params.get("page", 1)
+        page_num = params.get("page_num", 1)
         page_size = params.get("page_size", 100)
         
         while True:
-            params["page"] = page
+            params["page_num"] = page_num
             params["page_size"] = page_size
             url = self._build_url()
-            response = await self.client._request("GET", url, params=serialize(params))
-            response_data = response.json()
+            response = await self.client._request("GET", url, params=params)
+            data = response.json()
             
-            # Check if response is paginated
-            if isinstance(response_data, dict) and 'items' in response_data:
-                items = response_data['items']
-                total_pages = response_data.get('total_pages', 1)
-                
-                if not items:
-                    break
-                    
-                for item in items:
-                    yield self.model_class.from_api_response(item)
+            items = data.get("items", [])
+            has_more = data.get("has_more", False)
+            
+            for item in items:
+                yield self.model_class.from_api_response(item)
                 
-                if page >= total_pages:
-                    break
-                    
-                page += 1
-            else:
-                # Not paginated, just use the data as is
-                page_data = self._parse_response_data(response_data)
-                if not page_data:
-                    break
-                    
-                for item in page_data:
-                    yield self.model_class.from_api_response(item)
+            if not has_more or not items:
                 break
+                
+            page_num += 1
+            
+            if stop_page and page_num > stop_page:
+                break

airwallex/api/beneficiary.py

@@ -2,22 +2,22 @@
 Airwallex Beneficiary API.
 """
 from typing import Dict, Any, List, Optional, Type, TypeVar, Union, cast
-from ..models.beneficiary import Beneficiary, BeneficiaryCreateRequest, BeneficiaryUpdateRequest
+from ..models.beneficiary import Beneficiary as BeneficiaryModel, BeneficiaryCreateRequest, BeneficiaryUpdateRequest
 from .base import AirwallexAPIBase
 
-T = TypeVar("T", bound=Beneficiary)
+T = TypeVar("T", bound=BeneficiaryModel)
 
 
-class Beneficiary(AirwallexAPIBase[Beneficiary]):
+class Beneficiary(AirwallexAPIBase[BeneficiaryModel]):
     """
     Operations for Airwallex beneficiaries.
     
     Beneficiaries represent recipients of payments.
     """
     endpoint = "beneficiaries"
-    model_class = cast(Type[Beneficiary], Beneficiary)
+    model_class = cast(Type[BeneficiaryModel], BeneficiaryModel)
     
-    def create_from_model(self, beneficiary: BeneficiaryCreateRequest) -> Beneficiary:
+    def create_from_model(self, beneficiary: BeneficiaryCreateRequest) -> BeneficiaryModel:
         """
         Create a new beneficiary using a Pydantic model.
         
@@ -29,7 +29,7 @@ class Beneficiary(AirwallexAPIBase[Beneficiary]):
         """
         return self.create(beneficiary)
     
-    async def create_from_model_async(self, beneficiary: BeneficiaryCreateRequest) -> Beneficiary:
+    async def create_from_model_async(self, beneficiary: BeneficiaryCreateRequest) -> BeneficiaryModel:
         """
         Create a new beneficiary using a Pydantic model asynchronously.
         
@@ -41,7 +41,7 @@ class Beneficiary(AirwallexAPIBase[Beneficiary]):
         """
         return await self.create_async(beneficiary)
     
-    def update_from_model(self, beneficiary_id: str, beneficiary: BeneficiaryUpdateRequest) -> Beneficiary:
+    def update_from_model(self, beneficiary_id: str, beneficiary: BeneficiaryUpdateRequest) -> BeneficiaryModel:
         """
         Update a beneficiary using a Pydantic model.
         
@@ -54,7 +54,7 @@ class Beneficiary(AirwallexAPIBase[Beneficiary]):
         """
         return self.update(beneficiary_id, beneficiary)
     
-    async def update_from_model_async(self, beneficiary_id: str, beneficiary: BeneficiaryUpdateRequest) -> Beneficiary:
+    async def update_from_model_async(self, beneficiary_id: str, beneficiary: BeneficiaryUpdateRequest) -> BeneficiaryModel:
         """
         Update a beneficiary using a Pydantic model asynchronously.
         
@@ -103,7 +103,7 @@ class Beneficiary(AirwallexAPIBase[Beneficiary]):
         else:
             raise ValueError("Use validate for sync clients")
     
-    def deactivate(self, beneficiary_id: str) -> Beneficiary:
+    def deactivate(self, beneficiary_id: str) -> BeneficiaryModel:
         """
         Deactivate a beneficiary.
         
@@ -116,7 +116,7 @@ class Beneficiary(AirwallexAPIBase[Beneficiary]):
         update_request = BeneficiaryUpdateRequest(status="disabled")
         return self.update(beneficiary_id, update_request)
     
-    async def deactivate_async(self, beneficiary_id: str) -> Beneficiary:
+    async def deactivate_async(self, beneficiary_id: str) -> BeneficiaryModel:
         """
         Deactivate a beneficiary asynchronously.
         
@@ -129,7 +129,7 @@ class Beneficiary(AirwallexAPIBase[Beneficiary]):
         update_request = BeneficiaryUpdateRequest(status="disabled")
         return await self.update_async(beneficiary_id, update_request)
     
-    def activate(self, beneficiary_id: str) -> Beneficiary:
+    def activate(self, beneficiary_id: str) -> BeneficiaryModel:
         """
         Activate a beneficiary.
         
@@ -142,7 +142,7 @@ class Beneficiary(AirwallexAPIBase[Beneficiary]):
         update_request = BeneficiaryUpdateRequest(status="active")
         return self.update(beneficiary_id, update_request)
     
-    async def activate_async(self, beneficiary_id: str) -> Beneficiary:
+    async def activate_async(self, beneficiary_id: str) -> BeneficiaryModel:
         """
         Activate a beneficiary asynchronously.
         

airwallex/api/issuing_transaction.py

@@ -189,43 +189,4 @@ class IssuingTransaction(AirwallexAPIBase[Transaction]):
                 
             page_num += 1
                 
-        return [self.model_class.from_api_response(item) for item in all_items]
-    
-    async def paginate_async(self, **params: Any) -> List[Transaction]:
-        """
-        Fetch all pages of transactions asynchronously.
-        
-        Args:
-            **params: Filter parameters to pass to the API
-            
-        Returns:
-            List[Transaction]: All transactions matching the filters
-        """
-        if not self.client.__class__.__name__.startswith('Async'):
-            raise ValueError("This method requires an async client.")
-            
-        all_items: List[Dict[str, Any]] = []
-        page_num = params.get("page_num", 0)
-        page_size = params.get("page_size", 10)
-        
-        while True:
-            params["page_num"] = page_num
-            params["page_size"] = page_size
-            
-            response = await self.client._request("GET", self._build_url(), params=params)
-            data = response.json()
-            
-            items = data.get("items", [])
-            has_more = data.get("has_more", False)
-            
-            if not items:
-                break
-                
-            all_items.extend(items)
-            
-            if not has_more:
-                break
-                
-            page_num += 1
-                
-        return [self.model_class.from_api_response(item) for item in all_items]
+        return [self.model_class.from_api_response(item) for item in all_items]

{airwallex_sdk-0.1.0.dist-info → airwallex_sdk-0.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: airwallex-sdk
-Version: 0.1.0
+Version: 0.1.1
 Summary: Unofficial Airwallex SDK for Python
 License: MIT
 Author: duneraccoon

{airwallex_sdk-0.1.0.dist-info → airwallex_sdk-0.1.1.dist-info}/RECORD

@@ -2,8 +2,8 @@ airwallex/__init__.py,sha256=u37jsOHa_cPHZWNV2w5BIq65HPWimCCmMGeoCbJbzgQ,2389
 airwallex/api/__init__.py,sha256=1T54Z3An7kgBNxHMhkQFv6jk2dnaT9OKL79MytcGhtg,1042
 airwallex/api/account.py,sha256=kdIBXNoeAYl0p1gD6Oz1nCuQn1v6E_ESJfYxPwD5sF4,3760
 airwallex/api/account_detail.py,sha256=XRrWlUm99jEhh4clqlJr3uCs6Awd2ZhXsr4h89A3eyc,17885
-airwallex/api/base.py,sha256=x9WMly6i6hfX8bCy_xH0Yw77aYYdLe1NxhIm2OpBegk,20140
-airwallex/api/beneficiary.py,sha256=4fprYXmqtBk5nHhp1ks3V-LXOIlV1dk0PEzoHM_sHwc,5580
+airwallex/api/base.py,sha256=RMz1QER61CtOWs7-g0xeoDebu0-YOSUI_ozKgYh5Q0U,16293
+airwallex/api/beneficiary.py,sha256=IRrivxCiP4gJQRN27RAjOhzHTHcf_g4Kvz1LtrvnHok,5660
 airwallex/api/financial_transaction.py,sha256=6INPjTwLO99LL2ph0uVHcPSpIJ5Qyc4xW38KXrIq8TQ,4137
 airwallex/api/invoice.py,sha256=JZSSqhqG5I2pATOlplvuRs70uW8JUYRU-Po08O3SW90,9488
 airwallex/api/issuing_authorization.py,sha256=PSbf4MMalI7u3-xb6GGHzi2o9nh9xWTGyexgtPDvfQo,11297
@@ -11,7 +11,7 @@ airwallex/api/issuing_card.py,sha256=1SX1mMpeOsaKyICDtzuPO_E-3hwD5J0Fhai1nJuggEo
 airwallex/api/issuing_cardholder.py,sha256=JmblwrNN8dstzYr6Yie8FRGNuw5zcsLKu5eqJtZ4C3k,8422
 airwallex/api/issuing_config.py,sha256=P_C_4hskUnwCpoxKro36xG3O6AN5Ena7dz-_NHgogPc,3015
 airwallex/api/issuing_digital_wallet_token.py,sha256=CIEn15rsONkofChpOtZ_pAQnmHFwVaYlm_NF_wH3Fnk,9447
-airwallex/api/issuing_transaction.py,sha256=3SjL3EtI9lMtlhCdufBrfi0qHhF7PgNjggkjwldBG50,8478
+airwallex/api/issuing_transaction.py,sha256=EppsT0LaZ4WTRqrbB337QALAjwu58iMOh7XB_izxVSo,7173
 airwallex/api/issuing_transaction_dispute.py,sha256=C7rJO5LHSwq5mjsMCZlEqjWquxbZxGWFuNLBJrlpMZ8,13244
 airwallex/api/payment.py,sha256=JfQJWwtvJpmYCzdLL4Sn5_FbFyd7ruez0zE5maRy_kU,5214
 airwallex/client.py,sha256=21EjrBsXpdWWpvMvRz1OBpYpxiCOzlpWyRri5zm3pJM,14924
@@ -34,6 +34,6 @@ airwallex/models/issuing_transaction.py,sha256=SPprY12C6sLV5-fZqExzzFV3l6Llh-A93
 airwallex/models/issuing_transaction_dispute.py,sha256=OR78VtO9a5_C3FYyVrwH6UVsvW5ptym5SeDokWgoP4w,3062
 airwallex/models/payment.py,sha256=Yxr2w8sesAEko7BccHR3Qwz5hly1OLfctzU3V-3levU,4393
 airwallex/utils.py,sha256=qKiA1e7g-RcUs7yXpaYsUgcxoeYjCoGvytFohYwPV-Q,3685
-airwallex_sdk-0.1.0.dist-info/METADATA,sha256=JpdVWVHJbs9pmpzXqHTy0KaNNMLB-Iif_b9oGAesVJQ,5600
-airwallex_sdk-0.1.0.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-airwallex_sdk-0.1.0.dist-info/RECORD,,
+airwallex_sdk-0.1.1.dist-info/METADATA,sha256=Mz8REwz85RmSHo2BPzTEM1lXBbOZ1R-O2-3Eztk1UEo,5600
+airwallex_sdk-0.1.1.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+airwallex_sdk-0.1.1.dist-info/RECORD,,