corrected issue with header initialization in json helper

Author: zeryx

Algorithmia/client.py

@@ -24,16 +24,15 @@ class Client(object):
     requestSession = None
     bearerToken = None
 
-
-    def __init__(self, apiKey = None, apiAddress = None, caCert = None, bearerToken=None):
+    def __init__(self, apiKey=None, apiAddress=None, caCert=None, bearerToken=None):
         # Override apiKey with environment variable
         config = None
         self.requestSession = requests.Session()
         if apiKey is None and 'ALGORITHMIA_API_KEY' in os.environ:
             apiKey = os.environ['ALGORITHMIA_API_KEY']
         elif bearerToken is None and 'ALGORITHMIA_BEARER_TOKEN' in os.environ:
             bearerToken = os.environ['ALGORITHMIA_BEARER_TOKEN']
-        
+
         self.bearerToken = bearerToken
         self.apiKey = apiKey
         if apiAddress is not None:
@@ -224,8 +223,10 @@ def postJsonHelper(self, url, input_object, parse_response_as_json=True, **query
         headers = {}
         if self.apiKey is not None:
             headers['Authorization'] = self.apiKey
-        else: 
-            headers['Authorization'] = "Bearer "+ self.bearerToken
+        elif self.bearerToken is not None:
+            headers['Authorization'] = 'Bearer ' + self.bearerToken
+        else:
+            raise Exception("No authentication provided")
 
         input_json = None
         if input_object is None:
@@ -253,8 +254,8 @@ def getHelper(self, url, **query_parameters):
         headers = {}
         if self.apiKey is not None:
             headers['Authorization'] = self.apiKey
-        elif self.bearerToken is not None: 
-            headers['Authorization'] = 'Bearer '+ self.bearerToken
+        elif self.bearerToken is not None:
+            headers['Authorization'] = 'Bearer ' + self.bearerToken
         else:
             raise Exception("No authentication provided")
         return self.requestSession.get(self.apiAddress + url, headers=headers, params=query_parameters)
@@ -263,8 +264,8 @@ def getStreamHelper(self, url, **query_parameters):
         headers = {}
         if self.apiKey is not None:
             headers['Authorization'] = self.apiKey
-        elif self.bearerToken is not None: 
-            headers['Authorization'] = 'Bearer '+ self.bearerToken
+        elif self.bearerToken is not None:
+            headers['Authorization'] = 'Bearer ' + self.bearerToken
         else:
             raise Exception("No authentication provided")
         return self.requestSession.get(self.apiAddress + url, headers=headers, params=query_parameters, stream=True)
@@ -273,8 +274,8 @@ def patchHelper(self, url, params):
         headers = {'content-type': 'application/json'}
         if self.apiKey is not None:
             headers['Authorization'] = self.apiKey
-        elif self.bearerToken is not None: 
-            headers['Authorization'] = 'Bearer '+ self.bearerToken
+        elif self.bearerToken is not None:
+            headers['Authorization'] = 'Bearer ' + self.bearerToken
         else:
             raise Exception("No authentication provided")
         return self.requestSession.patch(self.apiAddress + url, headers=headers, data=json.dumps(params))
@@ -284,8 +285,8 @@ def headHelper(self, url):
         headers = {}
         if self.apiKey is not None:
             headers['Authorization'] = self.apiKey
-        elif self.bearerToken is not None: 
-            headers['Authorization'] = 'Bearer '+ self.bearerToken
+        elif self.bearerToken is not None:
+            headers['Authorization'] = 'Bearer ' + self.bearerToken
         else:
             raise Exception("No authentication provided")
         return self.requestSession.head(self.apiAddress + url, headers=headers)
@@ -295,8 +296,8 @@ def putHelper(self, url, data):
         headers = {}
         if self.apiKey is not None:
             headers['Authorization'] = self.apiKey
-        elif self.bearerToken is not None: 
-            headers['Authorization'] = 'Bearer '+ self.bearerToken
+        elif self.bearerToken is not None:
+            headers['Authorization'] = 'Bearer ' + self.bearerToken
         else:
             raise Exception("No authentication provided")
         if isJson(data):
@@ -312,8 +313,8 @@ def deleteHelper(self, url):
         headers = {}
         if self.apiKey is not None:
             headers['Authorization'] = self.apiKey
-        elif self.bearerToken is not None: 
-            headers['Authorization'] = 'Bearer '+ self.bearerToken
+        elif self.bearerToken is not None:
+            headers['Authorization'] = 'Bearer ' + self.bearerToken
         else:
             raise Exception("No authentication provided")
         response = self.requestSession.delete(self.apiAddress + url, headers=headers)
@@ -375,11 +376,12 @@ def freeze(self, manifest_path, manifest_output_dir="."):
                 required_files[i]['md5_checksum'] = md5_checksum
             lock_md5_checksum = md5_for_str(str(manifest_file))
             manifest_file['lock_checksum'] = lock_md5_checksum
-            with open(manifest_output_dir+'/'+'model_manifest.json.freeze', 'w') as f:
+            with open(manifest_output_dir + '/' + 'model_manifest.json.freeze', 'w') as f:
                 json.dump(manifest_file, f)
         else:
             print("Expected to find a model_manifest.json file, none was discovered in working directory")
 
+
 def isJson(myjson):
     try:
         json_object = json.loads(myjson)