refactor: remove the mess of imports.

paquiteau · Sep 24, 2023 · c4de251 · c4de251
1 parent f054156
commit c4de251
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 74 deletions.
diff --git a/src/simfmri/simulator/__init__.py b/src/simfmri/simulator/__init__.py
@@ -4,44 +4,22 @@
 """
 from .simulation import SimDataType, SimulationParams, SimulationData
 from .handlers import (
+    AVAILABLE_HANDLERS,
     H,
-    AcquisitionHandler,
-    ActivationHandler,
-    BigPhantomGeneratorHandler,
-    BrainwebPhantomHandler,
-    GaussianNoiseHandler,
-    KspaceNoiseHandler,
-    NoiseHandler,
-    RadialAcquisitionHandler,
-    RicianNoiseHandler,
-    RoiDefinerHandler,
-    SheppLoganGeneratorHandler,
-    SlicerHandler,
-    TextureAdderHandler,
-    VDSAcquisitionHandler,
-    StackedSpiralAcquisitionHandler,
+    handler,
+    get_handler,
+    list_handlers,
+    AbstractHandler,
 )
 
 __all__ = [
-    "H",
-    "AcquisitionHandler",
-    "ActivationHandler",
-    "BigPhantomGeneratorHandler",
-    "BrainwebPhantomHandler",
-    "GaussianNoiseHandler",
-    "KspaceNoiseHandler",
-    "NoiseHandler",
-    "RadialAcquisitionHandler",
-    "RicianNoiseHandler",
-    "RoiDefinerHandler",
-    "SheppLoganGeneratorHandler",
     "SimulationData",
     "SimDataType",
     "SimulationParams",
-    "SlicerHandler",
-    "TextureAdderHandler",
-    "VDSAcquisitionHandler",
-    "StackedSpiralAcquisitionHandler",
-    # handlers
-    # simulation
+    "AVAILABLE_HANDLERS",
+    "H",
+    "handler",
+    "get_handler",
+    "list_handlers",
+    "AbstractHandler",
 ]
diff --git a/src/simfmri/simulator/handlers/__init__.py b/src/simfmri/simulator/handlers/__init__.py
@@ -22,48 +22,11 @@
     AbstractHandler,
 )
 
-from .acquisition import (
-    AcquisitionHandler,
-    VDSAcquisitionHandler,
-    RadialAcquisitionHandler,
-    StackedSpiralAcquisitionHandler,
-)
-from .activation import ActivationHandler
-from .base import AbstractHandler
-from .loader import LoadDataHandler, SaveDataHandler
-from .noise import (
-    GaussianNoiseHandler,
-    KspaceNoiseHandler,
-    NoiseHandler,
-    RicianNoiseHandler,
-)
-from .phantom import (
-    SheppLoganGeneratorHandler,
-    SlicerHandler,
-    BigPhantomGeneratorHandler,
-    RoiDefinerHandler,
-    BrainwebPhantomHandler,
-    TextureAdderHandler,
-)
-
 __all__ = [
+    "AVAILABLE_HANDLERS",
     "H",
+    "handler",
+    "get_handler",
+    "list_handlers",
     "AbstractHandler",
-    "AcquisitionHandler",
-    "ActivationHandler",
-    "BigPhantomGeneratorHandler",
-    "BrainwebPhantomHandler",
-    "GaussianNoiseHandler",
-    "KspaceNoiseHandler",
-    "LoadDataHandler",
-    "NoiseHandler",
-    "RicianNoiseHandler",
-    "RoiDefinerHandler",
-    "SaveDataHandler",
-    "SheppLoganGeneratorHandler",
-    "SlicerHandler",
-    "TextureAdderHandler",
-    "VDSAcquisitionHandler",
-    "RadialAcquisitionHandler",
-    "StackedSpiralAcquisitionHandler",
 ]