oscura 0.8.0__py3-none-any.whl → 0.11.0__py3-none-any.whl

oscura/utils/math/interpolation.py

@@ -35,7 +35,7 @@ def interpolate(
     *,
     method: Literal["linear", "cubic", "nearest", "zero"] = "linear",
     fill_value: float | tuple[float, float] = np.nan,
-    channel_name: str | None = None,
+    channel: str | None = None,
 ) -> WaveformTrace:
     """Interpolate trace to new time points.
 
@@ -47,7 +47,7 @@ def interpolate(
         new_time: New time points in seconds.
         method: Interpolation method ("linear", "cubic", "nearest", "zero").
         fill_value: Value for points outside original range.
-        channel_name: Name for the result trace (optional).
+        channel: Name for the result trace (optional).
 
     Returns:
         Interpolated WaveformTrace at new time points.
@@ -70,13 +70,13 @@ def interpolate(
 
     # Create interpolator and interpolate
     interp_func = _create_interpolator(
-        trace.time_vector, trace.data.astype(np.float64), method, fill_value
+        trace.time, trace.data.astype(np.float64), method, fill_value
     )
     result_data = interp_func(new_time)
 
     # Build result trace
     new_sample_rate = _calculate_new_sample_rate(new_time, trace.metadata.sample_rate)
-    new_metadata = _create_interpolated_metadata(trace, new_sample_rate, channel_name)
+    new_metadata = _create_interpolated_metadata(trace, new_sample_rate, channel)
 
     return WaveformTrace(data=result_data.astype(np.float64), metadata=new_metadata)
 
@@ -107,7 +107,7 @@ def _calculate_new_sample_rate(new_time: NDArray[np.float64], original_sample_ra
 
 
 def _create_interpolated_metadata(
-    trace: WaveformTrace, new_sample_rate: float, channel_name: str | None
+    trace: WaveformTrace, new_sample_rate: float, channel: str | None
 ) -> TraceMetadata:
     """Create metadata for interpolated trace."""
     return TraceMetadata(
@@ -117,7 +117,7 @@ def _create_interpolated_metadata(
         acquisition_time=trace.metadata.acquisition_time,
         trigger_info=trace.metadata.trigger_info,
         source_file=trace.metadata.source_file,
-        channel_name=channel_name or f"{trace.metadata.channel_name or 'trace'}_interp",
+        channel=channel or f"{trace.metadata.channel or 'trace'}_interp",
     )
 
 
@@ -214,7 +214,7 @@ def resample(
     num_samples: int | None = None,
     method: Literal["fft", "polyphase", "interp"] = "fft",
     anti_alias: bool = True,
-    channel_name: str | None = None,
+    channel: str | None = None,
 ) -> WaveformTrace:
     """Resample trace to new sample rate or number of samples.
 
@@ -232,7 +232,7 @@ def resample(
             - "polyphase": Polyphase filter resampling (efficient)
             - "interp": Linear interpolation (fastest)
         anti_alias: Apply anti-aliasing filter before downsampling.
-        channel_name: Name for the result trace (optional).
+        channel: Name for the result trace (optional).
 
     Returns:
         Resampled WaveformTrace.
@@ -293,7 +293,7 @@ def resample(
         acquisition_time=trace.metadata.acquisition_time,
         trigger_info=trace.metadata.trigger_info,
         source_file=trace.metadata.source_file,
-        channel_name=channel_name or f"{trace.metadata.channel_name or 'trace'}_resampled",
+        channel=channel or f"{trace.metadata.channel or 'trace'}_resampled",
     )
 
     return WaveformTrace(data=result_data.astype(np.float64), metadata=new_metadata)
@@ -305,7 +305,7 @@ def align_traces(
     *,
     method: Literal["interpolate", "resample"] = "interpolate",
     reference: Literal["first", "second", "higher"] = "higher",
-    channel_names: tuple[str | None, str | None] | None = None,
+    channels: tuple[str | None, str | None] | None = None,
 ) -> tuple[WaveformTrace, WaveformTrace]:
     """Align two traces to have the same sample rate and length.
 
@@ -322,7 +322,7 @@ def align_traces(
             - "first": Use trace1's sample rate
             - "second": Use trace2's sample rate
             - "higher": Use the higher sample rate (default)
-        channel_names: Optional names for the aligned traces.
+        channels: Optional names for the aligned traces.
 
     Returns:
         Tuple of (aligned_trace1, aligned_trace2) with matching parameters.
@@ -353,17 +353,17 @@ def align_traces(
     # Create common time vector
     common_time = np.arange(num_samples) / target_rate
 
-    name1 = channel_names[0] if channel_names else None
-    name2 = channel_names[1] if channel_names else None
+    name1 = channels[0] if channels else None
+    name2 = channels[1] if channels else None
 
     if method == "interpolate":
         # Interpolate both traces to common time points
-        aligned1 = interpolate(trace1, common_time, channel_name=name1)
-        aligned2 = interpolate(trace2, common_time, channel_name=name2)
+        aligned1 = interpolate(trace1, common_time, channel=name1)
+        aligned2 = interpolate(trace2, common_time, channel=name2)
     else:  # "resample"
         # Resample both to common rate
-        aligned1 = resample(trace1, num_samples=num_samples, channel_name=name1)
-        aligned2 = resample(trace2, num_samples=num_samples, channel_name=name2)
+        aligned1 = resample(trace1, num_samples=num_samples, channel=name1)
+        aligned2 = resample(trace2, num_samples=num_samples, channel=name2)
 
     return aligned1, aligned2
 
@@ -374,7 +374,7 @@ def downsample(
     *,
     anti_alias: bool = True,
     method: Literal["decimate", "average", "max", "min"] = "decimate",
-    channel_name: str | None = None,
+    channel: str | None = None,
 ) -> WaveformTrace:
     """Downsample trace by an integer factor.
 
@@ -390,7 +390,7 @@ def downsample(
             - "average": Average every N samples
             - "max": Maximum of every N samples
             - "min": Minimum of every N samples
-        channel_name: Name for the result trace (optional).
+        channel: Name for the result trace (optional).
 
     Returns:
         Downsampled WaveformTrace.
@@ -440,7 +440,7 @@ def downsample(
         acquisition_time=trace.metadata.acquisition_time,
         trigger_info=trace.metadata.trigger_info,
         source_file=trace.metadata.source_file,
-        channel_name=channel_name or f"{trace.metadata.channel_name or 'trace'}_ds{factor}",
+        channel=channel or f"{trace.metadata.channel or 'trace'}_ds{factor}",
     )
 
     return WaveformTrace(data=result_data, metadata=new_metadata)

oscura/utils/pipeline/__init__.py

@@ -1,15 +1,12 @@
-"""Pipeline architecture for composable trace transformations.
+"""Reverse engineering pipeline for protocol analysis.
 
-This package provides pipeline composition, functional operators, and
-base classes for building reusable trace processing workflows.
+This package provides the REPipeline for automated protocol reverse engineering
+from captured traces, including flow extraction, payload analysis, field inference,
+and protocol structure discovery.
 
 - RE-INT-001: RE Pipeline Integration
 """
 
-from .base import TraceTransformer
-from .composition import Composable, compose, curry, make_composable, pipe
-from .pipeline import Pipeline
-
 # RE-INT-001: Reverse Engineering Pipeline
 from .reverse_engineering import (
     FlowInfo,
@@ -22,22 +19,12 @@ from .reverse_engineering import (
 )
 
 __all__ = [
-    "Composable",
     # RE-INT-001: Reverse Engineering Pipeline
     "FlowInfo",
     "MessageTypeInfo",
-    # Pipeline
-    "Pipeline",
     "ProtocolCandidate",
     "REAnalysisResult",
     "REPipeline",
     "StageResult",
-    # Base classes
-    "TraceTransformer",
     "analyze",
-    # Composition
-    "compose",
-    "curry",
-    "make_composable",
-    "pipe",
 ]

oscura/utils/progressive.py

@@ -242,10 +242,7 @@ def analyze_roi(
             sample_rate=trace.metadata.sample_rate,
             vertical_scale=trace.metadata.vertical_scale,
             vertical_offset=trace.metadata.vertical_offset,
-            acquisition_time=trace.metadata.acquisition_time,
-            trigger_info=trace.metadata.trigger_info,
-            source_file=trace.metadata.source_file,
-            channel_name=getattr(trace.metadata, "channel_name", None),
+            channel=trace.metadata.channel,
         ),
     )
 

oscura/utils/triggering/edge.py

@@ -78,7 +78,7 @@ class EdgeTrigger(Trigger):
         else:
             data = trace.data
 
-        sample_period = trace.metadata.time_base
+        sample_period = 1.0 / trace.metadata.sample_rate
         events: list[TriggerEvent] = []
 
         if self.hysteresis > 0:

oscura/utils/triggering/pattern.py

@@ -91,7 +91,7 @@ class PatternTrigger(Trigger):
             level = self._get_level(trace)
             digital = trace.data >= level
 
-        sample_period = trace.metadata.time_base
+        sample_period = 1.0 / trace.metadata.sample_rate
         events: list[TriggerEvent] = []
 
         if self.match_type == "sequence":
@@ -240,7 +240,7 @@ class MultiChannelPatternTrigger(Trigger):
                 digitals.append(trace.data >= level)
 
         # Find samples where all channels match pattern
-        sample_period = traces[0].metadata.time_base
+        sample_period = 1.0 / traces[0].metadata.sample_rate
         n_samples = min(len(d) for d in digitals)
         events: list[TriggerEvent] = []
 

oscura/utils/triggering/pulse.py

@@ -142,7 +142,7 @@ class PulseWidthTrigger(Trigger):
             data = trace.data
             level = self.level
 
-        sample_period = trace.metadata.time_base
+        sample_period = 1.0 / trace.metadata.sample_rate
         pulses: list[PulseInfo] = []
 
         # Find all threshold crossings
@@ -419,7 +419,7 @@ class RuntTrigger(Trigger):
             return []
 
         data = trace.data
-        sample_period = trace.metadata.time_base
+        sample_period = 1.0 / trace.metadata.sample_rate
         events: list[TriggerEvent] = []
 
         zones = np.array([self._get_zone(v) for v in data])

oscura/utils/triggering/window.py

@@ -97,7 +97,7 @@ class WindowTrigger(Trigger):
             List of trigger events for window crossings.
         """
         data = trace.data
-        sample_period = trace.metadata.time_base
+        sample_period = 1.0 / trace.metadata.sample_rate
         events: list[TriggerEvent] = []
 
         # Determine if each sample is inside the window
@@ -182,7 +182,7 @@ class ZoneTrigger(Trigger):
             List of trigger events.
         """
         data = trace.data
-        sample_period = trace.metadata.time_base
+        sample_period = 1.0 / trace.metadata.sample_rate
         time_vector = np.arange(len(data)) * sample_period
         events: list[TriggerEvent] = []
 
@@ -396,7 +396,7 @@ class MaskTrigger(Trigger):
         mask_path = Path(self.mask_points)
 
         data = trace.data
-        sample_period = trace.metadata.time_base
+        sample_period = 1.0 / trace.metadata.sample_rate
         time_vector = np.arange(len(data)) * sample_period
 
         # Create points array for containment test

oscura/validation/hil_testing.py

@@ -35,7 +35,7 @@ from enum import Enum
 from typing import Any, Protocol
 
 try:
-    import can  # type: ignore[import-untyped]
+    import can
 except ImportError:
     can = None  # type: ignore[assignment]
 
@@ -46,18 +46,18 @@ except ImportError:
     # Create module structure for test patching even when pyusb unavailable
     import types
 
-    usb = types.ModuleType("usb")  # type: ignore[assignment]
+    usb = types.ModuleType("usb")
     usb.core = None  # type: ignore[attr-defined]
 
 try:
     import spidev  # type: ignore[import-not-found]
 except ImportError:
-    spidev = None  # type: ignore[assignment]
+    spidev = None
 
 try:
     from smbus2 import SMBus  # type: ignore[import-not-found]
 except ImportError:
-    SMBus = None  # type: ignore[assignment]
+    SMBus = None
 
 try:
     import RPi.GPIO as GPIO  # type: ignore[import-untyped]
@@ -65,23 +65,23 @@ except ImportError:
     try:
         import gpiod  # type: ignore[import-not-found]
 
-        GPIO = None  # type: ignore[assignment]
+        GPIO = None
     except ImportError:
-        GPIO = None  # type: ignore[assignment]
-        gpiod = None  # type: ignore[assignment]
+        GPIO = None
+        gpiod = None
 
 try:
     from scapy.all import IP, UDP, Packet, wrpcap  # type: ignore[attr-defined]
 except ImportError:
-    IP = None  # type: ignore[assignment]
-    UDP = None  # type: ignore[assignment]
+    IP = None
+    UDP = None
     Packet = None  # type: ignore[assignment,misc]
     wrpcap = None  # type: ignore[assignment]
 
 try:
     import serial  # type: ignore[import-untyped]
 except ImportError:
-    serial = None  # type: ignore[assignment]
+    serial = None
 
 from oscura.utils.serial import connect_serial_port
 
@@ -960,7 +960,7 @@ class HILTester:
             # Create UDP packet for received data if present
             if recv_data:
                 pkt = IP(src="192.168.1.1") / UDP(sport=12345) / bytes(recv_data)
-                pkt.time = timestamp + 0.001  # Slight offset
+                pkt.time = timestamp + 0.001
                 packets.append(pkt)
 
         if packets: