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

oscura/loaders/touchstone.py

@@ -16,12 +16,37 @@ from __future__ import annotations
 import contextlib
 import re
 from pathlib import Path
+from typing import TYPE_CHECKING
 
 import numpy as np
 
-from oscura.analyzers.signal_integrity.sparams import SParameterData
 from oscura.core.exceptions import FormatError, LoaderError
 
+# LAZY IMPORT: SParameterData is only needed at return time, not parse time
+# This breaks the touchstone -> signal_integrity -> analyzer dependency chain
+# See .claude/PERFORMANCE_PROFILE_2026-01-25.md for performance analysis
+# Import time reduced from 879ms to <50ms by deferring this import
+if TYPE_CHECKING:
+    from oscura.analyzers.signal_integrity.sparams import SParameterData
+
+# Module-level cache for lazy import
+_SParameterData: type[SParameterData] | None = None
+
+
+def _get_s_parameter_data_class() -> type[SParameterData]:
+    """Get SParameterData class with lazy import.
+
+    Returns:
+        SParameterData class.
+    """
+    global _SParameterData
+    if _SParameterData is None:
+        from oscura.analyzers.signal_integrity.sparams import SParameterData as SPD
+
+        _SParameterData = SPD
+    # At this point _SParameterData cannot be None due to the if statement above
+    return _SParameterData
+
 
 def load_touchstone(path: str | Path) -> SParameterData:
     """Load S-parameter data from Touchstone file.
@@ -60,31 +85,22 @@ def load_touchstone(path: str | Path) -> SParameterData:
     n_ports = int(match.group(1))
 
     try:
-        with open(path) as f:
+        with open(path, encoding="utf-8", buffering=65536) as f:
             lines = f.readlines()
     except Exception as e:
-        raise LoaderError(f"Failed to read file: {e}")  # noqa: B904
+        raise LoaderError(f"Failed to read file: {e}") from e
 
     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.
+def _separate_touchstone_lines(lines: list[str]) -> tuple[list[str], str | None, list[str]]:
+    """Separate file lines into comments, options, and data.
 
     Args:
-        lines: File lines.
-        n_ports: Number of ports.
-        source_file: Source file path.
+        lines: All file lines.
 
     Returns:
-        Parsed SParameterData.
-
-    Raises:
-        FormatError: If file format is invalid.
+        Tuple of (comments, option_line, data_lines).
     """
     comments = []
     option_line = None
@@ -92,7 +108,6 @@ def _parse_touchstone(
 
     for line in lines:
         line = line.strip()
-
         if not line:
             continue
 
@@ -103,55 +118,91 @@ def _parse_touchstone(
         else:
             data_lines.append(line)
 
-    # Parse option line
+    return (comments, option_line, data_lines)
+
+
+def _parse_touchstone_options(option_line: str | None) -> tuple[float, str, float]:
+    """Parse option line to extract frequency unit, format, and impedance.
+
+    Args:
+        option_line: Option line starting with '#' or None.
+
+    Returns:
+        Tuple of (freq_unit multiplier, format_type, z0 impedance).
+    """
     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])
+    if not option_line:
+        return (freq_unit, format_type, z0)
 
-    # Parse data
-    frequencies = []
-    s_data = []
+    option_line = option_line.lower()
+    parts = option_line.split()
 
-    # Number of S-parameters per frequency
-    n_s_params = n_ports * n_ports
+    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" and i + 1 < len(parts):
+            # Reference impedance follows
+            with contextlib.suppress(ValueError):
+                z0 = float(parts[i + 1])
 
-    i = 0
-    while i < len(data_lines):
-        # First line has frequency and first S-parameters
-        parts = data_lines[i].split()
+    return (freq_unit, format_type, z0)
 
-        if len(parts) < 1:
-            i += 1
-            continue
 
-        freq = float(parts[0]) * freq_unit
-        frequencies.append(freq)
+def _is_new_frequency_line(parts: list[str]) -> bool:
+    """Check if line represents a new frequency point.
+
+    Args:
+        parts: Split line parts.
+
+    Returns:
+        True if this is a new frequency line (odd number of numeric values).
+    """
+    try:
+        float(parts[0])
+        return len(parts) % 2 == 1
+    except (ValueError, IndexError):
+        return False
+
 
-        # Collect all S-parameter values for this frequency
-        s_values = []
+def _collect_s_parameter_values(
+    data_lines: list[str], start_idx: int, n_s_params: int
+) -> tuple[list[tuple[float, float]], int]:
+    """Collect S-parameter value pairs for one frequency.
 
-        # Add values from first line
-        for j in range(1, len(parts), 2):
+    Args:
+        data_lines: All data lines.
+        start_idx: Index of first line (contains frequency).
+        n_s_params: Expected number of S-parameters.
+
+    Returns:
+        Tuple of (value pairs list, next line index).
+    """
+    s_values = []
+    parts = data_lines[start_idx].split()
+
+    # Add values from first line (skip frequency at parts[0])
+    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 = start_idx + 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()
+
+        # Stop if this is a new frequency line
+        if _is_new_frequency_line(parts):
+            break
+
+        for j in range(0, len(parts), 2):
             if j + 1 < len(parts):
                 val1 = float(parts[j])
                 val2 = float(parts[j + 1])
@@ -159,55 +210,99 @@ def _parse_touchstone(
 
         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()
+    return (s_values, i)
+
+
+def _convert_to_complex(val1: float, val2: float, format_type: str) -> complex:
+    """Convert value pair to complex number based on format.
+
+    Args:
+        val1: First value (real/magnitude/dB).
+        val2: Second value (imaginary/angle).
+        format_type: Format type ("ri", "ma", or "db").
+
+    Returns:
+        Complex number representation.
+    """
+    if format_type == "ri":
+        # Real/Imaginary
+        return complex(val1, val2)
+    elif format_type == "ma":
+        # Magnitude/Angle (degrees)
+        angle_rad = np.radians(val2)
+        return complex(val1 * np.exp(1j * angle_rad))
+    elif format_type == "db":
+        # dB/Angle (degrees)
+        mag = 10 ** (val1 / 20)
+        angle_rad = np.radians(val2)
+        return complex(mag * np.exp(1j * angle_rad))
+    return complex(0, 0)
+
+
+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.
 
-            # 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  # Skip lines that can't be parsed as numeric data
+    Raises:
+        FormatError: If file format is invalid.
+    """
+    # Separate lines into components
+    comments, option_line, data_lines = _separate_touchstone_lines(lines)
+
+    # Parse options
+    freq_unit, format_type, z0 = _parse_touchstone_options(option_line)
 
-            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))
+    # Parse data
+    frequencies = []
+    s_data = []
+    n_s_params = n_ports * n_ports
 
+    i = 0
+    while i < len(data_lines):
+        parts = data_lines[i].split()
+
+        if len(parts) < 1:
             i += 1
+            continue
 
-        # 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))
+        # Extract frequency
+        freq = float(parts[0]) * freq_unit
+        frequencies.append(freq)
+
+        # Collect S-parameter values
+        s_values, next_i = _collect_s_parameter_values(data_lines, i, n_s_params)
+
+        # Convert to complex numbers
+        s_complex = [_convert_to_complex(val1, val2, format_type) for val1, val2 in s_values]
 
         # 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)
 
+        i = next_i
+
     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(
+    # Lazy import of SParameterData class - only happens on first actual file load
+    SParameterDataClass = _get_s_parameter_data_class()
+
+    return SParameterDataClass(
         frequencies=frequencies_arr,
         s_matrix=s_matrix_arr,
         n_ports=n_ports,