studio exception implementation, retuning resp json instead of resp

Author: 2lives

setup.py

@@ -11,7 +11,7 @@
 
 setup(
     name='skylab_studio',
-    version='0.0.9',
+    version='0.0.10',
     author='skylabtech',
     author_email='[email protected]',
     packages=find_packages(),

skylab_studio/__init__.py

@@ -13,6 +13,7 @@
 import hashlib
 
 from .version import VERSION
+from .studio_exception import StudioException
 
 API_HEADER_KEY = 'X-SLT-API-KEY'
 API_HEADER_CLIENT = 'X-SLT-API-CLIENT'
@@ -117,26 +118,39 @@ def _api_request(self, endpoint, http_method, **kwargs):
             headers=headers,
         )
 
-        if http_method == 'POST':
-            if data:
-                response = requests.post(path, data=data, **req_kw)
-            else:
-                response = requests.post(path, **req_kw)
-        elif http_method == 'PUT':
-            response = requests.put(path, data=data, **req_kw)
-        elif http_method == 'DELETE':
-            response = requests.delete(path, **req_kw)
-        else:
-            response = requests.get(path, data=data, **req_kw)
-
-        LOGGER.debug('\tresponse code:%s', response.status_code)
-
         try:
-            LOGGER.debug('\tresponse: %s', response.json())
-        except ValueError:
-            LOGGER.debug('\tresponse: %s', response.content)
-
-        return response
+          if http_method == 'POST':
+              if data:
+                  response = requests.post(path, data=data, **req_kw)
+              else:
+                  response = requests.post(path, **req_kw)
+          elif http_method == 'PUT':
+              response = requests.put(path, data=data, **req_kw)
+          elif http_method == 'DELETE':
+              response = requests.delete(path, **req_kw)
+          else:
+              response = requests.get(path, data=data, **req_kw)
+
+          LOGGER.debug('\tresponse code:%s', response.status_code)
+
+          try:
+              LOGGER.debug('\tresponse: %s', response.json())
+          except ValueError:
+              LOGGER.debug('\tresponse: %s', response.content)
+
+          if not response.ok:
+              status_code = response.status_code
+              message = response.json()['message']
+
+              raise StudioException(status_code, message)
+        except (StudioException, Exception) as e:
+              formatted_response = {
+                  "message": e.message,
+                  "status": e.status_code
+              }
+              return formatted_response
+
+        return response.json()
 
     def list_jobs(self):
         """ API call to get all jobs """
@@ -239,7 +253,7 @@ def list_photos(self):
             'GET'
         )
 
-    def get_upload_url(self, payload={"use_cache_upload": False}):
+    def _get_upload_url(self, payload={"use_cache_upload": False}):
       return self._api_request('photos/upload_url', 'GET', payload=payload)
 
     # todo privatize this method and test photo_upload
@@ -303,7 +317,7 @@ def upload_photo(self, photo_path, model, id):
         }
 
         # Ask studio for a presigned url
-        upload_url_resp = self.get_upload_url(payload=payload)
+        upload_url_resp = self._get_upload_url(payload=payload)
         upload_url = upload_url_resp.json()['url']
 
         # PUT request to presigned url with image data

skylab_studio/studio_exception.py

@@ -0,0 +1,6 @@
+class StudioException(Exception):
+    def __init__(self, status_code, message="Studio exception occurred"):
+        self.status_code = status_code
+        self.message = message
+        super().__init__(self.message, self.status_code)
+  

skylab_studio/version.py

@@ -3,4 +3,4 @@
 For more information, visit https://studio.skylabtech.ai
 """
 
-VERSION = '0.0.9'
+VERSION = '0.0.10'