Remove compose_modeler in favor of Tidy3dBaseModel.from_file

Author: momchil-flex

tests/test_plugins/smatrix/test_run_functions.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import json
 from unittest.mock import MagicMock
 
 import pydantic.v1 as pd
@@ -14,38 +13,15 @@
     make_component_modeler as make_modal_component_modeler,
 )
 from tidy3d import SimulationDataMap
-from tidy3d.components.base import Tidy3dBaseModel
 from tidy3d.components.data.sim_data import SimulationData
 from tidy3d.plugins.smatrix.data.terminal import TerminalComponentModelerData
 from tidy3d.plugins.smatrix.run import (
     _run_local,
-    compose_modeler,
     compose_modeler_data,
     create_batch,
 )
 
 
-def test_compose_modeler_unsupported_type(tmp_path, monkeypatch):
-    # Create a dummy HDF5 file path
-    modeler_file = tmp_path / "dummy_modeler.hdf5"
-
-    # Prepare a dummy JSON string with an unsupported type
-    dummy_json = {"type": "UnsupportedComponentModeler", "some_key": "some_value"}
-    dummy_json_str = json.dumps(dummy_json)
-
-    # Mock Tidy3dBaseModel._json_string_from_hdf5 to return our dummy JSON string
-    def mock_json_string_from_hdf5(filepath):
-        if filepath == str(modeler_file):
-            return dummy_json_str
-        return ""
-
-    monkeypatch.setattr(Tidy3dBaseModel, "_json_string_from_hdf5", mock_json_string_from_hdf5)
-
-    # Expect a TypeError when calling compose_modeler with the unsupported type
-    with pytest.raises(TypeError, match="Unsupported modeler type: str"):
-        compose_modeler(modeler_file=str(modeler_file))
-
-
 def test_create_batch(monkeypatch, tmp_path):
     # Mock Batch and Batch.to_file
     mock_batch_instance = MagicMock()

tidy3d/__init__.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+from tidy3d.components.base import Tidy3dBaseModel
 from tidy3d.components.boundary import BroadbandModeABCFitterParam, BroadbandModeABCSpec
 from tidy3d.components.data.index import SimulationDataMap
 from tidy3d.components.frequency_extrapolation import LowFrequencySmoothingSpec
@@ -812,6 +813,7 @@ def set_logging_level(level: str) -> None:
     "TemperatureData",
     "TemperatureMonitor",
     "TetrahedralGridDataset",
+    "Tidy3dBaseModel",
     "Transformed",
     "TriangleMesh",
     "TriangularGridDataset",

tidy3d/plugins/smatrix/run.py

@@ -1,10 +1,7 @@
 from __future__ import annotations
 
-import json
-from os import PathLike
 from typing import Any
 
-from tidy3d.components.base import Tidy3dBaseModel
 from tidy3d.components.data.index import SimulationDataMap
 from tidy3d.log import log
 from tidy3d.plugins.smatrix.component_modelers.modal import ModalComponentModeler
@@ -18,43 +15,6 @@
 DEFAULT_DATA_DIR = "."
 
 
-def compose_modeler(
-    modeler_file: PathLike,
-) -> ComponentModelerType:
-    """Load a component modeler from an HDF5 file.
-
-    This function reads an HDF5 file, determines the modeler type
-    (`ModalComponentModeler` or `TerminalComponentModeler`), and constructs the
-    corresponding modeler object.
-
-    Parameters
-    ----------
-    modeler_file : PathLike
-        Path to the HDF5 file containing the modeler definition.
-
-    Returns
-    -------
-    ComponentModelerType
-        The loaded `ModalComponentModeler` or `TerminalComponentModeler` object.
-
-    Raises
-    ------
-    TypeError
-        If the modeler type specified in the file is not supported.
-    """
-    json_str = Tidy3dBaseModel._json_string_from_hdf5(modeler_file)
-    model_dict = json.loads(json_str)
-    modeler_type = model_dict["type"]
-
-    if modeler_type == "ModalComponentModeler":
-        modeler = ModalComponentModeler.from_file(modeler_file)
-    elif modeler_type == "TerminalComponentModeler":
-        modeler = TerminalComponentModeler.from_file(modeler_file)
-    else:
-        raise TypeError(f"Unsupported modeler type: {type(modeler_type).__name__}")
-    return modeler
-
-
 def compose_modeler_data(
     modeler: ModalComponentModeler | TerminalComponentModeler,
     indexed_sim_data: SimulationDataMap,