All tests passing

Author: daquinteroflex

tests/test_plugins/smatrix/test_component_modeler.py

@@ -194,14 +194,14 @@ def run_component_modeler(monkeypatch, modeler: ComponentModeler) -> ComponentMo
     sim_dict = modeler.sim_dict
     batch_data = {task_name: run_emulated(sim) for task_name, sim in sim_dict.items()}
     port_data = PortSimulationData(
-        ports=[port for port in batch_data.keys()],
-        data=[sim_data for sim_data in batch_data.values()],
+        ports=list(batch_data.keys()),
+        data=list(batch_data.values()),
     )
     modeler_data = ComponentModelerData(modeler=modeler, data=port_data)
     return modeler_data
 
 
-def get_port_data_array(monkeypatch, modeler: ComponentModeler) -> TerminalPortDataArray:
+def get_port_data_array(monkeypatch, modeler: ComponentModeler):
     modeler_data = run_component_modeler(monkeypatch=monkeypatch, modeler=modeler)
     return modeler_data.smatrix.data
 
@@ -278,7 +278,8 @@ def test_run(monkeypatch):
 
 def test_run_component_modeler(monkeypatch):
     modeler = make_component_modeler()
-    s_matrix = get_port_data_array(monkeypatch, modeler)
+    modeler_data = run_component_modeler(monkeypatch, modeler=modeler)
+    s_matrix = modeler_data.smatrix
 
     for port_in in modeler.ports:
         for mode_index_in in range(port_in.mode_spec.num_modes):
@@ -301,7 +302,8 @@ def test_component_modeler_run_only(monkeypatch):
     ONLY_SOURCE = (port_run_only, mode_index_run_only) = ("right_bot", 0)
     run_only = [ONLY_SOURCE]
     modeler = make_component_modeler(run_only=run_only)
-    s_matrix = get_port_data_array(monkeypatch, modeler)
+    modeler_data = run_component_modeler(monkeypatch, modeler=modeler)
+    s_matrix = modeler_data.smatrix
 
     coords_in_run_only = {"port_in": port_run_only, "mode_index_in": mode_index_run_only}
 
@@ -346,7 +348,8 @@ def test_run_component_modeler_mappings(monkeypatch):
         ((("left_bot", 0), ("right_top", 0)), (("left_top", 0), ("right_bot", 0)), +1),
     )
     modeler = make_component_modeler(element_mappings=element_mappings)
-    s_matrix = get_port_data_array(monkeypatch, modeler)
+    modeler_data = run_component_modeler(monkeypatch, modeler=modeler)
+    s_matrix = modeler_data.smatrix
     _test_mappings(element_mappings, s_matrix)
 
 
@@ -372,11 +375,12 @@ def test_mapping_exclusion(monkeypatch):
     element_mappings.append(mapping)
 
     modeler = make_component_modeler(element_mappings=element_mappings)
+    modeler_data = run_component_modeler(monkeypatch, modeler=modeler)
+    s_matrix = modeler_data.smatrix
 
     run_sim_indices = modeler.matrix_indices_run_sim
     assert EXCLUDE_INDEX not in run_sim_indices, "mapping didnt exclude row properly"
 
-    s_matrix = get_port_data_array(monkeypatch, modeler)
     _test_mappings(element_mappings, s_matrix)
 
 

tests/test_plugins/smatrix/test_terminal_component_modeler.py

@@ -755,8 +755,8 @@ def test_antenna_helpers(monkeypatch, tmp_path):
 
     # Run simulation to get data
     modeler_data = run_component_modeler(monkeypatch, modeler)
-    rad_mon_data = modeler_data.data[radiation_monitor.name]
     sim_data = modeler_data.data[modeler_data.modeler.get_task_name(modeler.ports[0])]
+    rad_mon_data = sim_data[radiation_monitor.name]
 
     # Test monitor helper
     found_mon = modeler.get_radiation_monitor_by_name(radiation_monitor.name)
@@ -781,7 +781,7 @@ def test_antenna_helpers(monkeypatch, tmp_path):
 
     # Test power wave amplitude computation
     a, b = modeler_data.compute_power_wave_amplitudes_at_each_port(
-        modeler.port_reference_impedances, sim_data
+        modeler_data.port_reference_impedances, sim_data
     )
     assert isinstance(a, PortDataArray)
     assert isinstance(b, PortDataArray)