Avoid rename for diff

Author: daquinteroflex

tidy3d/plugins/smatrix/__init__.py

@@ -4,10 +4,13 @@
 
 import warnings
 
+from tidy3d.plugins.smatrix.component_modelers.modal import (
+    AbstractComponentModeler,
+    ComponentModeler,
+)
+from tidy3d.plugins.smatrix.component_modelers.terminal import TerminalComponentModeler
 from tidy3d.plugins.smatrix.data.data import ComponentModelerData, TerminalComponentModelerData
 from tidy3d.plugins.smatrix.data.data_array import PortDataArray, TerminalPortDataArray
-from tidy3d.plugins.smatrix.modelers.modal import AbstractComponentModeler, ComponentModeler
-from tidy3d.plugins.smatrix.modelers.terminal import TerminalComponentModeler
 from tidy3d.plugins.smatrix.ports.coaxial_lumped import CoaxialLumpedPort
 from tidy3d.plugins.smatrix.ports.modal import ModalPortDataArray, Port
 from tidy3d.plugins.smatrix.ports.rectangular_lumped import LumpedPort

tidy3d/plugins/smatrix/modelers/__init__.py renamed to tidy3d/plugins/smatrix/component_modelers/__init__.py

@@ -17,11 +17,11 @@
 from tidy3d.constants import C_0, OHM
 from tidy3d.exceptions import SetupError, Tidy3dKeyError, ValidationError
 from tidy3d.log import log
-from tidy3d.plugins.smatrix.data.data_array import PortDataArray
-from tidy3d.plugins.smatrix.modelers.base import (
+from tidy3d.plugins.smatrix.component_modelers.base import (
     AbstractComponentModeler,
     TerminalPortType,
 )
+from tidy3d.plugins.smatrix.data.data_array import PortDataArray
 from tidy3d.plugins.smatrix.ports.base_lumped import AbstractLumpedPort
 from tidy3d.plugins.smatrix.ports.coaxial_lumped import CoaxialLumpedPort
 from tidy3d.plugins.smatrix.ports.rectangular_lumped import LumpedPort

tidy3d/plugins/smatrix/modelers/base.py renamed to tidy3d/plugins/smatrix/component_modelers/base.py

@@ -13,9 +13,9 @@
 from tidy3d.components.data.sim_data import SimulationData
 from tidy3d.components.microwave.data.monitor_data import AntennaMetricsData
 from tidy3d.log import log
+from tidy3d.plugins.smatrix.component_modelers.base import TerminalPortType
+from tidy3d.plugins.smatrix.component_modelers.terminal import TerminalComponentModeler
 from tidy3d.plugins.smatrix.data.data_array import PortDataArray, TerminalPortDataArray
-from tidy3d.plugins.smatrix.modelers.base import TerminalPortType
-from tidy3d.plugins.smatrix.modelers.terminal import TerminalComponentModeler
 
 
 class MicrowavePortSimulationData(Tidy3dBaseModel):

tidy3d/plugins/smatrix/modelers/modal.py renamed to tidy3d/plugins/smatrix/component_modelers/modal.py

@@ -7,15 +7,15 @@
 import numpy as np
 
 from tidy3d.components.data.sim_data import SimulationData
+from tidy3d.plugins.smatrix.component_modelers.base import (
+    DEFAULT_DATA_DIR,
+)
+from tidy3d.plugins.smatrix.component_modelers.terminal import TerminalComponentModeler
 from tidy3d.plugins.smatrix.data.data import (
     MicrowavePortSimulationData,
     TerminalComponentModelerData,
 )
 from tidy3d.plugins.smatrix.data.data_array import PortDataArray, TerminalPortDataArray
-from tidy3d.plugins.smatrix.modelers.base import (
-    DEFAULT_DATA_DIR,
-)
-from tidy3d.plugins.smatrix.modelers.terminal import TerminalComponentModeler
 from tidy3d.plugins.smatrix.ports.wave import WavePort
 from tidy3d.plugins.smatrix.utils import check_port_impedance_sign, compute_F, compute_port_VI
 from tidy3d.web import BatchData

tidy3d/plugins/smatrix/modelers/terminal.py renamed to tidy3d/plugins/smatrix/component_modelers/terminal.py

@@ -1,7 +1,7 @@
 # backwards compatibility support for ``from tidy3d.plugins.smatrix.smatrix import ``
 from __future__ import annotations
 
-from .modelers.modal import ComponentModeler
+from .component_modelers.modal import ComponentModeler
 from .ports.modal import Port
 
 __all__ = ["ComponentModeler", "Port"]

tidy3d/plugins/smatrix/data/data.py

@@ -7,11 +7,11 @@
 from tidy3d.components.data.data_array import DataArray, FreqDataArray
 from tidy3d.components.data.sim_data import SimulationData
 from tidy3d.exceptions import Tidy3dError
-from tidy3d.plugins.smatrix.data.data_array import PortDataArray, TerminalPortDataArray
-from tidy3d.plugins.smatrix.modelers.base import (
+from tidy3d.plugins.smatrix.component_modelers.base import (
     AbstractComponentModeler,
     TerminalPortType,
 )
+from tidy3d.plugins.smatrix.data.data_array import PortDataArray, TerminalPortDataArray
 from tidy3d.plugins.smatrix.ports.coaxial_lumped import CoaxialLumpedPort
 from tidy3d.plugins.smatrix.ports.rectangular_lumped import LumpedPort