GEOPY-1966: Additional cleanups from the GEOPY-1966 PR

simpeg_drivers/components/locations.py

@@ -17,11 +17,7 @@
 if TYPE_CHECKING:
     from geoh5py.workspace import Workspace
 
-    from simpeg_drivers.params import (
-        BaseForwardOptions,
-        BaseInversionOptions,
-        InversionBaseParams,
-    )
+    from simpeg_drivers.params import BaseForwardOptions, BaseInversionOptions
 
 import numpy as np
 from geoh5py.objects import ObjectBase, Points
@@ -54,16 +50,14 @@ class InversionLocations:
     def __init__(
         self,
         workspace: Workspace,
-        params: InversionBaseParams | BaseForwardOptions | BaseInversionOptions,
+        params: BaseForwardOptions | BaseInversionOptions,
     ):
         """
         :param workspace: Geoh5py workspace object containing location based data.
         :param params: Options object containing location based data parameters.
         """
         self.workspace = workspace
-        self._params: (
-            InversionBaseParams | BaseForwardOptions | BaseInversionOptions
-        ) = params
+        self._params: BaseForwardOptions | BaseInversionOptions = params
         self.mask: np.ndarray | None = None
         self.locations: np.ndarray | None = None
 

simpeg_drivers/components/meshes.py

@@ -23,11 +23,7 @@
 from octree_creation_app.params import OctreeParams
 from octree_creation_app.utils import octree_2_treemesh, treemesh_2_octree
 
-from simpeg_drivers.params import (
-    BaseForwardOptions,
-    BaseInversionOptions,
-    InversionBaseParams,
-)
+from simpeg_drivers.params import BaseForwardOptions, BaseInversionOptions
 from simpeg_drivers.utils.meshes import auto_mesh_parameters
 from simpeg_drivers.utils.utils import drape_2_tensor
 
@@ -81,7 +77,7 @@ class InversionMesh:
     def __init__(
         self,
         workspace: Workspace,
-        params: InversionBaseParams | BaseForwardOptions | BaseInversionOptions,
+        params: BaseForwardOptions | BaseInversionOptions,
     ) -> None:
         """
         :param workspace: Workspace object containing mesh data.

simpeg_drivers/driver.py

@@ -55,7 +55,6 @@
 )
 from simpeg_drivers.components.factories import DirectivesFactory, MisfitFactory
 from simpeg_drivers.params import (
-    InversionBaseParams,
     BaseForwardOptions,
     BaseInversionOptions,
 )
@@ -66,13 +65,11 @@
 
 
 class InversionDriver(BaseDriver):
-    _params_class = InversionBaseParams | BaseForwardOptions | BaseInversionOptions  # pylint: disable=E0601
+    _params_class = BaseForwardOptions | BaseInversionOptions
     _inversion_type: str | None = None
     _validations = None
 
-    def __init__(
-        self, params: InversionBaseParams | BaseForwardOptions | BaseInversionOptions
-    ):
+    def __init__(self, params: BaseForwardOptions | BaseInversionOptions):
         super().__init__(params)
 
         self.inversion_type = self.params.inversion_type
@@ -285,29 +282,25 @@ def out_group(self):
         return self._out_group
 
     @property
-    def params(self) -> InversionBaseParams | BaseForwardOptions | BaseInversionOptions:
+    def params(self) -> BaseForwardOptions | BaseInversionOptions:
         """Application parameters."""
         return self._params
 
     @params.setter
     def params(
         self,
-        val: BaseForwardOptions
-        | BaseInversionOptions
-        | InversionBaseParams
-        | SweepParams,
+        val: BaseForwardOptions | BaseInversionOptions | SweepParams,
     ):
         if not isinstance(
             val,
             (
                 BaseForwardOptions,
                 BaseInversionOptions,
-                InversionBaseParams,
                 SweepParams,
             ),
         ):
             raise TypeError(
-                "Parameters must be of type 'InversionBaseParams' or 'SweepParams'."
+                "Parameters must be of type 'BaseInversionOptions', 'BaseForwardOptions' or 'SweepParams'."
             )
         self._params = val
 

simpeg_drivers/joint/joint_cross_gradient/params.py

@@ -14,7 +14,6 @@
 from pathlib import Path
 from typing import ClassVar
 
-from geoh5py.data import FloatData
 from geoh5py.objects import Octree
 
 from simpeg_drivers import assets_path