Merge branch 'develop' into feature/Add_arbor_support

.gitlab-ci.yml

+include:
+    - project: 'vr-group/in-situ-pipeline/insite'
+      ref: develop 
+      file: '/test-setup.yml'
+
+variables:
+    ACCESS_NODE_COMMIT: $CI_COMMIT_SHA
+
+api_test:
+    extends: .api_test

access_node/__main__.py

@@ -3,6 +3,7 @@
 import connexion
 
 from access_node import encoder
+from flask_cors import CORS
 
 from access_node.models.nodes import nodes
 import json
@@ -31,6 +32,7 @@ def main():
     app.app.json_encoder = encoder.JSONEncoder
     app.add_api('swagger.yaml', arguments={
                 'title': 'In-Situ Pipeline REST API'})
+    CORS(app.app)
     app.run(port=8080)
 
 

access_node/controllers/nest_controller.py

@@ -39,14 +39,15 @@ def nest_get_gids_in_population(population_id):  # noqa: E501
 
 
 def nest_get_multimeter_info():  # noqa: E501
-    """Retrieves the measurements for a multimeter (optional) and GIDS (optional).
+    """Retreives the available multimeters and their properties.
 
      # noqa: E501
 
 
     :rtype: MultimeterInfo
     """
-    return 'do some magic!'
+    multimeter_info = requests.get(nodes.info_node+'/multimeter_info').json()
+    return multimeter_info
 
 
 def nest_get_multimeter_measurements(multimeter_id, attribute, _from=None, to=None, gids=None, offset=None, limit=None):  # noqa: E501
@@ -71,7 +72,53 @@ def nest_get_multimeter_measurements(multimeter_id, attribute, _from=None, to=No
 
     :rtype: MultimeterMeasurement
     """
-    return 'do some magic!'
+    mult_info = get_multimeter_info()
+
+    mult_gids = []
+    multimeter_exists = False
+    for mult in mult_info:
+        if mult['id'] == multimeter_id:
+            multimeter_exists = True
+            if attribute not in mult['attributes']:
+                return Status(code=400, message="Given multimeter does not measure given attribute")
+            mult_gids = mult['gids']
+            break
+    if not multimeter_exists:
+        return Status(code=400, message="Given multimeter does not exist")
+
+    if gids == None:
+        gids = mult_gids
+    else:
+        for gid in gids:
+            if gid not in mult_gids:
+                return Status(code=400, message="Gid "+str(gid)+" is not measured by given Multimeter")
+
+    init = True
+    sim_times = []
+    measurement = MultimeterMeasurement([],[],[])
+    for node in nodes.simulation_nodes:
+        response = requests.get(
+            'http://'+node+'/multimeter_measurement', params={"multimeter_id": multimeter_id, "attribute": attribute, "_from": _from, "to": to, "gids": gids}).json()
+        if init:
+            sim_times = response['simulation_times']
+            measurement = MultimeterMeasurement(sim_times, gids, [None for x in range(0,(len(sim_times)*len(gids)))])
+            init = False
+        for x in range(len(response['gids'])):
+            gid = response['gids'][x]
+            index = measurement.gids.index(gid)
+            index_offset = index * len(sim_times)
+            for y in range(len(sim_times)):
+                measurement.values[index_offset+y] = response['values'][x*len(sim_times)+y]
+
+    # offset and limit
+    if (offset is None):
+        offset = 0
+    if (limit is None or (limit + offset) > len(measurement.gids)):
+        limit = len(measurement.gids) - offset
+    measurement.gids = measurement.gids[offset:offset+limit]
+    measurement.values = measurement.values[offset*len(sim_times):(offset+limit)*len(sim_times)]
+
+    return measurement
 
 
 def nest_get_neuron_properties(gids=None):  # noqa: E501
@@ -147,10 +194,10 @@ def nest_get_spikes(_from=None, to=None, gids=None, offset=None, limit=None):  #
     # offset and limit
     if (offset is None):
         offset = 0
-    if (limit is None):
-        limit = len(spikes.gids)
-    spikes.gids = spikes.gids[offset:limit]
-    spikes.simulation_times = spikes.simulation_times[offset:limit]
+    if (limit is None or (limit + offset) > len(spikes.gids)):
+        limit = len(spikes.gids) - offset
+    spikes.gids = spikes.gids[offset:offset+limit]
+    spikes.simulation_times = spikes.simulation_times[offset:offset+limit]
 
     return spikes
 
@@ -190,9 +237,9 @@ def nest_get_spikes_by_population(population_id, _from=None, to=None, offset=Non
     # offset and limit
     if (offset is None):
         offset = 0
-    if (limit is None):
-        limit = len(spikes.gids)
-    spikes.gids = spikes.gids[offset:limit]
-    spikes.simulation_times = spikes.simulation_times[offset:limit]
+    if (limit is None or (limit + offset) > len(spikes.gids)):
+        limit = len(spikes.gids) - offset
+    spikes.gids = spikes.gids[offset:offset+limit]
+    spikes.simulation_times = spikes.simulation_times[offset:offset+limit]
 
     return spikes

requirements.txt

@@ -2,3 +2,4 @@ connexion == 1.1.15
 python_dateutil == 2.6.0
 setuptools >= 21.0.0
 requests
+flask_cors