Merge pull request #21 from Prevedere/dev

0.4.0 Release

Author: hiramf

CHANGELOG.md

@@ -1,6 +1,12 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## 0.4.0 - 2019-09-06
+### Added
+- Can now use a difference base url instead of 'api' using a new argument 'base'
+### Changed
+- Authentication of api key context is improved and should be faster
+
 ## 0.3.2 - 2019-07-11
 ### Added
 - Authenticates by calling to `/company`

prevedere/prevedere.py

@@ -7,7 +7,7 @@
 
 class Api:
 
-    def __init__(self, api_key: str = None):
+    def __init__(self, api_key: str = None, base: str = None):
         """
         API can be initialized directly by passing string, if not it looks for prevedere_api.ini in current working directory.
         Copy the prevedere_api.ini.example file and remove `.example` from the end.
@@ -38,12 +38,16 @@ def __init__(self, api_key: str = None):
                 raise FileNotFoundError('prevedere_api.ini config file not found in directory: ' + str(filepath.parent))
                 logging.exception()
 
+        if base:
+            self.base = base
+            logging.debug(f'Using "{self.base}" instead of "api."')
+        else:
+            self.base = 'api'
+        
         try:
             self.api_key = str(UUID(api_key))
-            company = self.fetch('/company')
-            if len(company) == 1:
-                self.company = company[0]
-                logging.info('Successfully validated as ' + self.company['Name'])
+            self.context = self.fetch('/context')
+            logging.debug(f"Hello {self.context['User']['FirstName']}, you're now connected to the {self.context['Company']['Prefix']} instance.")
         except (TypeError, ValueError, requests.exceptions.HTTPError) as e:
             raise ApiKeyError(f"'{api_key}' is not a valid API Key. " +\
             "Please check the config file or string that was passed to the constructor and try again.") from e
@@ -53,7 +57,7 @@ def fetch(self, path: str, payload: dict = None) -> dict:
         if payload is None:
             payload = {}
         payload['ApiKey'] = self.api_key
-        url = f'https://api.prevedere.com{path}'
+        url = f'https://{self.base}.prevedere.com{path}'
         try:
             r = requests.get(url, params=payload)
             r.raise_for_status()

setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name='prevedere-api',
-    version='0.3.2',
+    version='0.4.0',
     author="Prevedere, Inc.",
     author_email="[email protected]",
     description="API interface for Prevedere Inc. in Python 3.6+",