Fixed circular import

CHANGELOG.md

@@ -16,6 +16,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
  - bidsmap/bidsmap: For `__unknown__` and `__ignore__` modalities, the model will be fixed to `__unknown__`
  - mapper: If suffix is not defined, an error will be shown, and no further vqalidations will be performed on that file
  - BidsTable: Updated `lineterminator` parameter, making it compatible with modern (>1.4) Pandas, and Pythons up to 3.12
+ - Modules: Base module class selector has been moved into tools, new modalities are no longer decalred in `selector.py`
 
 
 ## [1.7.1] - 2024-09-05

bidsme/Modules/base.py

@@ -41,7 +41,7 @@
 from bidsme.bidsMeta import BidsSession
 from bidsme.schema.BIDSschema import BIDSschema
 
-from bidsme.bidsmap import Run
+# from bidsme.bidsmap import Run
 
 
 from ._constants import ignoremodality, unknownmodality
@@ -1151,7 +1151,7 @@ def bidsify(self, bidsfolder: str) -> None:
             self.rec_BIDSfields.DumpDefinitions(scans_json)
         return os.path.join(outdir, bidsname + ext)
 
-    def setLabels(self, run: Run = None):
+    def setLabels(self, run=None):
         """
         Set the BIDS tags (labels) according to given run
 

bidsme/bidsify.py

@@ -36,12 +36,13 @@
 
 from bidsme.tools import paths
 from bidsme.tools import tools
-from bidsme.tools import selector
+from bidsme.tools import type_selector
 from bidsme.bidsmap import Bidsmap
 from bidsme.bidsMeta import BidsSession
 from bidsme.bidsMeta import BidsTable
 
 logger = logging.getLogger(__name__)
+selector = type_selector()
 
 
 def coin(destination: str,

bidsme/bidsmap/_bidsmap.py

@@ -32,12 +32,13 @@
 
 from bidsme.tools import info
 from bidsme.tools.yaml import yaml
-from bidsme.tools import selector
+from bidsme.tools import type_selector
 
 from ._run import Run
 from bidsme import Modules
 
 logger = logging.getLogger(__name__)
+selector = type_selector()
 
 
 class Bidsmap(object):

bidsme/mapper.py

@@ -34,7 +34,7 @@
 from bidsme import plugins
 from bidsme import Modules
 
-from bidsme.tools import selector
+from bidsme.tools import type_selector
 from bidsme.tools import paths
 from bidsme.tools import info
 from bidsme.tools import tools
@@ -45,6 +45,7 @@
 from .Modules._constants import ignoremodality, unknownmodality
 
 logger = logging.getLogger(__name__)
+selector = type_selector()
 
 
 def createmap(destination,

bidsme/prepare.py

@@ -29,9 +29,8 @@
 
 from bidsme import exceptions
 from bidsme import plugins
-from bidsme import Modules
 
-from bidsme.tools import selector
+from bidsme.tools import type_selector
 from bidsme.tools import tools
 from bidsme.tools import paths
 
@@ -40,6 +39,7 @@
 
 
 logger = logging.getLogger(__name__)
+selector = type_selector()
 
 
 def sortsession(outfolder: str,

bidsme/process.py

@@ -32,7 +32,7 @@
 from bidsme import plugins
 from bidsme import Modules
 
-from bidsme.tools import selector
+from bidsme.tools import type_selector
 from bidsme.tools import paths
 from bidsme.tools import tools
 
@@ -41,6 +41,7 @@
 from bidsme.bidsMeta import BidsTable
 
 logger = logging.getLogger(__name__)
+selector = type_selector()
 
 
 def coin(destination: str,

bidsme/tools/selector.py

@@ -24,14 +24,17 @@
 ##############################################################################
 from types import ModuleType
 
-from .. import Modules
+from bidsme import Modules
 
 
 class type_selector(object):
     __slots__ = ["types_list"]
 
     def __init__(self):
-
+        """
+        Class guessing the module and file format based on
+        path or folder
+        """
         self.types_list = {}
         for i in dir(Modules):
             obj = getattr(Modules, i)
@@ -52,6 +55,10 @@ def select(self, folder: str, module: str = ""):
         module: str
             restrict type of class
         """
+        if module and module not in self.types_list:
+            raise KeyError("Module {} is not one of supported modules {}"
+                           .format(module, self.types_list.keys()))
+
         if module == "":
             for m in self.types_list:
                 for cls in self.types_list[m]:
@@ -74,6 +81,10 @@ def selectFile(self, file: str, module: str = ""):
         module: str
             restrict type of class
         """
+        if module and module not in self.types_list:
+            raise KeyError("Module {} is not one of supported modules {}"
+                           .format(module, self.types_list.keys()))
+
         if module == "":
             for m in self.types_list:
                 for cls in self.types_list[m]:
@@ -96,6 +107,10 @@ def selectByName(self, name: str, module: str = ""):
         module: str
             restrict type of class
         """
+        if module and module not in self.types_list:
+            raise KeyError("Module {} is not one of supported modules {}"
+                           .format(module, self.types_list.keys()))
+
         if module == "":
             for m in self.types_list:
                 for cls in self.types_list[m]: