|
23 | 23 |
|
24 | 24 | logger = logging.getLogger(__name__) |
25 | 25 |
|
26 | | -# Zarr attribute keys (polystore prefix) with optional legacy fallback prefixes |
| 26 | +# Zarr attribute keys (polystore prefix only) |
27 | 27 | _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 | | -] |
33 | 28 | ATTR_FILENAME_MAP = f"{_ATTR_PREFIX}_filename_map" |
34 | 29 | ATTR_OUTPUT_PATHS = f"{_ATTR_PREFIX}_output_paths" |
35 | 30 | 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] |
39 | 31 | DEFAULT_PLATE_NAME = os.getenv("POLYSTORE_PLATE_NAME", "Polystore_Plate") |
40 | 32 |
|
41 | 33 |
|
42 | | -def _get_attr(attrs: Dict[str, Any], key: str, legacy_keys: List[str]): |
| 34 | +def _get_attr(attrs: Dict[str, Any], key: str): |
43 | 35 | if key in attrs: |
44 | 36 | return attrs[key] |
45 | | - for legacy_key in legacy_keys: |
46 | | - if legacy_key in attrs: |
47 | | - return attrs[legacy_key] |
48 | 37 | return None |
49 | 38 |
|
50 | 39 |
|
@@ -397,9 +386,7 @@ def load_batch(self, file_paths: List[Union[str, Path]], **kwargs) -> List[Any]: |
397 | 386 | field_group = well_group["0"] |
398 | 387 | if "0" in field_group.array_keys(): |
399 | 388 | 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) |
403 | 390 | if filename_map_attr is not None: |
404 | 391 | filename_map = dict(filename_map_attr) |
405 | 392 |
|
@@ -807,9 +794,7 @@ def _matches_filters(name: str) -> bool: |
807 | 794 | field_group = well_group["0"] |
808 | 795 | if "0" in field_group.array_keys(): |
809 | 796 | 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) |
813 | 798 | if output_paths_attr is not None: |
814 | 799 | output_paths = output_paths_attr |
815 | 800 | for filename in output_paths: |
|
0 commit comments