Merge branch 'release/0.3.0' into GEOPY-2193

Author: domfournier

.pre-commit-config.yaml

@@ -86,6 +86,7 @@ repos:
     -   id: mixed-line-ending
         exclude: ^\.idea/.*\.xml$
     -   id: name-tests-test
+        exclude: testing_utils.py
     -   id: pretty-format-json
         args:
             - --autofix

simpeg_drivers-assets/uijson/tdem_inversion.ui.json

@@ -315,6 +315,8 @@
         ],
         "label": "Gradient rotation",
         "parent": "mesh",
+        "optional": true,
+        "enabled": false,
         "value": ""
     },
     "s_norm": {

simpeg_drivers/components/factories/misfit_factory.py

@@ -79,7 +79,19 @@ def assemble_arguments(  # pylint: disable=arguments-differ
         for local_index in tiles:
             if len(local_index) == 0:
                 continue
-            local_mesh = None
+
+            local_sim, _, _, _ = self.create_nested_simulation(
+                inversion_data,
+                inversion_mesh,
+                None,
+                active_cells,
+                local_index,
+                channel=None,
+                tile_id=tile_count,
+                padding_cells=self.params.padding_cells,
+            )
+
+            local_mesh = getattr(local_sim, "mesh", None)
 
             for count, channel in enumerate(channels):
                 n_split = split_list[misfit_count]
@@ -97,8 +109,6 @@ def assemble_arguments(  # pylint: disable=arguments-differ
                         )
                     )
 
-                    local_mesh = getattr(local_sim, "mesh", None)
-
                     if count == 0:
                         if self.factory_type in [
                             "fdem",

simpeg_drivers/driver.py

@@ -612,30 +612,38 @@ def configure_dask(self):
             dconf.set(scheduler="threads", pool=ThreadPool(n_cpu))
 
     @classmethod
-    def start(cls, filepath: str | Path | InputFile):
+    def start(
+        cls, filepath: str | Path | InputFile, driver_class=None, **kwargs
+    ) -> InversionDriver:
+        """
+        Start the inversion driver.
+
+        :param filepath: Path to the input file or InputFile object.
+        :param driver_class: Optional driver class to use instead of the default.
+        :param kwargs: Additional keyword arguments for InputFile read_ui_json.
+
+        :return: InversionDriver instance with the specified parameters.
+        """
         if isinstance(filepath, InputFile):
             ifile = filepath
         else:
-            ifile = InputFile.read_ui_json(filepath)
+            ifile = InputFile.read_ui_json(filepath, **kwargs)
 
-        forward_only = ifile.data["forward_only"]
-        inversion_type = ifile.ui_json.get("inversion_type", None)
-
-        driver_class = cls.driver_class_from_name(
-            inversion_type, forward_only=forward_only
-        )
-
-        with ifile.data["geoh5"].open(mode="r+"):
-            params = driver_class._options_class.build(ifile)
-            driver = driver_class(params)
+        if driver_class is None:
+            driver = cls.from_input_file(ifile)
+        else:
+            with ifile.data["geoh5"].open(mode="r+"):
+                params = driver_class._options_class.build(ifile)
+                driver = driver_class(params)
 
         driver.run()
+
         return driver
 
     @staticmethod
     def driver_class_from_name(
         name: str, forward_only: bool = False
-    ) -> InversionDriver:
+    ) -> type[InversionDriver]:
         if name not in DRIVER_MAP:
             msg = f"Inversion type {name} is not supported."
             msg += f" Valid inversions are: {(*list(DRIVER_MAP),)}."
@@ -649,6 +657,26 @@ def driver_class_from_name(
         module = __import__(mod_name, fromlist=[class_name])
         return getattr(module, class_name)
 
+    @classmethod
+    def from_input_file(cls, ifile: InputFile) -> InversionDriver:
+        forward_only = ifile.data["forward_only"]
+        inversion_type = ifile.ui_json.get("inversion_type", None)
+        if inversion_type is None:
+            raise GeoAppsError(
+                "Key/value 'inversion_type' not found in the input file. "
+                "Please specify the inversion type in the UI JSON."
+            )
+
+        driver_class = cls.driver_class_from_name(
+            inversion_type, forward_only=forward_only
+        )
+
+        with ifile.data["geoh5"].open(mode="r+"):
+            params = driver_class._options_class.build(ifile)
+            driver = driver_class(params)
+
+        return driver
+
 
 class InversionLogger:
     def __init__(self, logfile, driver):

tests/data_test.py

@@ -29,7 +29,7 @@
 from simpeg_drivers.potential_fields.magnetic_vector.options import (
     MVIInversionOptions,
 )
-from simpeg_drivers.utils.testing import Geoh5Tester, setup_inversion_workspace
+from tests.testing_utils import Geoh5Tester, setup_inversion_workspace
 
 
 def get_mvi_params(tmp_path: Path, **kwargs) -> MVIInversionOptions:

tests/driver_test.py

@@ -15,7 +15,7 @@
 from simpeg_drivers.options import ActiveCellsOptions
 from simpeg_drivers.potential_fields import GravityInversionOptions
 from simpeg_drivers.potential_fields.gravity.driver import GravityInversionDriver
-from simpeg_drivers.utils.testing import setup_inversion_workspace
+from tests.testing_utils import setup_inversion_workspace
 
 
 def test_smallness_terms(tmp_path: Path):