Passing local tests

Author: daquinteroflex

tests/test_plugins/smatrix/test_component_modeler.py

@@ -8,7 +8,8 @@
 
 import tidy3d as td
 from tidy3d.exceptions import SetupError, Tidy3dKeyError
-from tidy3d.plugins.smatrix import ComponentModeler, ComponentModelerData, Port, IndexSimulationData
+from tidy3d import IndexSimulationData
+from tidy3d.plugins.smatrix import ComponentModeler, ComponentModelerData, Port
 from tidy3d.web.api.container import Batch
 
 from ...utils import run_emulated

tests/test_plugins/smatrix/test_terminal_component_modeler.py

@@ -15,12 +15,12 @@
     CustomCurrentIntegral2D,
     VoltageIntegralAxisAligned,
 )
+from tidy3d import IndexSimulationData
 from tidy3d.plugins.smatrix import (
     AbstractComponentModeler,
     CoaxialLumpedPort,
     LumpedPort,
     PortDataArray,
-    IndexSimulationData,
     TerminalComponentModeler,
     TerminalComponentModelerData,
     TerminalPortDataArray,

tidy3d/__init__.py

@@ -35,6 +35,8 @@
     HeatSimulationData,
     VolumeMesherData,
 )
+from tidy3d.components.index import IndexSimulation
+from tidy3d.components.data.index import IndexSimulationData
 from tidy3d.components.tcad.data.types import (
     SteadyCapacitanceData,
     SteadyElectricFieldData,
@@ -570,6 +572,8 @@ def set_logging_level(level: str) -> None:
     "HeatSource",
     "HeuristicPECStaircasing",
     "HuraySurfaceRoughness",
+    "IndexSimulation",
+    "IndexSimulationData",
     "IndexPerturbation",
     "IndexedDataArray",
     "IndexedFieldVoltageDataArray",

tidy3d/components/data/index.py

@@ -1,5 +1,8 @@
-from tidy3d.components.simulaton_types import SimulationDataType
+from __future__ import annotations
+
 from tidy3d.components.base import Tidy3dBaseModel
+from tidy3d.components.simulaton_types import SimulationDataType
+
 
 class IndexSimulationData(Tidy3dBaseModel):
     index: tuple[str, ...]
@@ -21,4 +24,4 @@ def __getitem__(self, index: str) -> SimulationDataType:
         for i, index_i in enumerate(self.index):
             if index_i == index:
                 return self.data[i]
-        raise KeyError(f"Index '{index}' not found.")
+        raise KeyError(f"Index '{index}' not found.")

tidy3d/components/index.py

@@ -1,5 +1,8 @@
-from tidy3d.components.simulaton_types import SimulationType
+from __future__ import annotations
+
 from tidy3d.components.base import Tidy3dBaseModel
+from tidy3d.components.simulaton_types import SimulationType
+
 
 class IndexSimulation(Tidy3dBaseModel):
     index: tuple[str, ...]
@@ -22,5 +25,3 @@ def __getitem__(self, index: str) -> SimulationType:
             if index_i == index:
                 return self.simulation[i]
         raise KeyError(f"Index '{index}' not found.")
-
-

tidy3d/components/simulaton_types.py

@@ -1,14 +1,7 @@
-
 from __future__ import annotations
 
-import json
-from typing import Callable, Optional, Union
-
-import pydantic.v1 as pd
-from pydantic.v1 import BaseModel
+from typing import Union
 
-from tidy3d import log
-from tidy3d.components.base import _get_valid_extension
 from tidy3d.components.data.monitor_data import ModeSolverData
 from tidy3d.components.data.sim_data import SimulationData
 from tidy3d.components.eme.data.sim_data import EMESimulationData
@@ -19,19 +12,11 @@
 from tidy3d.components.tcad.data.sim_data import (
     HeatChargeSimulationData,
     HeatSimulationData,
-    VolumeMesherData,
 )
 from tidy3d.components.tcad.mesher import VolumeMesher
 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.web.core.file_util import (
-    read_simulation_from_hdf5,
-    read_simulation_from_hdf5_gz,
-    read_simulation_from_json,
-)
-from tidy3d.web.core.stub import TaskStub, TaskStubData
-from tidy3d.web.core.types import TaskType
 
 SimulationType = Union[
     Simulation,
@@ -50,4 +35,3 @@
     ModeSolverData,
     ModeSimulationData,
 ]
-

tidy3d/plugins/smatrix/__init__.py

@@ -38,8 +38,8 @@
     "ComponentModeler",
     "ComponentModelerData",
     "ComponentModelerDataLumpedPort",
-    "ComponentModelerType",
     "ComponentModelerDataType",
+    "ComponentModelerType",
     "LumpedPort",
     "MicrowaveSMatrixData",
     "ModalPortDataArray",

tidy3d/plugins/smatrix/data/modal.py

@@ -5,12 +5,9 @@
 import pydantic.v1 as pd
 
 from tidy3d.components.base import Tidy3dBaseModel, cached_property
-from tidy3d.components.data.sim_data import SimulationData
 from tidy3d.components.data.index import IndexSimulationData
 from tidy3d.plugins.smatrix.component_modelers.modal import ComponentModeler
 from tidy3d.plugins.smatrix.data.data_array import ModalPortDataArray
-from tidy3d.plugins.smatrix.ports.types import PortReferenceType
-
 
 
 class ComponentModelerData(Tidy3dBaseModel):

tidy3d/plugins/smatrix/run.py

@@ -50,7 +50,12 @@ def create_batch(
     else:
         group_id_dict = None
 
-    batch = Batch(simulations=modeler.sim_dict, parent_tasks=parent_task_dict, group_ids=group_id_dict, **kwargs)
+    batch = Batch(
+        simulations=modeler.sim_dict,
+        parent_tasks=parent_task_dict,
+        group_ids=group_id_dict,
+        **kwargs,
+    )
     batch.to_file(filepath)
     return batch
 

tidy3d/plugins/smatrix/web/api/mode.py

@@ -21,13 +21,13 @@
 from tidy3d.exceptions import SetupError, WebError
 from tidy3d.log import get_logging_console, log
 from tidy3d.plugins.mode.mode_solver import MODE_MONITOR_NAME, ModeSolver
-from tidy3d.version import __version__
 from tidy3d.plugins.smatrix.web.core.core_config import get_logger_console
 from tidy3d.plugins.smatrix.web.core.environment import Env
 from tidy3d.plugins.smatrix.web.core.http_util import http
 from tidy3d.plugins.smatrix.web.core.s3utils import download_file, download_gz_file, upload_file
 from tidy3d.plugins.smatrix.web.core.task_core import Folder
 from tidy3d.plugins.smatrix.web.core.types import PayType, ResourceLifecycle, Submittable
+from tidy3d.version import __version__
 
 SIMULATION_JSON = "simulation.json"
 SIM_FILE_HDF5_GZ = "simulation.hdf5.gz"