ezmsg-sigproc 2.14.0__py3-none-any.whl → 2.15.0__py3-none-any.whl

ezmsg/sigproc/__version__.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '2.14.0'
-__version_tuple__ = version_tuple = (2, 14, 0)
+__version__ = version = '2.15.0'
+__version_tuple__ = version_tuple = (2, 15, 0)
 
 __commit_id__ = commit_id = None

ezmsg/sigproc/rollingscaler.py

@@ -12,8 +12,6 @@ from ezmsg.baseproc import (
 from ezmsg.util.messages.axisarray import AxisArray
 from ezmsg.util.messages.util import replace
 
-from ezmsg.sigproc.sampler import SampleMessage
-
 
 class RollingScalerSettings(ez.Settings):
     axis: str = "time"
@@ -168,8 +166,8 @@ class RollingScalerProcessor(BaseAdaptiveTransformer[RollingScalerSettings, Axis
 
         self._state.samples.append((n_b, mean_b, M2_b))
 
-    def partial_fit(self, message: SampleMessage) -> None:
-        x = message.sample.data
+    def partial_fit(self, message: AxisArray) -> None:
+        x = message.data
         self._add_batch_stats(x)
 
     def _process(self, message: AxisArray) -> AxisArray:

ezmsg/sigproc/sampler.py

@@ -21,7 +21,7 @@ from ezmsg.util.messages.util import replace
 
 from .util.axisarray_buffer import HybridAxisArrayBuffer
 from .util.buffer import UpdateStrategy
-from .util.message import SampleMessage, SampleTriggerMessage
+from .util.message import SampleTriggerMessage
 from .util.profile import profile_subpub
 
 
@@ -75,17 +75,7 @@ class SamplerState:
 
 
 class SamplerTransformer(BaseStatefulTransformer[SamplerSettings, AxisArray, AxisArray, SamplerState]):
-    def __call__(self, message: AxisArray | SampleTriggerMessage) -> list[SampleMessage]:
-        # TODO: Currently we have a single entry point that accepts both
-        #  data and trigger messages and we choose a code path based on
-        #  the message type. However, in the future we will likely replace
-        #  SampleTriggerMessage with an agumented form of AxisArray,
-        #  leveraging its attrs field, which makes this a bit harder.
-        #  We should probably force callers of this object to explicitly
-        #  call `push_trigger` for trigger messages. This will also
-        #  simplify typing somewhat because `push_trigger` should not
-        #  return anything yet we currently have it returning an empty
-        #  list just to be compatible with __call__.
+    def __call__(self, message: AxisArray | SampleTriggerMessage) -> list[AxisArray]:
         if isinstance(message, AxisArray):
             return super().__call__(message)
         else:
@@ -109,7 +99,7 @@ class SamplerTransformer(BaseStatefulTransformer[SamplerSettings, AxisArray, Axi
             self._state.triggers = deque()
         self._state.triggers.clear()
 
-    def _process(self, message: AxisArray) -> list[SampleMessage]:
+    def _process(self, message: AxisArray) -> list[AxisArray]:
         self._state.buffer.write(message)
 
         # How much data in the buffer?
@@ -119,7 +109,7 @@ class SamplerTransformer(BaseStatefulTransformer[SamplerSettings, AxisArray, Axi
         )
 
         # Process in reverse order so that we can remove triggers safely as we iterate.
-        msgs_out: list[SampleMessage] = []
+        msgs_out: list[AxisArray] = []
         for trig_ix in range(len(self._state.triggers) - 1, -1, -1):
             trig = self._state.triggers[trig_ix]
             if trig.period is None:
@@ -152,13 +142,13 @@ class SamplerTransformer(BaseStatefulTransformer[SamplerSettings, AxisArray, Axi
             # Note: buffer will trim itself as needed based on buffer_dur.
 
             # Prepare output and drop trigger
-            msgs_out.append(SampleMessage(trigger=copy.copy(trig), sample=buff_axarr))
+            msgs_out.append(replace(buff_axarr, attrs={**buff_axarr.attrs, "trigger": copy.copy(trig)}))
             del self._state.triggers[trig_ix]
 
         msgs_out.reverse()  # in-place
         return msgs_out
 
-    def push_trigger(self, message: SampleTriggerMessage) -> list[SampleMessage]:
+    def push_trigger(self, message: SampleTriggerMessage) -> list[AxisArray]:
         # Input is a trigger message that we will use to sample the buffer.
 
         if self._state.buffer is None:
@@ -198,7 +188,7 @@ class Sampler(BaseTransformerUnit[SamplerSettings, AxisArray, AxisArray, Sampler
     SETTINGS = SamplerSettings
 
     INPUT_TRIGGER = ez.InputStream(SampleTriggerMessage)
-    OUTPUT_SIGNAL = ez.OutputStream(SampleMessage)
+    OUTPUT_SIGNAL = ez.OutputStream(AxisArray)
 
     @ez.subscriber(INPUT_TRIGGER)
     async def on_trigger(self, msg: SampleTriggerMessage) -> None:
@@ -228,7 +218,8 @@ def sampler(
 
     Returns:
         A generator that expects `.send` either an :obj:`AxisArray` containing streaming data messages,
-        or a :obj:`SampleTriggerMessage` containing a trigger, and yields the list of :obj:`SampleMessage` s.
+        or a :obj:`SampleTriggerMessage` containing a trigger, and yields the list of :obj:`AxisArray` s
+        with trigger info stored in ``attrs["trigger"]``.
     """
     return SamplerTransformer(
         settings=SamplerSettings(

{ezmsg_sigproc-2.14.0.dist-info → ezmsg_sigproc-2.15.0.dist-info}/METADATA

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: ezmsg-sigproc
-Version: 2.14.0
+Version: 2.15.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>, Kyle McGraw <kmcgraw@blackrockneuro.com>
 License-Expression: MIT
 License-File: LICENSE
 Requires-Python: >=3.10.15
 Requires-Dist: array-api-compat>=1.11.1
-Requires-Dist: ezmsg-baseproc>=1.1.0
+Requires-Dist: ezmsg-baseproc>=1.3.0
 Requires-Dist: ezmsg>=3.6.0
 Requires-Dist: numba>=0.61.0
 Requires-Dist: numpy>=1.26.0

{ezmsg_sigproc-2.14.0.dist-info → ezmsg_sigproc-2.15.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 ezmsg/sigproc/__init__.py,sha256=8K4IcOA3-pfzadoM6s2Sfg5460KlJUocGgyTJTJl96U,52
-ezmsg/sigproc/__version__.py,sha256=ho7Izv0FLYm0b-otHGFFngHF9OeMd4aMhL-uSzYcJ5U,706
+ezmsg/sigproc/__version__.py,sha256=a2xWIti3jyJFUZUTWeA586-E0pruFwlKCcTQl-q5UQQ,706
 ezmsg/sigproc/activation.py,sha256=83vnTa3ZcC4Q3VSWcGfaqhCEqYRNySUOyVpMHZXfz-c,2755
 ezmsg/sigproc/adaptive_lattice_notch.py,sha256=ThUR48mbSHuThkimtD0j4IXNMrOVcpZgGhE7PCYfXhU,8818
 ezmsg/sigproc/affinetransform.py,sha256=rnbQ2QtLq15eoFrqL-ij12yXSoLLq5ncOwRRzQgB1lA,22574
@@ -33,8 +33,8 @@ ezmsg/sigproc/merge.py,sha256=LmuN3LDIZF7DynMcjLp7eGc2G3Yxks9Zd8-luSqqXuA,15436
 ezmsg/sigproc/messages.py,sha256=KQczHTeifn4BZycChN8ZcpfZoQW3lC_xuFmN72QT97s,925
 ezmsg/sigproc/quantize.py,sha256=y7T4_67BHZluX3gyl2anp8iL6EEI6JvsK7Pmp1vapsk,2268
 ezmsg/sigproc/resample.py,sha256=3mm9pvxryNVhQuTCIMW3ToUkUfbVOCsIgvXUiurit1Y,11389
-ezmsg/sigproc/rollingscaler.py,sha256=GcLctVAWTmx9J39r0-dt3e7C_hs25s7M0dDnKiGhkC4,8955
-ezmsg/sigproc/sampler.py,sha256=iOk2YoUX22u9iTjFKimzP5V074RDBVcmswgfyxvZRZo,10761
+ezmsg/sigproc/rollingscaler.py,sha256=1cJf-wESetWJihrIWKJUycSkH_5OG3K5JncxjM-1TTI,8895
+ezmsg/sigproc/sampler.py,sha256=IgQ4d1VE-aaf0U2vkGDXtIwsKfpoW9ZR_s8Fi9VW3Kc,10103
 ezmsg/sigproc/scaler.py,sha256=kVXjRbqoxJ5yJICGsGagRXYIDW3-oihSnbBj-n3s55o,6816
 ezmsg/sigproc/signalinjector.py,sha256=mB62H2b-ScgPtH1jajEpxgDHqdb-RKekQfgyNncsE8Y,2874
 ezmsg/sigproc/singlebandpow.py,sha256=BVlWhFI6zU3ME3EVdZbwf-FMz1d2sfuNFDKXs1hn5HM,4353
@@ -63,7 +63,7 @@ ezmsg/sigproc/util/message.py,sha256=ppN3IYtIAwrxWG9JOvgWFn1wDdIumkEzYFfqpH9VQkY
 ezmsg/sigproc/util/profile.py,sha256=eVOo9pXgusrnH1yfRdd2RsM7Dbe2UpyC0LJ9MfGpB08,416
 ezmsg/sigproc/util/sparse.py,sha256=NjbJitCtO0B6CENTlyd9c-lHEJwoCan-T3DIgPyeShw,4834
 ezmsg/sigproc/util/typeresolution.py,sha256=fMFzLi63dqCIclGFLcMdM870OYxJnkeWw6aWKNMk718,362
-ezmsg_sigproc-2.14.0.dist-info/METADATA,sha256=Ml-3BXd3vRBRe3H1j1pmWdlXmvnvphbYQ7SH_n4pw9Y,1909
-ezmsg_sigproc-2.14.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-ezmsg_sigproc-2.14.0.dist-info/licenses/LICENSE,sha256=seu0tKhhAMPCUgc1XpXGGaCxY1YaYvFJwqFuQZAl2go,1100
-ezmsg_sigproc-2.14.0.dist-info/RECORD,,
+ezmsg_sigproc-2.15.0.dist-info/METADATA,sha256=WHVPI25XYKw4BAzF8749TZ5k-rg0Ik1iiH-p5ze8byc,1909
+ezmsg_sigproc-2.15.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+ezmsg_sigproc-2.15.0.dist-info/licenses/LICENSE,sha256=seu0tKhhAMPCUgc1XpXGGaCxY1YaYvFJwqFuQZAl2go,1100
+ezmsg_sigproc-2.15.0.dist-info/RECORD,,