Skip to content
Snippets Groups Projects
Verified Commit 8e8f2616 authored by David Hoese's avatar David Hoese
Browse files

Fix CSV status string

parent 7ab73551
No related branches found
No related tags found
No related merge requests found
...@@ -196,7 +196,7 @@ def handle_csv(frame, epoch, response_info, formatting_kwargs): ...@@ -196,7 +196,7 @@ def handle_csv(frame, epoch, response_info, formatting_kwargs):
output = output.format( output = output.format(
sep=sep, sep=sep,
status=response_info.get("status_info", "success"), status=response_info.get("status", "success"),
code=code, code=code,
message=response_info.get("message", ""), message=response_info.get("message", ""),
num_results=frame.shape[0] if frame is not None else 0, num_results=frame.shape[0] if frame is not None else 0,
...@@ -432,7 +432,10 @@ def _query_time_series_db(time_parameters, influx_symbols): ...@@ -432,7 +432,10 @@ def _query_time_series_db(time_parameters, influx_symbols):
try: try:
result = query(influx_symbols, *time_parameters) result = query(influx_symbols, *time_parameters)
except ReadTimeoutError: except ReadTimeoutError:
message = "Request took too long to process. It may be too much data. Try a shorter time range." message = (
"Request took too long to process. It may be too much data. "
"Try a shorter time range or use files API."
)
code = 413 code = 413
status = "fail" status = "fail"
result = None result = None
......
...@@ -298,6 +298,14 @@ def test_too_many_points(client): ...@@ -298,6 +298,14 @@ def test_too_many_points(client):
assert res["status"] == "fail" assert res["status"] == "fail"
def test_too_many_points_csv(client):
res = client.get("/api/data.csv?symbols=aoss.tower.air_temp&begin=1970-01-01T00:00:00")
assert res.status_code == 413
csv_data = res.data.decode()
assert "status: fail" in csv_data
assert "num_results: 0" in csv_data
@pytest.mark.parametrize( @pytest.mark.parametrize(
("begin", "end", "exp_query_time"), ("begin", "end", "exp_query_time"),
[ [
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment