Merge branch 'release/10.0'

Author: kevanescence

dataikuapi/apinode_client.py

@@ -6,15 +6,16 @@ class APINodeClient(DSSBaseClient):
     This is an API client for the user-facing API of DSS API Node server (user facing API)
     """
 
-    def __init__(self, uri, service_id, api_key=None):
+    def __init__(self, uri, service_id, api_key=None, bearer_token=None):
         """
         Instantiate a new DSS API client on the given base URI with the given API key.
 
         :param str uri: Base URI of the DSS API node server (http://host:port/ or https://host:port/)
         :param str service_id: Identifier of the service to query
-        :param str api_key: Optional, API key for the service. Only required if the service has authentication
+        :param str api_key: Optional, API key for the service. Only required if the service has its authorization setup to API keys
+        :param str bearer_token: Optional, The bearer token. Only required if the service has its authorization setup to OAuth2/JWT
         """
-        DSSBaseClient.__init__(self, "%s/%s" % (uri, "public/api/v1/%s" % service_id), api_key)
+        DSSBaseClient.__init__(self, "%s/%s" % (uri, "public/api/v1/%s" % service_id), api_key=api_key, bearer_token=bearer_token)
 
     def predict_record(self, endpoint_id, features, forced_generation=None, dispatch_key=None, context=None,
                        with_explanations=None, explanation_method=None, n_explanations=None, n_explanations_mc_steps=None):

dataikuapi/base_client.py

@@ -5,8 +5,9 @@
 from .utils import DataikuException
 
 class DSSBaseClient(object):
-    def __init__(self, base_uri, api_key=None, internal_ticket=None):
+    def __init__(self, base_uri, api_key=None, internal_ticket=None, bearer_token=None):
         self.api_key = api_key
+        self.bearer_token = bearer_token
         self.base_uri = base_uri
         self._session = Session()
 
@@ -18,12 +19,18 @@ def _perform_http(self, method, path, params=None, body=None, stream=False):
         if body:
             body = json.dumps(body)
 
-        auth = HTTPBasicAuth(self.api_key, "")
+        headers = None
+        auth = None
+
+        if self.api_key:
+            auth = HTTPBasicAuth(self.api_key, "")
+        elif self.bearer_token:
+            headers = {"Authorization": "Bearer " + self.bearer_token}
 
         try:
             http_res = self._session.request(
                     method, "%s/%s" % (self.base_uri, path),
-                    params=params, data=body,
+                    params=params, data=body, headers=headers,
                     auth=auth, stream = stream)
             http_res.raise_for_status()
             return http_res