move codecjson definition to common

Author: d-v-b

src/zarr/abc/codec.py

@@ -13,6 +13,7 @@
 from zarr.abc.metadata import Metadata
 from zarr.core.buffer import Buffer, NDBuffer
 from zarr.core.common import (
+    CodecJSON,
     CodecJSON_V2,
     CodecJSON_V3,
     ZarrFormat,
@@ -48,12 +49,6 @@
 CodecOutput = TypeVar("CodecOutput", bound=NDBuffer | Buffer)
 
 
-# The widest type we will *accept* for a codec JSON
-# This covers v2 and v3
-CodecJSON = CodecJSON_V2 | CodecJSON_V3
-"""The widest type of JSON-like input that could specify a codec."""
-
-
 class BaseCodec(Metadata, Generic[CodecInput, CodecOutput]):
     """Generic base class for codecs.
 

src/zarr/codecs/_v2.py

@@ -11,9 +11,9 @@
     ArrayArrayCodec,
     ArrayBytesCodec,
     BytesBytesCodec,
-    CodecJSON,
 )
 from zarr.core.common import (
+    CodecJSON,
     CodecJSON_V2,
     CodecJSON_V3,
     _check_codecjson_v2,

src/zarr/codecs/blosc.py

@@ -20,12 +20,8 @@
 from packaging.version import Version
 from typing_extensions import ReadOnly
 
-from zarr.abc.codec import BytesBytesCodec, CodecJSON
-from zarr.core.common import (
-    JSON,
-    NamedRequiredConfig,
-    ZarrFormat,
-)
+from zarr.abc.codec import BytesBytesCodec
+from zarr.core.common import JSON, CodecJSON, NamedRequiredConfig, ZarrFormat
 from zarr.core.dtype.common import HasItemSize
 from zarr.errors import CodecValidationError
 

src/zarr/codecs/bytes.py

@@ -9,9 +9,9 @@
 import numpy as np
 from typing_extensions import ReadOnly
 
-from zarr.abc.codec import ArrayBytesCodec, CodecJSON
+from zarr.abc.codec import ArrayBytesCodec
 from zarr.core.buffer import Buffer, NDArrayLike, NDBuffer
-from zarr.core.common import JSON, NamedConfig, ZarrFormat
+from zarr.core.common import JSON, CodecJSON, NamedConfig, ZarrFormat
 from zarr.core.dtype.common import HasEndianness
 
 if TYPE_CHECKING:

src/zarr/codecs/crc32c_.py

@@ -9,8 +9,8 @@
 from crc32c import crc32c
 from typing_extensions import ReadOnly
 
-from zarr.abc.codec import BytesBytesCodec, CodecJSON
-from zarr.core.common import JSON, NamedConfig, ZarrFormat, parse_named_configuration
+from zarr.abc.codec import BytesBytesCodec
+from zarr.core.common import JSON, CodecJSON, NamedConfig, ZarrFormat, parse_named_configuration
 from zarr.errors import CodecValidationError
 
 if TYPE_CHECKING:

src/zarr/codecs/gzip.py

@@ -8,13 +8,9 @@
 from numcodecs.gzip import GZip
 from typing_extensions import ReadOnly
 
-from zarr.abc.codec import BytesBytesCodec, CodecJSON
+from zarr.abc.codec import BytesBytesCodec
 from zarr.core.buffer.cpu import as_numpy_array_wrapper
-from zarr.core.common import (
-    JSON,
-    NamedRequiredConfig,
-    ZarrFormat,
-)
+from zarr.core.common import JSON, CodecJSON, NamedRequiredConfig, ZarrFormat
 
 if TYPE_CHECKING:
     from typing import Self

src/zarr/codecs/numcodecs/_codecs.py

@@ -48,12 +48,12 @@
     ArrayArrayCodec,
     ArrayBytesCodec,
     BytesBytesCodec,
-    CodecJSON,
 )
 from zarr.core.array_spec import ArraySpec
 from zarr.core.buffer.cpu import as_numpy_array_wrapper
 from zarr.core.common import (
     JSON,
+    CodecJSON,
     CodecJSON_V2,
     CodecJSON_V3,
     NamedConfig,

src/zarr/codecs/sharding.py

@@ -27,7 +27,6 @@
     ArrayBytesCodecPartialDecodeMixin,
     ArrayBytesCodecPartialEncodeMixin,
     Codec,
-    CodecJSON,
     CodecPipeline,
 )
 from zarr.abc.store import (
@@ -50,6 +49,7 @@
 from zarr.core.chunk_grids import ChunkGrid, RegularChunkGrid
 from zarr.core.common import (
     JSON,
+    CodecJSON,
     CodecJSON_V2,
     CodecJSON_V3,
     NamedRequiredConfig,

src/zarr/codecs/transpose.py

@@ -7,13 +7,9 @@
 import numpy as np
 from typing_extensions import ReadOnly
 
-from zarr.abc.codec import ArrayArrayCodec, CodecJSON
+from zarr.abc.codec import ArrayArrayCodec
 from zarr.core.array_spec import ArraySpec
-from zarr.core.common import (
-    JSON,
-    NamedRequiredConfig,
-    ZarrFormat,
-)
+from zarr.core.common import JSON, CodecJSON, NamedRequiredConfig, ZarrFormat
 from zarr.errors import CodecValidationError
 
 if TYPE_CHECKING:

src/zarr/codecs/vlen_utf8.py

@@ -6,9 +6,9 @@
 import numpy as np
 from numcodecs.vlen import VLenBytes, VLenUTF8
 
-from zarr.abc.codec import ArrayBytesCodec, CodecJSON
+from zarr.abc.codec import ArrayBytesCodec
 from zarr.core.buffer import Buffer, NDBuffer
-from zarr.core.common import JSON, NamedConfig, ZarrFormat
+from zarr.core.common import JSON, CodecJSON, NamedConfig, ZarrFormat
 
 if TYPE_CHECKING:
     from typing import Self