Skip to content

Commit 335af41

Browse files
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent a29f4bd commit 335af41

8 files changed

Lines changed: 166 additions & 165 deletions

File tree

src/wristpy/io/readers/readers.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,7 @@ def read_watch_data(
4848
warnings = data.get("warnings", [])
4949
if warnings:
5050
logger.warning(
51-
f"Recovered partial data for {file_name} "
52-
f"with {len(warnings)} warnings."
51+
f"Recovered partial data for {file_name} with {len(warnings)} warnings."
5352
)
5453
except Exception as e:
5554
raise IOError(f"Error reading file: {e}. File type is unsupported.") from e

src/wristpy/processing/metrics.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,9 @@ def mean_amplitude_deviation(
118118
).set_sorted("time")
119119

120120
mad_df = (
121-
mad_lf.group_by_dynamic(index_column="time", every=f"{int(epoch_length*1e9)}ns")
121+
mad_lf.group_by_dynamic(
122+
index_column="time", every=f"{int(epoch_length * 1e9)}ns"
123+
)
122124
.agg(
123125
[
124126
(

tests/unit/test_analytics.py

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ def test_fill_false_blocks() -> None:
3636

3737
result = analytics._fill_false_blocks(sleep_idx_array, gap_block)
3838

39-
assert np.array_equal(
40-
result, expected_result
41-
), f"Expected {expected_result}, but got {result}"
39+
assert np.array_equal(result, expected_result), (
40+
f"Expected {expected_result}, but got {result}"
41+
)
4242

4343

4444
def test_compute_abs_diff_mean_anglez(
@@ -55,9 +55,9 @@ def test_compute_abs_diff_mean_anglez(
5555

5656
result = sleep_detection._compute_abs_diff_mean_anglez(sleep_detection.anglez)
5757

58-
assert np.array_equal(
59-
result.measurements, expected_result
60-
), f"Expected {expected_result}, but got {result.measurements}"
58+
assert np.array_equal(result.measurements, expected_result), (
59+
f"Expected {expected_result}, but got {result.measurements}"
60+
)
6161
assert np.array_equal(len(result.time), expected_length)
6262

6363

@@ -91,12 +91,12 @@ def test_spt_window(sleep_detection: analytics.GgirSleepDetection) -> None:
9191

9292
result = sleep_detection._spt_window(sleep_detection.anglez)
9393

94-
assert np.array_equal(
95-
result.measurements, expected_result
96-
), f"Expected {expected_result}, but got {result.measurements}"
97-
assert np.array_equal(
98-
len(result.time), expected_length
99-
), f"Expected {expected_length}, but got {len(result.time)}"
94+
assert np.array_equal(result.measurements, expected_result), (
95+
f"Expected {expected_result}, but got {result.measurements}"
96+
)
97+
assert np.array_equal(len(result.time), expected_length), (
98+
f"Expected {expected_length}, but got {len(result.time)}"
99+
)
100100

101101

102102
def test_spt_window_null(sleep_detection: analytics.GgirSleepDetection) -> None:
@@ -106,12 +106,12 @@ def test_spt_window_null(sleep_detection: analytics.GgirSleepDetection) -> None:
106106

107107
result = sleep_detection._spt_window(sleep_detection.anglez)
108108

109-
assert np.array_equal(
110-
result.measurements, expected_result
111-
), f"Expected {expected_result}, but got {result.measurements}"
112-
assert np.array_equal(
113-
len(result.time), expected_length
114-
), f"Expected {expected_length}, but got {len(result.time)}"
109+
assert np.array_equal(result.measurements, expected_result), (
110+
f"Expected {expected_result}, but got {result.measurements}"
111+
)
112+
assert np.array_equal(len(result.time), expected_length), (
113+
f"Expected {expected_length}, but got {len(result.time)}"
114+
)
115115

116116

117117
def test_calculate_sib_periods(sleep_detection: analytics.GgirSleepDetection) -> None:
@@ -121,12 +121,12 @@ def test_calculate_sib_periods(sleep_detection: analytics.GgirSleepDetection) ->
121121

122122
result = sleep_detection._calculate_sib_periods(sleep_detection.anglez, 10)
123123

124-
assert np.array_equal(
125-
result.measurements, expected_result
126-
), f"Expected {expected_result}, but got {result.measurements}"
127-
assert (
128-
len(result.measurements) == expected_length
129-
), f"Expected {expected_length}, but got {len(result.measurements)}"
124+
assert np.array_equal(result.measurements, expected_result), (
125+
f"Expected {expected_result}, but got {result.measurements}"
126+
)
127+
assert len(result.measurements) == expected_length, (
128+
f"Expected {expected_length}, but got {len(result.measurements)}"
129+
)
130130

131131

132132
def test_find_onset_wakeup_times(sleep_detection: analytics.GgirSleepDetection) -> None:

tests/unit/test_calibration.py

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -116,12 +116,12 @@ def test_closest_point_fit() -> None:
116116

117117
linear_transform = calibrator._closest_point_fit((unit_sphere * scale) + offset)
118118

119-
assert np.allclose(
120-
linear_transform.scale, expected_scale, atol=1e-3
121-
), f"Scale is {linear_transform.scale} expected {expected_scale}"
122-
assert np.allclose(
123-
linear_transform.offset, expected_offset, atol=1e-3
124-
), f"Offset is {linear_transform.offset} expected {expected_offset})"
119+
assert np.allclose(linear_transform.scale, expected_scale, atol=1e-3), (
120+
f"Scale is {linear_transform.scale} expected {expected_scale}"
121+
)
122+
assert np.allclose(linear_transform.offset, expected_offset, atol=1e-3), (
123+
f"Offset is {linear_transform.offset} expected {expected_offset})"
124+
)
125125

126126

127127
def test_closest_point_fit_constrainedmin() -> None:
@@ -137,12 +137,12 @@ def test_closest_point_fit_constrainedmin() -> None:
137137

138138
linear_transform = calibrator._closest_point_fit((unit_sphere * scale) + offset)
139139

140-
assert np.allclose(
141-
linear_transform.scale, expected_scale, atol=1e-3
142-
), f"Scale is {linear_transform.scale} expected {expected_scale}"
143-
assert np.allclose(
144-
linear_transform.offset, expected_offset, atol=1e-3
145-
), f"Offset is {linear_transform.offset} expected {expected_offset})"
140+
assert np.allclose(linear_transform.scale, expected_scale, atol=1e-3), (
141+
f"Scale is {linear_transform.scale} expected {expected_scale}"
142+
)
143+
assert np.allclose(linear_transform.offset, expected_offset, atol=1e-3), (
144+
f"Offset is {linear_transform.offset} expected {expected_offset})"
145+
)
146146

147147

148148
def test_closest_point_fit_constrainmin_calibration_error() -> None:
@@ -202,12 +202,12 @@ def test_ggir_calibration_successful() -> None:
202202

203203
linear_transform = calibrator._calibrate(dummy_measure)
204204

205-
assert np.allclose(
206-
linear_transform.scale, expected_scale, atol=1e-3
207-
), f"Scale is {linear_transform.scale} expected {expected_scale}"
208-
assert np.allclose(
209-
linear_transform.offset, expected_offset, atol=1e-3
210-
), f"Offset is {linear_transform.offset} expected {expected_offset}"
205+
assert np.allclose(linear_transform.scale, expected_scale, atol=1e-3), (
206+
f"Scale is {linear_transform.scale} expected {expected_scale}"
207+
)
208+
assert np.allclose(linear_transform.offset, expected_offset, atol=1e-3), (
209+
f"Offset is {linear_transform.offset} expected {expected_offset}"
210+
)
211211

212212

213213
@pytest.mark.parametrize(
@@ -276,12 +276,12 @@ def test_run_ggircalibration() -> None:
276276

277277
result = calibrator.run_calibration(dummy_measure)
278278

279-
assert isinstance(
280-
result, models.Measurement
281-
), f"was expecting type models.Measurement, object is of type {type(result)}"
282-
assert np.allclose(
283-
result.measurements, expected_data.measurements, atol=1e-3
284-
), "Measurement data did not match"
279+
assert isinstance(result, models.Measurement), (
280+
f"was expecting type models.Measurement, object is of type {type(result)}"
281+
)
282+
assert np.allclose(result.measurements, expected_data.measurements, atol=1e-3), (
283+
"Measurement data did not match"
284+
)
285285
assert result.time.equals(expected_data.time), "Time series are not equal"
286286

287287

@@ -309,12 +309,12 @@ def test_run_constrainedmincalibration() -> None:
309309

310310
result = calibrator.run_calibration(dummy_measure)
311311

312-
assert isinstance(
313-
result, models.Measurement
314-
), f"was expecting type models.Measurement, object is of type {type(result)}"
315-
assert np.allclose(
316-
result.measurements, expected_data.measurements, atol=1e-3
317-
), "Measurement data did not match"
312+
assert isinstance(result, models.Measurement), (
313+
f"was expecting type models.Measurement, object is of type {type(result)}"
314+
)
315+
assert np.allclose(result.measurements, expected_data.measurements, atol=1e-3), (
316+
"Measurement data did not match"
317+
)
318318
assert result.time.equals(expected_data.time), "Time series are not equal"
319319

320320

@@ -342,12 +342,12 @@ def test_run_chunked_calibration() -> None:
342342

343343
result = calibrator.run_calibration(dummy_measure)
344344

345-
assert isinstance(
346-
result, models.Measurement
347-
), f"was expecting type models.Measurement, object is of type {type(result)}"
348-
assert np.allclose(
349-
result.measurements, expected_data.measurements, atol=1e-3
350-
), "Measurement data did not match"
345+
assert isinstance(result, models.Measurement), (
346+
f"was expecting type models.Measurement, object is of type {type(result)}"
347+
)
348+
assert np.allclose(result.measurements, expected_data.measurements, atol=1e-3), (
349+
"Measurement data did not match"
350+
)
351351
assert result.time.equals(expected_data.time), "Time series are not equal"
352352

353353

tests/unit/test_computations.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,9 +181,9 @@ def test_moving_median(window_size: int, expected_output: np.ndarray) -> None:
181181
f"measurements array are not the same shape. Expected {expected_output.shape}, "
182182
f"instead got: {test_result.measurements.shape}"
183183
)
184-
assert np.all(
185-
np.isclose(test_result.measurements, expected_output)
186-
), "Test results do not match the expected output"
184+
assert np.all(np.isclose(test_result.measurements, expected_output)), (
185+
"Test results do not match the expected output"
186+
)
187187

188188

189189
def test_resample_downsample_simple() -> None:

tests/unit/test_metrics.py

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,13 @@ def test_euclidean_norm_minus_one(
5555
expected_length = math.ceil(len(test_time) / 5)
5656
enmo_results = metrics.euclidean_norm_minus_one(test_acceleration)
5757

58-
assert np.all(
59-
np.isclose(enmo_results.measurements, expected_enmo)
60-
), f"Expected {expected_enmo}"
58+
assert np.all(np.isclose(enmo_results.measurements, expected_enmo)), (
59+
f"Expected {expected_enmo}"
60+
)
6161

62-
assert (
63-
len(enmo_results.time) == expected_length
64-
), "Input time attribute does not match output time attribute."
62+
assert len(enmo_results.time) == expected_length, (
63+
"Input time attribute does not match output time attribute."
64+
)
6565

6666

6767
@pytest.mark.parametrize(
@@ -91,9 +91,9 @@ def test_angle_relative_to_horizontal(
9191
np.isclose(angle_z_results.measurements, expected_anglez, equal_nan=True)
9292
), f"Expected {expected_anglez}, got: {angle_z_results.measurements}"
9393

94-
assert (
95-
len(angle_z_results.time) == expected_length
96-
), "Input time attribute does not match output time attribute."
94+
assert len(angle_z_results.time) == expected_length, (
95+
"Input time attribute does not match output time attribute."
96+
)
9797

9898

9999
@pytest.mark.parametrize(
@@ -115,9 +115,9 @@ def test_cleanup_isolated_ones_nonwear_value(
115115
"""Test the cleanup isolated ones nonwear value function."""
116116
test_result = metrics._cleanup_isolated_ones_nonwear_value(nonwear_value_array)
117117

118-
assert np.all(
119-
test_result == expected_result
120-
), f"Expected {expected_result}, got: {test_result}"
118+
assert np.all(test_result == expected_result), (
119+
f"Expected {expected_result}, got: {test_result}"
120+
)
121121

122122

123123
def test_group_acceleration_data_by_time() -> None:
@@ -158,9 +158,9 @@ def test_compute_nonwear_value_per_axis(
158158
acceleration_grouped["X"], std_criteria=modifier
159159
)
160160

161-
assert (
162-
test_resultx == expected_result
163-
), f"Expected {expected_result}, got: {test_resultx}"
161+
assert test_resultx == expected_result, (
162+
f"Expected {expected_result}, got: {test_resultx}"
163+
)
164164

165165

166166
def test_compute_nonwear_value_array(create_acceleration: pl.DataFrame) -> None:
@@ -179,12 +179,12 @@ def test_compute_nonwear_value_array(create_acceleration: pl.DataFrame) -> None:
179179
std_criteria=1,
180180
)
181181

182-
assert np.all(
183-
test_result == expected_result
184-
), f"Expected {expected_result}, got: {test_result}"
185-
assert (
186-
len(test_result) == expected_time_length
187-
), f"Expected time to be {expected_time_length}, got: {len(test_result)}"
182+
assert np.all(test_result == expected_result), (
183+
f"Expected {expected_result}, got: {test_result}"
184+
)
185+
assert len(test_result) == expected_time_length, (
186+
f"Expected time to be {expected_time_length}, got: {len(test_result)}"
187+
)
188188

189189

190190
@pytest.mark.parametrize(
@@ -214,12 +214,12 @@ def test_detect_nonwear(
214214
std_criteria=modifier,
215215
)
216216

217-
assert np.all(
218-
test_result.measurements == modifier
219-
), f"Expected non-wear flag value to be {expected_result}, got: {test_result}"
220-
assert (
221-
len(test_result.time) == expected_time_length
222-
), f"Expected time to be {expected_time_length}, got: {len(test_result.time)}"
217+
assert np.all(test_result.measurements == modifier), (
218+
f"Expected non-wear flag value to be {expected_result}, got: {test_result}"
219+
)
220+
assert len(test_result.time) == expected_time_length, (
221+
f"Expected time to be {expected_time_length}, got: {len(test_result.time)}"
222+
)
223223

224224

225225
def test_mean_amplitude_deviation_function(create_acceleration: pl.DataFrame) -> None:
@@ -230,12 +230,12 @@ def test_mean_amplitude_deviation_function(create_acceleration: pl.DataFrame) ->
230230

231231
test_result = metrics.mean_amplitude_deviation(acceleration)
232232

233-
assert np.all(
234-
test_result.measurements == expected_result
235-
), f"Expected MAD value to be {expected_result}, got: {test_result}"
236-
assert (
237-
len(test_result.time) == expected_time
238-
), f"Expected time to be {expected_time}, got: {len(test_result.time)}"
233+
assert np.all(test_result.measurements == expected_result), (
234+
f"Expected MAD value to be {expected_result}, got: {test_result}"
235+
)
236+
assert len(test_result.time) == expected_time, (
237+
f"Expected time to be {expected_time}, got: {len(test_result.time)}"
238+
)
239239

240240

241241
def test_ag_counts_null(create_acceleration: pl.DataFrame) -> None:
@@ -247,9 +247,9 @@ def test_ag_counts_null(create_acceleration: pl.DataFrame) -> None:
247247

248248
ag_counts = metrics.actigraph_activity_counts(acceleration)
249249

250-
assert np.all(
251-
ag_counts.measurements == expected_result
252-
), f"Expected activity counts to be {expected_result}, got: {ag_counts}"
250+
assert np.all(ag_counts.measurements == expected_result), (
251+
f"Expected activity counts to be {expected_result}, got: {ag_counts}"
252+
)
253253
assert len(ag_counts.time) == expected_time
254254

255255

@@ -280,9 +280,9 @@ def test_ag_counts_max() -> None:
280280

281281
ag_counts = metrics.actigraph_activity_counts(acceleration)
282282

283-
assert np.all(
284-
ag_counts.measurements[2:] == expected_result
285-
), f"Expected activity counts to be {expected_result}, got: {ag_counts}"
283+
assert np.all(ag_counts.measurements[2:] == expected_result), (
284+
f"Expected activity counts to be {expected_result}, got: {ag_counts}"
285+
)
286286

287287

288288
@pytest.mark.parametrize("temp_length", [498, 500])

0 commit comments

Comments
 (0)