📡 RF modular restructure v1

pyproject.toml

@@ -178,6 +178,16 @@ dev = [
   'cma',
   'diff-cover'
 ]
+tests-only = [
+  'pytest',
+  'pytest-timeout',
+  'pytest-xdist',
+  'pytest-env',
+  'pytest-cov', 
+  'psutil',
+  'ruff',
+  'diff-cover'
+]
 docs = [
   "jupyter",
   "jinja2",

tests/test_plugins/smatrix/test_terminal_component_modeler.py

@@ -8,6 +8,7 @@
 
 import tidy3d as td
 from tidy3d.components.data.data_array import FreqDataArray
+from tidy3d.components.microwave.ports.base_lumped import AbstractLumpedPort
 from tidy3d.exceptions import SetupError, Tidy3dError, Tidy3dKeyError
 from tidy3d.plugins.microwave import (
     CurrentIntegralAxisAligned,
@@ -23,7 +24,6 @@
     TerminalPortDataArray,
     WavePort,
 )
-from tidy3d.plugins.smatrix.ports.base_lumped import AbstractLumpedPort
 
 from ...utils import run_emulated
 from .terminal_component_modeler_def import make_coaxial_component_modeler, make_component_modeler

tidy3d/microwave/__init__.py

@@ -0,0 +1,26 @@
+"""Imports from microwave plugin."""
+
+from __future__ import annotations
+
+from tidy3d.components.microwave import models
+from tidy3d.components.microwave.array_factor import (
+    RectangularAntennaArrayCalculator,
+)
+from tidy3d.microwave.lobe_measurer import LobeMeasurer
+
+__all__ = [
+    "AxisAlignedPathIntegral",
+    "CurrentIntegralAxisAligned",
+    "CurrentIntegralTypes",
+    "CustomCurrentIntegral2D",
+    "CustomPathIntegral2D",
+    "CustomVoltageIntegral2D",
+    "ImpedanceCalculator",
+    "LobeMeasurer",
+    "RectangularAntennaArrayCalculator",
+    "VoltageIntegralAxisAligned",
+    "VoltageIntegralTypes",
+    "models",
+    "path_integrals_from_lumped_element",
+    "rf_material_library",
+]

tidy3d/plugins/smatrix/component_modelers/base.py → tidy3d/microwave/component_modelers/base.py

@@ -12,21 +12,21 @@
 from tidy3d.components.base import Tidy3dBaseModel, cached_property
 from tidy3d.components.data.data_array import DataArray
 from tidy3d.components.data.sim_data import SimulationData
+from tidy3d.components.microwave.ports.coaxial_lumped import CoaxialLumpedPort
+from tidy3d.components.microwave.ports.modal import Port
+from tidy3d.components.microwave.ports.rectangular_lumped import LumpedPort
+from tidy3d.components.microwave.ports.wave import WavePort
 from tidy3d.components.simulation import Simulation
 from tidy3d.components.types import FreqArray
 from tidy3d.config import config
 from tidy3d.constants import HERTZ
 from tidy3d.exceptions import SetupError, Tidy3dKeyError
 from tidy3d.log import log
-from tidy3d.plugins.smatrix.ports.coaxial_lumped import CoaxialLumpedPort
-from tidy3d.plugins.smatrix.ports.modal import Port
-from tidy3d.plugins.smatrix.ports.rectangular_lumped import LumpedPort
-from tidy3d.plugins.smatrix.ports.wave import WavePort
 from tidy3d.web.api.container import Batch, BatchData
 
 # fwidth of gaussian pulse in units of central frequency
 FWIDTH_FRAC = 1.0 / 10
-DEFAULT_DATA_DIR = "."
+DEFAULT_DATA_DIR = ""
 
 LumpedPortType = Union[LumpedPort, CoaxialLumpedPort]
 TerminalPortType = Union[LumpedPortType, WavePort]

tidy3d/plugins/smatrix/component_modelers/modal.py → tidy3d/microwave/component_modelers/modal.py

@@ -11,14 +11,14 @@
 
 from tidy3d.components.base import cached_property
 from tidy3d.components.data.sim_data import SimulationData
+from tidy3d.components.microwave.ports.modal import ModalPortDataArray, Port
 from tidy3d.components.monitor import ModeMonitor
 from tidy3d.components.simulation import Simulation
 from tidy3d.components.source.field import ModeSource
 from tidy3d.components.source.time import GaussianPulse
 from tidy3d.components.types import Ax, Complex
 from tidy3d.components.viz import add_ax_if_none, equal_aspect
 from tidy3d.exceptions import SetupError
-from tidy3d.plugins.smatrix.ports.modal import ModalPortDataArray, Port
 from tidy3d.web.api.container import BatchData
 
 from .base import FWIDTH_FRAC, AbstractComponentModeler

tidy3d/plugins/smatrix/component_modelers/terminal.py → tidy3d/microwave/component_modelers/terminal.py

@@ -13,6 +13,11 @@
 from tidy3d.components.data.sim_data import SimulationData
 from tidy3d.components.geometry.utils_2d import snap_coordinate_to_grid
 from tidy3d.components.microwave.data.monitor_data import AntennaMetricsData
+from tidy3d.components.microwave.data.terminal import PortDataArray, TerminalPortDataArray
+from tidy3d.components.microwave.ports.base_lumped import AbstractLumpedPort
+from tidy3d.components.microwave.ports.coaxial_lumped import CoaxialLumpedPort
+from tidy3d.components.microwave.ports.rectangular_lumped import LumpedPort
+from tidy3d.components.microwave.ports.wave import WavePort
 from tidy3d.components.monitor import DirectivityMonitor
 from tidy3d.components.simulation import Simulation
 from tidy3d.components.source.time import GaussianPulse
@@ -21,11 +26,6 @@
 from tidy3d.constants import C_0, OHM
 from tidy3d.exceptions import SetupError, Tidy3dError, Tidy3dKeyError, ValidationError
 from tidy3d.log import log
-from tidy3d.plugins.smatrix.data.terminal import PortDataArray, TerminalPortDataArray
-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
-from tidy3d.plugins.smatrix.ports.wave import WavePort
 from tidy3d.web.api.container import BatchData
 
 from .base import AbstractComponentModeler, TerminalPortType

tidy3d/plugins/smatrix/ports/coaxial_lumped.py → tidy3d/microwave/ports/coaxial_lumped.py

@@ -15,6 +15,7 @@
 from tidy3d.components.geometry.utils_2d import increment_float
 from tidy3d.components.grid.grid import Grid, YeeGrid
 from tidy3d.components.lumped_element import CoaxialLumpedResistor
+from tidy3d.components.microwave.path_integrals import AbstractAxesRH
 from tidy3d.components.monitor import FieldMonitor
 from tidy3d.components.source.current import CustomCurrentSource
 from tidy3d.components.source.time import GaussianPulse
@@ -23,7 +24,6 @@
 from tidy3d.constants import MICROMETER
 from tidy3d.exceptions import SetupError, ValidationError
 from tidy3d.plugins.microwave import CustomCurrentIntegral2D, VoltageIntegralAxisAligned
-from tidy3d.plugins.microwave.path_integrals import AbstractAxesRH
 
 from .base_lumped import AbstractLumpedPort
 

tidy3d/plugins/microwave/__init__.py

@@ -2,24 +2,28 @@
 
 from __future__ import annotations
 
-from . import models
-from .array_factor import (
+from tidy3d.components.microwave import models
+from tidy3d.components.microwave.array_factor import (
     RectangularAntennaArrayCalculator,
 )
-from .auto_path_integrals import path_integrals_from_lumped_element
-from .custom_path_integrals import (
+from tidy3d.components.microwave.auto_path_integrals import path_integrals_from_lumped_element
+from tidy3d.components.microwave.custom_path_integrals import (
     CustomCurrentIntegral2D,
     CustomPathIntegral2D,
     CustomVoltageIntegral2D,
 )
-from .impedance_calculator import CurrentIntegralTypes, ImpedanceCalculator, VoltageIntegralTypes
-from .lobe_measurer import LobeMeasurer
-from .path_integrals import (
+from tidy3d.components.microwave.impedance_calculator import (
+    CurrentIntegralTypes,
+    ImpedanceCalculator,
+    VoltageIntegralTypes,
+)
+from tidy3d.components.microwave.path_integrals import (
     AxisAlignedPathIntegral,
     CurrentIntegralAxisAligned,
     VoltageIntegralAxisAligned,
 )
-from .rf_material_library import rf_material_library
+from tidy3d.components.microwave.rf_material_library import rf_material_library
+from tidy3d.microwave.lobe_measurer import LobeMeasurer
 
 __all__ = [
     "AxisAlignedPathIntegral",

tidy3d/plugins/smatrix/__init__.py

@@ -4,13 +4,17 @@
 
 import warnings
 
-from .component_modelers.modal import AbstractComponentModeler, ComponentModeler, ModalPortDataArray
-from .component_modelers.terminal import TerminalComponentModeler
-from .data.terminal import PortDataArray, TerminalPortDataArray
-from .ports.coaxial_lumped import CoaxialLumpedPort
-from .ports.modal import Port
-from .ports.rectangular_lumped import LumpedPort
-from .ports.wave import WavePort
+from tidy3d.components.microwave.component_modelers.modal import (
+    AbstractComponentModeler,
+    ComponentModeler,
+    ModalPortDataArray,
+)
+from tidy3d.components.microwave.component_modelers.terminal import TerminalComponentModeler
+from tidy3d.components.microwave.data.terminal import PortDataArray, TerminalPortDataArray
+from tidy3d.components.microwave.ports.coaxial_lumped import CoaxialLumpedPort
+from tidy3d.components.microwave.ports.modal import Port
+from tidy3d.components.microwave.ports.rectangular_lumped import LumpedPort
+from tidy3d.components.microwave.ports.wave import WavePort
 
 # Instantiate on plugin import till we unite with toplevel
 warnings.filterwarnings(

tidy3d/plugins/smatrix/smatrix.py

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