Skip to content
Snippets Groups Projects
Commit c1cee84c authored by Simon Oehrl's avatar Simon Oehrl
Browse files

Merge branch 'develop' into 'feature/Fix_spikes_per_population' 

# Conflicts:
#   access_node/controllers/nest_controller.py
parents 55c1fb83 8352d3c5
Branches
Tags
1 merge request!7Remove redundant code and use existing functions
Show whitespace changes
Inline Side-by-side
Showing
with 136 additions and 100 deletions
.gitlab-ci.yml
+ 2
− 1
View file @ c1cee84c
...@@ -29,8 +29,9 @@ deploy:master: ...@@ -29,8 +29,9 @@ deploy:master:
script: script:
- docker build -t rwthvr/insite-access-node . - docker build -t rwthvr/insite-access-node .
- VERSION=$(git tag --points-at $CI_COMMIT_SHA) - VERSION=$(git tag --points-at $CI_COMMIT_SHA)
- echo $VERSION
- > - >
[[ $VERSION =~ ^[0-9]+\.[0-9]+(\.[0-9]+)?$ ]] [[ $VERSION =~ ^[0-9]+\.[0-9]+(\.[0-9]+)?$ ]]
- docker tag rwthvr/insite-access-node rwthvr/access-node:$VERSION - docker tag rwthvr/insite-access-node rwthvr/insite-access-node:$VERSION
- docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
- docker push rwthvr/insite-access-node - docker push rwthvr/insite-access-node
.swagger-codegen/VERSION
+ 1
− 1
View file @ c1cee84c
2.4.8 2.4.13
\ No newline at end of file \ No newline at end of file
access_node/__main__.py
+ 12
− 12
View file @ c1cee84c
...@@ -25,18 +25,18 @@ def ConnectToDatabase(postgres_username, postgres_password): ...@@ -25,18 +25,18 @@ def ConnectToDatabase(postgres_username, postgres_password):
def main(): def main():
# Wait for simulation nodes to post to database # Wait for simulation nodes to post to database
time.sleep(5) time.sleep(0.1)
# get simulation nodes # # get simulation nodes
con = ConnectToDatabase('postgres', 'postgres') # con = ConnectToDatabase('postgres', 'postgres')
cur = con.cursor() # cur = con.cursor()
# NEST # # NEST
cur.execute("SELECT address FROM nest_simulation_node") # cur.execute("SELECT address FROM nest_simulation_node")
nodes.nest_simulation_nodes = [i[0] for i in cur.fetchall()] # nodes.nest_simulation_nodes = [i[0] for i in cur.fetchall()]
# Arbor # # Arbor
cur.execute("SELECT address FROM nest_simulation_node") # cur.execute("SELECT address FROM nest_simulation_node")
nodes.arbor_simulation_nodes = [i[0] for i in cur.fetchall()] # nodes.arbor_simulation_nodes = [i[0] for i in cur.fetchall()]
con.close() # con.close()
# run acces_node # run acces_node
......
access_node/controllers/arbor_controller.py
+ 6
− 6
View file @ c1cee84c
...@@ -26,7 +26,7 @@ def connect_to_database(): ...@@ -26,7 +26,7 @@ def connect_to_database():
def arbor_get_attributes(): # noqa: E501 def arbor_get_attributes(): # noqa: E501
"""Retrieves the list of all attributes. """Retrieves a list of all attributes.
# noqa: E501 # noqa: E501
...@@ -44,7 +44,7 @@ def arbor_get_attributes(): # noqa: E501 ...@@ -44,7 +44,7 @@ def arbor_get_attributes(): # noqa: E501
def arbor_get_cell_ids(): # noqa: E501 def arbor_get_cell_ids(): # noqa: E501
"""Retrieves the list of all cell ids. """Retrieves a list of all cell ids.
# noqa: E501 # noqa: E501
...@@ -98,7 +98,7 @@ def arbor_get_measurements(attribute, probe_ids=None, _from=None, to=None, offse ...@@ -98,7 +98,7 @@ def arbor_get_measurements(attribute, probe_ids=None, _from=None, to=None, offse
# noqa: E501 # noqa: E501
:param attribute: The attribute to query (e.g., 'V_m' for the membrane potential) :param attribute: The attribute to query
:type attribute: str :type attribute: str
:param probe_ids: A list of probes ids queried for data. :param probe_ids: A list of probes ids queried for data.
:type probe_ids: List[int] :type probe_ids: List[int]
...@@ -108,7 +108,7 @@ def arbor_get_measurements(attribute, probe_ids=None, _from=None, to=None, offse ...@@ -108,7 +108,7 @@ def arbor_get_measurements(attribute, probe_ids=None, _from=None, to=None, offse
:type to: float :type to: float
:param offset: The offset into the result. :param offset: The offset into the result.
:type offset: int :type offset: int
:param limit: The maximum of entries to be result. :param limit: The maximum of entries to be returned.
:type limit: int :type limit: int
:rtype: ArborMeasurement :rtype: ArborMeasurement
...@@ -151,7 +151,7 @@ def arbor_get_measurements(attribute, probe_ids=None, _from=None, to=None, offse ...@@ -151,7 +151,7 @@ def arbor_get_measurements(attribute, probe_ids=None, _from=None, to=None, offse
def arbor_get_probes(attribute=None): # noqa: E501 def arbor_get_probes(attribute=None): # noqa: E501
"""Retrieves the list of all probes for a given attribute (optional). """Retrieves a list of all probes for a given attribute (optional).
# noqa: E501 # noqa: E501
...@@ -187,7 +187,7 @@ def arbor_get_probes(attribute=None): # noqa: E501 ...@@ -187,7 +187,7 @@ def arbor_get_probes(attribute=None): # noqa: E501
def arbor_get_simulation_time_info(): # noqa: E501 def arbor_get_simulation_time_info(): # noqa: E501
"""Retrieves simulation time information. """Retrieves simulation time information(begin, current, end).
# noqa: E501 # noqa: E501
......
access_node/controllers/nest_controller.py
+ 28
− 14
View file @ c1cee84c
...@@ -26,7 +26,7 @@ def connect_to_database(): ...@@ -26,7 +26,7 @@ def connect_to_database():
def nest_get_gids(): # noqa: E501 def nest_get_gids(): # noqa: E501
"""Retrieves the list of all GID. """Retrieves a list of all gids.
# noqa: E501 # noqa: E501
...@@ -44,7 +44,7 @@ def nest_get_gids(): # noqa: E501 ...@@ -44,7 +44,7 @@ def nest_get_gids(): # noqa: E501
def nest_get_gids_in_population(population_id): # noqa: E501 def nest_get_gids_in_population(population_id): # noqa: E501
"""Retrieves the list of all neuron IDs within the population. """Retrieves the list of all neuron ids within the population.
# noqa: E501 # noqa: E501
...@@ -96,19 +96,19 @@ def nest_get_multimeter_info(): # noqa: E501 ...@@ -96,19 +96,19 @@ def nest_get_multimeter_info(): # noqa: E501
def nest_get_multimeter_measurements(multimeter_id, attribute, _from=None, to=None, gids=None, offset=None, limit=None): # noqa: E501 def nest_get_multimeter_measurements(multimeter_id, attribute, _from=None, to=None, gids=None, offset=None, limit=None): # noqa: E501
"""Retrieves the measurements for a multimeter, attribute and GIDS (optional). """Retrieves the measurements for a multimeter, attribute and gids (optional).
# noqa: E501 # noqa: E501
:param multimeter_id: The multimeter to query :param multimeter_id: The multimeter to query
:type multimeter_id: :type multimeter_id: int
:param attribute: The attribute to query (e.g., 'V_m' for the membrane potential) :param attribute: The attribute to query (e.g., 'V_m' for the membrane potential)
:type attribute: str :type attribute: str
:param _from: The start time (including) to be queried. :param _from: The start time (including) to be queried.
:type _from: float :type _from: float
:param to: The end time (excluding) to be queried. :param to: The end time (excluding) to be queried.
:type to: float :type to: float
:param gids: A list of GIDs queried for spike data. :param gids: A list of gids queried for spike data.
:type gids: List[int] :type gids: List[int]
:param offset: The offset into the result. :param offset: The offset into the result.
:type offset: int :type offset: int
...@@ -174,7 +174,7 @@ def nest_get_neuron_properties(gids=None): # noqa: E501 ...@@ -174,7 +174,7 @@ def nest_get_neuron_properties(gids=None): # noqa: E501
# noqa: E501 # noqa: E501
:param gids: A list of GIDs queried for properties. :param gids: A list of gids queried for properties.
:type gids: List[int] :type gids: List[int]
:rtype: List[NestNeuronProperties] :rtype: List[NestNeuronProperties]
...@@ -208,7 +208,7 @@ def nest_get_neuron_properties(gids=None): # noqa: E501 ...@@ -208,7 +208,7 @@ def nest_get_neuron_properties(gids=None): # noqa: E501
def nest_get_populations(): # noqa: E501 def nest_get_populations(): # noqa: E501
"""Retrieves the list of all population IDs. """Retrieves a list of all population IDs.
# noqa: E501 # noqa: E501
...@@ -226,7 +226,7 @@ def nest_get_populations(): # noqa: E501 ...@@ -226,7 +226,7 @@ def nest_get_populations(): # noqa: E501
def nest_get_simulation_time_info(): # noqa: E501 def nest_get_simulation_time_info(): # noqa: E501
"""Retrieves simulation time information. """Retrieves simulation time information (begin, current, end).
# noqa: E501 # noqa: E501
...@@ -234,8 +234,14 @@ def nest_get_simulation_time_info(): # noqa: E501 ...@@ -234,8 +234,14 @@ def nest_get_simulation_time_info(): # noqa: E501
:rtype: SimulationTimeInfo :rtype: SimulationTimeInfo
""" """
con = connect_to_database()
cur = con.cursor()
cur.execute("SELECT address FROM nest_simulation_node")
nodes.nest_simulation_nodes = [i[0] for i in cur.fetchall()]
con.close()
print("Updated simumlation nodes: " + str(nodes.nest_simulation_nodes))
current_time = float('inf') current_time = float('inf')
print("Hello")
for node in nodes.nest_simulation_nodes: for node in nodes.nest_simulation_nodes:
response = requests.get( response = requests.get(
node+'/current_simulation_time').json() node+'/current_simulation_time').json()
...@@ -247,7 +253,7 @@ def nest_get_simulation_time_info(): # noqa: E501 ...@@ -247,7 +253,7 @@ def nest_get_simulation_time_info(): # noqa: E501
def nest_get_spikes(_from=None, to=None, gids=None, offset=None, limit=None): # noqa: E501 def nest_get_spikes(_from=None, to=None, gids=None, offset=None, limit=None): # noqa: E501
"""Retrieves the spikes for the given simulation steps (optional) and GIDS (optional). """Retrieves the spikes for the given simulation steps (optional) and gids (optional).
# noqa: E501 # noqa: E501
...@@ -255,15 +261,23 @@ def nest_get_spikes(_from=None, to=None, gids=None, offset=None, limit=None): # ...@@ -255,15 +261,23 @@ def nest_get_spikes(_from=None, to=None, gids=None, offset=None, limit=None): #
:type _from: float :type _from: float
:param to: The end time (excluding) to be queried. :param to: The end time (excluding) to be queried.
:type to: float :type to: float
:param gids: A list of GIDs queried for spike data. :param gids: A list of gids queried for spike data.
:type gids: List[int] :type gids: List[int]
:param offset: The offset into the result. :param offset: The offset into the result.
:type offset: int :type offset: int
:param limit: The maximum of entries to be result. :param limit: The maximum of entries to be returned.
:type limit: int :type limit: int
:rtype: Spikes :rtype: Spikes
""" """
con = connect_to_database()
cur = con.cursor()
cur.execute("SELECT address FROM nest_simulation_node")
nodes.nest_simulation_nodes = [i[0] for i in cur.fetchall()]
con.close()
print("Updated simumlation nodes: " + str(nodes.nest_simulation_nodes))
spikes = Spikes([], []) spikes = Spikes([], [])
for node in nodes.nest_simulation_nodes: for node in nodes.nest_simulation_nodes:
response = requests.get( response = requests.get(
...@@ -302,7 +316,7 @@ def nest_get_spikes_by_population(population_id, _from=None, to=None, offset=Non ...@@ -302,7 +316,7 @@ def nest_get_spikes_by_population(population_id, _from=None, to=None, offset=Non
:type to: float :type to: float
:param offset: The offset into the result. :param offset: The offset into the result.
:type offset: int :type offset: int
:param limit: The maximum of entries to be result. :param limit: The maximum of entries to be returned.
:type limit: int :type limit: int
:rtype: Spikes :rtype: Spikes
......
access_node/models/multimeter_info.py
+ 0
− 1
View file @ c1cee84c
...@@ -6,7 +6,6 @@ from datetime import date, datetime # noqa: F401 ...@@ -6,7 +6,6 @@ from datetime import date, datetime # noqa: F401
from typing import List, Dict # noqa: F401 from typing import List, Dict # noqa: F401
from access_node.models.base_model_ import Model from access_node.models.base_model_ import Model
from access_node.models.multimeter_info_inner import MultimeterInfoInner # noqa: F401,E501
from access_node import util from access_node import util
......
access_node/models/multimeter_measurement.py
+ 2
− 2
View file @ c1cee84c
...@@ -100,7 +100,7 @@ class MultimeterMeasurement(Model): ...@@ -100,7 +100,7 @@ class MultimeterMeasurement(Model):
def values(self) -> List[float]: def values(self) -> List[float]:
"""Gets the values of this MultimeterMeasurement. """Gets the values of this MultimeterMeasurement.
This array contains the measured values for each probe and time to get the value for probe n at time t you have to use the index n * length(simulation_times) + t # noqa: E501 This array contains the measured values for each gid and time to get the value for gid n at time t you have to use the index n * length(simulation_times) + t # noqa: E501
:return: The values of this MultimeterMeasurement. :return: The values of this MultimeterMeasurement.
:rtype: List[float] :rtype: List[float]
...@@ -111,7 +111,7 @@ class MultimeterMeasurement(Model): ...@@ -111,7 +111,7 @@ class MultimeterMeasurement(Model):
def values(self, values: List[float]): def values(self, values: List[float]):
"""Sets the values of this MultimeterMeasurement. """Sets the values of this MultimeterMeasurement.
This array contains the measured values for each probe and time to get the value for probe n at time t you have to use the index n * length(simulation_times) + t # noqa: E501 This array contains the measured values for each gid and time to get the value for gid n at time t you have to use the index n * length(simulation_times) + t # noqa: E501
:param values: The values of this MultimeterMeasurement. :param values: The values of this MultimeterMeasurement.
:type values: List[float] :type values: List[float]
......
access_node/swagger/swagger.yaml
+ 85
− 63
View file @ c1cee84c
...@@ -63,11 +63,11 @@ paths: ...@@ -63,11 +63,11 @@ paths:
type: "integer" type: "integer"
format: "uint64" format: "uint64"
responses: responses:
200: "200":
description: "Operation successful." description: "Operation successful."
schema: schema:
$ref: "#/definitions/Spikes" $ref: "#/definitions/Spikes"
400: "400":
description: "Operation failed." description: "Operation failed."
schema: schema:
type: "string" type: "string"
...@@ -77,20 +77,23 @@ paths: ...@@ -77,20 +77,23 @@ paths:
get: get:
tags: tags:
- "arbor" - "arbor"
summary: "Retrieves the list of all cell ids." summary: "Retrieves a list of all cell ids."
operationId: "arbor_get_cell_ids" operationId: "arbor_get_cell_ids"
produces: produces:
- "application/json" - "application/json"
parameters: [] parameters: []
responses: responses:
200: "200":
description: "Operation successful." description: "Operation successful."
schema: schema:
type: "array" type: "array"
items: items:
type: "integer" type: "integer"
format: "uint64" format: "uint64"
400: example:
- 1
- 2
"400":
description: "Operation failed." description: "Operation failed."
schema: schema:
type: "string" type: "string"
...@@ -100,7 +103,7 @@ paths: ...@@ -100,7 +103,7 @@ paths:
get: get:
tags: tags:
- "arbor" - "arbor"
summary: "Retrieves the list of all probes for a given attribute (optional)." summary: "Retrieves a list of all probes for a given attribute (optional)."
operationId: "arbor_get_probes" operationId: "arbor_get_probes"
produces: produces:
- "application/json" - "application/json"
...@@ -111,13 +114,13 @@ paths: ...@@ -111,13 +114,13 @@ paths:
required: false required: false
type: "string" type: "string"
responses: responses:
200: "200":
description: "Operation successful." description: "Operation successful."
schema: schema:
type: "array" type: "array"
items: items:
$ref: "#/definitions/Probe" $ref: "#/definitions/Probe"
400: "400":
description: "Operation failed." description: "Operation failed."
schema: schema:
type: "string" type: "string"
...@@ -127,13 +130,13 @@ paths: ...@@ -127,13 +130,13 @@ paths:
get: get:
tags: tags:
- "arbor" - "arbor"
summary: "Retrieves the list of all attributes." summary: "Retrieves a list of all attributes."
operationId: "arbor_get_attributes" operationId: "arbor_get_attributes"
produces: produces:
- "application/json" - "application/json"
parameters: [] parameters: []
responses: responses:
200: "200":
description: "Operation successful." description: "Operation successful."
schema: schema:
type: "array" type: "array"
...@@ -142,7 +145,7 @@ paths: ...@@ -142,7 +145,7 @@ paths:
example: example:
- "Voltage" - "Voltage"
- "Current" - "Current"
400: "400":
description: "Operation failed." description: "Operation failed."
schema: schema:
type: "string" type: "string"
...@@ -161,7 +164,7 @@ paths: ...@@ -161,7 +164,7 @@ paths:
parameters: parameters:
- name: "attribute" - name: "attribute"
in: "query" in: "query"
description: "The attribute to query (e.g., 'V_m' for the membrane potential)" description: "The attribute to query"
required: true required: true
type: "string" type: "string"
- name: "probe_ids" - name: "probe_ids"
...@@ -192,16 +195,16 @@ paths: ...@@ -192,16 +195,16 @@ paths:
format: "uint64" format: "uint64"
- name: "limit" - name: "limit"
in: "query" in: "query"
description: "The maximum of entries to be result." description: "The maximum of entries to be returned."
required: false required: false
type: "integer" type: "integer"
format: "uint64" format: "uint64"
responses: responses:
200: "200":
description: "Operation successful." description: "Operation successful."
schema: schema:
$ref: "#/definitions/ArborMeasurement" $ref: "#/definitions/ArborMeasurement"
400: "400":
description: "Operation failed." description: "Operation failed."
schema: schema:
type: "string" type: "string"
...@@ -211,17 +214,17 @@ paths: ...@@ -211,17 +214,17 @@ paths:
get: get:
tags: tags:
- "arbor" - "arbor"
summary: "Retrieves simulation time information." summary: "Retrieves simulation time information(begin, current, end)."
operationId: "arbor_get_simulation_time_info" operationId: "arbor_get_simulation_time_info"
produces: produces:
- "application/json" - "application/json"
parameters: [] parameters: []
responses: responses:
200: "200":
description: "Operation successful." description: "Operation successful."
schema: schema:
$ref: "#/definitions/SimulationTimeInfo" $ref: "#/definitions/SimulationTimeInfo"
400: "400":
description: "Operation failed." description: "Operation failed."
schema: schema:
type: "string" type: "string"
...@@ -245,13 +248,13 @@ paths: ...@@ -245,13 +248,13 @@ paths:
type: "integer" type: "integer"
format: "uint64" format: "uint64"
responses: responses:
200: "200":
description: "Operation successful." description: "Operation successful."
schema: schema:
type: "array" type: "array"
items: items:
$ref: "#/definitions/ArborCellProperties" $ref: "#/definitions/ArborCellProperties"
400: "400":
description: "Operation failed." description: "Operation failed."
schema: schema:
type: "string" type: "string"
...@@ -261,17 +264,17 @@ paths: ...@@ -261,17 +264,17 @@ paths:
get: get:
tags: tags:
- "nest" - "nest"
summary: "Retrieves simulation time information." summary: "Retrieves simulation time information (begin, current, end)."
operationId: "nest_get_simulation_time_info" operationId: "nest_get_simulation_time_info"
produces: produces:
- "application/json" - "application/json"
parameters: [] parameters: []
responses: responses:
200: "200":
description: "Operation successful." description: "Operation successful."
schema: schema:
$ref: "#/definitions/SimulationTimeInfo" $ref: "#/definitions/SimulationTimeInfo"
400: "400":
description: "Operation failed." description: "Operation failed."
schema: schema:
type: "string" type: "string"
...@@ -281,20 +284,25 @@ paths: ...@@ -281,20 +284,25 @@ paths:
get: get:
tags: tags:
- "nest" - "nest"
summary: "Retrieves the list of all GID." summary: "Retrieves a list of all gids."
operationId: "nest_get_gids" operationId: "nest_get_gids"
produces: produces:
- "application/json" - "application/json"
parameters: [] parameters: []
responses: responses:
200: "200":
description: "Operation successful." description: "Operation successful."
schema: schema:
type: "array" type: "array"
items: items:
type: "integer" type: "integer"
format: "uint64" format: "uint64"
400: example:
- 1
- 2
- 3
- 15
"400":
description: "Operation failed." description: "Operation failed."
schema: schema:
type: "string" type: "string"
...@@ -311,20 +319,20 @@ paths: ...@@ -311,20 +319,20 @@ paths:
parameters: parameters:
- name: "gids" - name: "gids"
in: "query" in: "query"
description: "A list of GIDs queried for properties." description: "A list of gids queried for properties."
required: false required: false
type: "array" type: "array"
items: items:
type: "integer" type: "integer"
format: "uint64" format: "uint64"
responses: responses:
200: "200":
description: "Operation successful." description: "Operation successful."
schema: schema:
type: "array" type: "array"
items: items:
$ref: "#/definitions/NestNeuronProperties" $ref: "#/definitions/NestNeuronProperties"
400: "400":
description: "Operation failed." description: "Operation failed."
schema: schema:
type: "string" type: "string"
...@@ -334,20 +342,24 @@ paths: ...@@ -334,20 +342,24 @@ paths:
get: get:
tags: tags:
- "nest" - "nest"
summary: "Retrieves the list of all population IDs." summary: "Retrieves a list of all population IDs."
operationId: "nest_get_populations" operationId: "nest_get_populations"
produces: produces:
- "application/json" - "application/json"
parameters: [] parameters: []
responses: responses:
200: "200":
description: "Operation successful." description: "Operation successful."
schema: schema:
type: "array" type: "array"
items: items:
type: "integer" type: "integer"
format: "uint64" format: "uint64"
400: example:
- 1
- 2
- 3
"400":
description: "Operation failed." description: "Operation failed."
schema: schema:
type: "string" type: "string"
...@@ -358,7 +370,7 @@ paths: ...@@ -358,7 +370,7 @@ paths:
tags: tags:
- "nest" - "nest"
summary: "Retrieves the spikes for the given simulation steps (optional) and\ summary: "Retrieves the spikes for the given simulation steps (optional) and\
\ GIDS (optional)." \ gids (optional)."
operationId: "nest_get_spikes" operationId: "nest_get_spikes"
consumes: consumes:
- "application/json" - "application/json"
...@@ -379,7 +391,7 @@ paths: ...@@ -379,7 +391,7 @@ paths:
format: "double" format: "double"
- name: "gids" - name: "gids"
in: "query" in: "query"
description: "A list of GIDs queried for spike data." description: "A list of gids queried for spike data."
required: false required: false
type: "array" type: "array"
items: items:
...@@ -393,16 +405,16 @@ paths: ...@@ -393,16 +405,16 @@ paths:
format: "uint64" format: "uint64"
- name: "limit" - name: "limit"
in: "query" in: "query"
description: "The maximum of entries to be result." description: "The maximum of entries to be returned."
required: false required: false
type: "integer" type: "integer"
format: "uint64" format: "uint64"
responses: responses:
200: "200":
description: "Operation successful." description: "Operation successful."
schema: schema:
$ref: "#/definitions/Spikes" $ref: "#/definitions/Spikes"
400: "400":
description: "Operation failed." description: "Operation failed."
schema: schema:
type: "string" type: "string"
...@@ -446,16 +458,16 @@ paths: ...@@ -446,16 +458,16 @@ paths:
format: "uint64" format: "uint64"
- name: "limit" - name: "limit"
in: "query" in: "query"
description: "The maximum of entries to be result." description: "The maximum of entries to be returned."
required: false required: false
type: "integer" type: "integer"
format: "uint64" format: "uint64"
responses: responses:
200: "200":
description: "Operation successful." description: "Operation successful."
schema: schema:
$ref: "#/definitions/Spikes" $ref: "#/definitions/Spikes"
400: "400":
description: "Operation failed." description: "Operation failed."
schema: schema:
type: "string" type: "string"
...@@ -473,11 +485,11 @@ paths: ...@@ -473,11 +485,11 @@ paths:
- "application/json" - "application/json"
parameters: [] parameters: []
responses: responses:
200: "200":
description: "Operation successful." description: "Operation successful."
schema: schema:
$ref: "#/definitions/MultimeterInfo" $ref: "#/definitions/MultimeterInfo"
400: "400":
description: "Operation failed." description: "Operation failed."
schema: schema:
type: "string" type: "string"
...@@ -487,7 +499,7 @@ paths: ...@@ -487,7 +499,7 @@ paths:
get: get:
tags: tags:
- "nest" - "nest"
summary: "Retrieves the measurements for a multimeter, attribute and GIDS (optional)." summary: "Retrieves the measurements for a multimeter, attribute and gids (optional)."
operationId: "nest_get_multimeter_measurements" operationId: "nest_get_multimeter_measurements"
consumes: consumes:
- "application/json" - "application/json"
...@@ -498,8 +510,8 @@ paths: ...@@ -498,8 +510,8 @@ paths:
in: "query" in: "query"
description: "The multimeter to query" description: "The multimeter to query"
required: true required: true
type: "number" type: "integer"
format: "integer" format: "uint64"
- name: "attribute" - name: "attribute"
in: "query" in: "query"
description: "The attribute to query (e.g., 'V_m' for the membrane potential)" description: "The attribute to query (e.g., 'V_m' for the membrane potential)"
...@@ -519,7 +531,7 @@ paths: ...@@ -519,7 +531,7 @@ paths:
format: "double" format: "double"
- name: "gids" - name: "gids"
in: "query" in: "query"
description: "A list of GIDs queried for spike data." description: "A list of gids queried for spike data."
required: false required: false
type: "array" type: "array"
items: items:
...@@ -538,11 +550,11 @@ paths: ...@@ -538,11 +550,11 @@ paths:
type: "integer" type: "integer"
format: "uint64" format: "uint64"
responses: responses:
200: "200":
description: "Operation successful." description: "Operation successful."
schema: schema:
$ref: "#/definitions/MultimeterMeasurement" $ref: "#/definitions/MultimeterMeasurement"
400: "400":
description: "Operation failed." description: "Operation failed."
schema: schema:
type: "string" type: "string"
...@@ -552,7 +564,7 @@ paths: ...@@ -552,7 +564,7 @@ paths:
get: get:
tags: tags:
- "nest" - "nest"
summary: "Retrieves the list of all neuron IDs within the population." summary: "Retrieves the list of all neuron ids within the population."
operationId: "nest_get_gids_in_population" operationId: "nest_get_gids_in_population"
produces: produces:
- "application/json" - "application/json"
...@@ -564,14 +576,17 @@ paths: ...@@ -564,14 +576,17 @@ paths:
type: "integer" type: "integer"
format: "uint64" format: "uint64"
responses: responses:
200: "200":
description: "Operation successful." description: "Operation successful."
schema: schema:
type: "array" type: "array"
items: items:
type: "integer" type: "integer"
format: "uint64" format: "uint64"
400: example:
- 1
- 2
"400":
description: "Operation failed." description: "Operation failed."
schema: schema:
type: "string" type: "string"
...@@ -594,11 +609,11 @@ definitions: ...@@ -594,11 +609,11 @@ definitions:
format: "uint64" format: "uint64"
example: example:
simulation_times: simulation_times:
- 0.8008281904610115 - 0.8
- 0.8008281904610115 - 0.9
gids: gids:
- 6.027456183070403 - 1
- 6.027456183070403 - 2
MultimeterInfo: MultimeterInfo:
type: "array" type: "array"
items: items:
...@@ -607,6 +622,10 @@ definitions: ...@@ -607,6 +622,10 @@ definitions:
- id: 0 - id: 0
attributes: attributes:
- "V_m" - "V_m"
gids:
- 1
- 2
- 3
MultimeterMeasurement: MultimeterMeasurement:
type: "object" type: "object"
properties: properties:
...@@ -724,7 +743,9 @@ definitions: ...@@ -724,7 +743,9 @@ definitions:
type: "object" type: "object"
properties: {} properties: {}
example: example:
population: "pop1" gid: 1
properties:
population: 2
position: position:
- 0.1 - 0.1
- 0.1 - 0.1
...@@ -742,9 +763,9 @@ definitions: ...@@ -742,9 +763,9 @@ definitions:
type: "number" type: "number"
format: "double" format: "double"
example: example:
current: 1.4658129805029452 current: 2.1
start: 0.8008281904610115 start: 0.1
end: 6.027456183070403 end: 4.5
MultimeterInfo_inner: MultimeterInfo_inner:
properties: properties:
id: id:
...@@ -759,3 +780,4 @@ definitions: ...@@ -759,3 +780,4 @@ definitions:
items: items:
type: "integer" type: "integer"
format: "uint64" format: "uint64"
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment