Revert "Reorganise based on feedback"

This reverts commit 6aeb51e.

Author: daquinteroflex

tests/test_components/test_types.py

@@ -7,7 +7,7 @@
 import pytest
 
 from tidy3d.components.base import Tidy3dBaseModel
-from tidy3d.components.types import ArrayLike, Complex, constrained_array
+from tidy3d.components.types.base import ArrayLike, Complex, constrained_array
 
 
 def _test_validate_array_like():

tidy3d/components/apodization.py

@@ -5,7 +5,7 @@
 import numpy as np
 import pydantic.v1 as pd
 
-from tidy3d.components.types import ArrayFloat1D, Ax
+from tidy3d.components.types.base import ArrayFloat1D, Ax
 from tidy3d.constants import SECOND
 from tidy3d.exceptions import SetupError
 

tidy3d/components/autograd/derivative_utils.py

@@ -9,7 +9,7 @@
 import xarray as xr
 
 from tidy3d.components.data.data_array import FreqDataArray, ScalarFieldDataArray
-from tidy3d.components.types import ArrayLike, Bound, tidycomplex
+from tidy3d.components.types.base import ArrayLike, Bound, tidycomplex
 from tidy3d.constants import C_0, EPSILON_0, LARGE_NUMBER, MU_0
 from tidy3d.log import log
 

tidy3d/components/autograd/types.py

@@ -10,7 +10,8 @@
 from autograd.builtins import dict as dict_ag
 from autograd.extend import Box, defvjp, primitive
 
-from tidy3d.components.types import ArrayFloat2D, ArrayLike, Complex, Size1D, _add_schema
+from tidy3d.components.types.base import ArrayFloat2D, ArrayLike, Complex, Size1D
+from tidy3d.components.types.utils import _add_schema
 
 # add schema to the Box
 _add_schema(Box, title="AutogradBox", field_type_str="autograd.tracer.Box")

tidy3d/components/base.py

@@ -23,7 +23,7 @@
 from autograd.tracer import isbox
 from pydantic.v1.fields import ModelField
 
-from tidy3d.components.types import TYPE_TAG_STR, ComplexNumber, Literal
+from tidy3d.components.types.base import TYPE_TAG_STR, ComplexNumber, Literal
 from tidy3d.exceptions import FileError
 from tidy3d.log import log
 

tidy3d/components/base_sim/data/sim_data.py

@@ -14,7 +14,7 @@
 from tidy3d.components.base_sim.simulation import AbstractSimulation
 from tidy3d.components.data.utils import UnstructuredGridDatasetType
 from tidy3d.components.monitor import AbstractMonitor
-from tidy3d.components.types import FieldVal
+from tidy3d.components.types.base import FieldVal
 from tidy3d.exceptions import DataError, Tidy3dKeyError, ValidationError
 
 

tidy3d/components/base_sim/monitor.py

@@ -9,7 +9,7 @@
 
 from tidy3d.components.base import cached_property
 from tidy3d.components.geometry.base import Box
-from tidy3d.components.types import ArrayFloat1D, Axis, Numpy
+from tidy3d.components.types.base import ArrayFloat1D, Axis, Numpy
 from tidy3d.components.validators import _warn_unsupported_traced_argument
 from tidy3d.components.viz import PlotParams, plot_params_monitor
 

tidy3d/components/base_sim/simulation.py

@@ -13,7 +13,7 @@
 from tidy3d.components.medium import Medium, MediumType3D
 from tidy3d.components.scene import Scene
 from tidy3d.components.structure import Structure
-from tidy3d.components.types import (
+from tidy3d.components.types.base import (
     TYPE_TAG_STR,
     Ax,
     Axis,

tidy3d/components/bc_placement.py

@@ -7,7 +7,7 @@
 
 import pydantic.v1 as pd
 
-from tidy3d.components.types import BoxSurface
+from tidy3d.components.types.base import BoxSurface
 from tidy3d.exceptions import SetupError
 
 from .base import Tidy3dBaseModel

tidy3d/components/beam.py

@@ -9,7 +9,7 @@
 import autograd.numpy as np
 import pydantic.v1 as pd
 
-from tidy3d.components.types import TYPE_TAG_STR, Direction, FreqArray, Numpy
+from tidy3d.components.types.base import TYPE_TAG_STR, Direction, FreqArray, Numpy
 from tidy3d.constants import C_0, ETA_0, HERTZ, MICROMETER, RADIAN
 
 from .base import cached_property