Remove circular

Author: daquinteroflex

tests/test_plugins/smatrix/test_component_modeler.py

@@ -409,7 +409,7 @@ def test_to_from_file_batch(tmp_path, monkeypatch):
     modeler2 = modeler.from_file(fname)
 
     # BREAK this test because it introduces mutability which shouldn't exist
-    # assert modeler2.batch_cached == modeler2.batch == batch
+    assert modeler2.batch_cached == modeler2.batch == batch
 
 
 def test_non_default_path_dir(monkeypatch):

tidy3d/plugins/smatrix/component_modelers/base.py

@@ -105,7 +105,7 @@ class AbstractComponentModeler(ABC, Tidy3dBaseModel):
     )
 
     # TODO properly refactor, plugins should not have web methods.
-    batch_cached: BatchData = pd.Field(
+    batch_cached: Batch = pd.Field(
         None,
         title="Batch (Cached)",
         description="DEPRECATED: Optional field to specify ``batch``. Only used as a workaround internally "

tidy3d/web/api/tidy3d_stub.py

@@ -26,7 +26,6 @@
 from tidy3d.components.tcad.simulation.heat import HeatSimulation
 from tidy3d.components.tcad.simulation.heat_charge import HeatChargeSimulation
 from tidy3d.plugins.mode.mode_solver import ModeSolver
-from tidy3d.plugins.smatrix import TerminalComponentModeler
 from tidy3d.web.core.file_util import (
     read_simulation_from_hdf5,
     read_simulation_from_hdf5_gz,
@@ -43,7 +42,6 @@
     ModeSolver,
     ModeSimulation,
     VolumeMesher,
-    TerminalComponentModeler,
 ]
 SimulationDataType = Union[
     SimulationData,
@@ -102,9 +100,6 @@ def from_file(cls, file_path: str) -> SimulationType:
             sim = ModeSimulation.from_file(file_path)
         elif type_ == "VolumeMesher":
             sim = VolumeMesher.from_file(file_path)
-        elif type_ == "TerminalComponentModeler":
-            # TODO Remove: An aberration this is here, but alas necessity.
-            sim = TerminalComponentModeler.from_file(file_path)
 
         return sim
 
@@ -167,8 +162,6 @@ def get_type(self) -> str:
             return TaskType.MODE.name
         elif isinstance(self.simulation, VolumeMesher):
             return TaskType.VOLUME_MESH.name
-        if isinstance(self.simulation, TerminalComponentModeler):
-            return TaskType.TERMINAL_COMPONENT_MODELER.name
 
     def validate_pre_upload(self, source_required) -> None:
         """Perform some pre-checks on instances of component"""

tidy3d/web/core/types.py

@@ -55,7 +55,6 @@ class TaskType(str, Enum):
     EME = "EME"
     MODE = "MODE"
     VOLUME_MESH = "VOLUME_MESH"
-    TERMINAL_COMPONENT_MODELER = "TERMINAL_COMPONENT_MODELER"
 
 
 class PayType(str, Enum):