circular import still a problm

Author: daquinteroflex

tidy3d/plugins/smatrix/data/data.py

@@ -63,13 +63,7 @@ class TerminalComponentModelerData(Tidy3dBaseModel):
         "and from which this data was generated.",
     )
 
-    smatrix_data: MicrowaveSMatrixData = pd.Field(
-        ...,
-        title="S-Matrix Data",
-        description="Stores the computed S-matrix and reference impedances for the terminal ports",
-    )
-
-    port_simulation_data: MicrowavePortSimulationData = pd.Field(
+    data: MicrowavePortSimulationData = pd.Field(
         ...,
         title="Port-Simulation Data",
         description="Stores raw simulation data from each microwave port-specific simulation.",
@@ -81,6 +75,15 @@ class TerminalComponentModelerData(Tidy3dBaseModel):
         description="A string containing the log information from the simulation run.",
     )
 
+    @cached_property
+    def smatrix(self) -> MicrowaveSMatrixData:
+        "Stores the computed S-matrix and reference impedances for the terminal ports"
+        from tidy3d.plugins.smatrix.local_run import construct_smatrix
+
+        terminal_port_data = construct_smatrix(simulation=self.simulation)
+        smatrix_data = MicrowaveSMatrixData(data=terminal_port_data)
+        return smatrix_data
+
     @pd.root_validator(pre=False)
     def _warn_rf_license(cls, values):
         log.warning(
@@ -164,7 +167,7 @@ def get_antenna_metrics_data(
         # Retrieve associated simulation data
         combined_directivity_data = None
         for port, amplitude in port_dict.items():
-            sim_data_port = self.port_simulation_data.data[port]
+            sim_data_port = self.data.data[port]
             radiation_data = sim_data_port[rad_mon.name]
 
             a, b = compute_power_wave_amplitudes_at_each_port(

tidy3d/plugins/smatrix/local_run.py

@@ -13,7 +13,6 @@
 from tidy3d.plugins.smatrix.component_modelers.terminal import TerminalComponentModeler
 from tidy3d.plugins.smatrix.data.data import (
     MicrowavePortSimulationData,
-    MicrowaveSMatrixData,
     TerminalComponentModelerData,
 )
 from tidy3d.plugins.smatrix.data.data_array import PortDataArray, TerminalPortDataArray
@@ -57,16 +56,12 @@ def run(
         # TODO Remove once fully decoupled simulation from batch_data
         batch_data = simulation.batch_data
 
-    terminal_port_data = construct_smatrix(simulation=simulation, batch_data=batch_data)
-
     port_to_sim_data_map = {
         port_i: batch_data[simulation._task_name(port=port_i)] for port_i in simulation.ports
     }
+
     port_simulation_data = MicrowavePortSimulationData(data=port_to_sim_data_map)
-    smatrix_data = MicrowaveSMatrixData(data=terminal_port_data)
-    return TerminalComponentModelerData(
-        simulation=simulation, smatrix_data=smatrix_data, port_simulation_data=port_simulation_data
-    )
+    return TerminalComponentModelerData(simulation=simulation, data=port_simulation_data)
 
 
 def construct_smatrix(