paymentsgate 1.4.6__tar.gz → 1.4.8__tar.gz

{paymentsgate-1.4.6 → paymentsgate-1.4.8}/PKG-INFO

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

{paymentsgate-1.4.6 → paymentsgate-1.4.8}/paymentsgate/client.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
-from dataclasses import dataclass, field
+import logging
+from dataclasses import dataclass, is_dataclass, field, asdict
 import json
 from urllib.parse import urlencode
 
@@ -18,7 +19,8 @@ from paymentsgate.models import (
     PayInModel, 
     PayInResponseModel, 
     PayOutModel, 
-    PayOutResponseModel
+    PayOutResponseModel,
+    InvoiceModel
 )
 from paymentsgate.enums import ApiPaths
 from paymentsgate.transport import (
@@ -44,10 +46,12 @@ class ApiClient:
     REQUEST_DEBUG: bool = False
     RESPONSE_DEBUG: bool = False
 
-    def __init__(self, config: Credentials, baseUrl: str):
+    def __init__(self, config: Credentials, baseUrl: str, debug: bool=False):
         self.config = config
         self.cache = DefaultCache()
-        self.baseUrl = baseUrl;
+        self.baseUrl = baseUrl
+        if debug:
+            logging.basicConfig(level=logging.DEBUG)
 
     def PayIn(self, request: PayInModel) -> PayInResponseModel:
          # Prepare request
@@ -100,11 +104,30 @@ class ApiClient:
         # Handle response
         response = self._send_request(request)
         self.logger(request, response)
-        if (response.success):
-            return response.cast(GetQuoteResponseModel, APIResponseError)
-        else:
+        if not response.success:
             raise APIResponseError(response)
 
+        return response.cast(GetQuoteResponseModel, APIResponseError)
+    
+    def Status(self, query: str) -> InvoiceModel:
+         # Prepare request
+        request = Request(
+            method="get",
+            path=ApiPaths.invoices_info,
+            content_type='application/json',
+            noAuth=False,
+            signature=False,
+            body=request
+        )
+
+        # Handle response
+        response = self._send_request(request)
+        self.logger(request, response)
+        if not response.success:
+            raise APIResponseError(response)
+
+        return response.cast(InvoiceModel, APIResponseError)
+
     @property
     def token(self) -> AccessToken | None:
         # First check if valid token is cached
@@ -152,7 +175,7 @@ class ApiClient:
         """
         Send a specified Request to the GoPay REST API and process the response
         """
-
+        body = asdict(request.body) if is_dataclass(request.body) else request.body
         # Add Bearer authentication to headers if needed
         headers = request.headers or {}
         if not request.noAuth:
@@ -161,9 +184,10 @@ class ApiClient:
                 headers["Authorization"] = f"Bearer {auth.token}"
 
         if (request.method == 'get'):
+            params = urlencode(body)
             r = requests.request(
                 method=request.method,
-                url=f"{self.baseUrl}{request.path}?{urlencode(request.body)}",
+                url=f"{self.baseUrl}{request.path}?{params}",
                 headers=headers,
                 timeout=self.timeout
             )
@@ -172,7 +196,7 @@ class ApiClient:
                 method=request.method,
                 url=f"{self.baseUrl}{request.path}",
                 headers=headers,
-                json=request.body,
+                json=body,
                 timeout=self.timeout
             )
 

{paymentsgate-1.4.6 → paymentsgate-1.4.8}/paymentsgate/models.py

@@ -22,11 +22,11 @@ from pydantic import BaseModel, ConfigDict
 class Credentials:
   def __init__(
       self, 
-      account_id='', 
-      merchant_id='', 
-      project_id='', 
-      private_key='', 
-      public_key=''
+      account_id: str,
+      merchant_id: str,
+      project_id: str,
+      private_key: str,
+      public_key: str
   ):
      self.account_id = account_id
      self.merchant_id = merchant_id
@@ -34,14 +34,14 @@ class Credentials:
      self.private_key = private_key
      self.public_key = public_key
   
+  @classmethod
   def fromFile(cls, filename):
     data = json.load(open(filename))
-    cls.account_id = data.get('account_id')
-    cls.merchant_id = data.get('merchant_id')
-    cls.project_id = data.get('project_id')
-    cls.private_key = data.get('private_key')
-    cls.public_key = data.get('public_key')
-    return cls
+    return cls(data.get('account_id'),
+               data.get('merchant_id'),
+               data.get('project_id'),
+               data.get('private_key'),
+               data.get('public_key'))
 
 
 @dataclass
@@ -148,6 +148,7 @@ class GetQuoteResponseModel:
   fees: Optional[float]  = None
   fees_percent: Optional[float]  = None
   quotes: Optional[List[QuoteEntity]]  = None
+  expiredAt: Optional[datetime.datetime] = None
 
   #deprecated
   currency_from: Optional[CurrencyModel] = None
@@ -199,9 +200,11 @@ class InvoiceAmountModel:
 class InvoiceMetadataModel:
   invoiceId: Optional[str]
   clientId: Optional[str]
+  fiatAmount: Optional[float]
 
 @dataclass
 class InvoiceModel:
+  _id: str
   orderId: str
   projectId: str
   currencyFrom: CurrencyModel
@@ -211,6 +214,8 @@ class InvoiceModel:
   status: InvoiceStatusModel
   amounts: InvoiceAmountModel
   metadata: InvoiceMetadataModel
+  receiptUrls: List[str]
+  isExpired: bool
   createdAt: datetime
   updatedAt: datetime
   expiredAt: datetime
@@ -225,3 +230,4 @@ class AssetsAccountModel:
 @dataclass
 class AssetsResponseModel:
   assets: List[AssetsAccountModel]
+

{paymentsgate-1.4.6 → paymentsgate-1.4.8}/pyproject.toml

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

{paymentsgate-1.4.6 → paymentsgate-1.4.8}/setup.py

@@ -15,7 +15,7 @@ install_requires = \
 
 setup_kwargs = {
     'name': 'paymentsgate',
-    'version': '1.4.6',
+    'version': '1.4.8',
     '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',