Appending works

Author: danielballan

tiled/adapters/zarr.py

@@ -182,9 +182,9 @@ async def write_block(
     async def patch(
         self,
         data: NDArray[Any],
-        slice: NDSlice,
+        slice: Tuple[slice | int, ...],
         grow: bool = False,
-    ) -> Tuple[int, ...]:
+    ) -> Tuple[Tuple[int, ...], Tuple[Tuple[int, ...], ...]]:
         """
         Write data into a slice of the array, maybe growing it.
 
@@ -207,7 +207,16 @@ async def patch(
             else:
                 raise ValueError(f"Slice does not fit into array shape {current_shape}")
         self._array[slice] = data
-        return new_shape_tuple
+        new_chunks = []
+        # Zarr has regularly-sized chunks, so no user input is required to
+        # simply extend the existing pattern.
+        for chunk_size, size in zip(self._array.chunks, new_shape_tuple):
+            dim = [chunk_size] * (size // chunk_size)
+            if size % chunk_size:
+                dim.append(size % chunk_size)
+            new_chunks.append(tuple(dim))
+        new_chunks_tuple = tuple(new_chunks)
+        return new_shape_tuple, new_chunks_tuple
 
 
 if sys.version_info < (3, 9):

tiled/catalog/adapter.py

@@ -1044,28 +1044,30 @@ async def write_block(self, *args, **kwargs):
     async def patch(self, *args, **kwargs):
         # assumes a single DataSource (currently only supporting zarr)
         async with self.context.session() as db:
-            try:
-                new_shape = await ensure_awaitable(
-                    (await self.get_adapter()).patch, *args, **kwargs
-                )
-                node = await db.get(orm.Node, self.node.id)
-                data_source = node.data_sources[0]
-                structure_row = await db.get(orm.Structure, data_source.structure_id)
-                # Get the current structure row, update the shape, and write it back
-                structure_dict = copy.deepcopy(structure_row.structure)
-                structure_dict["shape"] = new_shape
-                structure_id = compute_structure_id(structure_dict)
-                statement = self.insert(orm.Structure).values(
-                    id=structure_id,
+            new_shape_and_chunks = await ensure_awaitable(
+                (await self.get_adapter()).patch, *args, **kwargs
+            )
+            node = await db.get(orm.Node, self.node.id)
+            data_source = node.data_sources[0]
+            structure_row = await db.get(orm.Structure, data_source.structure_id)
+            # Get the current structure row, update the shape, and write it back
+            structure_dict = copy.deepcopy(structure_row.structure)
+            structure_dict["shape"], structure_dict["chunks"] = new_shape_and_chunks
+            new_structure_id = compute_structure_id(structure_dict)
+            statement = (
+                self.insert(orm.Structure)
+                .values(
+                    id=new_structure_id,
                     structure=structure_dict,
                 )
-                await db.execute(statement)
-                new_structure = await db.get(orm.Structure, structure_id)
-                data_source.structure = new_structure
-                db.add(data_source)
-                await db.commit()
-            except Exception as e:
-                raise RuntimeError(f"Could not retrieve node: {e}")
+                .on_conflict_do_nothing(index_elements=["id"])
+            )
+            await db.execute(statement)
+            new_structure = await db.get(orm.Structure, new_structure_id)
+            data_source.structure = new_structure
+            data_source.structure_id = new_structure_id
+            db.add(data_source)
+            await db.commit()
 
 
 class CatalogAwkwardAdapter(CatalogNodeAdapter):

tiled/client/base.py

@@ -184,6 +184,9 @@ def refresh(self):
             )
         ).json()
         self._item = content["data"]
+        attributes = self._item["attributes"]
+        structure_type = STRUCTURE_TYPES[attributes["structure_family"]]
+        self._structure = structure_type.from_json(attributes["structure"])
         return self
 
     @property

tiled/server/dependencies.py

@@ -1,5 +1,5 @@
 from functools import lru_cache
-from typing import Optional
+from typing import Optional, Tuple
 
 import pydantic_settings
 from fastapi import Depends, HTTPException, Query, Request, Security
@@ -182,7 +182,7 @@ def parse_slice_str(dim: str):
 
 def slice_(
     slice: Optional[str] = Query(None, pattern=SLICE_REGEX),
-):
+) -> Tuple[slice | int, ...]:
     "Specify and parse a block index parameter."
 
     return tuple(parse_slice_str(dim) for dim in (slice or "").split(",") if dim)