ezmsg-sigproc 1.8.1__py3-none-any.whl → 2.0.0__py3-none-any.whl

ezmsg/sigproc/filter.py

@@ -1,15 +1,22 @@
+from abc import abstractmethod, ABC
 from dataclasses import dataclass, field
 import typing
 
 import ezmsg.core as ez
 from ezmsg.util.messages.axisarray import AxisArray
 from ezmsg.util.messages.util import replace
-from ezmsg.util.generator import consumer
 import numpy as np
 import numpy.typing as npt
 import scipy.signal
 
-from ezmsg.sigproc.base import GenAxisArray
+from ezmsg.sigproc.base import (
+    processor_state,
+    BaseStatefulTransformer,
+    BaseTransformerUnit,
+    SettingsType,
+    BaseConsumerUnit,
+    TransformerType,
+)
 
 
 @dataclass
@@ -18,6 +25,12 @@ class FilterCoefficients:
     a: np.ndarray = field(default_factory=lambda: np.array([1.0, 0.0]))
 
 
+# Type aliases
+BACoeffs = tuple[npt.NDArray, npt.NDArray]
+SOSCoeffs = npt.NDArray
+FilterCoefsType = typing.TypeVar("FilterCoefsType", BACoeffs, SOSCoeffs)
+
+
 def _normalize_coefs(
     coefs: FilterCoefficients | tuple[npt.NDArray, npt.NDArray] | npt.NDArray,
 ) -> tuple[str, tuple[npt.NDArray, ...]]:
@@ -33,167 +46,270 @@ def _normalize_coefs(
     return coef_type, coefs
 
 
-@consumer
-def filtergen(
-    axis: str, coefs: npt.NDArray | tuple[npt.NDArray] | None, coef_type: str
-) -> typing.Generator[AxisArray, AxisArray, None]:
-    """
-    Filter data using the provided coefficients.
-
-    Args:
-        axis: The name of the axis to operate on.
-        coefs: The pre-calculated filter coefficients.
-        coef_type: The type of filter coefficients. One of "ba" or "sos".
-
-    Returns:
-        A primed generator that, when passed an :obj:`AxisArray` via `.send(axis_array)`,
-         yields an :obj:`AxisArray` with the data filtered.
-    """
-    # Massage inputs
-    if coefs is not None and not isinstance(coefs, tuple):
-        # scipy.signal functions called with first arg `*coefs`, but sos coefs are a single ndarray.
-        coefs = (coefs,)
+class FilterBaseSettings(ez.Settings):
+    axis: str | None = None
+    """The name of the axis to operate on."""
 
-    # Init IO
-    msg_out = AxisArray(np.array([]), dims=[""])
+    coef_type: str = "ba"
+    """The type of filter coefficients. One of "ba" or "sos"."""
 
-    filt_func = {"ba": scipy.signal.lfilter, "sos": scipy.signal.sosfilt}[coef_type]
-    zi_func = {"ba": scipy.signal.lfilter_zi, "sos": scipy.signal.sosfilt_zi}[coef_type]
 
-    # State variables
-    zi: npt.NDArray | None = None
+class FilterSettings(FilterBaseSettings):
+    coefs: FilterCoefficients | None = None
+    """The pre-calculated filter coefficients."""
 
-    # Reset if these change.
-    check_input = {"key": None, "shape": None}
-    # fs changing will be handled by caller that creates coefficients.
-
-    while True:
-        msg_in: AxisArray = yield msg_out
-
-        if coefs is None:
-            # passthrough if we do not have a filter design.
-            msg_out = msg_in
-            continue
-
-        axis = msg_in.dims[0] if axis is None else axis
-        axis_idx = msg_in.get_axis_idx(axis)
-
-        # Re-calculate/reset zi if necessary
-        samp_shape = msg_in.data.shape[:axis_idx] + msg_in.data.shape[axis_idx + 1 :]
-        b_reset = samp_shape != check_input["shape"]
-        b_reset = b_reset or msg_in.key != check_input["key"]
-        if b_reset:
-            check_input["shape"] = samp_shape
-            check_input["key"] = msg_in.key
-
-            n_tail = msg_in.data.ndim - axis_idx - 1
-            zi = zi_func(*coefs)
-            zi_expand = (None,) * axis_idx + (slice(None),) + (None,) * n_tail
-            n_tile = (
-                msg_in.data.shape[:axis_idx] + (1,) + msg_in.data.shape[axis_idx + 1 :]
-            )
-            if coef_type == "sos":
-                # sos zi must keep its leading dimension (`order / 2` for low|high; `order` for bpass|bstop)
-                zi_expand = (slice(None),) + zi_expand
-                n_tile = (1,) + n_tile
-            zi = np.tile(zi[zi_expand], n_tile)
-
-        if msg_in.data.size > 0:
-            dat_out, zi = filt_func(*coefs, msg_in.data, axis=axis_idx, zi=zi)
-        else:
-            dat_out = msg_in.data
-        msg_out = replace(msg_in, data=dat_out)
+    # Note: coef_type = "ba" is assumed for this class.
 
 
-# Type aliases
-BACoeffs = tuple[npt.NDArray, npt.NDArray]
-SOSCoeffs = npt.NDArray
-FilterCoefsMultiType = BACoeffs | SOSCoeffs
+@processor_state
+class FilterState:
+    zi: npt.NDArray | None = None
 
 
-@consumer
-def filter_gen_by_design(
-    axis: str,
-    coef_type: str,
-    design_fun: typing.Callable[[float], FilterCoefsMultiType | None],
-) -> typing.Generator[AxisArray, AxisArray, None]:
+class FilterTransformer(
+    BaseStatefulTransformer[FilterSettings, AxisArray, AxisArray, FilterState]
+):
     """
-    Filter data using a filter whose coefficients are calculated using the provided design function.
-
-    Args:
-        axis: The name of the axis to filter.
-            Note: The axis must be represented in the message .axes and be of type AxisArray.LinearAxis.
-        coef_type: "ba" or "sos"
-        design_fun: A callable that takes "fs" as its only argument and returns a tuple of filter coefficients.
-          If the design_fun returns None then the filter will act as a passthrough.
-          Hint: To make a design function that only requires fs, use functools.partial to set other parameters.
-          See butterworthfilter for an example.
-
-    Returns:
-
+    Filter data using the provided coefficients.
     """
-    msg_out = AxisArray(np.array([]), dims=[""])
 
-    # State variables
-    # Initialize filtergen as passthrough until we receive a message that allows us to design the filter.
-    filter_gen = filtergen(axis, None, coef_type)
-
-    # Reset if these change.
-    check_input = {"gain": None}
-    # No need to check parameters that don't affect the design; filter_gen should check most of its parameters.
-
-    while True:
-        msg_in: AxisArray = yield msg_out
-        axis = axis or msg_in.dims[0]
-        b_reset = msg_in.axes[axis].gain != check_input["gain"]
-        if b_reset:
-            check_input["gain"] = msg_in.axes[axis].gain
-            coefs = design_fun(1 / msg_in.axes[axis].gain)
-            filter_gen = filtergen(axis, coefs, coef_type)
-
-        msg_out = filter_gen.send(msg_in)
+    def __call__(self, message: AxisArray) -> AxisArray:
+        if self.settings.coefs is None:
+            return message
+        if self._state.zi is None:
+            self._reset_state(message)
+            self._hash = self._hash_message(message)
+        return super().__call__(message)
+
+    def _hash_message(self, message: AxisArray) -> int:
+        axis = message.dims[0] if self.settings.axis is None else self.settings.axis
+        axis_idx = message.get_axis_idx(axis)
+        samp_shape = message.data.shape[:axis_idx] + message.data.shape[axis_idx + 1 :]
+        return hash((message.key, samp_shape))
+
+    def _reset_state(self, message: AxisArray) -> None:
+        axis = message.dims[0] if self.settings.axis is None else self.settings.axis
+        axis_idx = message.get_axis_idx(axis)
+        n_tail = message.data.ndim - axis_idx - 1
+        coefs = (
+            (self.settings.coefs,)
+            if self.settings.coefs is not None
+            and not isinstance(self.settings.coefs, tuple)
+            else self.settings.coefs
+        )
+        zi_func = {"ba": scipy.signal.lfilter_zi, "sos": scipy.signal.sosfilt_zi}[
+            self.settings.coef_type
+        ]
+        zi = zi_func(*coefs)
+        zi_expand = (None,) * axis_idx + (slice(None),) + (None,) * n_tail
+        n_tile = (
+            message.data.shape[:axis_idx] + (1,) + message.data.shape[axis_idx + 1 :]
+        )
 
+        if self.settings.coef_type == "sos":
+            zi_expand = (slice(None),) + zi_expand
+            n_tile = (1,) + n_tile
 
-class FilterBaseSettings(ez.Settings):
-    axis: str | None = None
-    coef_type: str = "ba"
+        self.state.zi = np.tile(zi[zi_expand], n_tile)
 
+    def update_coefficients(
+        self,
+        coefs: FilterCoefficients | tuple[npt.NDArray, npt.NDArray] | npt.NDArray,
+        coef_type: str | None = None,
+    ) -> None:
+        """
+        Update filter coefficients.
+
+        If the new coefficients have the same length as the current ones, only the coefficients are updated.
+        If the lengths differ, the filter state is also reset to handle the new filter order.
+
+        Args:
+            coefs: New filter coefficients
+        """
+        old_coefs = self.settings.coefs
+
+        # Update settings with new coefficients
+        self.settings = replace(self.settings, coefs=coefs)
+        if coef_type is not None:
+            self.settings = replace(self.settings, coef_type=coef_type)
+
+        # Check if we need to reset the state
+        if self.state.zi is not None:
+            reset_needed = False
+
+            if self.settings.coef_type == "ba":
+                if isinstance(old_coefs, FilterCoefficients) and isinstance(
+                    coefs, FilterCoefficients
+                ):
+                    if len(old_coefs.b) != len(coefs.b) or len(old_coefs.a) != len(
+                        coefs.a
+                    ):
+                        reset_needed = True
+                elif isinstance(old_coefs, tuple) and isinstance(coefs, tuple):
+                    if len(old_coefs[0]) != len(coefs[0]) or len(old_coefs[1]) != len(
+                        coefs[1]
+                    ):
+                        reset_needed = True
+                else:
+                    reset_needed = True
+            elif self.settings.coef_type == "sos":
+                if isinstance(old_coefs, np.ndarray) and isinstance(coefs, np.ndarray):
+                    if old_coefs.shape != coefs.shape:
+                        reset_needed = True
+                else:
+                    reset_needed = True
+
+            if reset_needed:
+                self.state.zi = None  # This will trigger _reset_state on the next call
+
+    def _process(self, message: AxisArray) -> AxisArray:
+        if message.data.size > 0:
+            axis = message.dims[0] if self.settings.axis is None else self.settings.axis
+            axis_idx = message.get_axis_idx(axis)
+            coefs = (
+                (self.settings.coefs,)
+                if self.settings.coefs is not None
+                and not isinstance(self.settings.coefs, tuple)
+                else self.settings.coefs
+            )
+            filt_func = {"ba": scipy.signal.lfilter, "sos": scipy.signal.sosfilt}[
+                self.settings.coef_type
+            ]
+            dat_out, self.state.zi = filt_func(
+                *coefs, message.data, axis=axis_idx, zi=self.state.zi
+            )
+        else:
+            dat_out = message.data
 
-class FilterBase(GenAxisArray):
-    SETTINGS = FilterBaseSettings
+        return replace(message, data=dat_out)
 
-    # Backwards-compatible with `Filter` unit
-    INPUT_FILTER = ez.InputStream(FilterCoefsMultiType)
 
-    def design_filter(
-        self,
-    ) -> typing.Callable[[float], FilterCoefsMultiType | None]:
-        raise NotImplementedError("Must implement 'design_filter' in Unit subclass!")
+class Filter(
+    BaseTransformerUnit[FilterSettings, AxisArray, AxisArray, FilterTransformer]
+):
+    SETTINGS = FilterSettings
 
-    def construct_generator(self):
-        design_fun = self.design_filter()
-        self.STATE.gen = filter_gen_by_design(
-            self.SETTINGS.axis, self.SETTINGS.coef_type, design_fun
-        )
 
-    @ez.subscriber(INPUT_FILTER)
-    async def redesign(self, message: FilterBaseSettings) -> None:
-        self.apply_settings(message)
-        self.construct_generator()
+def filtergen(
+    axis: str, coefs: npt.NDArray | tuple[npt.NDArray] | None, coef_type: str
+) -> FilterTransformer:
+    """
+    Filter data using the provided coefficients.
 
+    Returns:
+        :obj:`FilterTransformer`.
+    """
+    return FilterTransformer(
+        FilterSettings(axis=axis, coefs=coefs, coef_type=coef_type)
+    )
 
-class FilterSettings(FilterBaseSettings):
-    # If you'd like to statically design a filter, define it in settings
-    coefs: FilterCoefficients | None = None
-    # Note: coef_type = "ba" is assumed for this class.
 
+@processor_state
+class FilterByDesignState:
+    filter: FilterTransformer | None = None
+    needs_redesign: bool = False
 
-class Filter(FilterBase):
-    SETTINGS = FilterSettings
 
-    INPUT_FILTER = ez.InputStream(FilterCoefficients)
+class FilterByDesignTransformer(
+    BaseStatefulTransformer[SettingsType, AxisArray, AxisArray, FilterByDesignState],
+    ABC,
+    typing.Generic[SettingsType, FilterCoefsType],
+):
+    """Abstract base class for filter design transformers."""
 
-    def design_filter(self) -> typing.Callable[[float], BACoeffs | None]:
-        if self.SETTINGS.coefs is None:
-            return lambda fs: None
-        return lambda fs: (self.SETTINGS.coefs.b, self.SETTINGS.coefs.a)
+    @classmethod
+    def get_message_type(cls, dir: str) -> type[AxisArray]:
+        if dir in ("in", "out"):
+            return AxisArray
+        else:
+            raise ValueError(f"Invalid direction: {dir}. Must be 'in' or 'out'.")
+
+    @abstractmethod
+    def get_design_function(self) -> typing.Callable[[float], FilterCoefsType | None]:
+        """Return a function that takes sampling frequency and returns filter coefficients."""
+        ...
+
+    def update_settings(
+        self, new_settings: typing.Optional[SettingsType] = None, **kwargs
+    ) -> None:
+        """
+        Update settings and mark that filter coefficients need to be recalculated.
+
+        Args:
+            new_settings: Complete new settings object to replace current settings
+            **kwargs: Individual settings to update
+        """
+        # Update settings
+        if new_settings is not None:
+            self.settings = new_settings
+        else:
+            self.settings = replace(self.settings, **kwargs)
+
+        # Set flag to trigger recalculation on next message
+        if self.state.filter is not None:
+            self.state.needs_redesign = True
+
+    def __call__(self, message: AxisArray) -> AxisArray:
+        # Offer a shortcut when there is no design function or order is 0.
+        if hasattr(self.settings, "order") and not self.settings.order:
+            return message
+        design_fun = self.get_design_function()
+        if design_fun is None:
+            return message
+
+        # Check if filter exists but needs redesign due to settings change
+        if self.state.filter is not None and self.state.needs_redesign:
+            axis = self.state.filter.settings.axis
+            fs = 1 / message.axes[axis].gain
+            coefs = design_fun(fs)
+            self.state.filter.update_coefficients(
+                coefs, coef_type=self.settings.coef_type
+            )
+            self.state.needs_redesign = False
+
+        return super().__call__(message)
+
+    def _hash_message(self, message: AxisArray) -> int:
+        axis = message.dims[0] if self.settings.axis is None else self.settings.axis
+        gain = message.axes[axis].gain if hasattr(message.axes[axis], "gain") else 1
+        axis_idx = message.get_axis_idx(axis)
+        samp_shape = message.data.shape[:axis_idx] + message.data.shape[axis_idx + 1 :]
+        return hash((message.key, samp_shape, gain))
+
+    def _reset_state(self, message: AxisArray) -> None:
+        design_fun = self.get_design_function()
+        axis = message.dims[0] if self.settings.axis is None else self.settings.axis
+        fs = 1 / message.axes[axis].gain
+        coefs = design_fun(fs)
+        new_settings = FilterSettings(
+            axis=axis, coef_type=self.settings.coef_type, coefs=coefs
+        )
+        self.state.filter = FilterTransformer(settings=new_settings)
+
+    def _process(self, message: AxisArray) -> AxisArray:
+        return self.state.filter(message)
+
+
+class BaseFilterByDesignTransformerUnit(
+    BaseTransformerUnit[SettingsType, AxisArray, AxisArray, FilterByDesignTransformer],
+    typing.Generic[SettingsType, TransformerType],
+):
+    @ez.subscriber(BaseConsumerUnit.INPUT_SETTINGS)
+    async def on_settings(self, msg: SettingsType) -> None:
+        """
+        Receive a settings message, override self.SETTINGS, and re-create the processor.
+        Child classes that wish to have fine-grained control over whether the
+        core processor resets on settings changes should override this method.
+
+        Args:
+            msg: a settings message.
+        """
+        self.apply_settings(msg)
+
+        # Check if processor exists yet
+        if hasattr(self, "processor") and self.processor is not None:
+            # Update the existing processor with new settings
+            self.processor.update_settings(self.SETTINGS)
+        else:
+            # Processor doesn't exist yet, create a new one
+            self.create_processor()