Shifted other .list() resource methods over to cls.request pattern

Author: Jason Costello

hypervector/resources/abstract/api_resource.py

@@ -28,7 +28,10 @@ def get(cls, uuid):
     @classmethod
     def request(cls, endpoint, method=requests.get):
         response = method(url=endpoint, headers=cls.get_headers())
-        return response.json()
+        if response.status_code == 200:
+            return response.json()
+        else:
+            raise HypervectorError(response)
 
     @classmethod
     def delete(cls, uuid):

hypervector/resources/core/benchmark.py

@@ -40,8 +40,8 @@ def list(cls, ensemble):
         parent_endpoint = f"{hypervector.API_BASE}/definition/{ensemble.definition_uuid}" \
                           f"/ensemble/{ensemble.ensemble_uuid}"
         endpoint = f"{parent_endpoint}/benchmarks"
-        response = requests.get(endpoint, headers=cls.get_headers())
-        return [cls.from_response(obj) for obj in response.json()]
+        response = cls.request(endpoint)
+        return [cls.from_response(obj) for obj in response]
 
     @classmethod
     def new(cls, ensemble, expected_output):

hypervector/resources/core/definition.py

@@ -45,7 +45,7 @@ def refresh(self):
     @classmethod
     def list(cls):
         endpoint = f"{hypervector.API_BASE}/definitions"
-        response = requests.get(endpoint, headers=cls.get_headers()).json()
+        response = cls.request(endpoint)
         return [cls.from_response(definition) for definition in response]
 
     @classmethod

hypervector/resources/core/ensemble.py

@@ -54,7 +54,7 @@ def refresh(self):
     def list(cls, definition):
         parent_endpoint = f"{hypervector.API_BASE}/definition/{definition.definition_uuid}"
         endpoint = f"{parent_endpoint}/ensembles"
-        response = requests.get(endpoint, headers=cls.get_headers()).json()
+        response = cls.request(endpoint)
         return [cls.from_response(ensemble) for ensemble in response]
 
     @classmethod

hypervector/resources/core/project.py

@@ -47,7 +47,6 @@ def list(cls):
     def new(cls):
         endpoint = hypervector.API_BASE + "/" + cls.resource_name + "/new"
         response = requests.post(endpoint, headers=cls.get_headers()).json()
-
         return cls.from_response(response)