dynamic range change, literal casting.

Author: frey-perez

src/wristpy/core/orchestrator.py

@@ -316,8 +316,6 @@ def _run_file(
 
     watch_data = readers.read_watch_data(input)
 
-    dynamic_range = watch_data.dynamic_range
-
     if calibrator is None:
         logger.debug("Running without calibration")
         calibrated_acceleration = watch_data.acceleration
@@ -341,7 +339,7 @@ def _run_file(
         calibrated_acceleration,
         activity_metric,
         epoch_length,
-        dynamic_range=dynamic_range,
+        dynamic_range=watch_data.dynamic_range,
     )
 
     sleep_detector = analytics.GgirSleepDetection(anglez)
@@ -425,14 +423,13 @@ def _compute_activity(
     elif activity_metric == "mad":
         return metrics.mean_amplitude_deviation(acceleration, epoch_length=epoch_length)
     elif activity_metric == "mims":
-        return (
-            metrics.monitor_independent_movement_summary_units(
+        if dynamic_range is None:
+            return metrics.monitor_independent_movement_summary_units(
                 acceleration,
                 epoch=epoch_length,
             )
-            if dynamic_range is None
-            else metrics.monitor_independent_movement_summary_units(
-                acceleration, epoch=epoch_length, dynamic_range=dynamic_range
-            )
+        return metrics.monitor_independent_movement_summary_units(
+            acceleration, epoch=epoch_length, dynamic_range=dynamic_range
         )
+
     return metrics.euclidean_norm_minus_one(acceleration, epoch_length=epoch_length)

src/wristpy/io/readers/readers.py

@@ -2,7 +2,7 @@
 
 import os
 import pathlib
-from typing import Literal, Optional, Union
+from typing import Literal, Union, cast
 
 import actfast
 import numpy as np
@@ -41,14 +41,16 @@ def read_watch_data(file_name: Union[pathlib.Path, str]) -> models.WatchData:
             )
 
     file_type = os.path.splitext(file_name)[1]
+    file_type = cast(Literal[".gt3x", ".bin"], file_type)
     idle_sleep_mode_flag = False
     if file_type == ".gt3x":
         idle_sleep_mode_flag = (
             data["metadata"]["device_feature_enabled"]["sleep_mode"].lower() == "true"
         )
 
     dynamic_range = _extract_dynamic_range(
-        metadata=data["metadata"], file_type=file_type
+        metadata=data["metadata"],
+        file_type=file_type,
     )
 
     return models.WatchData(
@@ -63,8 +65,8 @@ def read_watch_data(file_name: Union[pathlib.Path, str]) -> models.WatchData:
 
 
 def _extract_dynamic_range(
-    metadata: dict, file_type: str
-) -> Optional[tuple[float, float]]:
+    metadata: dict, file_type: Literal[".gt3x", ".bin"]
+) -> tuple[float, float]:
     """Extract the dynamic range from metadata.
 
     Args:
@@ -73,9 +75,12 @@ def _extract_dynamic_range(
 
     Returns:
         A tuple containing the accelerometer range.
+
+    Raises:
+        ValueError: If file type is not supported.
     """
     if file_type == ".gt3x":
-        dynamic_range = (
+        return (
             float(metadata.get("info", {}).get("Acceleration Min")),
             float(metadata.get("info", {}).get("Acceleration Max")),
         )
@@ -86,9 +91,9 @@ def _extract_dynamic_range(
             .strip()
             .split(" to ")
         )
-        dynamic_range = (float(range_str[0]), float(range_str[1]))
+        return (float(range_str[0]), float(range_str[1]))
 
-    return dynamic_range
+    raise ValueError(f"Unsupported file type given: {file_type}")
 
 
 def unix_epoch_time_to_polars_datetime(

src/wristpy/processing/metrics.py

@@ -1,6 +1,6 @@
 """Calculate base metrics, anglez and enmo."""
 
-from typing import Literal, Tuple
+from typing import Literal, Optional, Tuple
 
 import numpy as np
 import polars as pl
@@ -615,7 +615,7 @@ def monitor_independent_movement_summary_units(
     combination_method: Literal["sum", "vector_magnitude"] = "sum",
     epoch: float = 60.0,
     interpolation_frequency: int = 100,
-    dynamic_range: Tuple[float, float] = (-8.0, 8.0),
+    dynamic_range: tuple[float, float] = (-8.0, 8.0),
     cutoffs: Tuple[float, float] = (0.2, 5.0),
     order: int = 4,
     *,

tests/unit/test_readers.py

@@ -1,6 +1,7 @@
 """Test readers.py functions."""
 
 import pathlib
+from typing import Literal, cast
 
 import actfast
 import pytest
@@ -49,9 +50,10 @@ def test_extract_dynamic_range_bin(sample_data_bin: pathlib.Path) -> None:
     """Test extracting dynamic range metadata from .bin files."""
     expected_dynamic_range = (-8, 8)
     data = actfast.read(sample_data_bin)
+    file_type = cast(Literal[".gt3x", ".bin"], sample_data_bin.suffix)
 
     result = readers._extract_dynamic_range(
-        metadata=data["metadata"], file_type=sample_data_bin.suffix
+        metadata=data["metadata"], file_type=file_type
     )
 
     assert (
@@ -63,9 +65,10 @@ def test_extract_dynamic_range_gt3x(sample_data_bin: pathlib.Path) -> None:
     """Test extracting dynamic range metadata from .gt3x files."""
     expected_dynamic_range = (-8, 8)
     data = actfast.read(sample_data_bin)
+    file_type = cast(Literal[".gt3x", ".bin"], sample_data_bin.suffix)
 
     result = readers._extract_dynamic_range(
-        metadata=data["metadata"], file_type=sample_data_bin.suffix
+        metadata=data["metadata"], file_type=file_type
     )
 
     assert (