Raise when get_map gets a invalid space argument

Author: AhmetNSimsek

siibra/core/parcellation.py

@@ -31,6 +31,9 @@
 #                except Exception as e:
 #                    pass
 
+class ConflictingArgumentException(ValueError):
+    pass
+
 
 class ParcellationVersion:
     def __init__(
@@ -166,8 +169,9 @@ def get_map(self, space=None, maptype: Union[str, MapType] = MapType.LABELLED, s
             A ParcellationMap representing the volumetric map or
             a SparseMap representing the list of statistical maps.
         """
-        if not isinstance(maptype, MapType):
+        if isinstance(maptype, str):
             maptype = MapType[maptype.upper()]
+        assert isinstance(maptype, MapType), f"`maptype` have to be a MapType or str, not {type(maptype)}"
 
         candidates = [
             m for m in parcellationmap.Map.registry()
@@ -177,15 +181,18 @@ def get_map(self, space=None, maptype: Union[str, MapType] = MapType.LABELLED, s
             and m.parcellation.matches(self)
         ]
         if len(candidates) == 0:
-            logger.error(f"No {maptype} map in {space} available for {str(self)}")
-            return None
+            raise ConflictingArgumentException(
+                f"No {maptype} map with space specification '{space}' available for {str(self)}"
+            )
         if len(candidates) > 1:
             spec_candidates = [
-                c for c in candidates if all(w.lower() in c.name.lower() for w in spec.split())
+                c for c in candidates
+                if all(w.lower() in c.name.lower() for w in spec.split())
             ]
             if len(spec_candidates) == 0:
-                logger.warning(f"'{spec}' does not match any options from {[c.name for c in candidates]}.")
-                return None
+                raise ConflictingArgumentException(
+                    f"'{spec}' does not match any options from {[c.name for c in candidates]}."
+                )
             if len(spec_candidates) > 1:
                 logger.warning(
                     f"Multiple maps are available in this specification of space, parcellation, and map type.\n"

test/core/test_parcellation.py

@@ -1,7 +1,9 @@
 import unittest
-from siibra.core.parcellation import Parcellation, ParcellationVersion, MapType
+from siibra.core.parcellation import (
+    Parcellation, ParcellationVersion, MapType, ConflictingArgumentException
+)
 from siibra.core.region import Region
-from siibra.commons import Species, MapIndex
+from siibra.commons import Species
 from uuid import uuid4
 from parameterized import parameterized
 from unittest.mock import patch, MagicMock
@@ -21,6 +23,7 @@
 region_child2 = Region("bar")
 region_parent = Region("parent foo bar", children=[region_child1, region_child2])
 
+
 class DummySpace:
     def matches(self):
         raise NotImplementedError
@@ -218,7 +221,6 @@ def test_find_regions(self, parents_only):
                 p.find.assert_called_once_with(regionspec="fooz")
             self.assertEqual(result, [parc3] if parents_only else [parc1, parc2, parc3])
 
-
     @parameterized.expand([
         # partial matches work
         ("foo bar", False, False, region_parent),
@@ -232,7 +234,6 @@ def test_find_regions(self, parents_only):
     def test_get_region(self, regionspec, find_topmost, allow_tuple, result):
         self.parc.children = [region_parent]
         self.assertIs(self.parc.get_region(regionspec, find_topmost, allow_tuple), result)
-        
 
 
 # all_parcs = [p for p in parcellations]
@@ -271,5 +272,4 @@ def test_get_region(self, regionspec, find_topmost, allow_tuple, result):
 
 #     parc.get_map(space, map_type)
 
-
 parc_has_ebrains_doi = [("human", "julich brain 2.9")]