From d70b26b7f7c341451e89a4f1ed00b535d47c5d42 Mon Sep 17 00:00:00 2001 From: domfournier Date: Mon, 13 Apr 2026 14:50:08 -0700 Subject: [PATCH 1/2] Add import in inits --- simpeg_drivers/__init__.py | 2 +- simpeg_drivers/joint/joint_cross_gradient/__init__.py | 3 +++ simpeg_drivers/joint/joint_petrophysics/__init__.py | 3 +++ simpeg_drivers/joint/joint_surveys/__init__.py | 3 +++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/simpeg_drivers/__init__.py b/simpeg_drivers/__init__.py index 5c015262..aeb8c67d 100644 --- a/simpeg_drivers/__init__.py +++ b/simpeg_drivers/__init__.py @@ -131,7 +131,7 @@ def assets_path() -> Path: ), "joint surveys": ( "simpeg_drivers.joint.joint_surveys", - {"inversion": "JointSurveyDriver"}, + {"inversion": "JointSurveysDriver"}, ), "magnetic scalar": ( "simpeg_drivers.potential_fields.magnetic_scalar", diff --git a/simpeg_drivers/joint/joint_cross_gradient/__init__.py b/simpeg_drivers/joint/joint_cross_gradient/__init__.py index df32b204..51b7e774 100644 --- a/simpeg_drivers/joint/joint_cross_gradient/__init__.py +++ b/simpeg_drivers/joint/joint_cross_gradient/__init__.py @@ -7,3 +7,6 @@ # (see LICENSE file at the root of this source code package). ' # ' # ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' + +from .driver import JointCrossGradientDriver +from .options import JointCrossGradientOptions diff --git a/simpeg_drivers/joint/joint_petrophysics/__init__.py b/simpeg_drivers/joint/joint_petrophysics/__init__.py index df32b204..4eee21f4 100644 --- a/simpeg_drivers/joint/joint_petrophysics/__init__.py +++ b/simpeg_drivers/joint/joint_petrophysics/__init__.py @@ -7,3 +7,6 @@ # (see LICENSE file at the root of this source code package). ' # ' # ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' + +from .driver import JointPetrophysicsDriver +from .options import JointPetrophysicsOptions diff --git a/simpeg_drivers/joint/joint_surveys/__init__.py b/simpeg_drivers/joint/joint_surveys/__init__.py index df32b204..782d0ab7 100644 --- a/simpeg_drivers/joint/joint_surveys/__init__.py +++ b/simpeg_drivers/joint/joint_surveys/__init__.py @@ -7,3 +7,6 @@ # (see LICENSE file at the root of this source code package). ' # ' # ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' + +from .driver import JointSurveysDriver +from .options import JointSurveysOptions From a19d09a318b0528988e5935b64ec6a017a57ad71 Mon Sep 17 00:00:00 2001 From: domfournier Date: Mon, 13 Apr 2026 14:51:11 -0700 Subject: [PATCH 2/2] Add unit test for legacy driver from "inversion_type" --- tests/uijson_test.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tests/uijson_test.py b/tests/uijson_test.py index ee99b003..2cfce2dd 100644 --- a/tests/uijson_test.py +++ b/tests/uijson_test.py @@ -16,6 +16,7 @@ import numpy as np import pytest from geoapps_utils.driver.data import BaseData +from geoapps_utils.run import load_ui_json_as_dict from geoh5py import Workspace from geoh5py.ui_json import InputFile from geoh5py.ui_json.annotations import Deprecated @@ -357,3 +358,11 @@ def test_legacy_uijson(tmp_path: Path, caplog): assert "The Batch2D classes will be deprecated" in caplog.text assert driver.models + + +def test_driver_from_uijson(): + path = Path(__file__).resolve().parent / "legacy/v0.2.1" + + for file in path.glob("*.ui.json"): + input_file = load_ui_json_as_dict(file) + assert from_input_file(input_file)