Remove reference to TypeAlias

Author: domfournier

simpeg_drivers/electromagnetics/frequency_domain/options.py

@@ -13,7 +13,7 @@
 
 from logging import getLogger
 from pathlib import Path
-from typing import ClassVar, TypeAlias
+from typing import ClassVar
 
 from geoapps_utils.utils.importing import GeoAppsError
 from geoh5py.groups import PropertyGroup
@@ -22,7 +22,7 @@
     LargeLoopGroundFEMReceivers,
     MovingLoopGroundFEMReceivers,
 )
-from pydantic import AliasChoices, BaseModel, ConfigDict, Field, field_validator
+from pydantic import field_validator
 
 from simpeg_drivers import assets_path
 from simpeg_drivers.options import (
@@ -34,10 +34,6 @@
 )
 
 
-Receivers: TypeAlias = (
-    MovingLoopGroundFEMReceivers | LargeLoopGroundFEMReceivers | AirborneFEMReceivers
-)
-
 logger = getLogger(__name__)
 
 
@@ -98,7 +94,11 @@ class FDEMForwardOptions(BaseForwardOptions, BaseFDEMOptions):
     physical_property: str = "conductivity"
     inversion_type: str = "fdem"
 
-    data_object: Receivers
+    data_object: (
+        MovingLoopGroundFEMReceivers
+        | LargeLoopGroundFEMReceivers
+        | AirborneFEMReceivers
+    )
     z_real_channel_bool: bool
     z_imag_channel_bool: bool
     models: ConductivityModelOptions
@@ -121,7 +121,11 @@ class FDEMInversionOptions(BaseFDEMOptions, BaseInversionOptions):
     physical_property: str = "conductivity"
     inversion_type: str = "fdem"
 
-    data_object: Receivers
+    data_object: (
+        MovingLoopGroundFEMReceivers
+        | LargeLoopGroundFEMReceivers
+        | AirborneFEMReceivers
+    )
     z_real_channel: PropertyGroup | None = None
     z_real_uncertainty: PropertyGroup | None = None
     z_imag_channel: PropertyGroup | None = None

simpeg_drivers/electromagnetics/time_domain/options.py

@@ -12,7 +12,7 @@
 from __future__ import annotations
 
 from pathlib import Path
-from typing import ClassVar, TypeAlias
+from typing import ClassVar
 
 import numpy as np
 from geoh5py.groups import PropertyGroup
@@ -31,11 +31,6 @@
 )
 
 
-Receivers: TypeAlias = (
-    MovingLoopGroundTEMReceivers | LargeLoopGroundTEMReceivers | AirborneTEMReceivers
-)
-
-
 class BaseTDEMOptions(EMDataMixin):
     """
     Base class for Time Domain Electromagnetic options.
@@ -90,7 +85,11 @@ class TDEMForwardOptions(BaseTDEMOptions, BaseForwardOptions):
     physical_property: str = "conductivity"
     inversion_type: str = "tdem"
 
-    data_object: Receivers
+    data_object: (
+        MovingLoopGroundTEMReceivers
+        | LargeLoopGroundTEMReceivers
+        | AirborneTEMReceivers
+    )
     z_channel_bool: bool | None = None
     x_channel_bool: bool | None = None
     y_channel_bool: bool | None = None
@@ -115,7 +114,11 @@ class TDEMInversionOptions(BaseTDEMOptions, BaseInversionOptions):
     physical_property: str = "conductivity"
     inversion_type: str = "tdem"
 
-    data_object: Receivers
+    data_object: (
+        MovingLoopGroundTEMReceivers
+        | LargeLoopGroundTEMReceivers
+        | AirborneTEMReceivers
+    )
     z_channel: PropertyGroup | None = None
     z_uncertainty: PropertyGroup | None = None
     x_channel: PropertyGroup | None = None

simpeg_drivers/electromagnetics/time_domain_1d/options.py

@@ -12,14 +12,9 @@
 from __future__ import annotations
 
 from pathlib import Path
-from typing import ClassVar, TypeAlias
+from typing import ClassVar
 
 from geoh5py.groups import PropertyGroup
-from geoh5py.objects import (
-    AirborneTEMReceivers,
-    LargeLoopGroundTEMReceivers,
-    MovingLoopGroundTEMReceivers,
-)
 
 from simpeg_drivers import assets_path
 from simpeg_drivers.electromagnetics.base_1d_options import Base1DOptions
@@ -32,11 +27,6 @@
 )
 
 
-Receivers: TypeAlias = (
-    MovingLoopGroundTEMReceivers | LargeLoopGroundTEMReceivers | AirborneTEMReceivers
-)
-
-
 class TDEM1DForwardOptions(TDEMForwardOptions, Base1DOptions):
     """
     Time Domain Electromagnetic forward options.

simpeg_drivers/options.py

@@ -14,7 +14,7 @@
 from enum import Enum
 from logging import getLogger
 from pathlib import Path
-from typing import Annotated, Any, ClassVar, Literal, TypeAlias
+from typing import Annotated, Any, ClassVar, Literal
 
 import numpy as np
 from geoapps_utils.base import Options
@@ -48,10 +48,6 @@
 
 logger = getLogger(__name__)
 
-InversionDataDict: TypeAlias = (
-    dict[str, np.ndarray | None] | dict[str, dict[float, np.ndarray | None]]
-)
-
 
 def deprecate_warning(value, info):
     """Issue deprecation warning."""
@@ -362,7 +358,7 @@ def active_components(self) -> list[str]:
         return [k for k in self.components if getattr(self, f"{k}_channel_bool")]
 
     @property
-    def data(self) -> InversionDataDict:
+    def data(self) -> dict[str, dict[float, np.ndarray | None]]:
         """Return dictionary of data components and associated values."""
         return dict.fromkeys(self.active_components)
 
@@ -607,15 +603,15 @@ def active_components(self) -> list[str]:
         ]
 
     @property
-    def data(self) -> InversionDataDict:
+    def data(self) -> dict[str, dict[float, np.ndarray | None]]:
         """Return dictionary of data components and associated values."""
         out = {}
         for k in self.active_components:
             out[k] = self.component_data(k)
         return out
 
     @property
-    def uncertainties(self) -> InversionDataDict:
+    def uncertainties(self) -> dict[str, dict[float, np.ndarray | None]]:
         """Return dictionary of unceratinty components and associated values."""
         out = {}
         for k in self.active_components: