revising PR

Author: dmarek-flex

tests/test_components/test_microwave.py

@@ -581,7 +581,7 @@ def test_make_path_integrals_validation():
     microwave_spec = td.MicrowaveModeSpec(impedance_specs=(impedance_spec,))
 
     # Test successful creation
-    voltage_integrals, current_integrals = make_path_integrals(microwave_spec, mode_monitor)
+    voltage_integrals, current_integrals = make_path_integrals(microwave_spec)
     assert len(voltage_integrals) == 1
     assert len(current_integrals) == 1
     assert voltage_integrals[0] is not None
@@ -590,7 +590,7 @@ def test_make_path_integrals_validation():
     # Test with None specs - when both are None, use_automatic_setup is True
     # This means current integrals will be auto-generated, not None
     microwave_spec_none = td.MicrowaveModeSpec(impedance_specs=(None,))
-    voltage_integrals, current_integrals = make_path_integrals(microwave_spec_none, mode_monitor)
+    voltage_integrals, current_integrals = make_path_integrals(microwave_spec_none)
     assert len(voltage_integrals) == mode_monitor.mode_spec.num_modes
     assert len(current_integrals) == mode_monitor.mode_spec.num_modes
     assert all(vi is None for vi in voltage_integrals)
@@ -600,9 +600,6 @@ def test_make_path_integrals_validation():
 def test_make_path_integrals_construction_errors(monkeypatch):
     """Test that make_path_integrals handles construction errors properly."""
 
-    sim = make_mw_sim(False, False, "microstrip")
-    mode_monitor = sim.monitors[0]
-
     # Create a valid spec
     v_spec = td.AxisAlignedVoltageIntegralSpec(center=(1, 2, 3), size=(0, 0, 1), sign="-")
 
@@ -620,7 +617,7 @@ def mock_make_voltage_integral(path_spec):
 
     # This should raise a SetupError due to construction failure
     with pytest.raises(SetupError, match="Failed to construct path integrals"):
-        make_path_integrals(microwave_spec, mode_monitor)
+        make_path_integrals(microwave_spec)
 
 
 def test_path_integral_factory_composite_current():
@@ -658,9 +655,6 @@ def test_path_integral_factory_composite_current():
 def test_path_integral_factory_mixed_specs():
     """Test make_path_integrals with mixed voltage and current specs (some None)."""
 
-    sim = make_mw_sim(False, False, "microstrip")
-    mode_monitor = sim.monitors[0]
-
     # Create specs where some are None
     v_spec = td.AxisAlignedVoltageIntegralSpec(center=(1, 2, 3), size=(0, 0, 1), sign="-")
     i_spec = td.AxisAlignedCurrentIntegralSpec(center=(1, 2, 3), size=(0, 1, 1), sign="-")
@@ -675,7 +669,7 @@ def test_path_integral_factory_mixed_specs():
         ),
     )
 
-    voltage_integrals, current_integrals = make_path_integrals(microwave_spec, mode_monitor)
+    voltage_integrals, current_integrals = make_path_integrals(microwave_spec)
 
     assert len(voltage_integrals) == 2
     assert len(current_integrals) == 2

tidy3d/components/microwave/path_integrals/path_integral_factory.py

@@ -2,14 +2,18 @@
 
 from __future__ import annotations
 
-from typing import Optional, Union
+from typing import Optional
 
 from tidy3d.components.microwave.microwave_mode_spec import MicrowaveModeSpec
 from tidy3d.components.microwave.path_integrals.current_spec import (
     AxisAlignedCurrentIntegralSpec,
     CompositeCurrentIntegralSpec,
     Custom2DCurrentIntegralSpec,
 )
+from tidy3d.components.microwave.path_integrals.impedance_spec import (
+    AutoImpedanceSpec,
+    CustomImpedanceSpec,
+)
 from tidy3d.components.microwave.path_integrals.types import (
     CurrentPathSpecTypes,
     VoltagePathSpecTypes,
@@ -18,7 +22,6 @@
     AxisAlignedVoltageIntegralSpec,
     Custom2DVoltageIntegralSpec,
 )
-from tidy3d.components.monitor import ModeMonitor, ModeSolverMonitor
 from tidy3d.exceptions import SetupError, ValidationError
 from tidy3d.plugins.microwave import (
     AxisAlignedCurrentIntegral,
@@ -82,8 +85,7 @@ def make_current_integral(path_spec: CurrentPathSpecTypes) -> CurrentIntegralTyp
 
 
 def make_path_integrals(
-    microwave_mode_spec: MicrowaveModeSpec,
-    monitor: Union[ModeMonitor, ModeSolverMonitor],
+    microwave_mode_spec: MicrowaveModeSpec, auto_spec: Optional[CustomImpedanceSpec] = None
 ) -> tuple[tuple[Optional[VoltageIntegralTypes]], tuple[Optional[CurrentIntegralTypes]]]:
     """
     Given a microwave mode specification and monitor, create the voltage and
@@ -93,9 +95,8 @@ def make_path_integrals(
     ----------
     microwave_mode_spec : MicrowaveModeSpec
         Microwave mode specification for creating voltage and current path specifications.
-    monitor : Union[ModeMonitor, ModeSolverMonitor]
-        The monitor for which the path integrals are being generated.
-
+    auto_spec: Optional[CustomImpedanceSpec]
+        The automatically created impedance specification, if available.
     Returns
     -------
     tuple[tuple[Optional[VoltageIntegralTypes]], tuple[Optional[CurrentIntegralTypes]]]
@@ -107,7 +108,7 @@ def make_path_integrals(
         If path specifications cannot be auto-generated or path integrals cannot be constructed.
     """
 
-    if microwave_mode_spec._using_auto_current_spec:
+    if microwave_mode_spec._using_auto_current_spec and auto_spec is None:
         raise SetupError("Auto path specification is not available for the local mode solver.")
 
     v_integrals = []
@@ -122,6 +123,9 @@ def make_path_integrals(
             v_integrals.append(None)
             i_integrals.append(None)
             continue
+        elif isinstance(impedance_spec, AutoImpedanceSpec):
+            v_spec = None
+            i_spec = auto_spec.current_spec
         else:
             v_spec = impedance_spec.voltage_spec
             i_spec = impedance_spec.current_spec
@@ -137,7 +141,7 @@ def make_path_integrals(
             i_integrals.append(i_integral)
         except Exception as e:
             raise SetupError(
-                f"Failed to construct path integrals for the mode index {idx} in monitor '{monitor.name}' "
+                f"Failed to construct path integrals for the mode with index {idx} "
                 "from the impedance specification. "
                 "Please create a github issue so that the problem can be investigated."
             ) from e

tidy3d/components/mode/mode_solver.py

@@ -1380,10 +1380,7 @@ def _make_path_integrals(
             raise ValueError(
                 "Cannot make path integrals for when 'mode_spec' is not a 'MicrowaveModeSpec'."
             )
-        return make_path_integrals(
-            self.mode_spec.microwave_spec,
-            self.to_monitor(name=MODE_MONITOR_NAME),
-        )
+        return make_path_integrals(self.mode_spec.microwave_spec)
 
     def _add_microwave_data(self, mode_solver_data: ModeSolverData) -> ModeSolverData:
         """Calculate and add microwave data to ``mode_solver_data`` which uses the path specifications."""