v0.0.4

Author: denisneuf

python_paypal_api/auth/__init__.py

@@ -1,9 +1,11 @@
 from .access_token_client import AccessTokenClient
 from .access_token_response import AccessTokenResponse
 from .credentials import Credentials
+from .exceptions import AuthorizationError
 
 __all__ = [
     'AccessTokenResponse',
     'AccessTokenClient',
     'Credentials',
+    'AuthorizationError'
 ]

python_paypal_api/auth/access_token_client.py

@@ -1,35 +1,35 @@
 import requests
+from requests.auth import HTTPBasicAuth
 import hashlib
 import logging
 import confuse
-from python_paypal_api.base import BaseClient
-from python_paypal_api.base.enum import EndPoint
-from .credentials import Credentials
-from .access_token_response import AccessTokenResponse
-from .exceptions import AuthorizationError
 import os
 import logging
 import json
-
 from datetime import datetime, timedelta
-
-from requests.auth import HTTPBasicAuth
-
+from cachetools import TTLCache
+from python_paypal_api.base import BaseClient
+from python_paypal_api.base.enum import EndPoint
+from python_paypal_api.auth.credentials import Credentials
+from python_paypal_api.auth.access_token_response import AccessTokenResponse
+from python_paypal_api.auth.exceptions import AuthorizationError
 
 logging.basicConfig(
     level=logging.INFO,
     format="%(asctime)s:%(levelname)s:%(message)s"
 )
 
+cache = TTLCache(maxsize=10, ttl=timedelta(seconds=32400), timer=datetime.now)
 
 class AccessTokenClient(BaseClient):
 
     grant_type = 'client_credentials'
     path = '/v1/oauth2/token'
 
-    def __init__(self, account='default', credentials=None, proxies=None, verify=True, timeout=None):
+    def __init__(self, account='default', credentials=None, store_credentials=True, proxies=None, verify=True, timeout=None):
 
         self.cred = Credentials(credentials)
+        self.store_credentials = store_credentials
         self.host = EndPoint[self.cred.client_mode].value if self.cred.client_mode is not None else EndPoint["SANDBOX"].value
         self.timeout = timeout
         self.proxies = proxies
@@ -77,32 +77,56 @@ def create_cache_token(self, file:str):
             fout.write(json_object)
         return access_token
 
-
     def get_auth(self) -> AccessTokenResponse:
 
-        now_datetime = datetime.now()
 
-        config = confuse.Configuration('python-paypal-api')
-        file = os.path.join(config.config_dir(), self._get_cache_key())
-        try:
-            
-            openfile = open(file, 'r')
-            access_token = json.load(openfile)
-            future_datetime = datetime.fromisoformat(access_token["expire_time"])
-            # openfile.close()
-
-        except FileNotFoundError:
-
-            access_token = self.create_cache_token(file)
-            future_datetime = now_datetime + timedelta(seconds=access_token["expires_in"])
- 
-        if now_datetime > future_datetime:
-            if(os.path.isfile(file)):
-                os.remove(file)
-            access_token = self.create_cache_token(file)
+        # logging.info("self.store_credentials")
+        # logging.info(self.store_credentials)
+        # logging.info(self.get_file_auth())
+
+        if self.store_credentials:
+
+
+            now_datetime = datetime.now()
+
+            config = confuse.Configuration('python-paypal-api')
+            file = os.path.join(config.config_dir(), self._get_cache_key())
+            try:
+
+                openfile = open(file, 'r')
+                access_token = json.load(openfile)
+                future_datetime = datetime.fromisoformat(access_token["expire_time"])
+                openfile.close()
+
+            except FileNotFoundError:
+
+                access_token = self.create_cache_token(file)
+                future_datetime = now_datetime + timedelta(seconds=access_token["expires_in"])
+
+            if now_datetime > future_datetime:
+                if (os.path.isfile(file)):
+                    os.remove(file)
+                access_token = self.create_cache_token(file)
+
+            else:
+                pass
+
 
         else:
-            pass
+
+
+            cache_key = self._get_cache_key()
+            try:
+                # logging.info("cache")
+                access_token = cache[cache_key]
+            except KeyError:
+                # logging.info("request")
+                request_url = self.scheme + self.host + self.path
+                access_token = self._request(request_url, self.data, self.headers)
+                cache[cache_key] = access_token
+            # return AccessTokenResponse(**access_token)
+
+
 
         return AccessTokenResponse(**access_token)
 

python_paypal_api/base/__init__.py

@@ -1,10 +1,7 @@
 from .base_client import BaseClient
 from .client import Client
 from .helpers import PaypalEndpoint, PaypalEndpointParams
-from .exceptions import PaypalApiException, PaypalApiRequestException, PaypalTypeException
-from .exceptions import PaypalApiBadRequestException, PaypalApiForbiddenException
-from .exceptions import PaypalApiUnprocessableEntityException
-from .exceptions import PaypalApiResourceNotFound
+from .exceptions import PaypalApiException, PaypalTypeException
 from .credential_provider import CredentialProvider, MissingCredentials
 from .api_response import ApiResponse
 from .utils import Utils
@@ -18,11 +15,7 @@
     'PaypalEndpointParams',
     'PaypalEndpoint',
     'PaypalApiException',
-    'PaypalApiRequestException',
-    'PaypalApiBadRequestException',
-    'PaypalApiUnprocessableEntityException',
-    'PaypalApiResourceNotFound',
-    'PaypalApiForbiddenException'
+    'PaypalTypeException',
     'CredentialProvider',
     'MissingCredentials',
     'Utils',

python_paypal_api/base/client.py

@@ -5,38 +5,27 @@
 from python_paypal_api.auth.credentials import Credentials
 from python_paypal_api.auth import AccessTokenClient, AccessTokenResponse
 from python_paypal_api.base.credential_provider import CredentialProvider
-from .api_response import ApiResponse
-from .base_client import BaseClient
+from python_paypal_api.base.api_response import ApiResponse
+from python_paypal_api.base.base_client import BaseClient
 from python_paypal_api.base.enum import EndPoint
-from .exceptions import get_exception_for_content, get_exception_for_code
 import os
-import requests
-from io import BytesIO
-import gzip
-from zipfile import ZipFile
-import zipfile
-from urllib.parse import urlparse, quote
 
 log = logging.getLogger(__name__)
 
 class Client(BaseClient):
 
-    access_token_client_class = AccessTokenClient
-    grantless_scope = ''
-
     def __init__(
             self,
             account='default',
             credentials=None,
+            credential_providers=None,
+            store_credentials=False,
             proxies=None,
             verify=True,
             timeout=None,
-            debug=False,
-            credential_providers=None
+            debug=False
     ):
 
-        super().__init__(account, credentials)
-
         self.credentials = CredentialProvider(
             account,
             credentials,
@@ -46,9 +35,11 @@ def __init__(
         self.host = EndPoint[self.credentials.client_mode].value if self.credentials.client_mode is not None else EndPoint["SANDBOX"].value
         self.endpoint = self.scheme + self.host
         self.debug = debug
-        self._auth = self.access_token_client_class(
+        self.store_credentials = store_credentials
+        self._auth = AccessTokenClient(
             account=account,
             credentials=self.credentials,
+            store_credentials=self.store_credentials,
             proxies=proxies,
             verify=verify,
             timeout=timeout,
@@ -65,6 +56,7 @@ def headers(self):
             # 'Content-Type': 'application/json'
         }
 
+
     @property
     def auth(self) -> AccessTokenResponse:
         return self._auth.get_auth()

python_paypal_api/base/credential_provider.py

@@ -76,7 +76,6 @@ def load_credentials(self):
 
 class CredentialProvider:
     credentials = None
-    logger.info("CredentialProvider")
 
     CREDENTIAL_PROVIDERS: Iterable[Type[BaseCredentialProvider]] = (
         FromCodeCredentialProvider,

python_paypal_api/version.py

@@ -1 +1 @@
-__version__ = "0.0.3"
+__version__ = "0.0.4"

setup.py

@@ -43,7 +43,7 @@
 
 setup(
     name='python-paypal-api',
-    version='0.0.3',
+    version='0.0.4',
     python_requires='>=3.8',
     author='denisneuf',
     author_email='denisneuf@hotmail.com',
@@ -55,6 +55,7 @@
     install_requires = [ 
         'requests>=2.27.1,<2.29.0',
         'confuse>=1.7,<2.1',
+        'cachetools~=5.3.0'
     ],
     license="Apache License 2.0",
     classifiers=[