siibra 1.0.1a7__tar.gz → 1.0.1a9__tar.gz

{siibra-1.0.1a7/siibra.egg-info → siibra-1.0.1a9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: siibra
-Version: 1.0.1a7
+Version: 1.0.1a9
 Summary: siibra - Software interfaces for interacting with brain atlases
 Home-page: https://github.com/FZJ-INM1-BDA/siibra-python
 Author: Big Data Analytics Group, Forschungszentrum Juelich, Institute of Neuroscience and Medicine (INM-1)

siibra-1.0.1a9/siibra/VERSION

@@ -0,0 +1 @@
+1.0.1-alpha.9

{siibra-1.0.1a7 → siibra-1.0.1a9}/siibra/commons.py

@@ -753,7 +753,7 @@ class Species(Enum):
         OPENMINDS_IDS = {
             "97c070c6-8e1f-4ee8-9d28-18c7945921dd": 1,
             "ab532423-1fd7-4255-8c6f-f99dc6df814f": 2,
-            "d9875ebd-260e-4337-a637-b62fed4aa91d:": 3,
+            "d9875ebd-260e-4337-a637-b62fed4aa91d": 3,
             "0b6df2b3-5297-40cf-adde-9443d3d8214a": 4,
             "3ad33ec1-5152-497d-9352-1cf4497e0edd": 5,
             "2ab3ecf5-76cc-46fa-98ab-309e3fd50f57": 6,

{siibra-1.0.1a7 → siibra-1.0.1a9}/siibra/explorer/url.py

@@ -162,6 +162,7 @@ class DecodedUrl:
 
 def decode_url(url: str, vp_length=1000):
     import siibra
+    from siibra.locations import Point, BoundingBox
 
     try:
         space_match = re.search(r"/t:(?P<space_id>[^/]+)", url)
@@ -171,7 +172,7 @@ def decode_url(url: str, vp_length=1000):
     except Exception as e:
         raise DecodeNavigationException from e
 
-    nav_match = re.search(r"/@:(?P<navigation_str>.+)/?", url)
+    nav_match = re.search(r"/@:(?P<navigation_str>[^/]+)/?", url)
     navigation_str = nav_match.group("navigation_str")
     for char in navigation_str:
         assert char in cipher or char in [

{siibra-1.0.1a7 → siibra-1.0.1a9}/siibra/volumes/parcellationmap.py

@@ -370,10 +370,9 @@ class Map(concept.AtlasConcept, configuration_folder="maps"):
         if kwargs_fragment is not None:
             if (mapindex.fragment is not None) and (kwargs_fragment != mapindex.fragment):
                 raise exceptions.ConflictingArgumentException(
-                    "Conflicting specifications for fetching volume fragment: "
-                    f"{mapindex.fragment} / {kwargs_fragment}"
+                    f"Conflicting specifications for fetching volume fragment{f' for region {region}'}: "
+                    f"supplied: {kwargs_fragment}, preconfigured: {mapindex.fragment}"
                 )
-            mapindex.fragment = kwargs_fragment
 
         if mapindex.volume is None:
             mapindex.volume = 0
@@ -387,7 +386,7 @@ class Map(concept.AtlasConcept, configuration_folder="maps"):
         return _volume.FilteredVolume(
             parent_volume=self.volumes[mapindex.volume],
             label=mapindex.label,
-            fragment=mapindex.fragment,
+            fragment=kwargs_fragment or mapindex.fragment,
         )
 
     def fetch(

{siibra-1.0.1a7 → siibra-1.0.1a9/siibra.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: siibra
-Version: 1.0.1a7
+Version: 1.0.1a9
 Summary: siibra - Software interfaces for interacting with brain atlases
 Home-page: https://github.com/FZJ-INM1-BDA/siibra-python
 Author: Big Data Analytics Group, Forschungszentrum Juelich, Institute of Neuroscience and Medicine (INM-1)

siibra-1.0.1a7/siibra/VERSION

@@ -1 +0,0 @@
-1.0.1-alpha.7