oscura 0.7.0__py3-none-any.whl → 0.10.0__py3-none-any.whl

oscura/jupyter/display.py

@@ -103,8 +103,8 @@ class TraceDisplay:
             rows.append(("Sample Rate", rate_str))
 
         # Channel name
-        if hasattr(meta, "channel_name") and meta.channel_name:
-            rows.append(("Channel", meta.channel_name))
+        if hasattr(meta, "channel") and meta.channel:
+            rows.append(("Channel", meta.channel))
 
         # Source file
         if hasattr(meta, "source_file") and meta.source_file:

oscura/jupyter/magic.py

@@ -82,7 +82,7 @@ except ImportError:
 
 
 @magics_class
-class OscuraMagics(Magics):
+class OscuraMagics(Magics):  # type: ignore[misc]
     """IPython magics for Oscura analysis.
 
     Provides convenient shortcuts for loading traces, running measurements,
@@ -232,8 +232,8 @@ class OscuraMagics(Magics):
             meta = trace.metadata
             if hasattr(meta, "sample_rate"):
                 info["sample_rate"] = meta.sample_rate
-            if hasattr(meta, "channel_name"):
-                info["channel"] = meta.channel_name
+            if hasattr(meta, "channel"):
+                info["channel"] = meta.channel
 
         for key, value in info.items():
             print(f"{key}: {value}")

oscura/loaders/__init__.py

@@ -290,6 +290,10 @@ def load(
         return _dispatch_loader(loader_name, path, channel=channel, **kwargs)
 
 
+# Alias for auto-detection (backward compatibility)
+load_auto = load
+
+
 def _load_wfm_auto(
     path: Path,
     *,
@@ -400,8 +404,8 @@ def load_all_channels(
     else:
         # For other formats, try loading as single channel
         trace = load(path, format=format)
-        channel_name = getattr(trace.metadata, "channel_name", None) or "ch1"
-        return {channel_name: trace}
+        channel = getattr(trace.metadata, "channel", None) or "ch1"
+        return {channel: trace}
 
 
 def _load_all_channels_tektronix(
@@ -464,9 +468,9 @@ def _read_tektronix_file(path: Path) -> Any:
     except ImportError:
         # Fall back to single channel loading
         trace = load(path, format="tektronix")
-        channel_name = getattr(trace.metadata, "channel_name", None) or "ch1"
+        channel = getattr(trace.metadata, "channel", None) or "ch1"
         # Return a dict-like object to maintain compatibility
-        return {"__fallback__": {channel_name: trace}}
+        return {"__fallback__": {channel: trace}}
 
     try:
         return tm_data_types.read_file(str(path))
@@ -502,14 +506,14 @@ def _extract_analog_waveforms(
             sample_rate = 1.0 / x_increment if x_increment > 0 else 1e6
             vertical_scale = getattr(awfm, "y_scale", None)
             vertical_offset = getattr(awfm, "y_offset", None)
-            channel_name = getattr(awfm, "name", f"CH{i + 1}")
+            channel = getattr(awfm, "name", f"CH{i + 1}")
 
             trace = _build_waveform_trace(
                 data=data,
                 sample_rate=sample_rate,
                 vertical_scale=vertical_scale,
                 vertical_offset=vertical_offset,
-                channel_name=channel_name,
+                channel=channel,
                 path=path,
                 wfm=awfm,
             )
@@ -557,23 +561,23 @@ def _extract_direct_waveform(
         from oscura.loaders.tektronix import _load_digital_waveform
 
         trace = _load_digital_waveform(wfm, path, 0)
-        channel_name = trace.metadata.channel_name or "d1"
-        channels[channel_name.lower()] = trace
+        channel = trace.metadata.channel or "d1"
+        channels[channel.lower()] = trace
 
     elif wfm_type == "IQWaveform" or (
         hasattr(wfm, "i_axis_values") and hasattr(wfm, "q_axis_values")
     ):
         # IQWaveform format (RF/SDR data)
         loaded_trace = load(path, format="tektronix")
-        channel_name = loaded_trace.metadata.channel_name or "iq1"
-        channels[channel_name.lower()] = loaded_trace
+        channel = loaded_trace.metadata.channel or "iq1"
+        channels[channel.lower()] = loaded_trace
 
     elif hasattr(wfm, "y_axis_values") or hasattr(wfm, "y_data"):
         # Direct analog waveform
         loaded_trace = load(path, format="tektronix")
         # Add both analog and digital traces to channels
-        channel_name = loaded_trace.metadata.channel_name or "ch1"
-        channels[channel_name.lower()] = loaded_trace
+        channel = loaded_trace.metadata.channel or "ch1"
+        channels[channel.lower()] = loaded_trace
 
 
 def get_supported_formats() -> list[str]:
@@ -649,6 +653,7 @@ __all__ = [
     "hdf5",
     "load",
     "load_all_channels",
+    "load_auto",
     "load_binary",
     "load_binary_packets",
     "load_lazy",

oscura/loaders/binary.py

@@ -81,8 +81,8 @@ def load_binary(
     # Create metadata
     metadata = TraceMetadata(
         sample_rate=sample_rate,
+        channel=f"Channel {channel}",
         source_file=str(path),
-        channel_name=f"Channel {channel}",
     )
 
     return WaveformTrace(data=data.astype(np.float64), metadata=metadata)

oscura/loaders/chipwhisperer.py

@@ -399,8 +399,7 @@ def to_waveform_trace(
 
     metadata = TraceMetadata(
         sample_rate=traceset.sample_rate,
-        source_file=str(traceset.metadata.get("source_file", "")) if traceset.metadata else "",
-        channel_name=f"trace_{trace_index}",
+        channel=f"trace_{trace_index}",
     )
 
     return WaveformTrace(

oscura/loaders/configurable.py

@@ -1351,7 +1351,7 @@ def extract_channels(
         # Create metadata with configurable sample rate
         metadata = TraceMetadata(
             sample_rate=effective_sample_rate,
-            channel_name=ch_name,
+            channel=ch_name,
         )
 
         traces[ch_name] = DigitalTrace(data=data, metadata=metadata)

oscura/loaders/csv_loader.py

@@ -208,8 +208,8 @@ def _load_with_pandas(
         # Create metadata and trace
         metadata = TraceMetadata(
             sample_rate=detected_sample_rate,
+            channel=voltage_col_name or "CH1",
             source_file=str(path),
-            channel_name=voltage_col_name or "CH1",
         )
 
         return WaveformTrace(data=np.asarray(voltage_data, dtype=np.float64), metadata=metadata)
@@ -429,8 +429,8 @@ def _load_basic(
         # Create metadata and trace
         metadata = TraceMetadata(
             sample_rate=detected_sample_rate,
+            channel=channel_name,
             source_file=str(path),
-            channel_name=channel_name,
         )
 
         return WaveformTrace(data=np.array(voltage_data, dtype=np.float64), metadata=metadata)

oscura/loaders/hdf5_loader.py

@@ -413,8 +413,8 @@ def _build_metadata(
         sample_rate=float(detected_sample_rate),
         vertical_scale=float(vertical_scale) if vertical_scale else None,
         vertical_offset=float(vertical_offset) if vertical_offset else None,
+        channel=str(channel_name),
         source_file=str(file_path),
-        channel_name=str(channel_name),
     )
 
 

oscura/loaders/lazy.py

@@ -219,9 +219,14 @@ class LazyWaveformTrace:
         """
         from oscura.core.types import TraceMetadata, WaveformTrace
 
+        # Handle API migration: channel_name -> channel
+        metadata_dict = self._metadata.copy()
+        if "channel_name" in metadata_dict:
+            metadata_dict["channel"] = metadata_dict.pop("channel_name")
+
         metadata = TraceMetadata(
             sample_rate=self._sample_rate,
-            **self._metadata,
+            **metadata_dict,
         )
         return WaveformTrace(data=self.data, metadata=metadata)
 

oscura/loaders/mmap_loader.py

@@ -308,7 +308,6 @@ class MmapWaveformTrace:
 
         metadata = TraceMetadata(
             sample_rate=self._sample_rate,
-            source_file=str(self._file_path),
             **self._metadata,
         )
 

oscura/loaders/numpy_loader.py

@@ -173,8 +173,8 @@ def _build_npz_metadata(
         sample_rate=float(final_sample_rate),
         vertical_scale=float(detected_vertical_scale) if detected_vertical_scale else None,
         vertical_offset=float(detected_vertical_offset) if detected_vertical_offset else None,
+        channel=_get_channel_name(npz, channel),
         source_file=str(path),
-        channel_name=_get_channel_name(npz, channel),
     )
 
 
@@ -444,12 +444,13 @@ def _get_channel_name(
     elif isinstance(channel, int):
         return f"CH{channel + 1}"
 
-    # Try to find channel name in metadata
+    # Try to find channel name in metadata (support both old and new API)
     keys = list(npz.keys())
-    if "channel_name" in keys:
-        value = npz["channel_name"]
-        # NPZ values are always ndarrays
-        return str(value.item())
+    for key in ["channel", "channel_name"]:
+        if key in keys:
+            value = npz[key]
+            # NPZ values are always ndarrays
+            return str(value.item())
 
     return "CH1"
 
@@ -556,8 +557,8 @@ def load_raw_binary(
 
         metadata = TraceMetadata(
             sample_rate=sample_rate,
+            channel="RAW",
             source_file=str(path),
-            channel_name="RAW",
         )
 
         return WaveformTrace(data=data, metadata=metadata)

oscura/loaders/preprocessing.py

@@ -293,13 +293,11 @@ def trim_idle(
             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=trace.metadata.channel_name,
+            channel=trace.metadata.channel,
+            units=trace.metadata.units,
         )
 
-        return DigitalTrace(data=trimmed_data, metadata=new_metadata, edges=None)
+        return DigitalTrace(data=trimmed_data, metadata=new_metadata)
 
     return trace
 

oscura/loaders/rigol.py

@@ -26,7 +26,7 @@ if TYPE_CHECKING:
 
 # Try to import RigolWFM for full Rigol support
 try:
-    import RigolWFM.wfm as rigol_wfm  # type: ignore[import-untyped]  # Optional third-party library
+    import RigolWFM.wfm as rigol_wfm  # type: ignore[import-untyped,import-not-found]  # Optional third-party library
 
     RIGOL_WFM_AVAILABLE = True
 except ImportError:
@@ -109,14 +109,28 @@ def _load_with_rigolwfm(
             _extract_rigol_channel_data(wfm, channel, str(path))
         )
 
+        # Extract trigger info if available
+        trigger_info = None
+        if (
+            hasattr(wfm, "trigger_level")
+            or hasattr(wfm, "trigger_mode")
+            or hasattr(wfm, "trigger_source")
+        ):
+            trigger_info = {}
+            if hasattr(wfm, "trigger_level"):
+                trigger_info["level"] = wfm.trigger_level
+            if hasattr(wfm, "trigger_mode"):
+                trigger_info["mode"] = wfm.trigger_mode
+            if hasattr(wfm, "trigger_source"):
+                trigger_info["source"] = wfm.trigger_source
+
         # Build metadata
         metadata = TraceMetadata(
             sample_rate=sample_rate,
             vertical_scale=vertical_scale,
             vertical_offset=vertical_offset,
-            source_file=str(path),
-            channel_name=channel_name,
-            trigger_info=_extract_trigger_info(wfm),
+            channel=channel_name,
+            trigger_info=trigger_info,
         )
 
         return WaveformTrace(data=data, metadata=metadata)
@@ -200,7 +214,7 @@ def _extract_rigol_channel_data(
         file_path: File path for error messages.
 
     Returns:
-        Tuple of (data, sample_rate, vertical_scale, vertical_offset, channel_name).
+        Tuple of (data, sample_rate, vertical_scale, vertical_offset, channel).
 
     Raises:
         FormatError: If no waveform data found.
@@ -212,7 +226,7 @@ def _extract_rigol_channel_data(
         sample_rate = wfm.sample_rate if hasattr(wfm, "sample_rate") else 1e6
         vertical_scale = ch.volts_per_div if hasattr(ch, "volts_per_div") else None
         vertical_offset = ch.volt_offset if hasattr(ch, "volt_offset") else None
-        channel_name = f"CH{channel + 1}"
+        channel_name: str = f"CH{channel + 1}"
         return data, sample_rate, vertical_scale, vertical_offset, channel_name
 
     # Single channel format
@@ -302,7 +316,7 @@ def _load_basic(
             vertical_scale=vertical_scale,
             vertical_offset=vertical_offset,
             source_file=str(path),
-            channel_name=f"CH{channel + 1}",
+            channel=f"CH{channel + 1}",
         )
 
         return WaveformTrace(data=data, metadata=metadata)

oscura/loaders/sigrok.py

@@ -270,19 +270,16 @@ def _build_digital_trace(
     Returns:
         DigitalTrace object.
     """
-    edges = _compute_edges(channel_data, sample_rate)
+    _compute_edges(channel_data, sample_rate)
 
     trace_metadata = TraceMetadata(
         sample_rate=sample_rate,
-        source_file=str(path),
-        channel_name=channel_name,
-        trigger_info=metadata_dict.get("trigger"),
+        channel=channel_name,
     )
 
     return DigitalTrace(
         data=channel_data,
         metadata=trace_metadata,
-        edges=edges,
     )
 
 

oscura/loaders/tdms.py

@@ -230,14 +230,15 @@ def _build_tdms_metadata(
     sample_rate = _get_sample_rate(target_channel, target_group, tdms_file)
     vertical_scale = target_channel.properties.get("NI_Scale[0]_Linear_Slope")
     vertical_offset = target_channel.properties.get("NI_Scale[0]_Linear_Y_Intercept")
+    trigger_info = _extract_tdms_properties(target_channel)
 
     return TraceMetadata(
         sample_rate=sample_rate,
         vertical_scale=float(vertical_scale) if vertical_scale is not None else None,
         vertical_offset=float(vertical_offset) if vertical_offset is not None else None,
+        channel=target_channel.name,
+        trigger_info=trigger_info,
         source_file=str(path),
-        channel_name=target_channel.name,
-        trigger_info=_extract_tdms_properties(target_channel),
     )
 
 

oscura/loaders/tektronix.py

@@ -20,7 +20,6 @@ Example:
 
 from __future__ import annotations
 
-import contextlib
 import logging
 from pathlib import Path
 from typing import TYPE_CHECKING, Any, Union
@@ -80,7 +79,7 @@ def load_tektronix_wfm(
     Example:
         >>> trace = load_tektronix_wfm("TEK00001.wfm")
         >>> print(f"Sample rate: {trace.metadata.sample_rate} Hz")
-        >>> print(f"Channel: {trace.metadata.channel_name}")
+        >>> print(f"Channel: {trace.metadata.channel}")
 
         >>> # Check trace type
         >>> if isinstance(trace, DigitalTrace):
@@ -250,7 +249,7 @@ def _load_analog_waveforms_container(
     sample_rate = 1.0 / waveform.x_increment if waveform.x_increment > 0 else 1e6
     vertical_scale = getattr(waveform, "y_scale", None)
     vertical_offset = getattr(waveform, "y_offset", None)
-    channel_name = getattr(waveform, "name", f"CH{channel + 1}")
+    channel_name: str = str(getattr(waveform, "name", None) or f"CH{channel + 1}")
 
     # Use original wfm for trigger info (need to get it from parent)
     return _build_waveform_trace(
@@ -258,7 +257,7 @@ def _load_analog_waveforms_container(
         sample_rate=sample_rate,
         vertical_scale=vertical_scale,
         vertical_offset=vertical_offset,
-        channel_name=channel_name,
+        channel=channel_name,
         path=path,
         wfm=waveform,
     )
@@ -288,7 +287,7 @@ def _load_analog_waveform_direct(
     x_spacing = float(wfm.x_axis_spacing) if wfm.x_axis_spacing else 1e-6
     sample_rate = 1.0 / x_spacing if x_spacing > 0 else 1e6
     vertical_offset = y_offset
-    channel_name = (
+    channel_name: str = (
         wfm.source_name if hasattr(wfm, "source_name") and wfm.source_name else f"CH{channel + 1}"
     )
 
@@ -297,7 +296,7 @@ def _load_analog_waveform_direct(
         sample_rate=sample_rate,
         vertical_scale=None,
         vertical_offset=vertical_offset,
-        channel_name=channel_name,
+        channel=channel_name,
         path=path,
         wfm=wfm,
     )
@@ -321,14 +320,14 @@ def _load_legacy_y_data(
     sample_rate = 1.0 / x_increment if x_increment > 0 else 1e6
     vertical_scale = getattr(wfm, "y_scale", None)
     vertical_offset = getattr(wfm, "y_offset", None)
-    channel_name = getattr(wfm, "name", "CH1")
+    channel = getattr(wfm, "name", "CH1")
 
     return _build_waveform_trace(
         data=data,
         sample_rate=sample_rate,
         vertical_scale=vertical_scale,
         vertical_offset=vertical_offset,
-        channel_name=channel_name,
+        channel=channel,
         path=path,
         wfm=wfm,
     )
@@ -339,7 +338,7 @@ def _build_waveform_trace(
     sample_rate: float,
     vertical_scale: float | None,
     vertical_offset: float | None,
-    channel_name: str,
+    channel: str,
     path: Path,
     wfm: Any,
 ) -> WaveformTrace:
@@ -350,27 +349,38 @@ def _build_waveform_trace(
         sample_rate: Sample rate in Hz.
         vertical_scale: Vertical scale in volts/div.
         vertical_offset: Vertical offset in volts.
-        channel_name: Channel name.
+        channel: Channel name.
         path: Source file path.
         wfm: Original waveform object for trigger info extraction.
 
     Returns:
         Constructed WaveformTrace.
     """
+    # Extract trigger information
+    trigger_info = _extract_trigger_info(wfm)
+
     # Extract acquisition time if available
     acquisition_time = None
     if hasattr(wfm, "date_time"):
-        with contextlib.suppress(ValueError, AttributeError):
-            acquisition_time = wfm.date_time
+        try:
+            from datetime import datetime
+
+            # Handle both datetime objects and other formats
+            if isinstance(wfm.date_time, datetime):
+                acquisition_time = wfm.date_time
+            # Add additional parsing if needed for other formats
+        except (ValueError, AttributeError, TypeError):
+            # Silently ignore invalid or unparseable times
+            pass
 
     metadata = TraceMetadata(
         sample_rate=sample_rate,
         vertical_scale=vertical_scale,
         vertical_offset=vertical_offset,
-        acquisition_time=acquisition_time,
+        channel=channel,
         source_file=str(path),
-        channel_name=channel_name,
-        trigger_info=_extract_trigger_info(wfm),
+        trigger_info=trigger_info,
+        acquisition_time=acquisition_time,
     )
 
     return WaveformTrace(data=data, metadata=metadata)
@@ -407,19 +417,15 @@ def _load_digital_waveform(
     sample_rate = _extract_sample_rate(wfm)
 
     # Extract channel name
-    channel_name = _extract_channel_name(wfm, channel)
+    channel_name: str = _extract_channel(wfm, channel)
 
     # Build metadata
     metadata = TraceMetadata(
         sample_rate=sample_rate,
-        source_file=str(path),
-        channel_name=channel_name,
+        channel=channel_name,
     )
 
-    # Extract edge information if available
-    edges = _extract_edges(wfm)
-
-    return DigitalTrace(data=data, metadata=metadata, edges=edges)
+    return DigitalTrace(data=data, metadata=metadata)
 
 
 def _extract_digital_samples(wfm: Any, path: Path) -> NDArray[np.bool_]:
@@ -465,7 +471,7 @@ def _extract_sample_rate(wfm: Any) -> float:
     return 1.0 / x_spacing if x_spacing > 0 else 1e6
 
 
-def _extract_channel_name(wfm: Any, channel: int) -> str:
+def _extract_channel(wfm: Any, channel: int) -> str:
     """Extract channel name from waveform object."""
     # Try source_name first
     if hasattr(wfm, "source_name") and wfm.source_name:
@@ -534,18 +540,19 @@ def _load_iq_waveform(
     sample_rate = 1.0 / x_spacing if x_spacing > 0 else 1e6
 
     # Extract channel name
-    channel_name = "IQ1"
+    channel = "IQ1"
     if hasattr(wfm, "source_name") and wfm.source_name:
-        channel_name = wfm.source_name
+        channel = wfm.source_name
 
     # Build metadata
     metadata = TraceMetadata(
         sample_rate=sample_rate,
-        source_file=str(path),
-        channel_name=channel_name,
+        channel=channel,
     )
 
-    return IQTrace(i_data=i_data, q_data=q_data, metadata=metadata)
+    # Create complex I/Q data
+    iq_data = i_data + 1j * q_data
+    return IQTrace(data=iq_data, metadata=metadata)
 
 
 def _load_basic(
@@ -641,14 +648,14 @@ def _parse_wfm003(
     # Extract metadata from header
     sample_rate = _extract_sample_interval(file_data, header_size)
     vertical_scale, vertical_offset = _extract_vertical_params(file_data, header_size)
-    channel_name = f"CH{channel + 1}"
+    channel_name: str = f"CH{channel + 1}"
 
     metadata = TraceMetadata(
         sample_rate=sample_rate,
         vertical_scale=vertical_scale,
         vertical_offset=vertical_offset,
+        channel=channel_name,
         source_file=str(path),
-        channel_name=channel_name,
     )
 
     return WaveformTrace(data=data, metadata=metadata)
@@ -797,8 +804,7 @@ def _parse_wfm_legacy(
         sample_rate=sample_rate,
         vertical_scale=vertical_scale,
         vertical_offset=vertical_offset,
-        source_file=str(path),
-        channel_name=f"CH{channel + 1}",
+        channel=f"CH{channel + 1}",
     )
 
     return WaveformTrace(data=data, metadata=metadata)