Fix non-conformant "attributes" metadata (#303)

* Fix non-conformant "attributes" metadata * fmt
earth-mover · Oct 19, 2024 · 6ef42f1 · 6ef42f1
1 parent aa7f8ac
commit 6ef42f1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/icechunk-python/tests/test_zarr/test_store/test_icechunk_store.py b/icechunk-python/tests/test_zarr/test_store/test_icechunk_store.py
@@ -10,7 +10,7 @@
 from zarr.core.sync import collect_aiterator
 from zarr.testing.store import StoreTests
 
-DEFAULT_GROUP_METADATA = b'{"zarr_format":3,"node_type":"group","attributes":null}'
+DEFAULT_GROUP_METADATA = b'{"zarr_format":3,"node_type":"group"}'
 ARRAY_METADATA = (
     b'{"zarr_format":3,"node_type":"array","attributes":{"foo":42},'
     b'"shape":[2,2,2],"data_type":"int32","chunk_grid":{"name":"regular","configuration":{"chunk_shape":[1,1,1]}},'

diff --git a/icechunk/src/zarr.rs b/icechunk/src/zarr.rs
@@ -1143,6 +1143,7 @@ struct ArrayMetadata {
     zarr_format: u8,
     #[serde(deserialize_with = "validate_array_node_type")]
     node_type: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
     attributes: Option<UserAttributes>,
     #[serde(flatten)]
     #[serde_as(as = "TryFromInto<ZarrArrayMetadataSerialzer>")]
@@ -1283,6 +1284,7 @@ struct GroupMetadata {
     zarr_format: u8,
     #[serde(deserialize_with = "validate_group_node_type")]
     node_type: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
     attributes: Option<UserAttributes>,
 }
 
@@ -1726,9 +1728,7 @@ mod tests {
             .await?;
         assert_eq!(
             store.get("zarr.json", &ByteRange::ALL).await.unwrap(),
-            Bytes::copy_from_slice(
-                br#"{"zarr_format":3,"node_type":"group","attributes":null}"#
-            )
+            Bytes::copy_from_slice(br#"{"zarr_format":3,"node_type":"group"}"#)
         );
 
         store.set("a/b/zarr.json", Bytes::copy_from_slice(br#"{"zarr_format":3, "node_type":"group", "attributes": {"spam":"ham", "eggs":42}}"#)).await?;