oscura 0.1.2__py3-none-any.whl → 0.3.0__py3-none-any.whl

oscura/__init__.py

@@ -46,7 +46,7 @@ Example:
 For more information, see https://github.com/oscura-re/oscura
 """
 
-__version__ = "0.1.2"
+__version__ = "0.3.0"
 __author__ = "Oscura Contributors"
 
 # Core types

oscura/analyzers/packet/payload_extraction.py

@@ -6,8 +6,6 @@ This module provides payload extraction from PCAP packets with metadata
 preservation, filtering, and multiple output formats.
 """
 
-from __future__ import annotations
-
 from collections.abc import Iterator, Sequence
 from dataclasses import dataclass
 from typing import Any, Literal
@@ -122,7 +120,7 @@ class PayloadExtractor:
         packets: Sequence[dict[str, Any] | bytes],
         protocol: str | None = None,
         port_filter: tuple[int | None, int | None] | None = None,
-    ) -> list[PayloadInfo]:
+    ) -> list["PayloadInfo"]:
         """Extract payloads from all packets with metadata.
 
         Implements RE-PAY-001: Batch payload extraction with metadata.
@@ -186,7 +184,7 @@ class PayloadExtractor:
     def iter_payloads(
         self,
         packets: Sequence[dict[str, Any] | bytes],
-    ) -> Iterator[PayloadInfo]:
+    ) -> Iterator["PayloadInfo"]:
         """Iterate over payloads for memory-efficient processing.
 
         Implements RE-PAY-001: Streaming payload iteration.

oscura/analyzers/packet/stream.py

@@ -22,11 +22,11 @@ from typing import TYPE_CHECKING, Any, BinaryIO, TypeVar
 
 from oscura.analyzers.packet.parser import BinaryParser
 
+T = TypeVar("T")
+
 if TYPE_CHECKING:
     from collections.abc import Callable, Iterator
 
-T = TypeVar("T")
-
 
 @dataclass
 class StreamPacket:
@@ -282,7 +282,7 @@ def pipeline(
     yield from result
 
 
-def batch[T](
+def batch(
     source: Iterator[T],
     size: int,
 ) -> Iterator[list[T]]:
@@ -311,7 +311,7 @@ def batch[T](
         yield current_batch
 
 
-def take[T](source: Iterator[T], n: int) -> Iterator[T]:
+def take(source: Iterator[T], n: int) -> Iterator[T]:
     """Take first n items.
 
     Args:
@@ -329,7 +329,7 @@ def take[T](source: Iterator[T], n: int) -> Iterator[T]:
         count += 1  # noqa: SIM113
 
 
-def skip[T](source: Iterator[T], n: int) -> Iterator[T]:
+def skip(source: Iterator[T], n: int) -> Iterator[T]:
     """Skip first n items.
 
     Args:

oscura/analyzers/patterns/__init__.py

@@ -22,6 +22,8 @@ Author: Oscura Development Team
 
 # Periodic pattern detection (PAT-001)
 # Pattern clustering (PAT-004)
+from __future__ import annotations
+
 from .clustering import (
     ClusteringResult,
     ClusterResult,
@@ -125,7 +127,7 @@ def find_motifs(
     return results
 
 
-def extract_motif(data: Any, start: int, length: int) -> "NDArray[np.generic]":
+def extract_motif(data: Any, start: int, length: int) -> NDArray[np.generic]:
     """Extract a motif from data.
 
     Args:
@@ -137,10 +139,9 @@ def extract_motif(data: Any, start: int, length: int) -> "NDArray[np.generic]":
         Extracted motif as numpy array.
     """
     import numpy as np
-    from numpy.typing import NDArray
 
     data_arr = np.asarray(data)
-    result: NDArray[np.generic] = data_arr[start : start + length]
+    result = data_arr[start : start + length]
     return result
 
 

oscura/analyzers/patterns/clustering.py

@@ -7,6 +7,8 @@ using various distance metrics and clustering approaches.
 Author: Oscura Development Team
 """
 
+from __future__ import annotations
+
 from dataclasses import dataclass
 from typing import Literal
 
@@ -984,7 +986,7 @@ class PatternClusterer:
 
     def fit(
         self, patterns: list[bytes | np.ndarray[tuple[int], np.dtype[np.uint8]]]
-    ) -> "PatternClusterer":
+    ) -> PatternClusterer:
         """Fit the clusterer to patterns (sklearn-style interface).
 
         Args:

oscura/analyzers/power/ac_power.py

@@ -11,8 +11,6 @@ Example:
     >>> print(f"Power factor: {pf:.3f}, Reactive power: {q:.2f} VAR")
 """
 
-from __future__ import annotations
-
 import numpy as np
 
 from oscura.analyzers.power.basic import average_power

oscura/analyzers/power/basic.py

@@ -11,8 +11,6 @@ Example:
     >>> print(f"Average: {stats['average']:.2f} W, Peak: {stats['peak']:.2f} W")
 """
 
-from __future__ import annotations
-
 from typing import Any
 
 import numpy as np

oscura/analyzers/power/ripple.py

@@ -9,8 +9,6 @@ Example:
     >>> print(f"Ripple: {r_pp*1e3:.2f} mV pp, {r_rms*1e3:.2f} mV rms")
 """
 
-from __future__ import annotations
-
 import numpy as np
 from scipy import signal
 

oscura/analyzers/signal_integrity/embedding.py

@@ -12,8 +12,6 @@ References:
     IEEE 370-2020: Standard for Electrical Characterization of PCBs
 """
 
-from __future__ import annotations
-
 import numpy as np
 
 from oscura.analyzers.signal_integrity.sparams import (

oscura/analyzers/signal_integrity/sparams.py

@@ -1,11 +1,14 @@
-"""S-Parameter handling and Touchstone file support.
+"""S-Parameter handling and analysis.
 
-This module provides Touchstone file loading and S-parameter
-calculations including return loss and insertion loss.
+This module provides S-parameter calculations including return loss and
+insertion loss for signal integrity analysis.
 
+For loading Touchstone files, use:
+    >>> from oscura.loaders import load_touchstone
 
 Example:
-    >>> from oscura.analyzers.signal_integrity.sparams import load_touchstone
+    >>> from oscura.loaders import load_touchstone
+    >>> from oscura.analyzers.signal_integrity.sparams import return_loss
     >>> s_params = load_touchstone("cable.s2p")
     >>> rl = return_loss(s_params, frequency=1e9)
 
@@ -16,16 +19,11 @@ References:
 
 from __future__ import annotations
 
-import contextlib
-import re
 from dataclasses import dataclass, field
-from pathlib import Path
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Any
 
 import numpy as np
 
-from oscura.core.exceptions import FormatError, LoaderError
-
 if TYPE_CHECKING:
     from numpy.typing import NDArray
 
@@ -94,201 +92,6 @@ class SParameterData:
         )
 
 
-def load_touchstone(path: str | Path) -> SParameterData:
-    """Load S-parameter data from Touchstone file.
-
-    Supports .s1p through .s8p formats and both Touchstone 1.0
-    and 2.0 file formats.
-
-    Args:
-        path: Path to Touchstone file.
-
-    Returns:
-        SParameterData with loaded S-parameters.
-
-    Raises:
-        LoaderError: If file cannot be read.
-        FormatError: If file format is invalid.
-
-    Example:
-        >>> s_params = load_touchstone("cable.s2p")
-        >>> print(f"Loaded {s_params.n_ports}-port, {len(s_params.frequencies)} points")
-
-    References:
-        Touchstone 2.0 File Format Specification
-    """
-    path = Path(path)
-
-    if not path.exists():
-        raise LoaderError(f"File not found: {path}")
-
-    # Determine number of ports from extension
-    suffix = path.suffix.lower()
-    match = re.match(r"\.s(\d+)p", suffix)
-    if not match:
-        raise FormatError(f"Unsupported file extension: {suffix}")
-
-    n_ports = int(match.group(1))
-
-    try:
-        with open(path) as f:
-            lines = f.readlines()
-    except Exception as e:
-        raise LoaderError(f"Failed to read file: {e}")  # noqa: B904
-
-    return _parse_touchstone(lines, n_ports, str(path))
-
-
-def _parse_touchstone(
-    lines: list[str],
-    n_ports: int,
-    source_file: str,
-) -> SParameterData:
-    """Parse Touchstone file content.
-
-    Args:
-        lines: File lines.
-        n_ports: Number of ports.
-        source_file: Source file path.
-
-    Returns:
-        Parsed SParameterData.
-
-    Raises:
-        FormatError: If file format is invalid.
-    """
-    comments = []
-    option_line = None
-    data_lines = []
-
-    for line in lines:
-        line = line.strip()
-
-        if not line:
-            continue
-
-        if line.startswith("!"):
-            comments.append(line[1:].strip())
-        elif line.startswith("#"):
-            option_line = line
-        else:
-            data_lines.append(line)
-
-    # Parse option line
-    freq_unit = 1e9  # Default GHz
-    format_type = "ma"  # Default MA (magnitude/angle)
-    z0 = 50.0
-
-    if option_line:
-        option_line = option_line.lower()
-        parts = option_line.split()
-
-        for i, part in enumerate(parts):
-            if part in ("hz", "khz", "mhz", "ghz"):
-                freq_unit = {
-                    "hz": 1.0,
-                    "khz": 1e3,
-                    "mhz": 1e6,
-                    "ghz": 1e9,
-                }[part]
-            elif part in ("db", "ma", "ri"):
-                format_type = part
-            elif part == "r":
-                # Reference impedance follows
-                if i + 1 < len(parts):
-                    with contextlib.suppress(ValueError):
-                        z0 = float(parts[i + 1])
-
-    # Parse data
-    frequencies = []
-    s_data = []
-
-    # Number of S-parameters per frequency
-    n_s_params = n_ports * n_ports
-
-    i = 0
-    while i < len(data_lines):
-        # First line has frequency and first S-parameters
-        parts = data_lines[i].split()
-
-        if len(parts) < 1:
-            i += 1
-            continue
-
-        freq = float(parts[0]) * freq_unit
-        frequencies.append(freq)
-
-        # Collect all S-parameter values for this frequency
-        s_values = []
-
-        # Add values from first line
-        for j in range(1, len(parts), 2):
-            if j + 1 < len(parts):
-                val1 = float(parts[j])
-                val2 = float(parts[j + 1])
-                s_values.append((val1, val2))
-
-        i += 1
-
-        # Continue collecting from subsequent lines if needed
-        while len(s_values) < n_s_params and i < len(data_lines):
-            parts = data_lines[i].split()
-
-            # Check if this is a new frequency (has odd number of values)
-            try:
-                float(parts[0])
-                if len(parts) % 2 == 1:
-                    break  # New frequency line
-            except (ValueError, IndexError):
-                pass
-
-            for j in range(0, len(parts), 2):
-                if j + 1 < len(parts):
-                    val1 = float(parts[j])
-                    val2 = float(parts[j + 1])
-                    s_values.append((val1, val2))
-
-            i += 1
-
-        # Convert to complex based on format
-        s_complex = []
-        for val1, val2 in s_values:
-            if format_type == "ri":
-                # Real/Imaginary
-                s_complex.append(complex(val1, val2))
-            elif format_type == "ma":
-                # Magnitude/Angle (degrees)
-                mag = val1
-                angle_rad = np.radians(val2)
-                s_complex.append(mag * np.exp(1j * angle_rad))
-            elif format_type == "db":
-                # dB/Angle (degrees)
-                mag = 10 ** (val1 / 20)
-                angle_rad = np.radians(val2)
-                s_complex.append(mag * np.exp(1j * angle_rad))
-
-        # Reshape into matrix
-        if len(s_complex) == n_s_params:
-            s_matrix = np.array(s_complex).reshape(n_ports, n_ports)
-            s_data.append(s_matrix)
-
-    if len(frequencies) == 0:
-        raise FormatError("No valid frequency points found")
-
-    frequencies_arr = np.array(frequencies, dtype=np.float64)
-    s_matrix_arr = np.array(s_data, dtype=np.complex128)
-
-    return SParameterData(
-        frequencies=frequencies_arr,
-        s_matrix=s_matrix_arr,
-        n_ports=n_ports,
-        z0=z0,
-        format=format_type,
-        source_file=source_file,
-        comments=comments,
-    )
-
-
 def return_loss(
     s_params: SParameterData,
     frequency: float | None = None,
@@ -474,11 +277,30 @@ def _abcd_to_s_single(abcd: NDArray[np.complex128], z0: float) -> NDArray[np.com
     return np.array([[S11, S12], [S21, S22]], dtype=np.complex128)
 
 
+# Backward compatibility: load_touchstone moved to loaders module
+# Import with deprecation warning
+def __getattr__(name: str) -> Any:
+    """Provide backward compatibility for load_touchstone."""
+    if name == "load_touchstone":
+        import warnings
+
+        from oscura.loaders.touchstone import load_touchstone
+
+        warnings.warn(
+            "Importing load_touchstone from oscura.analyzers.signal_integrity.sparams "
+            "is deprecated. Use 'from oscura.loaders import load_touchstone' instead.",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        return load_touchstone
+    raise AttributeError(f"module '{__name__}' has no attribute '{name}'")
+
+
 __all__ = [
     "SParameterData",
     "abcd_to_s",
     "insertion_loss",
-    "load_touchstone",
+    "load_touchstone",  # Backward compatibility via __getattr__  # noqa: F822
     "return_loss",
     "s_to_abcd",
 ]

oscura/analyzers/spectral/fft.py

@@ -4,8 +4,6 @@ This module provides FFT-based spectral analysis including chunked processing
 for large datasets.
 """
 
-from __future__ import annotations
-
 from typing import Any
 
 import numpy as np

oscura/analyzers/statistical/__init__.py

@@ -17,6 +17,8 @@ Requirements:
 - RE-ENT-002: Byte Frequency Distribution
 """
 
+from __future__ import annotations
+
 from typing import TYPE_CHECKING, Union
 
 import numpy as np
@@ -134,9 +136,7 @@ entropy = shannon_entropy
 DataType = Union[bytes, bytearray, "NDArray[np.uint8]"]
 
 
-def entropy_windowed(
-    data: DataType, window_size: int = 256, step: int = 1
-) -> "NDArray[np.float64]":
+def entropy_windowed(data: DataType, window_size: int = 256, step: int = 1) -> NDArray[np.float64]:
     """Windowed entropy calculation (alias for sliding_entropy)."""
     return sliding_entropy(data, window_size=window_size, step=step)
 

oscura/analyzers/statistical/checksum.py

@@ -5,6 +5,8 @@ This module provides tools for detecting checksum and CRC fields in binary
 messages by analyzing field correlations and testing common algorithms.
 """
 
+from __future__ import annotations
+
 from dataclasses import dataclass, field
 from typing import TYPE_CHECKING, Any, Literal, Union
 

oscura/analyzers/statistical/classification.py

@@ -6,6 +6,8 @@ binary, compressed, encrypted, or padding using multiple statistical tests
 and heuristics.
 """
 
+from __future__ import annotations
+
 from dataclasses import dataclass, field
 from typing import Any, Literal, Union
 

oscura/analyzers/statistical/entropy.py

@@ -8,6 +8,8 @@ transitions for field boundary identification, and classifying data types
 based on entropy characteristics.
 """
 
+from __future__ import annotations
+
 from collections import Counter
 from dataclasses import dataclass, field
 from typing import TYPE_CHECKING, Literal, Union
@@ -78,8 +80,8 @@ class ByteFrequencyResult:
         printable_ratio: Proportion of printable ASCII.
     """
 
-    counts: "NDArray[np.int64]"
-    frequencies: "NDArray[np.float64]"
+    counts: NDArray[np.int64]
+    frequencies: NDArray[np.float64]
     entropy: float
     unique_bytes: int
     most_common: list[tuple[int, int]]
@@ -103,8 +105,8 @@ class FrequencyAnomalyResult:
     """
 
     anomalous_bytes: list[int]
-    z_scores: "NDArray[np.float64]"
-    is_anomalous: "NDArray[np.bool_]"
+    z_scores: NDArray[np.float64]
+    is_anomalous: NDArray[np.bool_]
     expected_frequency: float
 
 
@@ -221,7 +223,7 @@ def bit_entropy(data: DataType) -> float:
 
 def sliding_entropy(
     data: DataType, window: int = 256, step: int = 64, window_size: int | None = None
-) -> "NDArray[np.float64]":
+) -> NDArray[np.float64]:
     """Calculate sliding window entropy profile.
 
     : Shannon Entropy Analysis
@@ -563,7 +565,7 @@ def classify_by_entropy(data: DataType) -> EntropyResult:
     )
 
 
-def entropy_profile(data: DataType, window: int = 256) -> "NDArray[np.float64]":
+def entropy_profile(data: DataType, window: int = 256) -> NDArray[np.float64]:
     """Generate entropy profile for visualization.
 
     : Shannon Entropy Analysis
@@ -588,7 +590,7 @@ def entropy_profile(data: DataType, window: int = 256) -> "NDArray[np.float64]":
     return sliding_entropy(data, window=window, step=step)
 
 
-def entropy_histogram(data: DataType) -> tuple["NDArray[np.intp]", "NDArray[np.float64]"]:
+def entropy_histogram(data: DataType) -> tuple[NDArray[np.intp], NDArray[np.float64]]:
     """Generate byte frequency histogram.
 
     : Shannon Entropy Analysis
@@ -799,7 +801,7 @@ def detect_frequency_anomalies(data: DataType, z_threshold: float = 3.0) -> Freq
 
 def compare_byte_distributions(
     data_a: DataType, data_b: DataType
-) -> tuple[float, float, "NDArray[np.float64]"]:
+) -> tuple[float, float, NDArray[np.float64]]:
     """Compare byte frequency distributions between two data samples.
 
     Implements RE-ENT-002: Byte Frequency Distribution.
@@ -849,7 +851,7 @@ def compare_byte_distributions(
 
 def sliding_byte_frequency(
     data: DataType, window: int = 256, step: int = 64, byte_value: int | None = None
-) -> "NDArray[np.float64]":
+) -> NDArray[np.float64]:
     """Compute sliding window byte frequency profile.
 
     Implements RE-ENT-002: Byte Frequency Distribution.

oscura/analyzers/statistical/ngrams.py

@@ -6,6 +6,8 @@ in binary data, useful for pattern identification, data characterization,
 and protocol fingerprinting.
 """
 
+from __future__ import annotations
+
 from collections import Counter
 from dataclasses import dataclass
 from typing import TYPE_CHECKING, Any, Union
@@ -310,7 +312,7 @@ def find_unusual_ngrams(
     return unusual
 
 
-def ngram_heatmap(data: DataType, n: int = 2) -> "NDArray[np.float64]":
+def ngram_heatmap(data: DataType, n: int = 2) -> NDArray[np.float64]:
     """Generate n-gram co-occurrence heatmap.
 
     : N-gram Frequency Analysis
@@ -586,7 +588,7 @@ class NGramAnalyzer:
         """
         return find_unusual_ngrams(data, baseline=baseline, n=self.n, z_threshold=z_threshold)
 
-    def heatmap(self, data: DataType) -> "NDArray[np.float64]":
+    def heatmap(self, data: DataType) -> NDArray[np.float64]:
         """Generate bigram heatmap.
 
         Args:

oscura/api/fluent.py

@@ -7,7 +7,7 @@ expressing signal analysis operations in a readable, intuitive way.
 from __future__ import annotations
 
 from dataclasses import dataclass, field
-from typing import TYPE_CHECKING, Any, TypeVar
+from typing import TYPE_CHECKING, Any, Generic, TypeVar
 
 import numpy as np
 
@@ -26,7 +26,7 @@ __all__ = [
 
 
 @dataclass
-class FluentResult[T]:
+class FluentResult(Generic[T]):
     """Result container with fluent interface.
 
     Provides method chaining for result processing.

oscura/automotive/__init__.py

@@ -40,9 +40,7 @@ Example:
     P0420: Catalyst System Efficiency Below Threshold (Bank 1)
 """
 
-from __future__ import annotations
-
-__version__ = "0.1.0"
+__version__ = "0.3.0"  # pragma: no cover
 
 __all__ = [
     "CANMessage",

oscura/automotive/can/__init__.py

@@ -4,8 +4,6 @@ This submodule provides CAN-specific analysis tools for reverse engineering
 automotive protocols from captured CAN bus data.
 """
 
-from __future__ import annotations
-
 __all__ = [
     "ByteChange",
     "CANMessage",

oscura/automotive/dbc/__init__.py

@@ -3,8 +3,6 @@
 This module provides DBC file parsing and generation capabilities.
 """
 
-from __future__ import annotations
-
 __all__ = ["DBCGenerator", "DBCParser", "load_dbc"]
 
 try:

oscura/automotive/dtc/__init__.py

@@ -19,8 +19,6 @@ Example:
     >>> print(f"{len(powertrain)} powertrain codes")
 """
 
-from __future__ import annotations
-
 from oscura.automotive.dtc.database import DTCS, DTCDatabase, DTCInfo
 
 __all__ = [