couple collection_id and layer_group_id; better error responses

web_api/app/annotations.py

@@ -1,7 +1,7 @@
 # pylint: disable=all # type: ignore
 from typing import Annotated
 
-from fastapi import FastAPI, Query
+from fastapi import FastAPI, Query, Request
 
 from zetta_utils.db_annotations.annotation import (
     add_annotation,
@@ -15,9 +15,16 @@
     update_annotations,
 )
 
+from .utils import generic_exception_handler
+
 api = FastAPI()
 
 
+@api.exception_handler(Exception)
+async def generic_handler(request: Request, exc: Exception):
+    return generic_exception_handler(request, exc)
+
+
 @api.get("/single/{annotation_id}")
 async def read_single(annotation_id: str):
     return read_annotation(annotation_id)

web_api/app/collections.py

@@ -1,7 +1,7 @@
 # pylint: disable=all # type: ignore
 from typing import Annotated
 
-from fastapi import FastAPI, Query
+from fastapi import FastAPI, HTTPException, Query, Request
 
 from zetta_utils.db_annotations.collection import (
     add_collection,
@@ -12,17 +12,27 @@
     update_collection,
 )
 
+from .utils import generic_exception_handler
+
 api = FastAPI()
 
 
+@api.exception_handler(Exception)
+async def generic_handler(request: Request, exc: Exception):
+    return generic_exception_handler(request, exc)
+
+
 @api.get("/single/{collection_id}")
 async def read_single(collection_id: str):
     return read_collection(collection_id)
 
 
 @api.post("/single")
 async def add_single(name: str, user: str, comment: str | None = None):
-    return add_collection(name, user, comment=comment)
+    try:
+        return add_collection(name, user, comment=comment)
+    except KeyError:
+        raise HTTPException(status_code=409, detail=f"`{name}` exists.")
 
 
 @api.put("/single")

web_api/app/layer_groups.py

@@ -1,7 +1,7 @@
 # pylint: disable=all # type: ignore
 from typing import Annotated
 
-from fastapi import FastAPI, Query
+from fastapi import FastAPI, HTTPException, Query, Request
 
 from zetta_utils.db_annotations.layer_group import (
     add_layer_group,
@@ -12,9 +12,16 @@
     update_layer_group,
 )
 
+from .utils import generic_exception_handler
+
 api = FastAPI()
 
 
+@api.exception_handler(Exception)
+async def generic_handler(request: Request, exc: Exception):
+    return generic_exception_handler(request, exc)
+
+
 @api.get("/single/{layer_group_id}")
 async def read_single(layer_group_id: str):
     return read_layer_group(layer_group_id)
@@ -28,9 +35,14 @@ async def add_single(
     layers: list[str] | None = None,
     comment: str | None = None,
 ):
-    return add_layer_group(
-        name=name, collection_id=collection_id, user=user, layers=layers, comment=comment
-    )
+    try:
+        return add_layer_group(
+            name=name, collection_id=collection_id, user=user, layers=layers, comment=comment
+        )
+    except KeyError:
+        raise HTTPException(
+            status_code=409, detail=f"`{collection_id}` already has layer group `{name}`."
+        )
 
 
 @api.put("/single")

web_api/app/layers.py

@@ -1,7 +1,7 @@
 # pylint: disable=all # type: ignore
 from typing import Annotated
 
-from fastapi import FastAPI, Query
+from fastapi import FastAPI, Query, Request
 
 from zetta_utils.db_annotations.layer import (
     add_layer,
@@ -10,9 +10,16 @@
     update_layer,
 )
 
+from .utils import generic_exception_handler
+
 api = FastAPI()
 
 
+@api.exception_handler(Exception)
+async def generic_handler(request: Request, exc: Exception):
+    return generic_exception_handler(request, exc)
+
+
 @api.get("/single/{layer_id}")
 async def read_single(layer_id: str):
     return read_layer(layer_id)

web_api/app/painting.py

@@ -10,12 +10,17 @@
 from zetta_utils.geometry import Vec3D
 from zetta_utils.layer.volumetric import VolumetricIndex
 from zetta_utils.layer.volumetric.cloudvol import build_cv_layer
-from zetta_utils.log import get_logger
 
-logger = get_logger("zetta_ai")
+from .utils import generic_exception_handler
+
 api = FastAPI()
 
 
+@api.exception_handler(Exception)
+async def generic_handler(request: Request, exc: Exception):
+    return generic_exception_handler(request, exc)
+
+
 @api.get("/cutout")
 async def read_cutout(
     path: Annotated[str, Query()],
@@ -25,19 +30,13 @@ async def read_cutout(
     is_fortran: Annotated[bool, Query()] = True,
 ):
     index = VolumetricIndex.from_coords(bbox_start, bbox_end, Vec3D(*resolution))
-    logger.info(f"Index: {index}")
     layer = build_cv_layer(path, readonly=True)
 
     data = np.ascontiguousarray(layer[index])
-    logger.info(f"Data shape: {data.shape}")
     if is_fortran:
         data = einops.rearrange(data, "C X Y Z -> Z Y X C")
-        logger.info(f"Data shape after rearrange: {data.shape}")
     data_bytes = data.tobytes()
-    logger.info(f"Num bytes: {len(data_bytes)}")
     compressed_data = gzip.compress(data_bytes)
-    logger.info(f"Num compressed bytes: {len(data_bytes)}")
-
     return Response(content=compressed_data)
 
 
@@ -51,24 +50,16 @@ async def write_cutout(
     is_fortran: Annotated[bool, Query()] = True,
 ):
     index = VolumetricIndex.from_coords(bbox_start, bbox_end, Vec3D(*resolution))
-    logger.info(f"Index: {index}")
     cv_kwargs = {"non_aligned_writes": True}
     layer = build_cv_layer(path, cv_kwargs=cv_kwargs)
-    logger.info(f"Non aligned writes enabled: {layer.backend.enforce_chunk_aligned_writes}")
     shape = [layer.backend.num_channels, *(np.array(bbox_end) - np.array(bbox_start))]
 
-    logger.info(f"Expected shape: {shape}")
     data = await request.body()
-    logger.info(f"Compressed data len: {len(data)}")
-    # Decompress the gzipped data
     data = gzip.decompress(data)
-    logger.info(f"Decompressed data len: {len(data)}")
 
     if not is_fortran:
         data_arr = np.frombuffer(data, dtype=layer.backend.dtype).reshape(shape)
     else:
         data_arr = np.frombuffer(data, dtype=layer.backend.dtype).reshape(shape[::-1])
         data_arr = einops.rearrange(data_arr, "Z Y X C -> C X Y Z")
-
-    logger.info(f"Final data shape: {data_arr.shape}")
     layer[index] = data_arr

web_api/app/utils.py

@@ -0,0 +1,17 @@
+# pylint: disable=all # type: ignore
+
+import traceback
+
+from fastapi import Request, Response
+
+from zetta_utils.log import get_logger
+
+logger = get_logger("web_api")
+
+
+def generic_exception_handler(request: Request, exc: Exception):
+    logger.error(traceback.format_exc())
+    if isinstance(exc, KeyError):
+        if request.method == "GET":
+            return Response(status_code=404, content=repr(exc))
+    return Response(status_code=500, content=traceback.format_exc())

zetta_utils/db_annotations/layer_group.py

@@ -61,7 +61,7 @@ def add_layer_group(
     layers: list[str] | None = None,
     comment: str | None = None,
 ) -> str:
-    layer_group_id = name
+    layer_group_id = f"{collection_id}:{name}"
     if layer_group_id in LAYER_GROUPS_DB:
         raise KeyError(f"{layer_group_id} already exists.")
     col_keys = INDEXED_COLS + NON_INDEXED_COLS