paymentsgate 1.4.6__py3-none-any.whl → 1.4.8__py3-none-any.whl

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/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.dist-info → paymentsgate-1.4.8.dist-info}/METADATA

@@ -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.dist-info → paymentsgate-1.4.8.dist-info}/RECORD

@@ -1,13 +1,13 @@
 paymentsgate/__init__.py,sha256=53DrE7IRD2NFQshE2EGYQ28jLr-ro45iFei28ZMOezI,336
 paymentsgate/cache.py,sha256=w3xB3iaYPxVEZbeWxpWM1PQT-JctspoI5qC9bv6Xmts,1002
-paymentsgate/client.py,sha256=ooCufbfpfZ5QtSM59oI_Ul-vo3zoJQlpL-nVIsn92l0,6789
+paymentsgate/client.py,sha256=OM-kNkSKARc4_Nub9Vy0HEswQfaaYVvK7P3bbxh0Lag,7577
 paymentsgate/enums.py,sha256=wvDeVQvSO5WPPSWd1XKOh-8vgI1gsK2wyfMi7P8vay0,3311
 paymentsgate/exceptions.py,sha256=fQniUSQp8XkWXPCITHDUbVNcDwSPA8rJpwbbhJ8wfNQ,1306
 paymentsgate/logger.py,sha256=QY6upavgb2y9dRQG05NwF_OTxP7bPspZR5QdpCjJULI,221
-paymentsgate/models.py,sha256=s0-G4-g3x6m_IZ5erkeNEThaAzPIP8MM66CGBhfK970,4905
+paymentsgate/models.py,sha256=LEwaoy2rkdA-2BLJoV85aKBlDMDu4NETZ0thCrBIV1g,5017
 paymentsgate/tokens.py,sha256=qdvCQJ9jYIRKSxlmm5gip-nMAQWH8_EHys9zwel4oaU,916
 paymentsgate/transport.py,sha256=pOmvDZh06uIGIUWTFi0vgf8pAgQT1f96ArcJNycU2Ks,785
-paymentsgate-1.4.6.dist-info/LICENSE,sha256=4xWMZLmqNJ6602DZLEg0A9v03uT4xMq_-XSIxvXvfYM,1075
-paymentsgate-1.4.6.dist-info/WHEEL,sha256=bbU3AyvhQ312rVm7zzRQjs6axI1UYWC3nmFA2E6FFSI,88
-paymentsgate-1.4.6.dist-info/METADATA,sha256=SibpipuhhUL5EyvhFkr2vJBxTp8EQ3ofASKTV95qL10,4020
-paymentsgate-1.4.6.dist-info/RECORD,,
+paymentsgate-1.4.8.dist-info/LICENSE,sha256=4xWMZLmqNJ6602DZLEg0A9v03uT4xMq_-XSIxvXvfYM,1075
+paymentsgate-1.4.8.dist-info/WHEEL,sha256=bbU3AyvhQ312rVm7zzRQjs6axI1UYWC3nmFA2E6FFSI,88
+paymentsgate-1.4.8.dist-info/METADATA,sha256=iQOvqOiCD_fnXJhEGnS3lOJId4rZJkAM1S9Tqh7qkWA,4020
+paymentsgate-1.4.8.dist-info/RECORD,,