paymentsgate 1.5.7__tar.gz → 1.5.9__tar.gz

{paymentsgate-1.5.7 → paymentsgate-1.5.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: paymentsgate
-Version: 1.5.7
+Version: 1.5.9
 Summary: PaymentsGate's Python SDK for REST API
 Home-page: https://github.com/paymentsgate/python-secure-api
 License: MIT

{paymentsgate-1.5.7 → paymentsgate-1.5.9}/paymentsgate/client.py

@@ -145,14 +145,15 @@ class ApiAsyncClient(BaseClient):
             raise APIResponseError(response)
         return response.cast(InvoiceModel, APIResponseError)
     
-    async def List(self, page: int | int = 0) -> InvoiceListModelWithMeta:
+    async def List(self, page: int = 0) -> InvoiceListModelWithMeta:
          # Prepare request
         request = Request(
             method="get",
-            path=ApiPaths.invoices_list.replace('$1', page | 10),
+            path=ApiPaths.invoices_list,
             content_type='application/json',
             noAuth=False,
             signature=False,
+            body={"page": page},
         )
 
         # Handle response
@@ -161,7 +162,6 @@ class ApiAsyncClient(BaseClient):
             raise APIResponseError(response)
         return response.cast(InvoiceListModelWithMeta, APIResponseError)
 
-
     async def get_token(self) -> AccessToken | None:
         # First check if valid token is cached
         token = self.cache.get_token("AccessToken")
@@ -351,6 +351,7 @@ class ApiClient(BaseClient):
             noAuth=False,
             signature=False,
             body=params.model_dump(exclude_none=True),
+            # body=GetQuoteTlv(**params).model_dump(exclude_none=True),
         )
 
         # Handle response
@@ -377,6 +378,23 @@ class ApiClient(BaseClient):
 
         return response.cast(InvoiceModel, APIResponseError)
 
+    def List(self, page: int = 0) -> InvoiceListModelWithMeta:
+         # Prepare request
+        request = Request(
+            method="get",
+            path=ApiPaths.invoices_list,
+            content_type='application/json',
+            noAuth=False,
+            signature=False,
+            body={"page": page},
+        )
+
+        # Handle response
+        response = self._send_request(request)
+        if not response.success:
+            raise APIResponseError(response)
+        return response.cast(InvoiceListModelWithMeta, APIResponseError)
+
     def get_token(self) -> AccessToken | None:
         # First check if valid token is cached
         token = self.cache.get_token('access')
@@ -431,7 +449,10 @@ class ApiClient(BaseClient):
                 headers["Authorization"] = f"Bearer {auth.token}"
 
         if (request.method == 'get'):
-            params = urlencode(body)
+            if (request.body == None):
+                request.body = ''
+
+            params = urlencode(request.body)
             r = httpx.request(
                 method=request.method,
                 url=f"{self.baseUrl}{request.path}?{params}",
@@ -443,7 +464,7 @@ class ApiClient(BaseClient):
                 method=request.method,
                 url=f"{self.baseUrl}{request.path}",
                 headers=headers,
-                json=body,
+                json=request.body,
                 timeout=self.timeout
             )
 

{paymentsgate-1.5.7 → paymentsgate-1.5.9}/paymentsgate/enums.py

@@ -16,7 +16,7 @@ class ApiPaths(StrEnum):
     invoices_payout_tlv = "/deals/tlv"
     invoices_info = "/deals/:id"
     invoices_credentials = "/deals/:id/credentials"
-    invoices_list = "/deals/list?page=$1"
+    invoices_list = "/deals/list"
     assets_list = "/wallet"
     assets_deposit = "/wallet/deposit"
     banks_list = "/banks/find"

{paymentsgate-1.5.7 → paymentsgate-1.5.9}/paymentsgate/models.py

@@ -211,27 +211,28 @@ class InvoiceAmountModel(BaseResponseModel):
 
 
 class InvoiceMetadataModel(BaseResponseModel):
-    invoiceId: Optional[str]
-    clientId: Optional[str]
-    fiatAmount: Optional[float]
+    invoiceId: Optional[str]  | None = None
+    clientId: Optional[str]  | None = None
+    fiatAmount: Optional[float]  | None = None
 
 
 class InvoiceModel(BaseResponseModel):
     id: str | None = Field(..., alias='_id')
-    orderId: str
-    projectId: str
-    currencyFrom: CurrencyModel
-    currencyTo: CurrencyModel
-    direction: InvoiceDirection
-    amount: float
-    status: InvoiceStatusModel
-    amounts: InvoiceAmountModel
-    metadata: InvoiceMetadataModel
-    receiptUrls: List[str]
-    isExpired: bool
+    orderId: str  | None = None
+    projectId: str  | None = None
+    currencyFrom: CurrencyModel  | None = None
+    currencyTo: CurrencyModel  | None = None
+    direction: InvoiceDirection  | None = None
+    amount: float  | None = None
+    status: InvoiceStatusModel  | None = None
+    amounts: InvoiceAmountModel  | None = None
+    metadata: InvoiceMetadataModel  | None = None
+    receiptUrls: List[str]  | None = None
+    isExpired: bool  | None = None
     createdAt: datetime.datetime | None = None
     updatedAt: datetime.datetime | None = None
     expiredAt: datetime.datetime | None = None
+    model_config = ConfigDict(extra="ignore")
 
 
 class AssetsAccountModel(BaseResponseModel):
@@ -307,5 +308,6 @@ class ListMetadata(BaseResponseModel):
     total: int
 
 class InvoiceListModelWithMeta(BaseResponseModel): 
-    metadata: ListMetadata
-    rows: List[InvoiceModel]
+    meta: ListMetadata
+    rows: List[InvoiceModel]
+    model_config = ConfigDict(extra="ignore")

{paymentsgate-1.5.7 → paymentsgate-1.5.9}/pyproject.toml

@@ -14,7 +14,7 @@ name = "paymentsgate"
 packages = [{include = "paymentsgate"}]
 readme = "README.md"
 repository = "https://github.com/paymentsgate/python-secure-api"
-version = "1.5.7"
+version = "1.5.9"
 
 [tool.poetry.dependencies]
 pydantic = "^2.8.2"

{paymentsgate-1.5.7 → paymentsgate-1.5.9}/setup.py

@@ -17,7 +17,7 @@ install_requires = \
 
 setup_kwargs = {
     'name': 'paymentsgate',
-    'version': '1.5.7',
+    'version': '1.5.9',
     'description': "PaymentsGate's Python SDK for REST API",
     'long_description': '\n# Paymentsgate Python SDK for Payments REST API\n\n\n## Requirements\n\n- Python >= 3.8.1\n- dependencies:\n  - [`requests`](https://github.com/kennethreitz/requests)\n  - [`pydantic`](https://docs.pydantic.dev/latest/)\n  - [`jwt`](https://pyjwt.readthedocs.io/en/stable/)\n  \n## Installation\n\nThe simplest way to install SDK is to use [PIP](https://docs.python.org/3/installing/):\n\n```bash\npip install paymentsgate\n```\n\n## Basic usage\n\n```python\nfrom paymentsgate import ApiClient, Credentials, Currencies\n\n\n# minimal configuration\nconfig = Credentials().fromFile(\'/path/to/credentials.json\');\n\n# create ApiClient\nclient = ApiClient(config, baseUrl=\'https://api.example.com\');\n\n# request quote\nres = cli.Quote(\n  {\n    "amount": 10.10,\n    "currency_from": Currencies.EUR,\n    "currency_to": Currencies.AZN,\n  }\n)\nprint(res);\n```\n\nThe `credentials.json` file is used to connect to the client and contains all necessary data to use the API. This file can be obtained in your personal cabinet, in the service accounts section. Follow the instructions in the documentation to issue new keys. If you already have keys, but you don\'t feel comfortable storing them in a file, you can use client initialization via variables. In this case, the key data can be stored in external storage instead of on the file system:\n\n```python\nfrom paymentsgate import ApiClient, Credentials\n\nconfig = Credentials(\n  account_id="00000000-4000-4000-0000-00000000000a" \n  public_key="LS0tLS1CRUdJTiBSU0EgUFJJVkFUNSUlFb3dJQk..."\n)\n\nclient = ApiClient(config, baseUrl=\'https://api.example.com\');\n\n...\n```\n*It is important to note that the data format for key transfer is base46.\n\n## Examples\n\n### create PayIn\n\n```python\nres = cli.PayIn(\n  {\n    "amount": 10.10,\n    "currency": Currencies.AZN,\n    "invoiceId": "INVOICE-112123124",\n    "clientId": "",\n    "successUrl": "https://example.com/success",\n    "failUrl": "https://example.com/fail",\n    "type": InvoiceTypes.m10\n  }\n)\nprint(res);\n```\n\n### create PayOut\n\n```python\nres = cli.PayOut(\n  {\n    "amount": 5.12,\n    "currencyTo": Currencies.EUR,\n    "invoiceId": "INVOICE-112123124",\n    "clientId": "CLIENT-003010023004",\n    "baseCurrency": CurrencyTypes.fiat,\n    "feesStrategy": FeesStrategy.add,\n    "recipient": {\n      "account_number": "4000000000000012",\n      "account_owner": "CARD HOLDER",\n      "type": CredentialsTypes.card\n    }\n  }\n)\nprint(res);\n```\n\n### Error handling\n\n```python\ntry:\n  res = cli.PayOut(\n    {\n      "amount": 5.12,\n      "currencyTo": Currencies.EUR,\n      "invoiceId": "INVOICE-112123124",\n      "clientId": "CLIENT-003010023004",\n      "baseCurrency": CurrencyTypes.fiat,\n      "feesStrategy": FeesStrategy.add,\n      "recipient": {\n        "account_number": "4000000000000012",\n        "account_owner": "CARD HOLDER",\n        "type": CredentialsTypes.card\n      }\n    }\n  )\n  print(res);\nexcept APIAuthenticationError as err:\n  print(f"Authentication fail: {err.message}")\nexcept APIResponseError as err:\n  print(f"Exception: {err.error}; Message: {err.message}")\n```',
     'author': 'PaymentsGate',