Skip to content

Commit bb132f2

Browse files
committed
Drop legacy Zarr attribute fallback
1 parent 97ecbf1 commit bb132f2

1 file changed

Lines changed: 4 additions & 19 deletions

File tree

src/polystore/zarr.py

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -23,28 +23,17 @@
2323

2424
logger = logging.getLogger(__name__)
2525

26-
# Zarr attribute keys (polystore prefix) with optional legacy fallback prefixes
26+
# Zarr attribute keys (polystore prefix only)
2727
_ATTR_PREFIX = "polystore"
28-
_LEGACY_ATTR_PREFIXES = [
29-
prefix.strip()
30-
for prefix in os.getenv("POLYSTORE_LEGACY_ATTR_PREFIXES", "").split(",")
31-
if prefix.strip()
32-
]
3328
ATTR_FILENAME_MAP = f"{_ATTR_PREFIX}_filename_map"
3429
ATTR_OUTPUT_PATHS = f"{_ATTR_PREFIX}_output_paths"
3530
ATTR_DIMENSIONS = f"{_ATTR_PREFIX}_dimensions"
36-
LEGACY_ATTR_FILENAME_MAPS = [f"{prefix}_filename_map" for prefix in _LEGACY_ATTR_PREFIXES]
37-
LEGACY_ATTR_OUTPUT_PATHS = [f"{prefix}_output_paths" for prefix in _LEGACY_ATTR_PREFIXES]
38-
LEGACY_ATTR_DIMENSIONS = [f"{prefix}_dimensions" for prefix in _LEGACY_ATTR_PREFIXES]
3931
DEFAULT_PLATE_NAME = os.getenv("POLYSTORE_PLATE_NAME", "Polystore_Plate")
4032

4133

42-
def _get_attr(attrs: Dict[str, Any], key: str, legacy_keys: List[str]):
34+
def _get_attr(attrs: Dict[str, Any], key: str):
4335
if key in attrs:
4436
return attrs[key]
45-
for legacy_key in legacy_keys:
46-
if legacy_key in attrs:
47-
return attrs[legacy_key]
4837
return None
4938

5039

@@ -397,9 +386,7 @@ def load_batch(self, file_paths: List[Union[str, Path]], **kwargs) -> List[Any]:
397386
field_group = well_group["0"]
398387
if "0" in field_group.array_keys():
399388
field_array = field_group["0"]
400-
filename_map_attr = _get_attr(
401-
field_array.attrs, ATTR_FILENAME_MAP, LEGACY_ATTR_FILENAME_MAPS
402-
)
389+
filename_map_attr = _get_attr(field_array.attrs, ATTR_FILENAME_MAP)
403390
if filename_map_attr is not None:
404391
filename_map = dict(filename_map_attr)
405392

@@ -807,9 +794,7 @@ def _matches_filters(name: str) -> bool:
807794
field_group = well_group["0"]
808795
if "0" in field_group.array_keys():
809796
field_array = field_group["0"]
810-
output_paths_attr = _get_attr(
811-
field_array.attrs, ATTR_OUTPUT_PATHS, LEGACY_ATTR_OUTPUT_PATHS
812-
)
797+
output_paths_attr = _get_attr(field_array.attrs, ATTR_OUTPUT_PATHS)
813798
if output_paths_attr is not None:
814799
output_paths = output_paths_attr
815800
for filename in output_paths:

0 commit comments

Comments
 (0)