Change the Reductionist API to return a JSON payload, ths removes all the headers such as x-activestorage-count in favour of returning their data as part of the JSON payload.

Author: maxstack

activestorage/reductionist.py

@@ -235,15 +235,16 @@ def request(session: requests.Session, url: str, request_data: dict):
 
 def decode_result(response):
     """Decode a successful response, return as a 2-tuple of (numpy array or scalar, count)."""
-    dtype = response.headers['x-activestorage-dtype']
-    shape = json.loads(response.headers['x-activestorage-shape'])
+    reduction_result = json.loads(response.content)
+    dtype = reduction_result['dtype']
+    shape = reduction_result['shape']
 
     # Result
-    result = np.frombuffer(response.content, dtype=dtype)
+    result = np.frombuffer(bytes(reduction_result['bytes']), dtype=dtype)
     result = result.reshape(shape)
 
     # Counts
-    count = json.loads(response.headers['x-activestorage-count'])
+    count = reduction_result['count']
     # TODO: When reductionist is ready, we need to fix 'count'
 
     # Mask the result

tests/unit/test_reductionist.py

@@ -11,15 +11,18 @@
 
 
 def make_response(content, status_code, dtype=None, shape=None, count=None):
-    response = requests.Response()
-    response._content = content
-    response.status_code = status_code
+    reduction_result = {
+        "bytes": content
+    }
     if dtype:
-        response.headers["x-activestorage-dtype"] = dtype
+        reduction_result["dtype"] = dtype
     if shape:
-        response.headers["x-activestorage-shape"] = shape
+        reduction_result["shape"] = shape
     if count:
-        response.headers["x-activestorage-count"] = count
+        reduction_result["count"] = count
+    response = requests.Response()
+    response._content = json.dumps(reduction_result)
+    response.status_code = status_code
     return response