deceit 0.4__tar.gz → 0.7__tar.gz

{deceit-0.4 → deceit-0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: deceit
-Version: 0.4
+Version: 0.7
 Summary: deceit
 Home-page: https://bitbucket.org/dbuy/deceit
 Author: dev

{deceit-0.4 → deceit-0.7}/deceit/api_client.py

@@ -1,25 +1,30 @@
 import json
 import logging
 import posixpath
+from datetime import datetime, timedelta
+from time import time
 from typing import Optional, Dict, Any
+from pytz import utc
 import requests
 from requests import PreparedRequest
 from requests.models import Request, Response
-
+from oauthlib.oauth2 import BackendApplicationClient
+from oauthlib.oauth2.rfc6749.tokens import prepare_bearer_headers
+from requests_oauthlib.oauth2_session import OAuth2Session
 from .adapters import RetryAdapter
 from .encoders import JsonEncoder
 from .exceptions import ApiException
 
 
-
 class ApiClient:
     def __init__(self, *args, base_url=None, default_timeout=None,
                  exception_class=None, **kwargs):
         self.base_url = base_url
-        adapter = RetryAdapter(timeout=default_timeout)
+        self.default_timeout = default_timeout
+        self.adapter = RetryAdapter(timeout=self.default_timeout)
         self.session = requests.Session()
-        self.session.mount('https://', adapter)
-        self.session.mount('http://', adapter)
+        self.session.mount('https://', self.adapter)
+        self.session.mount('http://', self.adapter)
         self.log = logging.getLogger(__name__)
         self.exception_class = exception_class or ApiException
 
@@ -61,16 +66,17 @@ class ApiClient:
         """
         headers = self.headers()
         headers.update(kwargs.pop('headers', None) or {})
-        timeout = kwargs.pop('timeout', None)
+        timeout = kwargs.pop('timeout', None) or self.default_timeout
         send_kwargs = {}
         if timeout is not None:
             send_kwargs['timeout'] = timeout
         base_url = self.base_url
         url = posixpath.join(base_url, route) if base_url else route
+        body = None
         if json_data:
             body = json.dumps(json_data, cls=JsonEncoder)
             headers.setdefault('content-type', 'application/json')
-        else:
+        elif form_data:
             body = form_data
             headers.setdefault('content-type', 'application/x-www-form-urlencoded')
         request = Request(
@@ -97,7 +103,7 @@ class ApiClient:
             raise self.exception_class.from_response(response)
         try:
             return response.json()
-        except json.JSONDecodeError:
+        except json.JSONDecodeError:  # pragma: nocover
             pass
         return None
 
@@ -123,3 +129,62 @@ class ApiClient:
         return self.send(
             'patch', route, params=params, form_data=form_data,
             json_data=json_data, **kwargs)
+
+
+class BackendOauth2Client(ApiClient):
+    def __init__(self, conf, *args, base_url=None, default_timeout=None,
+                 exception_class=None, token_url=None,
+                 client_id=None, password=None, scopes=None,
+                 include_client_id=None, **kwargs):
+        super().__init__(
+            base_url=base_url or conf.base_url or None,
+            default_timeout=default_timeout or conf.default_timeout or None,
+            exception_class=exception_class, **kwargs)
+        self.token_url = token_url or conf.token_url
+        self.client_id = client_id or conf.client_id
+        self.token_expires_at = time()
+        self.client_secret = password or conf.client_secret or conf.password
+        self.scopes = scopes or conf.scopes or []
+        self.session = OAuth2Session(client=BackendApplicationClient(
+            client_id=self.client_id,
+            scope=self.scope))
+        self.include_client_id = include_client_id or conf.get('include_client_id')
+        self.session.mount('https://', self.adapter)
+
+    @property
+    def scope(self):
+        if self.scopes:
+            scopes = ' '.join(self.scopes)
+            return scopes
+        return None
+
+    def fetch_token(self, **kwargs):
+        tm_now = time()
+        self.session.fetch_token(
+            self.token_url,
+            client_id=self.client_id,
+            client_secret=self.client_secret,
+            include_client_id=self.include_client_id,
+            scope=self.scope,
+            **kwargs)
+        expires_at = self.session.token.get('expires_at')
+        if not expires_at:
+            # microsoft apis can use `expires_on`
+            expires_at = self.session.token.get('expires_on')
+        if not expires_at:
+            # some other apis use `expires_in`
+            expires_at = self.session.token.get('expires_in') + tm_now
+        self.token_expires_at = expires_at - 300
+
+    @classmethod
+    def now(cls):
+        return datetime.now(utc)
+
+    @property
+    def expired(self):
+        return time() >= self.token_expires_at
+
+    def presend(self, request: PreparedRequest):
+        if self.expired:
+            self.fetch_token()
+        prepare_bearer_headers(self.session.access_token, request.headers)

{deceit-0.4 → deceit-0.7}/deceit/exceptions.py

@@ -3,12 +3,14 @@ from requests.models import Response
 
 
 class ApiException(Exception):
-    def __init__(self, status_code=None, content=None, text=None, data=None):
-        super().__init__(status_code, content, text, data)
+    def __init__(self, status_code=None, content=None, text=None, data=None,
+                 headers=None):
+        super().__init__(status_code, content, text, data, headers)
         self.status_code = status_code
         self.content = content
         self.text = text
         self.data = data
+        self.headers = headers
 
     def __str__(self):
         klass = self.__class__.__name__.lower()
@@ -23,7 +25,12 @@ class ApiException(Exception):
             body = json.dumps(self.data, indent=2)
         else:
             body = self.text
-        p.text(f'[{klass}] [{self.status_code}] => {body}')
+        st_headers = ''
+        if self.headers:
+            st = json.dumps(self.headers, indent=2)
+            st_headers = f'[{klass}] [{self.status_code}] / headers => {st}'
+        p.text(f'[{klass}] [{self.status_code}] => {body}' + st_headers)
+        p.text()
 
     @classmethod
     def from_response(cls, response: Response):
@@ -33,10 +40,12 @@ class ApiException(Exception):
                 response.content,
                 response.text,
                 response.json(),
+                response.headers,
             )
         except json.JSONDecodeError:
             return cls(
                 response.status_code,
                 response.content,
                 response.text,
+                headers=response.headers,
             )

{deceit-0.4 → deceit-0.7}/deceit.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: deceit
-Version: 0.4
+Version: 0.7
 Summary: deceit
 Home-page: https://bitbucket.org/dbuy/deceit
 Author: dev

{deceit-0.4 → deceit-0.7}/deceit.egg-info/requires.txt

@@ -1,4 +1,6 @@
 requests
+requests_oauthlib
+pytz
 
 [dev]
 pytest
@@ -10,3 +12,5 @@ pytest-pspec
 ipython
 bumpversion
 pytest-docker
+waddle
+convocations

{deceit-0.4 → deceit-0.7}/dev.txt

@@ -7,4 +7,6 @@ pytest-pspec
 ipython
 bumpversion
 pytest-docker
+waddle
+convocations
 

{deceit-0.4 → deceit-0.7}/setup.py

@@ -7,7 +7,7 @@ from importlib.resources import open_text
 # Version info -- read without importing
 _locals = {}
 
-version = '0.4'
+version = '0.7'
 
 # PyYAML ships a split Python 2/3 codebase. Unfortunately, some pip versions
 # attempt to interpret both halves of PyYAML, yielding SyntaxErrors. Thus, we
@@ -70,6 +70,8 @@ setup(
     ],
     install_requires=[
         'requests',
+        'requests_oauthlib',
+        'pytz',
     ],
     extras_require=extras,
 )