|
110 | 110 | _parse_array_array_codec, |
111 | 111 | _parse_array_bytes_codec, |
112 | 112 | _parse_bytes_bytes_codec, |
113 | | - _resolve_codec, |
114 | 113 | get_pipeline_class, |
115 | 114 | ) |
116 | 115 | from zarr.storage import StoreLike, make_store_path |
@@ -4002,30 +4001,11 @@ def _get_default_chunk_encoding_v3( |
4002 | 4001 | default_serializer = zarr_config.get("array.v3_default_serializer").get(dtype_key) |
4003 | 4002 | default_compressors = zarr_config.get("array.v3_default_compressors").get(dtype_key) |
4004 | 4003 |
|
4005 | | - filters_list: list[ArrayArrayCodec] = [] |
4006 | | - compressors_list: list[BytesBytesCodec] = [] |
| 4004 | + filters = tuple(_parse_array_array_codec(codec_dict) for codec_dict in default_filters) |
| 4005 | + serializer = _parse_array_bytes_codec(default_serializer) |
| 4006 | + compressors = tuple(_parse_bytes_bytes_codec(codec_dict) for codec_dict in default_compressors) |
4007 | 4007 |
|
4008 | | - serializer = _resolve_codec(default_serializer) |
4009 | | - if serializer is None: |
4010 | | - raise ValueError("Required ArrayBytesCodec was not found.") |
4011 | | - if not isinstance(serializer, ArrayBytesCodec): |
4012 | | - raise TypeError(f"Expected ArrayBytesCodec, got: {type(serializer)}") |
4013 | | - |
4014 | | - for codec_dict in default_filters: |
4015 | | - codec = _resolve_codec(codec_dict) |
4016 | | - if isinstance(codec, ArrayArrayCodec): |
4017 | | - filters_list.append(codec) |
4018 | | - else: |
4019 | | - raise TypeError(f"Expected ArrayArrayCodec, got: {type(codec)}") |
4020 | | - |
4021 | | - for codec_dict in default_compressors: |
4022 | | - codec = _resolve_codec(codec_dict) |
4023 | | - if isinstance(codec, BytesBytesCodec): |
4024 | | - compressors_list.append(codec) |
4025 | | - else: |
4026 | | - raise TypeError(f"Expected BytesBytesCodec, got: {type(codec)}") |
4027 | | - |
4028 | | - return tuple(filters_list), serializer, tuple(compressors_list) |
| 4008 | + return filters, serializer, compressors |
4029 | 4009 |
|
4030 | 4010 |
|
4031 | 4011 | def _get_default_chunk_encoding_v2( |
|
0 commit comments