Finally tests passing

Author: daquinteroflex

tests/test_plugins/smatrix/test_terminal_component_modeler.py

@@ -7,6 +7,7 @@
 import xarray as xr
 
 import tidy3d as td
+import tidy3d.plugins.smatrix.utils
 from tidy3d.components.data.data_array import FreqDataArray
 from tidy3d.exceptions import SetupError, Tidy3dError, Tidy3dKeyError
 from tidy3d.plugins.microwave import (
@@ -43,9 +44,9 @@ def run_component_modeler(monkeypatch, modeler: TerminalComponentModeler):
         lambda matrix: 1.0 / (2.0 * np.sqrt(np.abs(matrix) + 1e-4)),
     )
     monkeypatch.setattr(
-        TerminalComponentModeler,
+        td.plugins.smatrix.utils,
         "_check_port_impedance_sign",
-        lambda self, Z_numpy: (),
+        lambda Z_numpy: np.ndarray([]),
     )
 
     s_matrix = modeler._construct_smatrix()

tidy3d/plugins/smatrix/component_modelers/terminal.py

@@ -440,6 +440,6 @@ def _construct_smatrix(self) -> TerminalPortDataArray:
         return _construct_smatrix(self)
 
     def _internal_construct_smatrix(self, batch_data: typing.Any = None) -> TerminalPortDataArray:
-        from tidy3d.plugins.smatrix.run import _internal_construct_smatrix
+        from tidy3d.plugins.smatrix.run import _construct_smatrix
 
-        return _internal_construct_smatrix(self, batch_data=batch_data)
+        return _construct_smatrix(self)

tidy3d/plugins/smatrix/run.py

@@ -50,7 +50,9 @@ def _port_reference_impedances(simulation) -> PortDataArray:
 
 
 def compute_power_wave_amplitudes_at_each_port(
-    simulation, port_reference_impedances: PortDataArray, sim_data: SimulationData
+    simulation,
+    port_reference_impedances: PortDataArray,
+    sim_data: SimulationData,
 ) -> tuple[PortDataArray, PortDataArray]:
     """Compute the incident and reflected power wave amplitudes at each port.
     The computed amplitudes have not been normalized.