Skip to content

Commit d30ed16

Browse files
author
Julian Kath
committed
style: apply ruff-formatting
1 parent 798b17f commit d30ed16

3 files changed

Lines changed: 38 additions & 71 deletions

File tree

‎src/stats_can/helpers.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ def chunk_vectors(vectors: list[str] | str) -> list[list[int]]:
108108
]
109109
return chunks
110110

111+
111112
def pad_coordinate(coord: str) -> str:
112113
"""Right-pad a dot-delimited coordinate to 10 positions.
113114

‎src/stats_can/scwds.py‎

Lines changed: 7 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,7 @@
2727
from requests.adapters import HTTPAdapter
2828
from urllib3.util.retry import Retry
2929

30-
from stats_can.helpers import (
31-
chunk_vectors,
32-
parse_tables,
33-
parse_vectors,
34-
pad_coordinate
35-
)
30+
from stats_can.helpers import chunk_vectors, parse_tables, parse_vectors, pad_coordinate
3631
from stats_can.schemas import (
3732
ChangedSeries,
3833
ChangedCube,
@@ -93,9 +88,7 @@ def _fetch_and_validate(
9388
raise RuntimeError(f"data came back weird. We should never get here: {data}")
9489

9590

96-
def _post_in_chunks(
97-
url: str, body: list[dict], schema: type[T]
98-
) -> list[T]:
91+
def _post_in_chunks(url: str, body: list[dict], schema: type[T]) -> list[T]:
9992
"""POST ``body`` to ``url`` in chunks of ``_MAX_CHUNK`` items.
10093
10194
Validates each chunk's response against ``schema`` and concatenates the
@@ -106,9 +99,7 @@ def _post_in_chunks(
10699
for i, chunk in enumerate(chunks):
107100
if i > 0:
108101
time.sleep(_CHUNK_DELAY)
109-
result = _fetch_and_validate(
110-
url, schema=schema, method="POST", json=chunk
111-
)
102+
result = _fetch_and_validate(url, schema=schema, method="POST", json=chunk)
112103
final_list += result
113104
return final_list
114105

@@ -181,7 +172,6 @@ def get_cube_metadata(tables: str | list[str]) -> list[CubeMetadata]:
181172
)
182173

183174

184-
185175
def get_series_info_from_cube_pid_coord(
186176
pairs: tuple[str | int, str] | list[tuple[str | int, str]],
187177
) -> list[SeriesInfo]:
@@ -215,9 +205,7 @@ def get_series_info_from_cube_pid_coord(
215205
}
216206
for product_id, coord in pairs
217207
]
218-
return _post_in_chunks(
219-
f"{SC_URL}getSeriesInfoFromCubePidCoord", body, SeriesInfo
220-
)
208+
return _post_in_chunks(f"{SC_URL}getSeriesInfoFromCubePidCoord", body, SeriesInfo)
221209

222210

223211
def get_series_info_from_vector(vectors: str | list[str]) -> list[SeriesInfo]:
@@ -234,9 +222,7 @@ def get_series_info_from_vector(vectors: str | list[str]) -> list[SeriesInfo]:
234222
List of dicts containing metadata for each v#
235223
"""
236224
body = [{"vectorId": v} for v in parse_vectors(vectors)]
237-
return _post_in_chunks(
238-
f"{SC_URL}getSeriesInfoFromVector", body, SeriesInfo
239-
)
225+
return _post_in_chunks(f"{SC_URL}getSeriesInfoFromVector", body, SeriesInfo)
240226

241227

242228
def get_changed_series_data_from_cube_pid_coord(
@@ -292,9 +278,7 @@ def get_changed_series_data_from_vector(
292278
List of dicts containing changed data for each vector
293279
"""
294280
body = [{"vectorId": v} for v in parse_vectors(vectors)]
295-
return _post_in_chunks(
296-
f"{SC_URL}getChangedSeriesDataFromVector", body, VectorData
297-
)
281+
return _post_in_chunks(f"{SC_URL}getChangedSeriesDataFromVector", body, VectorData)
298282

299283

300284
def get_data_from_cube_pid_coord_and_latest_n_periods(
@@ -357,9 +341,7 @@ def get_data_from_vectors_and_latest_n_periods(
357341
:
358342
List of dicts containing data for each vector
359343
"""
360-
body = [
361-
{"vectorId": v, "latestN": periods} for v in parse_vectors(vectors)
362-
]
344+
body = [{"vectorId": v, "latestN": periods} for v in parse_vectors(vectors)]
363345
return _post_in_chunks(
364346
f"{SC_URL}getDataFromVectorsAndLatestNPeriods", body, VectorData
365347
)

‎tests/test_error_handling.py‎

Lines changed: 30 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -305,10 +305,10 @@ def test_single_pair_accepted(self):
305305
mock_resp = _mock_response(
306306
json_data=[{"status": "SUCCESS", "object": self._SERIES_INFO}]
307307
)
308-
with patch.object(
309-
scwds._session, "request", return_value=mock_resp
310-
) as mocked:
311-
result = scwds.get_series_info_from_cube_pid_coord(("25-10-0015-01", "1.12"))
308+
with patch.object(scwds._session, "request", return_value=mock_resp) as mocked:
309+
result = scwds.get_series_info_from_cube_pid_coord(
310+
("25-10-0015-01", "1.12")
311+
)
312312
assert len(result) == 1
313313
# Verify the body StatsCan received was parsed and padded.
314314
sent_json = mocked.call_args.kwargs["json"]
@@ -324,9 +324,7 @@ def test_list_of_pairs_accepted(self):
324324
{"status": "SUCCESS", "object": self._SERIES_INFO},
325325
]
326326
)
327-
with patch.object(
328-
scwds._session, "request", return_value=mock_resp
329-
) as mocked:
327+
with patch.object(scwds._session, "request", return_value=mock_resp) as mocked:
330328
result = scwds.get_series_info_from_cube_pid_coord(
331329
[("25100015", "1.12"), (25100015, "2")]
332330
)
@@ -343,9 +341,10 @@ def test_chunks_large_input(self):
343341
mock_resp = _mock_response(
344342
json_data=[{"status": "SUCCESS", "object": self._SERIES_INFO}]
345343
)
346-
with patch.object(
347-
scwds._session, "request", return_value=mock_resp
348-
) as mocked, patch("stats_can.scwds.time.sleep"):
344+
with (
345+
patch.object(scwds._session, "request", return_value=mock_resp) as mocked,
346+
patch("stats_can.scwds.time.sleep"),
347+
):
349348
scwds.get_series_info_from_cube_pid_coord(pairs)
350349
assert mocked.call_count == 2
351350

@@ -367,17 +366,13 @@ def test_single_pair_accepted(self):
367366
mock_resp = _mock_response(
368367
json_data=[{"status": "SUCCESS", "object": _VECTOR_DATA}]
369368
)
370-
with patch.object(
371-
scwds._session, "request", return_value=mock_resp
372-
) as mocked:
369+
with patch.object(scwds._session, "request", return_value=mock_resp) as mocked:
373370
result = scwds.get_changed_series_data_from_cube_pid_coord(
374371
("35-10-0003-01", "1.12")
375372
)
376373
assert len(result) == 1
377374
assert mocked.call_args.args[0] == "POST"
378-
assert mocked.call_args.args[1].endswith(
379-
"getChangedSeriesDataFromCubePidCoord"
380-
)
375+
assert mocked.call_args.args[1].endswith("getChangedSeriesDataFromCubePidCoord")
381376
assert mocked.call_args.kwargs["json"] == [
382377
{"productId": "35100003", "coordinate": "1.12.0.0.0.0.0.0.0.0"}
383378
]
@@ -390,9 +385,7 @@ def test_list_of_pairs_accepted(self):
390385
{"status": "SUCCESS", "object": _VECTOR_DATA},
391386
]
392387
)
393-
with patch.object(
394-
scwds._session, "request", return_value=mock_resp
395-
) as mocked:
388+
with patch.object(scwds._session, "request", return_value=mock_resp) as mocked:
396389
result = scwds.get_changed_series_data_from_cube_pid_coord(
397390
[("35100003", "1.12"), (35100003, "2")]
398391
)
@@ -408,9 +401,10 @@ def test_chunks_large_input(self):
408401
mock_resp = _mock_response(
409402
json_data=[{"status": "SUCCESS", "object": _VECTOR_DATA}]
410403
)
411-
with patch.object(
412-
scwds._session, "request", return_value=mock_resp
413-
) as mocked, patch("stats_can.scwds.time.sleep"):
404+
with (
405+
patch.object(scwds._session, "request", return_value=mock_resp) as mocked,
406+
patch("stats_can.scwds.time.sleep"),
407+
):
414408
scwds.get_changed_series_data_from_cube_pid_coord(pairs)
415409
assert mocked.call_count == 2
416410

@@ -423,9 +417,7 @@ def test_single_vector(self):
423417
mock_resp = _mock_response(
424418
json_data=[{"status": "SUCCESS", "object": _VECTOR_DATA}]
425419
)
426-
with patch.object(
427-
scwds._session, "request", return_value=mock_resp
428-
) as mocked:
420+
with patch.object(scwds._session, "request", return_value=mock_resp) as mocked:
429421
result = scwds.get_changed_series_data_from_vector("v32164132")
430422
assert len(result) == 1
431423
assert mocked.call_args.args[1].endswith("getChangedSeriesDataFromVector")
@@ -439,12 +431,8 @@ def test_list_of_vectors(self):
439431
{"status": "SUCCESS", "object": _VECTOR_DATA},
440432
]
441433
)
442-
with patch.object(
443-
scwds._session, "request", return_value=mock_resp
444-
) as mocked:
445-
result = scwds.get_changed_series_data_from_vector(
446-
["v32164132", "74804"]
447-
)
434+
with patch.object(scwds._session, "request", return_value=mock_resp) as mocked:
435+
result = scwds.get_changed_series_data_from_vector(["v32164132", "74804"])
448436
assert len(result) == 2
449437
assert mocked.call_args.kwargs["json"] == [
450438
{"vectorId": 32164132},
@@ -457,9 +445,10 @@ def test_chunks_large_input(self):
457445
mock_resp = _mock_response(
458446
json_data=[{"status": "SUCCESS", "object": _VECTOR_DATA}]
459447
)
460-
with patch.object(
461-
scwds._session, "request", return_value=mock_resp
462-
) as mocked, patch("stats_can.scwds.time.sleep"):
448+
with (
449+
patch.object(scwds._session, "request", return_value=mock_resp) as mocked,
450+
patch("stats_can.scwds.time.sleep"),
451+
):
463452
scwds.get_changed_series_data_from_vector(vectors)
464453
assert mocked.call_count == 2
465454

@@ -472,9 +461,7 @@ def test_single_pair_includes_latest_n(self):
472461
mock_resp = _mock_response(
473462
json_data=[{"status": "SUCCESS", "object": _VECTOR_DATA}]
474463
)
475-
with patch.object(
476-
scwds._session, "request", return_value=mock_resp
477-
) as mocked:
464+
with patch.object(scwds._session, "request", return_value=mock_resp) as mocked:
478465
result = scwds.get_data_from_cube_pid_coord_and_latest_n_periods(
479466
("35-10-0003-01", "1.12"), periods=3
480467
)
@@ -498,9 +485,7 @@ def test_list_of_pairs_shares_latest_n(self):
498485
{"status": "SUCCESS", "object": _VECTOR_DATA},
499486
]
500487
)
501-
with patch.object(
502-
scwds._session, "request", return_value=mock_resp
503-
) as mocked:
488+
with patch.object(scwds._session, "request", return_value=mock_resp) as mocked:
504489
result = scwds.get_data_from_cube_pid_coord_and_latest_n_periods(
505490
[("35100003", "1.12"), (35100003, "2")], periods=5
506491
)
@@ -524,10 +509,9 @@ def test_chunks_large_input(self):
524509
mock_resp = _mock_response(
525510
json_data=[{"status": "SUCCESS", "object": _VECTOR_DATA}]
526511
)
527-
with patch.object(
528-
scwds._session, "request", return_value=mock_resp
529-
) as mocked, patch("stats_can.scwds.time.sleep"):
530-
scwds.get_data_from_cube_pid_coord_and_latest_n_periods(
531-
pairs, periods=3
532-
)
512+
with (
513+
patch.object(scwds._session, "request", return_value=mock_resp) as mocked,
514+
patch("stats_can.scwds.time.sleep"),
515+
):
516+
scwds.get_data_from_cube_pid_coord_and_latest_n_periods(pairs, periods=3)
533517
assert mocked.call_count == 2

0 commit comments

Comments
 (0)