siibra 1.0.1a7__py3-none-any.whl → 1.0.1a9__py3-none-any.whl

siibra/VERSION

@@ -1 +1 @@
-1.0.1-alpha.7
+1.0.1-alpha.9

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/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/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.dist-info → siibra-1.0.1a9.dist-info}/METADATA

@@ -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.dist-info → siibra-1.0.1a9.dist-info}/RECORD

@@ -1,6 +1,6 @@
-siibra/VERSION,sha256=f2RISlKPjcRUgbF4Sy0G6Dt5Xz_DBE4RwqJSDaRm5TU,14
+siibra/VERSION,sha256=lOK2Kx6AE7Hs3dUDvh3mTY5Ssw9mBG-qYk3aAoRAp0A,14
 siibra/__init__.py,sha256=1uWhsE93KG4N9wiWoMdEokUXxfoRcyznXDktjAGhpEI,4496
-siibra/commons.py,sha256=KmbRdX6pfKTgIgbYufxhkE9YiLQ35GObbw6VyFdRm_w,28016
+siibra/commons.py,sha256=lL_bIEUQUfxo5wAOWTrb1C8YPZ8KlHUbQyATjyeVBIQ,28015
 siibra/exceptions.py,sha256=6MlXOadwXcCsceOE4lmy4fLJyAaBCCVvJF6BZlMYjU8,1371
 siibra/configuration/__init__.py,sha256=ArqQ_B8C_O61KA4Fk3ho8ksckbjLu-COOlPGiXyf8LE,752
 siibra/configuration/configuration.py,sha256=A651Tg632_a_c_yjxs-FJW_douQyzSJBoCDad4expVk,7151
@@ -14,7 +14,7 @@ siibra/core/region.py,sha256=036Fjck1H6wGSubJomjEHUN1I-XMPSPqx3_78MEYbG8,44108
 siibra/core/space.py,sha256=X7FyKgdhao3ezSWQZ0MAjDxlQh305S-4a4D630RaM-c,4588
 siibra/core/structure.py,sha256=M2li4PPiJf27dOc3b2ycCfHf7Ad1AWxBYc9OpSFazJM,4498
 siibra/explorer/__init__.py,sha256=XBAeYm4W3HlbWsKtt8gOwqE_FinIEY7RdA6Rg4Y275A,781
-siibra/explorer/url.py,sha256=S6Tpg1p2gmu5byHVqsXfkugUStLd1Fu94EqsDzgEU9E,7047
+siibra/explorer/url.py,sha256=R6fvFvd9rozecKHEes2TPHId92sLA0Oyeg7-JJiIELc,7102
 siibra/explorer/util.py,sha256=ul82TQZAULdupr4tJBACdkjlHm2mt8LJ9UpwNWGHYhE,2083
 siibra/features/__init__.py,sha256=FER6DMnkPhXSV1XMZWibZdyBwVhIgWYSUGYMEYEKb9c,3970
 siibra/features/anchor.py,sha256=cMuaGB8ZCGMpdeb3plzHzNC4ImsxsriQ66janWcjhjk,9101
@@ -64,7 +64,7 @@ siibra/vocabularies/gene_names.json,sha256=i-gnh753GyZtQfX_dWibNYr_d5ccDPHooOwsd
 siibra/vocabularies/receptor_symbols.json,sha256=F6DZIArPCBmJV_lWGV-zDpBBH_GOJOZm67LBE4qzMa4,5722
 siibra/vocabularies/region_aliases.json,sha256=T2w1wRlxPNTsPppXn0bzC70tNsb8mOjLsoHuxDSYm2w,8563
 siibra/volumes/__init__.py,sha256=9eiVjgGTqq9BiFJaLVLABtTrhIcE2k3Cn51yC4EKplg,936
-siibra/volumes/parcellationmap.py,sha256=z5wWxK_kcFpS_ROpc9ny4aCbM7P9qc3DRDxrOKGp2Hk,51409
+siibra/volumes/parcellationmap.py,sha256=M1ZGEWZ0owDcP5O9yrsZr8HloQa1knZzbI9g-v4rcYo,51430
 siibra/volumes/sparsemap.py,sha256=Yv07LIlt5yigw-ubWFq89hHnsivT7dymYCsCTe7Wu9I,17167
 siibra/volumes/volume.py,sha256=wLmtqoXBDoPvE3WBO_Hc8uny3cdE9mB0KgdCq0LOTa0,32408
 siibra/volumes/providers/__init__.py,sha256=AHZCjutCqO4mnHxyykVjqxlz85jDqFWcSjsa4ciwc1A,934
@@ -73,8 +73,8 @@ siibra/volumes/providers/gifti.py,sha256=JGuixlSJTVjbDU_M5oMDCV8BAwIzuczhnI-qZ7L
 siibra/volumes/providers/neuroglancer.py,sha256=b3TiJ6yrx_akLFKgHRKZyHculzzRIqbZ7U3TMQHy6-k,28618
 siibra/volumes/providers/nifti.py,sha256=aAzkmeDZaXRZ-dkAeEb2cSywNn9WzIz0z7yFtN6iNpU,10135
 siibra/volumes/providers/provider.py,sha256=Vn02au_LKynO5SIfqLyjqzxCf7JD9Wm4i7yEFcTX0WU,3585
-siibra-1.0.1a7.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-siibra-1.0.1a7.dist-info/METADATA,sha256=wvzztg9GqZBMq_u7M_7TYiQxRPL75WTHc_ESqgZ5lks,9301
-siibra-1.0.1a7.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-siibra-1.0.1a7.dist-info/top_level.txt,sha256=NF0OSGLL0li2qyC7MaU0iBB5Y9S09_euPpvisD0-8Hg,7
-siibra-1.0.1a7.dist-info/RECORD,,
+siibra-1.0.1a9.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+siibra-1.0.1a9.dist-info/METADATA,sha256=XKHahVbmwzZ3I3Kg4YL0AMzBbtsSQd0RrJImjWAAUCA,9301
+siibra-1.0.1a9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+siibra-1.0.1a9.dist-info/top_level.txt,sha256=NF0OSGLL0li2qyC7MaU0iBB5Y9S09_euPpvisD0-8Hg,7
+siibra-1.0.1a9.dist-info/RECORD,,

{siibra-1.0.1a7.dist-info → siibra-1.0.1a9.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.8.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any