diff --git a/src/ezmsg/sigproc/adaptive_lattice_notch.py b/src/ezmsg/sigproc/adaptive_lattice_notch.py index 1fe37db..6a3484b 100644 --- a/src/ezmsg/sigproc/adaptive_lattice_notch.py +++ b/src/ezmsg/sigproc/adaptive_lattice_notch.py @@ -4,12 +4,11 @@ import numpy as np import numpy.typing as npt import scipy.signal -from ezmsg.baseproc import BaseStatefulTransformer, processor_state +from ezmsg.baseproc import BaseStatefulTransformer, processor_state, resolve_configured_chunk_dim from ezmsg.util.messages.axisarray import AxisArray, CoordinateAxis from ezmsg.util.messages.util import replace from .util.deprecation import warn_axis_deprecated -from .util.message import resolve_configured_chunk_dim class AdaptiveLatticeNotchFilterSettings(ez.Settings): diff --git a/src/ezmsg/sigproc/adaptive_lnc.py b/src/ezmsg/sigproc/adaptive_lnc.py index 8628ccf..d6096c4 100644 --- a/src/ezmsg/sigproc/adaptive_lnc.py +++ b/src/ezmsg/sigproc/adaptive_lnc.py @@ -69,12 +69,12 @@ BaseStatefulTransformer, BaseTransformerUnit, processor_state, + resolve_configured_chunk_dim, ) from ezmsg.util.messages.axisarray import AxisArray from ezmsg.util.messages.util import replace from .util.deprecation import warn_axis_deprecated -from .util.message import resolve_configured_chunk_dim # Optional Apple-Silicon GPU backend. The canceller is an LTI SOS notch # cascade (see `design_lnc_sos`), so on MLX arrays we dispatch to the Metal diff --git a/src/ezmsg/sigproc/affinetransform.py b/src/ezmsg/sigproc/affinetransform.py index 5f4638b..9a3b50d 100644 --- a/src/ezmsg/sigproc/affinetransform.py +++ b/src/ezmsg/sigproc/affinetransform.py @@ -29,6 +29,7 @@ BaseStatefulTransformer, BaseTransformerUnit, processor_state, + resolve_feature_dim, ) from ezmsg.util.messages.axisarray import AxisArray, AxisBase from ezmsg.util.messages.util import replace @@ -36,9 +37,10 @@ from ezmsg.sigproc.util.array import array_device, is_float_dtype, xp_asarray, xp_copy, xp_create, xp_empty from ezmsg.sigproc.util.blockdiag import plan_block_matmul from ezmsg.sigproc.util.channels import ChannelGroupSpec, resolve_channel_groups -from ezmsg.sigproc.util.message import resolve_feature_dim, with_fingerprint from ezmsg.sigproc.util.rereference import RereferenceKind, rereference_matrix +from .util.message import with_fingerprint + KERNELS = ("auto", "dense", "blocks") """Valid values for :attr:`AffineTransformSettings.kernel`.""" diff --git a/src/ezmsg/sigproc/aggregate.py b/src/ezmsg/sigproc/aggregate.py index e4f4556..ab4e2fd 100644 --- a/src/ezmsg/sigproc/aggregate.py +++ b/src/ezmsg/sigproc/aggregate.py @@ -20,6 +20,7 @@ BaseTransformer, BaseTransformerUnit, processor_state, + resolve_feature_dim, ) from ezmsg.util.messages.axisarray import ( AxisArray, @@ -29,7 +30,7 @@ ) from .spectral import OptionsEnum -from .util.message import resolve_feature_dim, with_fingerprint +from .util.message import with_fingerprint class AggregationFunction(OptionsEnum): diff --git a/src/ezmsg/sigproc/align.py b/src/ezmsg/sigproc/align.py index 559c4fc..554d521 100644 --- a/src/ezmsg/sigproc/align.py +++ b/src/ezmsg/sigproc/align.py @@ -7,13 +7,13 @@ import ezmsg.core as ez import numpy as np +from ezmsg.baseproc import resolve_configured_chunk_dim from ezmsg.baseproc.protocols import processor_state from ezmsg.baseproc.stateful import BaseStatefulTransformer from ezmsg.util.messages.axisarray import AxisArray from .util.axisarray_buffer import HybridAxisArrayBuffer from .util.deprecation import warn_axis_deprecated -from .util.message import resolve_configured_chunk_dim class AlignAlongAxisSettings(ez.Settings): diff --git a/src/ezmsg/sigproc/binned_aggregate.py b/src/ezmsg/sigproc/binned_aggregate.py index d695925..a53c030 100644 --- a/src/ezmsg/sigproc/binned_aggregate.py +++ b/src/ezmsg/sigproc/binned_aggregate.py @@ -46,6 +46,7 @@ BaseStatefulTransformer, BaseTransformerUnit, processor_state, + resolve_configured_chunk_dim, ) from ezmsg.util.messages.axisarray import ( AxisArray, @@ -57,7 +58,7 @@ from .util.array import xp_copy from .util.binning import BinSchedule, BinStep from .util.deprecation import warn_axis_deprecated -from .util.message import is_empty_along, resolve_configured_chunk_dim, with_fingerprint +from .util.message import is_empty_along, with_fingerprint class BinnedAggregateSettings(ez.Settings): diff --git a/src/ezmsg/sigproc/butterworthzerophase.py b/src/ezmsg/sigproc/butterworthzerophase.py index 687cc22..548eb10 100644 --- a/src/ezmsg/sigproc/butterworthzerophase.py +++ b/src/ezmsg/sigproc/butterworthzerophase.py @@ -14,7 +14,7 @@ import numpy as np import scipy.signal from array_api_compat import get_namespace, is_numpy_array -from ezmsg.baseproc import BaseTransformerUnit +from ezmsg.baseproc import BaseTransformerUnit, resolve_configured_chunk_dim from ezmsg.baseproc.composite import CompositeProcessor from ezmsg.util.messages.axisarray import AxisArray, slice_along_axis from ezmsg.util.messages.util import replace @@ -32,7 +32,6 @@ _sosfilt_mlx_metal_xp, ) from .util.array import xp_asarray, xp_copy, xp_empty, xp_flip -from .util.message import resolve_configured_chunk_dim if _HAS_MLX_METAL: import mlx.core as _mx diff --git a/src/ezmsg/sigproc/concat.py b/src/ezmsg/sigproc/concat.py index 44adf9c..9384632 100644 --- a/src/ezmsg/sigproc/concat.py +++ b/src/ezmsg/sigproc/concat.py @@ -15,7 +15,8 @@ from ezmsg.util.messages.util import replace from ezmsg.sigproc.util.channels import AxisFingerprintMemo -from ezmsg.sigproc.util.message import with_fingerprint + +from .util.message import with_fingerprint logger = logging.getLogger(__name__) diff --git a/src/ezmsg/sigproc/coordinatespaces.py b/src/ezmsg/sigproc/coordinatespaces.py index 303ef01..195da8e 100644 --- a/src/ezmsg/sigproc/coordinatespaces.py +++ b/src/ezmsg/sigproc/coordinatespaces.py @@ -19,10 +19,11 @@ from ezmsg.baseproc import ( BaseTransformer, BaseTransformerUnit, + resolve_feature_dim, ) from ezmsg.util.messages.axisarray import AxisArray, replace -from .util.message import resolve_feature_dim, with_fingerprint +from .util.message import with_fingerprint # -- Utility functions for coordinate transformations -- diff --git a/src/ezmsg/sigproc/decimate.py b/src/ezmsg/sigproc/decimate.py index bc35d00..4623bbd 100644 --- a/src/ezmsg/sigproc/decimate.py +++ b/src/ezmsg/sigproc/decimate.py @@ -3,13 +3,13 @@ import typing import ezmsg.core as ez -from ezmsg.baseproc import BaseTransformerUnit +from ezmsg.baseproc import BaseTransformerUnit, suppress_axis_deprecation from ezmsg.util.messages.axisarray import AxisArray from .cheby import ChebyshevFilterSettings, ChebyshevFilterTransformer from .downsample import Downsample, DownsampleSettings from .filter import BACoeffs, SOSCoeffs -from .util.deprecation import suppress_axis_deprecation, warn_axis_deprecated +from .util.deprecation import warn_axis_deprecated class ChebyForDecimateTransformer(ChebyshevFilterTransformer[BACoeffs | SOSCoeffs]): diff --git a/src/ezmsg/sigproc/diff.py b/src/ezmsg/sigproc/diff.py index d8f2da2..0b10a1d 100644 --- a/src/ezmsg/sigproc/diff.py +++ b/src/ezmsg/sigproc/diff.py @@ -14,13 +14,13 @@ BaseStatefulTransformer, BaseTransformerUnit, processor_state, + resolve_configured_chunk_dim, ) from ezmsg.util.messages.axisarray import AxisArray, slice_along_axis from ezmsg.util.messages.util import replace from .util.array import xp_copy from .util.deprecation import warn_axis_deprecated -from .util.message import resolve_configured_chunk_dim class DiffSettings(ez.Settings): diff --git a/src/ezmsg/sigproc/downsample.py b/src/ezmsg/sigproc/downsample.py index 6148250..57a8c17 100644 --- a/src/ezmsg/sigproc/downsample.py +++ b/src/ezmsg/sigproc/downsample.py @@ -7,6 +7,7 @@ BaseStatefulTransformer, BaseTransformerUnit, processor_state, + resolve_chunk_dim, ) from ezmsg.util.messages.axisarray import ( AxisArray, @@ -14,7 +15,7 @@ slice_along_axis, ) -from .util.message import is_empty_along, resolve_chunk_dim +from .util.message import is_empty_along class DownsampleSettings(ez.Settings): diff --git a/src/ezmsg/sigproc/ewma.py b/src/ezmsg/sigproc/ewma.py index 6302a91..9b336cd 100644 --- a/src/ezmsg/sigproc/ewma.py +++ b/src/ezmsg/sigproc/ewma.py @@ -9,14 +9,13 @@ import numpy.typing as npt import scipy.signal as sps from array_api_compat import get_namespace, is_numpy_array -from ezmsg.baseproc import BaseStatefulTransformer, BaseTransformerUnit, processor_state +from ezmsg.baseproc import BaseStatefulTransformer, BaseTransformerUnit, processor_state, resolve_configured_chunk_dim from ezmsg.util.messages.axisarray import AxisArray, slice_along_axis from ezmsg.util.messages.util import replace from ezmsg.sigproc.util.array import np_finfo from .util.deprecation import warn_axis_deprecated -from .util.message import resolve_configured_chunk_dim def _ewma_mlx_metal_xp(data, axis_idx: int, zi, alpha: float, chunk_sizes: tuple[int, ...]): diff --git a/src/ezmsg/sigproc/ewmfilter.py b/src/ezmsg/sigproc/ewmfilter.py index 72a59a9..ad7e1a4 100644 --- a/src/ezmsg/sigproc/ewmfilter.py +++ b/src/ezmsg/sigproc/ewmfilter.py @@ -5,11 +5,10 @@ import ezmsg.core as ez import numpy as np +from ezmsg.baseproc import resolve_chunk_dim, suppress_axis_deprecation from ezmsg.util.messages.axisarray import AxisArray from ezmsg.util.messages.util import replace -from .util.deprecation import suppress_axis_deprecation -from .util.message import resolve_chunk_dim from .window import Window, WindowSettings diff --git a/src/ezmsg/sigproc/fbcca.py b/src/ezmsg/sigproc/fbcca.py index eb74279..37e32ef 100644 --- a/src/ezmsg/sigproc/fbcca.py +++ b/src/ezmsg/sigproc/fbcca.py @@ -12,6 +12,7 @@ BaseTransformer, BaseTransformerUnit, CompositeProcessor, + suppress_axis_deprecation, ) from ezmsg.util.messages.axisarray import AxisArray from ezmsg.util.messages.util import replace @@ -22,7 +23,6 @@ ) from .kaiser import KaiserFilterSettings from .sampler import SampleTriggerMessage -from .util.deprecation import suppress_axis_deprecation from .util.message import with_fingerprint from .window import WindowSettings, WindowTransformer diff --git a/src/ezmsg/sigproc/filter.py b/src/ezmsg/sigproc/filter.py index 2e6188d..78e155c 100644 --- a/src/ezmsg/sigproc/filter.py +++ b/src/ezmsg/sigproc/filter.py @@ -17,6 +17,8 @@ SettingsType, TransformerType, processor_state, + resolve_configured_chunk_dim, + suppress_axis_deprecation, ) from ezmsg.util.messages.axisarray import AxisArray, slice_along_axis from ezmsg.util.messages.util import replace @@ -24,8 +26,7 @@ from .util import sosfilt_direct from .util.array import array_device, xp_asarray, xp_create -from .util.deprecation import suppress_axis_deprecation, warn_axis_deprecated -from .util.message import resolve_configured_chunk_dim +from .util.deprecation import warn_axis_deprecated from .util.threaded_filt import DEFAULT_MIN_BYTES as _DEFAULT_THREAD_MIN_BYTES from .util.threaded_filt import filt_threaded, should_thread diff --git a/src/ezmsg/sigproc/filterbank.py b/src/ezmsg/sigproc/filterbank.py index c0aaf43..f095e9d 100644 --- a/src/ezmsg/sigproc/filterbank.py +++ b/src/ezmsg/sigproc/filterbank.py @@ -14,6 +14,7 @@ BaseStatefulTransformer, BaseTransformerUnit, processor_state, + resolve_configured_chunk_dim, ) from ezmsg.util.messages.axisarray import AxisArray from ezmsg.util.messages.util import replace @@ -21,7 +22,6 @@ from .spectrum import OptionsEnum from .util.deprecation import warn_axis_deprecated -from .util.message import resolve_configured_chunk_dim from .window import WindowTransformer diff --git a/src/ezmsg/sigproc/filterbankdesign.py b/src/ezmsg/sigproc/filterbankdesign.py index 5c7df21..d6bc804 100644 --- a/src/ezmsg/sigproc/filterbankdesign.py +++ b/src/ezmsg/sigproc/filterbankdesign.py @@ -8,6 +8,8 @@ from ezmsg.baseproc import ( BaseStatefulTransformer, processor_state, + resolve_configured_chunk_dim, + suppress_axis_deprecation, ) from ezmsg.util.messages.axisarray import AxisArray from ezmsg.util.messages.util import replace @@ -19,8 +21,7 @@ MinPhaseMode, ) from .kaiser import KaiserFilterSettings, kaiser_design_fun -from .util.deprecation import suppress_axis_deprecation, warn_axis_deprecated -from .util.message import resolve_configured_chunk_dim +from .util.deprecation import warn_axis_deprecated class FilterbankDesignSettings(ez.Settings): diff --git a/src/ezmsg/sigproc/fir_hilbert.py b/src/ezmsg/sigproc/fir_hilbert.py index 3c67777..b9d7101 100644 --- a/src/ezmsg/sigproc/fir_hilbert.py +++ b/src/ezmsg/sigproc/fir_hilbert.py @@ -6,7 +6,7 @@ import ezmsg.core as ez import numpy as np import scipy.signal as sps -from ezmsg.baseproc import BaseStatefulTransformer, processor_state +from ezmsg.baseproc import BaseStatefulTransformer, processor_state, resolve_configured_chunk_dim from ezmsg.util.messages.axisarray import AxisArray from ezmsg.util.messages.util import replace @@ -18,8 +18,6 @@ FilterByDesignTransformer, ) -from .util.message import resolve_configured_chunk_dim - class FIRHilbertFilterSettings(FilterBaseSettings): """Settings for :obj:`FIRHilbertFilter`.""" diff --git a/src/ezmsg/sigproc/flatten.py b/src/ezmsg/sigproc/flatten.py index 1d0c691..16f6af1 100644 --- a/src/ezmsg/sigproc/flatten.py +++ b/src/ezmsg/sigproc/flatten.py @@ -39,10 +39,11 @@ BaseStatefulTransformer, BaseTransformerUnit, processor_state, + resolve_chunk_dim, ) from ezmsg.util.messages.axisarray import AxisArray, CoordinateAxis, replace -from .util.message import resolve_chunk_dim, with_fingerprint +from .util.message import with_fingerprint def normalize_axis_label(label): diff --git a/src/ezmsg/sigproc/merge.py b/src/ezmsg/sigproc/merge.py index 518e666..ea08dbd 100644 --- a/src/ezmsg/sigproc/merge.py +++ b/src/ezmsg/sigproc/merge.py @@ -8,11 +8,11 @@ from __future__ import annotations import ezmsg.core as ez +from ezmsg.baseproc import suppress_axis_deprecation from ezmsg.util.messages.axisarray import AxisArray from .align import AlignAlongAxis, AlignAlongAxisProcessor, AlignAlongAxisSettings from .concat import Concat, ConcatProcessor, ConcatSettings -from .util.deprecation import suppress_axis_deprecation class MergeSettings(ez.Settings): diff --git a/src/ezmsg/sigproc/resample.py b/src/ezmsg/sigproc/resample.py index 9669d01..d43888e 100644 --- a/src/ezmsg/sigproc/resample.py +++ b/src/ezmsg/sigproc/resample.py @@ -13,6 +13,7 @@ BaseConsumerUnit, BaseStatefulProcessor, processor_state, + resolve_configured_chunk_dim, ) from ezmsg.util.messages.axisarray import AxisArray, LinearAxis, slice_along_axis from ezmsg.util.messages.util import replace @@ -20,7 +21,7 @@ from .util.axisarray_buffer import HybridAxisArrayBuffer, HybridAxisBuffer from .util.buffer import UpdateStrategy from .util.deprecation import warn_axis_deprecated -from .util.message import has_samples_along, resolve_configured_chunk_dim +from .util.message import has_samples_along def _as_limit(value: float | None) -> float | None: diff --git a/src/ezmsg/sigproc/rollingscaler.py b/src/ezmsg/sigproc/rollingscaler.py index 7e86f0a..7e9b252 100644 --- a/src/ezmsg/sigproc/rollingscaler.py +++ b/src/ezmsg/sigproc/rollingscaler.py @@ -10,12 +10,12 @@ BaseAdaptiveTransformer, BaseAdaptiveTransformerUnit, processor_state, + resolve_configured_chunk_dim, ) from ezmsg.util.messages.axisarray import AxisArray from ezmsg.util.messages.util import replace from .util.deprecation import warn_axis_deprecated -from .util.message import resolve_configured_chunk_dim class RollingScalerSettings(ez.Settings): diff --git a/src/ezmsg/sigproc/sampler.py b/src/ezmsg/sigproc/sampler.py index 154af3a..9c2d621 100644 --- a/src/ezmsg/sigproc/sampler.py +++ b/src/ezmsg/sigproc/sampler.py @@ -15,6 +15,7 @@ BaseStatefulTransformer, BaseTransformerUnit, processor_state, + resolve_configured_chunk_dim, ) from ezmsg.util.messages.axisarray import ( AxisArray, @@ -24,7 +25,7 @@ from .util.axisarray_buffer import HybridAxisArrayBuffer from .util.buffer import UpdateStrategy from .util.deprecation import warn_axis_deprecated -from .util.message import SampleTriggerMessage, resolve_configured_chunk_dim +from .util.message import SampleTriggerMessage from .util.profile import profile_subpub diff --git a/src/ezmsg/sigproc/scaler.py b/src/ezmsg/sigproc/scaler.py index f223562..fc883c1 100644 --- a/src/ezmsg/sigproc/scaler.py +++ b/src/ezmsg/sigproc/scaler.py @@ -5,10 +5,14 @@ import ezmsg.core as ez import numpy as np from array_api_compat import get_namespace + +# Imports for backwards compatibility with previous module location from ezmsg.baseproc import ( BaseStatefulTransformer, BaseTransformerUnit, processor_state, + resolve_configured_chunk_dim, + suppress_axis_deprecation, ) from ezmsg.util.messages.axisarray import AxisArray from ezmsg.util.messages.util import replace @@ -17,10 +21,7 @@ from .ewma import EWMASettings, EWMATransformer, _alpha_from_tau from .ewma import _tau_from_alpha as _tau_from_alpha from .ewma import ewma_step as ewma_step - -# Imports for backwards compatibility with previous module location -from .util.deprecation import suppress_axis_deprecation, warn_axis_deprecated -from .util.message import resolve_configured_chunk_dim +from .util.deprecation import warn_axis_deprecated class RiverAdaptiveStandardScalerSettings(ez.Settings): diff --git a/src/ezmsg/sigproc/slicer.py b/src/ezmsg/sigproc/slicer.py index ccc2b74..ef21888 100644 --- a/src/ezmsg/sigproc/slicer.py +++ b/src/ezmsg/sigproc/slicer.py @@ -9,6 +9,7 @@ BaseStatefulTransformer, BaseTransformerUnit, processor_state, + resolve_feature_dim, ) from ezmsg.util.messages.axisarray import ( AxisArray, @@ -17,7 +18,7 @@ slice_along_axis, ) -from .util.message import resolve_feature_dim, with_fingerprint +from .util.message import with_fingerprint """ Slicer:Select a subset of data along a particular axis. diff --git a/src/ezmsg/sigproc/spectrum.py b/src/ezmsg/sigproc/spectrum.py index bae5f76..7efd9b6 100644 --- a/src/ezmsg/sigproc/spectrum.py +++ b/src/ezmsg/sigproc/spectrum.py @@ -12,6 +12,7 @@ BaseStatefulTransformer, BaseTransformerUnit, processor_state, + resolve_transform_dim, ) from ezmsg.util.messages.axisarray import ( AxisArray, @@ -20,7 +21,6 @@ ) from .util.array import is_complex_dtype -from .util.message import resolve_transform_dim class OptionsEnum(enum.Enum): diff --git a/src/ezmsg/sigproc/util/channels.py b/src/ezmsg/sigproc/util/channels.py index bc4c6de..c6f6fec 100644 --- a/src/ezmsg/sigproc/util/channels.py +++ b/src/ezmsg/sigproc/util/channels.py @@ -38,10 +38,9 @@ from typing import Union import numpy as np +from ezmsg.baseproc import resolve_feature_dim from ezmsg.util.messages.axisarray import AxisArray -from .message import resolve_feature_dim - # Whether AxisFingerprintMemo counts its hits and misses. Off unless the env var # is set, because the answer it gives -- do axis objects survive, or is every # message a fresh deserialization? -- is a property of a *deployed* graph's diff --git a/src/ezmsg/sigproc/util/deprecation.py b/src/ezmsg/sigproc/util/deprecation.py index 3d218a9..66410da 100644 --- a/src/ezmsg/sigproc/util/deprecation.py +++ b/src/ezmsg/sigproc/util/deprecation.py @@ -31,12 +31,10 @@ import typing -from ezmsg.baseproc import suppress_axis_deprecation as suppress_axis_deprecation from ezmsg.baseproc import warn_axis_deprecated as _warn_axis_deprecated __all__ = [ "AXIS_REMOVAL_VERSION", - "suppress_axis_deprecation", "warn_axis_deprecated", ] @@ -49,8 +47,10 @@ def warn_axis_deprecated(settings: typing.Any, field: str = "axis") -> None: """Warn that *settings*' ``field`` is deprecated, if it was actually set. - Thin wrapper over :func:`ezmsg.baseproc.warn_axis_deprecated` that names this - distribution and its removal release, so the call sites stay a single line - and every message agrees about when the setting goes away. + Binds :func:`ezmsg.baseproc.warn_axis_deprecated` to this distribution and + its removal release, so the call sites stay a single line and every message + agrees about when the setting goes away. Not a re-export: suppression and + the resolution rules come from :mod:`ezmsg.baseproc` directly, so there is + exactly one of each in play. """ _warn_axis_deprecated(settings, field, package=_PACKAGE, removal=AXIS_REMOVAL_VERSION) diff --git a/src/ezmsg/sigproc/util/message.py b/src/ezmsg/sigproc/util/message.py index 2ad4b72..5011b63 100644 --- a/src/ezmsg/sigproc/util/message.py +++ b/src/ezmsg/sigproc/util/message.py @@ -7,13 +7,6 @@ import typing -from ezmsg.baseproc import ( - STREAMING_DIMS, - resolve_chunk_dim, - resolve_configured_chunk_dim, - resolve_feature_dim, - resolve_transform_dim, -) from ezmsg.baseproc.util.message import ( SampleMessage, SampleTriggerMessage, @@ -22,26 +15,14 @@ from ezmsg.util.messages.axisarray import AxisArray __all__ = [ - "STREAMING_DIMS", "SampleMessage", "SampleTriggerMessage", "has_samples_along", "is_empty_along", "is_sample_message", - "resolve_chunk_dim", - "resolve_configured_chunk_dim", - "resolve_feature_dim", - "resolve_transform_dim", "with_fingerprint", ] -# The rules themselves live in ezmsg-baseproc, which every ezmsg package depends -# on and whose `_message_hash` resolves the same thing: a processor whose -# arithmetic disagreed with its state-reset logic about which dimension is which -# would reset on the wrong changes and cache state along the wrong axis. Re- -# exported here so existing `from ezmsg.sigproc.util.message import ...` keeps -# working; new code should import from ezmsg.baseproc directly. - def with_fingerprint(axis: AxisArray.CoordinateAxis) -> AxisArray.CoordinateAxis: """Compute *axis*'s fingerprint now, and return the axis. diff --git a/src/ezmsg/sigproc/wavelets.py b/src/ezmsg/sigproc/wavelets.py index 9300660..da3cd03 100644 --- a/src/ezmsg/sigproc/wavelets.py +++ b/src/ezmsg/sigproc/wavelets.py @@ -11,13 +11,15 @@ BaseStatefulTransformer, BaseTransformerUnit, processor_state, + resolve_configured_chunk_dim, + suppress_axis_deprecation, ) from ezmsg.util.messages.axisarray import AxisArray from ezmsg.util.messages.util import replace from .filterbank import FilterbankMode, MinPhaseMode, filterbank -from .util.deprecation import suppress_axis_deprecation, warn_axis_deprecated -from .util.message import resolve_configured_chunk_dim, with_fingerprint +from .util.deprecation import warn_axis_deprecated +from .util.message import with_fingerprint class CWTSettings(ez.Settings): diff --git a/src/ezmsg/sigproc/window.py b/src/ezmsg/sigproc/window.py index d42c1da..dfd4e82 100644 --- a/src/ezmsg/sigproc/window.py +++ b/src/ezmsg/sigproc/window.py @@ -12,6 +12,7 @@ BaseStatefulTransformer, BaseTransformerUnit, processor_state, + resolve_configured_chunk_dim, ) from ezmsg.util.messages.axisarray import ( AxisArray, @@ -23,7 +24,7 @@ from .util.array import xp_empty from .util.buffer import HybridBuffer, UpdateStrategy from .util.deprecation import warn_axis_deprecated -from .util.message import is_empty_along, resolve_configured_chunk_dim +from .util.message import is_empty_along from .util.profile import profile_subpub from .util.sparse import sliding_win_oneaxis as sparse_sliding_win_oneaxis diff --git a/tests/unit/test_axis_deprecation.py b/tests/unit/test_axis_deprecation.py index 5d62c32..3746e7b 100644 --- a/tests/unit/test_axis_deprecation.py +++ b/tests/unit/test_axis_deprecation.py @@ -21,6 +21,7 @@ import ezmsg.core as ez import numpy as np import pytest +from ezmsg.baseproc import suppress_axis_deprecation from ezmsg.util.messages.axisarray import AxisArray from ezmsg.sigproc.butterworthfilter import ( @@ -39,10 +40,7 @@ AdaptiveStandardScalerSettings, AdaptiveStandardScalerTransformer, ) -from ezmsg.sigproc.util.deprecation import ( - AXIS_REMOVAL_VERSION, - suppress_axis_deprecation, -) +from ezmsg.sigproc.util.deprecation import AXIS_REMOVAL_VERSION from ezmsg.sigproc.window import WindowSettings, WindowTransformer FS = 100.0 @@ -351,7 +349,7 @@ def _windowed(): ) def test_it_warns_when_the_resolved_dim_is_not_the_old_default(self, caplog): - from ezmsg.sigproc.util.message import resolve_configured_chunk_dim + from ezmsg.baseproc import resolve_configured_chunk_dim class Proc: STREAMING_DIMS = ("time",) @@ -363,7 +361,7 @@ class Proc: assert any("used to operate on axis='time'" in r.message for r in caplog.records) def test_it_warns_only_once(self, caplog): - from ezmsg.sigproc.util.message import resolve_configured_chunk_dim + from ezmsg.baseproc import resolve_configured_chunk_dim class Proc: STREAMING_DIMS = ("time",) @@ -377,7 +375,7 @@ class Proc: def test_a_raw_stream_is_silent(self, caplog): """The overwhelmingly common case: chunk_dim is already "time", so nothing changed and there is nothing to say.""" - from ezmsg.sigproc.util.message import resolve_configured_chunk_dim + from ezmsg.baseproc import resolve_configured_chunk_dim class Proc: STREAMING_DIMS = ("time",) @@ -390,7 +388,7 @@ class Proc: def test_a_stream_without_the_old_default_dim_is_silent(self, caplog): """If ``time`` is not even present, the old default could not have been operating on it, so there is no behaviour change to report.""" - from ezmsg.sigproc.util.message import resolve_configured_chunk_dim + from ezmsg.baseproc import resolve_configured_chunk_dim class Proc: STREAMING_DIMS = ("time",) diff --git a/tests/unit/test_chunk_dim_resolution.py b/tests/unit/test_chunk_dim_resolution.py index 06897db..9823f59 100644 --- a/tests/unit/test_chunk_dim_resolution.py +++ b/tests/unit/test_chunk_dim_resolution.py @@ -13,14 +13,13 @@ import numpy as np import pytest -from ezmsg.util.messages.axisarray import AxisArray, CoordinateAxis - -from ezmsg.sigproc.util.message import ( +from ezmsg.baseproc import ( resolve_chunk_dim, resolve_configured_chunk_dim, resolve_feature_dim, resolve_transform_dim, ) +from ezmsg.util.messages.axisarray import AxisArray, CoordinateAxis FS = 100.0