ezmsg-sigproc 1.4.1__py3-none-any.whl → 1.5.0__py3-none-any.whl

ezmsg/sigproc/__version__.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.4.1'
-__version_tuple__ = version_tuple = (1, 4, 1)
+__version__ = version = '1.5.0'
+__version_tuple__ = version_tuple = (1, 5, 0)

ezmsg/sigproc/activation.py

@@ -1,10 +1,9 @@
-from dataclasses import replace
 import typing
 
 import numpy as np
 import scipy.special
 import ezmsg.core as ez
-from ezmsg.util.messages.axisarray import AxisArray
+from ezmsg.util.messages.axisarray import AxisArray, replace
 from ezmsg.util.generator import consumer
 
 from .spectral import OptionsEnum

ezmsg/sigproc/affinetransform.py

@@ -1,4 +1,3 @@
-from dataclasses import replace
 import os
 from pathlib import Path
 import typing
@@ -6,7 +5,7 @@ import typing
 import numpy as np
 import numpy.typing as npt
 import ezmsg.core as ez
-from ezmsg.util.messages.axisarray import AxisArray
+from ezmsg.util.messages.axisarray import AxisArray, AxisBase, replace
 from ezmsg.util.generator import consumer
 
 from .base import GenAxisArray
@@ -47,7 +46,7 @@ def affine_transform(
 
     # State variables
     # New axis with transformed labels, if required
-    new_axis: typing.Optional[AxisArray.Axis] = None
+    new_axis: typing.Optional[AxisBase] = None
 
     # Reset if any of these change.
     check_input = {"key": None}
@@ -71,10 +70,10 @@ def affine_transform(
             # Determine if we need to modify the transformed axis.
             if (
                 axis in msg_in.axes
-                and hasattr(msg_in.axes[axis], "labels")
+                and hasattr(msg_in.axes[axis], "data")
                 and weights.shape[0] != weights.shape[1]
             ):
-                in_labels = msg_in.axes[axis].labels
+                in_labels = msg_in.axes[axis].data
                 new_labels = []
                 n_in, n_out = weights.shape
                 if len(in_labels) != n_in:
@@ -101,8 +100,8 @@ def affine_transform(
                                 new_labels.append("")
                     elif np.all(b_filled_outputs):
                         # Transform is dropping some of the inputs.
-                        new_labels = np.array(in_labels)[b_used_inputs].tolist()
-                new_axis = replace(msg_in.axes[axis], labels=new_labels)
+                        new_labels = np.array(in_labels)[b_used_inputs]
+                new_axis = replace(msg_in.axes[axis], data=np.array(new_labels))
 
         data = msg_in.data
 

ezmsg/sigproc/aggregate.py

@@ -1,11 +1,15 @@
-from dataclasses import replace
 import typing
 
 import numpy as np
 import numpy.typing as npt
 import ezmsg.core as ez
 from ezmsg.util.generator import consumer
-from ezmsg.util.messages.axisarray import AxisArray, slice_along_axis
+from ezmsg.util.messages.axisarray import (
+    AxisArray,
+    slice_along_axis,
+    AxisBase,
+    replace,
+)
 
 from .spectral import OptionsEnum
 from .base import GenAxisArray
@@ -72,11 +76,11 @@ def ranged_aggregate(
 
     # State variables
     slices: typing.Optional[typing.List[typing.Tuple[typing.Any, ...]]] = None
-    out_axis: typing.Optional[AxisArray.Axis] = None
+    out_axis: typing.Optional[AxisBase] = None
     ax_vec: typing.Optional[npt.NDArray] = None
 
     # Reset if any of these changes. Key not checked because continuity between chunks not required.
-    check_inputs = {"gain": None, "offset": None}
+    check_inputs = {"gain": None, "offset": None, "len": None, "key": None}
 
     while True:
         msg_in: AxisArray = yield msg_out
@@ -86,35 +90,52 @@ def ranged_aggregate(
             axis = axis or msg_in.dims[0]
             target_axis = msg_in.get_axis(axis)
 
-            b_reset = target_axis.gain != check_inputs["gain"]
-            b_reset = b_reset or target_axis.offset != check_inputs["offset"]
+            # Check if we need to reset state
+            b_reset = msg_in.key != check_inputs["key"]
+            if hasattr(target_axis, "data"):
+                b_reset = b_reset or len(target_axis.data) != check_inputs["len"]
+            elif isinstance(target_axis, AxisArray.LinearAxis):
+                b_reset = b_reset or target_axis.gain != check_inputs["gain"]
+                b_reset = b_reset or target_axis.offset != check_inputs["offset"]
+
             if b_reset:
-                check_inputs["gain"] = target_axis.gain
-                check_inputs["offset"] = target_axis.offset
+                # Update check variables
+                check_inputs["key"] = msg_in.key
+                if hasattr(target_axis, "data"):
+                    check_inputs["len"] = len(target_axis.data)
+                else:
+                    check_inputs["gain"] = target_axis.gain
+                    check_inputs["offset"] = target_axis.offset
 
                 # If the axis we are operating on has changed (e.g., "time" or "win" axis always changes),
                 #  or the key has changed, then recalculate slices.
 
                 ax_idx = msg_in.get_axis_idx(axis)
 
-                ax_vec = (
-                    target_axis.offset
-                    + np.arange(msg_in.data.shape[ax_idx]) * target_axis.gain
-                )
+                if hasattr(target_axis, "data"):
+                    ax_vec = target_axis.data
+                else:
+                    ax_vec = target_axis.value(np.arange(msg_in.data.shape[ax_idx]))
+
                 slices = []
-                mids = []
+                ax_dat = []
                 for start, stop in bands:
                     inds = np.where(np.logical_and(ax_vec >= start, ax_vec <= stop))[0]
-                    mids.append(np.mean(inds) * target_axis.gain + target_axis.offset)
                     slices.append(np.s_[inds[0] : inds[-1] + 1])
-                out_ax_kwargs = {
-                    "unit": target_axis.unit,
-                    "offset": mids[0],
-                    "gain": (mids[1] - mids[0]) if len(mids) > 1 else 1.0,
-                }
-                if hasattr(target_axis, "labels"):
-                    out_ax_kwargs["labels"] = [f"{_[0]} - {_[1]}" for _ in bands]
-                out_axis = replace(target_axis, **out_ax_kwargs)
+                    if hasattr(target_axis, "data"):
+                        if ax_vec.dtype.type is np.str_:
+                            sl_dat = f"{ax_vec[start]} - {ax_vec[stop]}"
+                        else:
+                            sl_dat = ax_dat.append(np.mean(ax_vec[inds]))
+                    else:
+                        sl_dat = target_axis.value(np.mean(inds))
+                    ax_dat.append(sl_dat)
+
+                out_axis = AxisArray.CoordinateAxis(
+                    data=np.array(ax_dat),
+                    dims=[axis],
+                    unit=target_axis.unit,
+                )
 
             agg_func = AGGREGATORS[operation]
             out_data = [

ezmsg/sigproc/butterworthfilter.py

@@ -73,6 +73,7 @@ def butter(
 
     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.
         order: Filter order.
         cuton: Corner frequency of the filter in Hz.
         cutoff: Corner frequency of the filter in Hz.

ezmsg/sigproc/downsample.py

@@ -1,8 +1,11 @@
-from dataclasses import replace
 import typing
 
 import numpy as np
-from ezmsg.util.messages.axisarray import AxisArray, slice_along_axis
+from ezmsg.util.messages.axisarray import (
+    AxisArray,
+    slice_along_axis,
+    replace,
+)
 from ezmsg.util.generator import consumer
 import ezmsg.core as ez
 
@@ -22,6 +25,7 @@ def downsample(
 
     Args:
         axis: The name of the axis along which to downsample.
+            Note: The axis must exist in the message .axes and be of type AxisArray.LinearAxis.
         factor: Downsampling factor.
 
     Returns:

ezmsg/sigproc/ewmfilter.py

@@ -1,9 +1,8 @@
 import asyncio
-from dataclasses import replace
 import typing
 
 import ezmsg.core as ez
-from ezmsg.util.messages.axisarray import AxisArray
+from ezmsg.util.messages.axisarray import AxisArray, replace
 import numpy as np
 
 from .window import Window, WindowSettings

ezmsg/sigproc/filter.py

@@ -1,9 +1,9 @@
 import asyncio
-from dataclasses import dataclass, replace, field
+from dataclasses import dataclass, field
 import typing
 
 import ezmsg.core as ez
-from ezmsg.util.messages.axisarray import AxisArray
+from ezmsg.util.messages.axisarray import AxisArray, replace
 from ezmsg.util.generator import consumer
 import numpy as np
 import numpy.typing as npt

ezmsg/sigproc/filterbank.py

@@ -1,4 +1,3 @@
-from dataclasses import replace
 import functools
 import math
 import typing
@@ -9,7 +8,7 @@ import scipy.fft as sp_fft
 from scipy.special import lambertw
 import numpy.typing as npt
 import ezmsg.core as ez
-from ezmsg.util.messages.axisarray import AxisArray
+from ezmsg.util.messages.axisarray import AxisArray, replace
 from ezmsg.util.generator import consumer
 
 from .base import GenAxisArray

ezmsg/sigproc/math/abs.py

@@ -1,10 +1,9 @@
-from dataclasses import replace
 import typing
 
 import numpy as np
 import ezmsg.core as ez
 from ezmsg.util.generator import consumer
-from ezmsg.util.messages.axisarray import AxisArray
+from ezmsg.util.messages.axisarray import AxisArray, replace
 
 from ..base import GenAxisArray
 

ezmsg/sigproc/math/clip.py

@@ -1,10 +1,9 @@
-from dataclasses import replace
 import typing
 
 import numpy as np
 import ezmsg.core as ez
 from ezmsg.util.generator import consumer
-from ezmsg.util.messages.axisarray import AxisArray
+from ezmsg.util.messages.axisarray import AxisArray, replace
 
 from ..base import GenAxisArray
 

ezmsg/sigproc/math/difference.py

@@ -1,10 +1,9 @@
-from dataclasses import replace
 import typing
 
 import numpy as np
 import ezmsg.core as ez
 from ezmsg.util.generator import consumer
-from ezmsg.util.messages.axisarray import AxisArray
+from ezmsg.util.messages.axisarray import AxisArray, replace
 
 from ..base import GenAxisArray
 

ezmsg/sigproc/math/invert.py

@@ -1,10 +1,9 @@
-from dataclasses import replace
 import typing
 
 import numpy as np
 import ezmsg.core as ez
 from ezmsg.util.generator import consumer
-from ezmsg.util.messages.axisarray import AxisArray
+from ezmsg.util.messages.axisarray import AxisArray, replace
 
 from ..base import GenAxisArray
 

ezmsg/sigproc/math/log.py

@@ -1,10 +1,9 @@
-from dataclasses import replace
 import typing
 
 import numpy as np
 import ezmsg.core as ez
 from ezmsg.util.generator import consumer
-from ezmsg.util.messages.axisarray import AxisArray
+from ezmsg.util.messages.axisarray import AxisArray, replace
 
 from ..base import GenAxisArray
 
@@ -42,10 +41,11 @@ def log(
 
 class LogSettings(ez.Settings):
     base: float = 10.0
+    clip_zero: bool = False
 
 
 class Log(GenAxisArray):
     SETTINGS = LogSettings
 
     def construct_generator(self):
-        self.STATE.gen = log(base=self.SETTINGS.base)
+        self.STATE.gen = log(base=self.SETTINGS.base, clip_zero=self.SETTINGS.clip_zero)

ezmsg/sigproc/math/scale.py

@@ -1,10 +1,9 @@
-from dataclasses import replace
 import typing
 
 import numpy as np
 import ezmsg.core as ez
 from ezmsg.util.generator import consumer
-from ezmsg.util.messages.axisarray import AxisArray
+from ezmsg.util.messages.axisarray import AxisArray, replace
 
 from ..base import GenAxisArray
 

ezmsg/sigproc/messages.py

@@ -26,5 +26,5 @@ def TSMessage(
     dims[time_dim] = "time"
     offset = time.time() if timestamp is None else timestamp
     offset_adj = data.shape[time_dim] / fs  # offset corresponds to idx[0] on time_dim
-    axis = AxisArray.Axis.TimeAxis(fs, offset=offset - offset_adj)
+    axis = AxisArray.TimeAxis(fs, offset=offset - offset_adj)
     return AxisArray(data, dims=dims, axes=dict(time=axis))

ezmsg/sigproc/sampler.py

@@ -1,13 +1,17 @@
 import asyncio  # Dev/test apparatus
 from collections import deque
-from dataclasses import dataclass, replace, field
+from dataclasses import dataclass, field
 import time
 import typing
 
 import numpy as np
 import numpy.typing as npt
 import ezmsg.core as ez
-from ezmsg.util.messages.axisarray import AxisArray, slice_along_axis
+from ezmsg.util.messages.axisarray import (
+    AxisArray,
+    slice_along_axis,
+    replace,
+)
 from ezmsg.util.generator import consumer
 
 
@@ -52,6 +56,7 @@ def sampler(
             need a buffer of 0.5 + (1.5 - -1.0) = 3.0 seconds. It is best to at least double your estimate if memory allows.
         axis: The axis along which to sample the data.
             None (default) will choose the first axis in the first input.
+            Note: (for now) the axis must exist in the msg .axes and be of type AxisArray.LinearAxis
         period: The period in seconds during which to sample the data.
             Defaults to None. Only used if not None and the trigger message does not define its own period.
         value: The value to sample. Defaults to None.

ezmsg/sigproc/scaler.py

@@ -1,10 +1,9 @@
-from dataclasses import replace
 import typing
 
 import numpy as np
 import numpy.typing as npt
 import ezmsg.core as ez
-from ezmsg.util.messages.axisarray import AxisArray
+from ezmsg.util.messages.axisarray import AxisArray, replace
 from ezmsg.util.generator import consumer
 
 from .base import GenAxisArray
@@ -87,6 +86,7 @@ def scaler_np(
     Args:
         time_constant: Decay constant `tau` in seconds.
         axis: The name of the axis to accumulate statistics over.
+            Note: The axis must be in the msg.axes and be of type AxisArray.LinearAxis.
 
     Returns:
         A primed generator object that expects to be sent a :obj:`AxisArray` via `.send(axis_array)`

ezmsg/sigproc/signalinjector.py

@@ -1,8 +1,7 @@
-from dataclasses import replace
 import typing
 
 import ezmsg.core as ez
-from ezmsg.util.messages.axisarray import AxisArray
+from ezmsg.util.messages.axisarray import AxisArray, replace
 import numpy as np
 import numpy.typing as npt
 

ezmsg/sigproc/slicer.py

@@ -1,10 +1,14 @@
-from dataclasses import replace
 import typing
 
 import numpy as np
 import numpy.typing as npt
 import ezmsg.core as ez
-from ezmsg.util.messages.axisarray import AxisArray, slice_along_axis
+from ezmsg.util.messages.axisarray import (
+    AxisArray,
+    slice_along_axis,
+    AxisBase,
+    replace,
+)
 from ezmsg.util.generator import consumer
 
 from .base import GenAxisArray
@@ -15,7 +19,10 @@ Slicer:Select a subset of data along a particular axis.
 """
 
 
-def parse_slice(s: str) -> typing.Tuple[typing.Union[slice, int], ...]:
+def parse_slice(
+    s: str,
+    axinfo: typing.Optional[AxisArray.CoordinateAxis] = None,
+) -> typing.Tuple[typing.Union[slice, int], ...]:
     """
     Parses a string representation of a slice and returns a tuple of slice objects.
 
@@ -26,9 +33,13 @@ def parse_slice(s: str) -> typing.Tuple[typing.Union[slice, int], ...]:
     - "5" (or any integer) -> (5,). Take only that item.
         applying this to a ndarray or AxisArray will drop the dimension.
     - A comma-separated list of the above -> a tuple of slices | ints
+    - A comma-separated list of values and axinfo is provided and is a CoordinateAxis -> a tuple of ints
 
     Args:
         s: The string representation of the slice.
+        axinfo: (Optional) If provided, and of type CoordinateAxis,
+          and `s` is a comma-separated list of values, then the values
+          in s will be checked against the values in axinfo.data.
 
     Returns:
         A tuple of slice objects and/or ints.
@@ -38,9 +49,15 @@ def parse_slice(s: str) -> typing.Tuple[typing.Union[slice, int], ...]:
     if "," not in s:
         parts = [part.strip() for part in s.split(":")]
         if len(parts) == 1:
+            if (
+                axinfo is not None
+                and hasattr(axinfo, "data")
+                and parts[0] in axinfo.data
+            ):
+                return tuple(np.where(axinfo.data == parts[0])[0])
             return (int(parts[0]),)
         return (slice(*(int(part.strip()) if part else None for part in parts)),)
-    suplist = [parse_slice(_) for _ in s.split(",")]
+    suplist = [parse_slice(_, axinfo=axinfo) for _ in s.split(",")]
     return tuple([item for sublist in suplist for item in sublist])
 
 
@@ -64,7 +81,7 @@ def slicer(
 
     # State variables
     _slice: typing.Optional[typing.Union[slice, npt.NDArray]] = None
-    new_axis: typing.Optional[AxisArray.Axis] = None
+    new_axis: typing.Optional[AxisBase] = None
     b_change_dims: bool = False  # If number of dimensions changes when slicing
 
     # Reset if input changes
@@ -92,7 +109,7 @@ def slicer(
             b_change_dims = False
 
             # Calculate the slice
-            _slices = parse_slice(selection)
+            _slices = parse_slice(selection, msg_in.axes.get(axis, None))
             if len(_slices) == 1:
                 _slice = _slices[0]
                 # Do we drop the sliced dimension?
@@ -107,12 +124,15 @@ def slicer(
             # Create the output axis.
             if (
                 axis in msg_in.axes
-                and hasattr(msg_in.axes[axis], "labels")
-                and len(msg_in.axes[axis].labels) > 0
+                and hasattr(msg_in.axes[axis], "data")
+                and len(msg_in.axes[axis].data) > 0
             ):
-                in_labels = np.array(msg_in.axes[axis].labels)
-                new_labels = in_labels[_slice].tolist()
-                new_axis = replace(msg_in.axes[axis], labels=new_labels)
+                in_data = np.array(msg_in.axes[axis].data)
+                if b_change_dims:
+                    out_data = in_data[_slice : _slice + 1]
+                else:
+                    out_data = in_data[_slice]
+                new_axis = replace(msg_in.axes[axis], data=out_data)
 
         replace_kwargs = {}
         if b_change_dims:

ezmsg/sigproc/spectrum.py

@@ -1,11 +1,14 @@
-from dataclasses import replace
 import enum
 from functools import partial
 import typing
 
 import numpy as np
 import ezmsg.core as ez
-from ezmsg.util.messages.axisarray import AxisArray, slice_along_axis
+from ezmsg.util.messages.axisarray import (
+    AxisArray,
+    slice_along_axis,
+    replace,
+)
 from ezmsg.util.generator import consumer
 
 from .base import GenAxisArray
@@ -79,6 +82,7 @@ def spectrum(
 
     Args:
         axis: The name of the axis on which to calculate the spectrum.
+            Note: The axis must have an .axes entry of type LinearAxis, not CoordinateAxis.
         out_axis: The name of the new axis. Defaults to "freq".
         window: The :obj:`WindowFunction` to apply to the data slice prior to calculating the spectrum.
         transform: The :obj:`SpectralTransform` to apply to the spectral magnitude.
@@ -101,7 +105,7 @@ def spectrum(
     apply_window = window != WindowFunction.NONE
     do_fftshift &= output == SpectralOutput.FULL
     f_sl = slice(None)
-    freq_axis: typing.Optional[AxisArray.Axis] = None
+    freq_axis: typing.Optional[AxisArray.LinearAxis] = None
     fftfun: typing.Optional[typing.Callable] = None
     f_transform: typing.Optional[typing.Callable] = None
     new_dims: typing.Optional[typing.List[str]] = None
@@ -174,7 +178,7 @@ def spectrum(
                     freqs = np.fft.fftshift(freqs, axes=-1)
                 freqs = freqs[f_sl]
             freqs = freqs.tolist()  # To please type checking
-            freq_axis = AxisArray.Axis(
+            freq_axis = AxisArray.LinearAxis(
                 unit="Hz", gain=freqs[1] - freqs[0], offset=freqs[0]
             )
             if out_axis is None:

ezmsg/sigproc/synth.py

@@ -1,12 +1,12 @@
 import asyncio
-from dataclasses import replace, field
+from dataclasses import field
 import time
 from typing import Optional, Generator, AsyncGenerator, Union
 
 import numpy as np
 import ezmsg.core as ez
 from ezmsg.util.generator import consumer
-from ezmsg.util.messages.axisarray import AxisArray
+from ezmsg.util.messages.axisarray import AxisArray, replace
 
 from .butterworthfilter import ButterworthFilter, ButterworthFilterSettings
 from .base import GenAxisArray
@@ -138,6 +138,17 @@ async def acounter(
 
     n_sent: int = 0  # It is convenient to know how many samples we have sent.
     clock_zero: float = time.time()  # time associated with first sample
+    template = AxisArray(
+        data=np.array([[]]),
+        dims=["time", "ch"],
+        axes={
+            "time": AxisArray.TimeAxis(fs=fs),
+            "ch": AxisArray.CoordinateAxis(
+                data=np.array([f"Ch{_}" for _ in range(n_ch)]), dims=["ch"]
+            ),
+        },
+        key="acounter",
+    )
 
     while True:
         # 1. Sleep, if necessary, until we are at the end of the current block
@@ -167,10 +178,13 @@ async def acounter(
             # offset += clock_zero  # ??
 
         # 4. yield output
-        yield AxisArray(
-            block_samp,
-            dims=["time", "ch"],
-            axes={"time": AxisArray.Axis.TimeAxis(fs=fs, offset=offset)},
+        yield replace(
+            template,
+            data=block_samp,
+            axes={
+                "time": replace(template.axes["time"], offset=offset),
+                "ch": template.axes["ch"],
+            },
         )
 
         # 5. Update state for next iteration (after next yield)
@@ -273,6 +287,7 @@ def sin(
 
     Args:
         axis: The name of the axis over which the sinusoid passes.
+            Note: The axis must exist in the msg.axes and be of type AxisArray.LinearAxis.
         freq: The frequency of the sinusoid, in Hz.
         amp: The amplitude of the sinusoid.
         phase: The initial phase of the sinusoid, in radians.

ezmsg/sigproc/wavelets.py

@@ -1,11 +1,10 @@
-from dataclasses import replace
 import typing
 
 import numpy as np
 import numpy.typing as npt
 import pywt
 import ezmsg.core as ez
-from ezmsg.util.messages.axisarray import AxisArray
+from ezmsg.util.messages.axisarray import AxisArray, replace
 from ezmsg.util.generator import consumer
 
 from .base import GenAxisArray
@@ -24,11 +23,12 @@ def cwt(
     The function is equivalent to the :obj:`pywt.cwt` function, but is designed to work with streaming data.
 
     Args:
-        scales: The wavelet scales to use.
+        scales: The wavelet scales to use. Note: Scales will be sorted from largest to smallest.
         wavelet: Wavelet object or name of wavelet to use.
         min_phase: See filterbank MinPhaseMode for details.
         axis: The target axis for operation. Note that this will be moved to the -1th dimension
           because fft and matrix multiplication is much faster on the last axis.
+          This axis must be in the msg.axes and it must be of type AxisArray.LinearAxis.
 
     Returns:
         A primed Generator object that expects an :obj:`AxisArray` via `.send(axis_array)` of continuous data
@@ -37,7 +37,7 @@ def cwt(
     msg_out: typing.Optional[AxisArray] = None
 
     # Check parameters
-    scales = np.array(scales)
+    scales = np.sort(scales)[::-1]
     assert np.all(scales > 0), "Scales must be positive."
     assert scales.ndim == 1, "Scales must be a 1D list, tuple, or array."
     if not isinstance(wavelet, (pywt.ContinuousWavelet, pywt.Wavelet)):
@@ -103,7 +103,6 @@ def cwt(
                 pywt.scale2frequency(wavelet, scales, precision)
                 / msg_in.axes[axis].gain
             )
-            fstep = (freqs[1] - freqs[0]) if len(freqs) > 1 else 1.0
             # Create output template
             dummy_shape = in_shape + (len(scales), 0)
             template = AxisArray(
@@ -113,7 +112,9 @@ def cwt(
                 dims=msg_in.dims[:ax_idx] + msg_in.dims[ax_idx + 1 :] + ["freq", axis],
                 axes={
                     **msg_in.axes,
-                    "freq": AxisArray.Axis("Hz", offset=freqs[0], gain=fstep),
+                    "freq": AxisArray.CoordinateAxis(
+                        unit="Hz", data=freqs, dims=["freq"]
+                    ),
                 },
                 key=msg_in.key,
             )

ezmsg/sigproc/window.py

@@ -1,4 +1,3 @@
-from dataclasses import replace
 import traceback
 import typing
 
@@ -9,6 +8,7 @@ from ezmsg.util.messages.axisarray import (
     AxisArray,
     slice_along_axis,
     sliding_win_oneaxis,
+    replace,
 )
 from ezmsg.util.generator import consumer
 
@@ -31,6 +31,7 @@ def windowing(
     Args:
         axis: The axis along which to segment windows.
             If None, defaults to the first dimension of the first seen AxisArray.
+            Note: The windowed axis must be an AxisArray.LinearAxis, not an AxisArray.CoordinateAxis.
         newaxis: New axis on which windows are delimited, immediately
         preceding the target windowed axis. The data length along newaxis may be 0 if
         this most recent push did not provide enough data for a new window.
@@ -78,7 +79,7 @@ def windowing(
     shift_deficit: int = 0
     b_1to1 = window_shift is None
     newaxis_warned: bool = b_1to1
-    out_newaxis: typing.Optional[AxisArray.Axis] = None
+    out_newaxis: typing.Optional[AxisArray.LinearAxis] = None
     out_dims: typing.Optional[typing.List[str]] = None
 
     check_inputs = {"samp_shape": None, "fs": None, "key": None}

{ezmsg_sigproc-1.4.1.dist-info → ezmsg_sigproc-1.5.0.dist-info}/METADATA

@@ -1,12 +1,11 @@
 Metadata-Version: 2.3
 Name: ezmsg-sigproc
-Version: 1.4.1
+Version: 1.5.0
 Summary: Timeseries signal processing implementations in ezmsg
 Author-email: Griffin Milsap <griffin.milsap@gmail.com>, Preston Peranich <pperanich@gmail.com>, Chadwick Boulay <chadwick.boulay@gmail.com>
-License-Expression: MIT
-License-File: LICENSE.txt
+License: MIT
 Requires-Python: >=3.9
-Requires-Dist: ezmsg>=3.5.0
+Requires-Dist: ezmsg>=3.6.0
 Requires-Dist: numpy>=1.26.0
 Requires-Dist: pywavelets>=1.6.0
 Requires-Dist: scipy>=1.13.1

ezmsg_sigproc-1.5.0.dist-info/RECORD

@@ -0,0 +1,35 @@
+ezmsg/sigproc/__init__.py,sha256=8K4IcOA3-pfzadoM6s2Sfg5460KlJUocGgyTJTJl96U,52
+ezmsg/sigproc/__version__.py,sha256=OYzqgMEgfFG0au4hzbEdgYI-c7Hxo3wdBtrpEjK1RoY,411
+ezmsg/sigproc/activation.py,sha256=4oDn_xPYRqG04-AEZPGXG7975WeKyljqTMAp86k6-X8,2619
+ezmsg/sigproc/affinetransform.py,sha256=UGVV9FWrvegBigPujtBNa4uziOzhN3HKNCpf7fVFHoI,8778
+ezmsg/sigproc/aggregate.py,sha256=DTFVzDHZRk-cdN3yjz3UmU5nG5dcyO_gWOqlIW9Z5AE,6347
+ezmsg/sigproc/bandpower.py,sha256=QPktf3v7sojDHhwUVcK3UNPU-Dm4sf2QQw3qmYWZ1r0,2228
+ezmsg/sigproc/base.py,sha256=vut0BLjgc0mxYRbs7tDd9XzwRFA2_GcsgXZmIYovR0Y,1248
+ezmsg/sigproc/butterworthfilter.py,sha256=bKfObvceOAU8ThebEtWA8DOpC0E6dspDmrGINBS_zfU,5450
+ezmsg/sigproc/decimate.py,sha256=zNxJXauE4Z54Yy7tpN9_oJuW0I0ppQRWhSpwb3Ri2gc,1473
+ezmsg/sigproc/downsample.py,sha256=gvGOc05wJz6oicEXSf3BUJ6Kpc2seQ4UQioe4PA-LaI,3474
+ezmsg/sigproc/ewmfilter.py,sha256=NRrHQmqODu0nre42mRCZWYEcG29UeAzWn9OdE_f1elE,4493
+ezmsg/sigproc/filter.py,sha256=wzpz8ABPdCt_gN37wkdoBAmrMnO80kcwoPZ5Zxmv4sg,8301
+ezmsg/sigproc/filterbank.py,sha256=NFGzetlpTPuzEBPmZSM83sZUXEjRoKNrojDdCvIhCUo,12420
+ezmsg/sigproc/messages.py,sha256=4GKPJrXrybLoFCBxKv87Qz5e2ykq2loPOq0vxDMhhW0,950
+ezmsg/sigproc/sampler.py,sha256=sHTj6eRwFc-JrGDpstHjJDClKdPrFVGLUGTz08QwYUc,12851
+ezmsg/sigproc/scaler.py,sha256=8GUE1FEjW96h0CEyZWzXCR2vqUWK2rOObia2RYK_Xhg,6009
+ezmsg/sigproc/signalinjector.py,sha256=yKWiL2C_qEhvcbMVp-0hvXs8SDfTUFB2xrvYPmPtSu8,2621
+ezmsg/sigproc/slicer.py,sha256=SMBYJNjBR5BzFdbdXBeZ0q35_utVhqy0TG2B4daE6Xw,5814
+ezmsg/sigproc/spectral.py,sha256=_2qO6as4Nesmc9V1WW2EXNMH5pPz8aVTEcIPOi4-g2o,322
+ezmsg/sigproc/spectrogram.py,sha256=16By4VWln7UvZ8IV_TdNAFaJDgkzvVKXWpnsoZoiW1M,3146
+ezmsg/sigproc/spectrum.py,sha256=Wwz2z6IZznzxeH8fS_pFgYxd45ctFp1RdmE7TWyUcDw,9513
+ezmsg/sigproc/synth.py,sha256=5XUSqgdaSmulonmI7wk3r0C1FDYbeL_PfKYyy4KyPjg,18830
+ezmsg/sigproc/wavelets.py,sha256=pusFCvIMxhCAg-6PQWp1bwvKcyyJLKwaOWhKCLqOTSE,6711
+ezmsg/sigproc/window.py,sha256=7TaOI3Z-oS-3_dYT2Pt1WE0_wU2JhARZKpAqnYUr7bw,13183
+ezmsg/sigproc/math/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ezmsg/sigproc/math/abs.py,sha256=P4fVsBePU_lEO1mxKP-0ueGQmAuMKXFckviLzAqQkoE,895
+ezmsg/sigproc/math/clip.py,sha256=uRPyyFIaaWc-JBtgb-eUxQnL5sbCql2FghtPOeNx4QA,1108
+ezmsg/sigproc/math/difference.py,sha256=AlFicTeEOrUYvdbi-fm-YglrRCMNB8bMKEJdC_2ZN9A,2160
+ezmsg/sigproc/math/invert.py,sha256=--pldt1XRHHPEY2gtbTFXVP1Q5rsjtht-BhkkFMFibE,859
+ezmsg/sigproc/math/log.py,sha256=dTahVnsXqc-NYRBE149SzV3eNV637kLuoMOs6KHAjjg,1536
+ezmsg/sigproc/math/scale.py,sha256=cGXzkiIW-TPHIgvNf8pimEF-e2zzTbRPnpMSuD37Kq4,1027
+ezmsg_sigproc-1.5.0.dist-info/METADATA,sha256=ZvTUyFuKvj4h0ezxKgTFcY_71IHEaxFm2F9QGlZa644,2339
+ezmsg_sigproc-1.5.0.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+ezmsg_sigproc-1.5.0.dist-info/licenses/LICENSE.txt,sha256=seu0tKhhAMPCUgc1XpXGGaCxY1YaYvFJwqFuQZAl2go,1100
+ezmsg_sigproc-1.5.0.dist-info/RECORD,,

{ezmsg_sigproc-1.4.1.dist-info → ezmsg_sigproc-1.5.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.25.0
+Generator: hatchling 1.26.3
 Root-Is-Purelib: true
 Tag: py3-none-any

ezmsg_sigproc-1.4.1.dist-info/RECORD

@@ -1,35 +0,0 @@
-ezmsg/sigproc/__init__.py,sha256=8K4IcOA3-pfzadoM6s2Sfg5460KlJUocGgyTJTJl96U,52
-ezmsg/sigproc/__version__.py,sha256=oFZsPxoSsCY6D2DiWMSueNvMDRRQN5ssWrPdQtlLJ_o,411
-ezmsg/sigproc/activation.py,sha256=amvVjO-1BcChgK0VQi44i7-Tmz_2FK1xb-BTC52_DO0,2642
-ezmsg/sigproc/affinetransform.py,sha256=a5xt6LSymlV3gNSdCjWdtUoi9kOkWiYx6oeiGEIphYI,8802
-ezmsg/sigproc/aggregate.py,sha256=Wnvz1xXDQhdVkTfVPOmhdmjgIhR_YQhioo8Dwh4BaoE,5615
-ezmsg/sigproc/bandpower.py,sha256=QPktf3v7sojDHhwUVcK3UNPU-Dm4sf2QQw3qmYWZ1r0,2228
-ezmsg/sigproc/base.py,sha256=vut0BLjgc0mxYRbs7tDd9XzwRFA2_GcsgXZmIYovR0Y,1248
-ezmsg/sigproc/butterworthfilter.py,sha256=vTESZAAcQhWLI8yIMOApsGAYgjv2ekCZsTIliFjEkc8,5345
-ezmsg/sigproc/decimate.py,sha256=zNxJXauE4Z54Yy7tpN9_oJuW0I0ppQRWhSpwb3Ri2gc,1473
-ezmsg/sigproc/downsample.py,sha256=0TOhWkg7B9g3FDcewHINZiNuo28JyXRtgTYvZ7C8ImM,3384
-ezmsg/sigproc/ewmfilter.py,sha256=XzTmouRa7AnPjTiI32-oumwm4ZfOl6uPPUSldExNpAs,4516
-ezmsg/sigproc/filter.py,sha256=x3ytFowxg4O0QFQeMDFmQieV86H-6Q3Mkt3ThRIOh60,8301
-ezmsg/sigproc/filterbank.py,sha256=Rhs7AKWy36lrMlzftEbYPXPW-FwZZ-QUCEp_QFG9mFU,12443
-ezmsg/sigproc/messages.py,sha256=KpYCWWRD5itVAq0-Lf8qd7ErEE1A9qdm2p7O8Y4zEFA,955
-ezmsg/sigproc/sampler.py,sha256=Zv5eq9CLpE8ui4HyZzBEqxwqBf--IbexS7zBx3qKp3w,12733
-ezmsg/sigproc/scaler.py,sha256=2Hi4XWWvUtPOVOfIyX0Dr0cZEdbTobZOoMXKh9Vszlk,5944
-ezmsg/sigproc/signalinjector.py,sha256=T1yvigk9WYujYqubd15UAF6hNmSqS9J7rCzaPYENoEA,2644
-ezmsg/sigproc/slicer.py,sha256=ffawSqhO06lC5TXg_Ujg0eP2EuF98McQiUdlwxn3psI,5072
-ezmsg/sigproc/spectral.py,sha256=_2qO6as4Nesmc9V1WW2EXNMH5pPz8aVTEcIPOi4-g2o,322
-ezmsg/sigproc/spectrogram.py,sha256=16By4VWln7UvZ8IV_TdNAFaJDgkzvVKXWpnsoZoiW1M,3146
-ezmsg/sigproc/spectrum.py,sha256=a75d6q6o3dAuqX6ZuFv6AfHYDOMuhA01OVCugzFMUSQ,9415
-ezmsg/sigproc/synth.py,sha256=ygJRI9Seqhrg13lUhcA6XSpxcEr3LL1NupviSQLrC9o,18351
-ezmsg/sigproc/wavelets.py,sha256=_3jI52NzksD1WNnHx03F2p4V2uGN_MtBbLsJGRjeyoE,6596
-ezmsg/sigproc/window.py,sha256=A697XG2YyR9ywmzfxJIXovi6wPwDhBI9UUeShNJFKgM,13094
-ezmsg/sigproc/math/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ezmsg/sigproc/math/abs.py,sha256=hqS_sbLqAKSlguj3_rsfeWzOe6233tMxXfjDPg1fi2g,918
-ezmsg/sigproc/math/clip.py,sha256=xIfc6fEfiNh7ILG3IYxcuCd5VBqmWXmDliGi_dKVJpM,1131
-ezmsg/sigproc/math/difference.py,sha256=s3al1WzUZXsG2XYzOprRcKP-VD9J5FwYx578_SKG0vg,2183
-ezmsg/sigproc/math/invert.py,sha256=H8df1u8OVb5TOkRC8p5EW7R17kHdLOYqXVH_axy5bkI,882
-ezmsg/sigproc/math/log.py,sha256=1wuPvdjiI29tC_gRSntfpAebJ0rDhlapyLjG5QwXRpo,1496
-ezmsg/sigproc/math/scale.py,sha256=iIQuJAr5pzCiMqzi2YdzLc1agQBKBOcngdNZlLO3X_o,1050
-ezmsg_sigproc-1.4.1.dist-info/METADATA,sha256=ba6ETetMm_XUgNkyMcGTgeVItvVZWd9QEzPpYkh0e3s,2376
-ezmsg_sigproc-1.4.1.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-ezmsg_sigproc-1.4.1.dist-info/licenses/LICENSE.txt,sha256=seu0tKhhAMPCUgc1XpXGGaCxY1YaYvFJwqFuQZAl2go,1100
-ezmsg_sigproc-1.4.1.dist-info/RECORD,,