Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 51 additions & 12 deletions src/onc/modules/_MultiPage.py
Original file line number Diff line number Diff line change
Expand Up @@ -133,22 +133,35 @@ def _catenateData(self, response: object, nextResponse: object, service: str):
Compatible with the row structure of different services
"""
if service.startswith("scalardata"):
keys = response["sensorData"][0]["data"].keys()

for sensorData in response["sensorData"]:
sensorCode = sensorData["sensorCode"]

# Sensor order may differ between pages, so match by sensor code.
nextSensor = next(
ns
for ns in nextResponse["sensorData"]
if ns["sensorCode"] == sensorCode
)
for key in keys:
sensorData["data"][key] += nextSensor["data"][key]
data = sensorData["data"]
nextData = nextSensor["data"]
if not isinstance(data, list):
# Array format stores each field in a separate list.
for key in data:
data[key] += nextData[key]
else:
# Object format stores whole readings in a single list.
data.extend(nextData)

elif service.startswith("rawdata"):
for key in response["data"]:
response["data"][key] += nextResponse["data"][key]
data = response["data"]
nextData = nextResponse["data"]
if not isinstance(data, list):
# Array format stores each field in a separate list.
for key in data:
data[key] += nextData[key]
else:
# Object format stores whole readings in a single list.
data.extend(nextData)

elif service.startswith("archivefile"):
response["files"] += nextResponse["files"]
Expand Down Expand Up @@ -190,10 +203,22 @@ def _rowCount(self, response, service: str):
Returns the number of records in the response
"""
if service.startswith("scalardata"):
return len(response["sensorData"][0]["data"]["sampleTimes"])
data = response["sensorData"][0]["data"]
if not isinstance(data, list):
# Default array format: {"sampleTimes": ["...", ...], "values": [...], "qaqcFlags": [...]}
return len(data["sampleTimes"])
else:
# Object format: [{"sampleTime": "...", "value": 0.0, "qaqcFlag": 1}, ...]
return len(data)

elif service.startswith("rawdata"):
return len(response["data"]["times"])
data = response["data"]
if not isinstance(data, list):
# Default array format: {"times": ["...", ...], "readings": [...], "lineTypes": [...]}
return len(data["times"])
else:
# Object format: [{"sampleTime": "...", "rawData": "...", "lineType": "..."}, ...]
return len(data)

elif service.startswith("archivefile"):
return len(response["files"])
Expand All @@ -208,12 +233,26 @@ def _responseTimespan(self, response, service: str):
# grab the first and last sample times

if service.startswith("scalardata"):
first = response["sensorData"][0]["data"]["sampleTimes"][0]
last = response["sensorData"][0]["data"]["sampleTimes"][-1]
data = response["sensorData"][0]["data"]
if not isinstance(data, list):
# Default array format: {"sampleTimes": ["...", ...], "values": [...], "qaqcFlags": [...]}
first = data["sampleTimes"][0]
last = data["sampleTimes"][-1]
else:
# Object format: [{"sampleTime": "...", "value": 0.0, "qaqcFlag": 1}, ...]
first = data[0]["sampleTime"]
last = data[-1]["sampleTime"]

elif service.startswith("rawdata"):
first = response["data"]["times"][0]
last = response["data"]["times"][-1]
data = response["data"]
if not isinstance(data, list):
# Default array format: {"times": ["...", ...], "readings": [...], "lineTypes": [...]}
first = data["times"][0]
last = data["times"][-1]
else:
# Object format: [{"sampleTime": "...", "rawData": "...", "lineType": "..."}, ...]
first = data[0]["sampleTime"]
last = data[-1]["sampleTime"]

elif service.startswith("archivefile"):
row0 = response["files"][0]
Expand Down
16 changes: 16 additions & 0 deletions tests/raw_data/test_rawdata_device.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,5 +72,21 @@ def test_valid_params_multi_pages(requester, params_multiple_pages):
assert data["next"] is not None, "Test should return multiple pages."


def test_valid_params_multiple_pages_object_format(
requester, params, params_multiple_pages
):
object_format = {"outputFormat": "object"}
data = requester.getRawdata(params | object_format)
data_all_pages = requester.getRawdata(
params_multiple_pages | object_format, allPages=True
)

assert isinstance(data_all_pages["data"], list)
assert (
data_all_pages["data"] == data["data"]
), "Test should concatenate rows for all pages."
assert data_all_pages["next"] is None, "Test should return only one page."


def _get_row_num(data):
return len(data["data"]["readings"])
16 changes: 16 additions & 0 deletions tests/raw_data/test_rawdata_location.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,5 +66,21 @@ def test_valid_params_multiple_pages(requester, params_multiple_pages):
assert data["next"] is not None, "Test should return multiple pages."


def test_valid_params_multiple_pages_object_format(
requester, params, params_multiple_pages
):
object_format = {"outputFormat": "object"}
data = requester.getRawdata(params | object_format)
data_all_pages = requester.getRawdata(
params_multiple_pages | object_format, allPages=True
)

assert isinstance(data_all_pages["data"], list)
assert (
data_all_pages["data"] == data["data"]
), "Test should concatenate rows for all pages."
assert data_all_pages["next"] is None, "Test should return only one page."


def _get_row_num(data):
return len(data["data"]["readings"])
16 changes: 16 additions & 0 deletions tests/scalar_data/test_scalardata_device.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,5 +62,21 @@ def test_valid_params_multiple_pages(requester, params_multiple_pages):
assert data["next"] is not None, "Test should return multiple pages."


def test_valid_params_multiple_pages_object_format(
requester, params_device, params_multiple_pages
):
object_format = {"outputFormat": "object"}
data = requester.getScalardata(params_device | object_format)
data_all_pages = requester.getScalardata(
params_multiple_pages | object_format, allPages=True
)

assert isinstance(data_all_pages["sensorData"][0]["data"], list)
assert (
data_all_pages["sensorData"][0]["data"] == data["sensorData"][0]["data"]
), "Test should concatenate rows for all pages."
assert data_all_pages["next"] is None, "Test should return only one page."


def _get_row_num(data):
return len(data["sensorData"][0]["data"]["values"])
16 changes: 16 additions & 0 deletions tests/scalar_data/test_scalardata_location.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,21 @@ def test_valid_params_multiple_pages(requester, params_multiple_pages):
assert data["next"] is not None, "Test should return multiple pages."


def test_valid_params_multiple_pages_object_format(
requester, params_location, params_multiple_pages
):
object_format = {"outputFormat": "object"}
data = requester.getScalardata(params_location | object_format)
data_all_pages = requester.getScalardata(
params_multiple_pages | object_format, allPages=True
)

assert isinstance(data_all_pages["sensorData"][0]["data"], list)
assert (
data_all_pages["sensorData"][0]["data"] == data["sensorData"][0]["data"]
), "Test should concatenate rows for all pages."
assert data_all_pages["next"] is None, "Test should return only one page."


def _get_row_num(data):
return len(data["sensorData"][0]["data"]["values"])
Loading