ngio 0.5.0a1__py3-none-any.whl → 0.5.0a3__py3-none-any.whl

ngio/ome_zarr_meta/v05/{_v05_spec_utils.py → _v05_spec.py}

@@ -23,7 +23,7 @@ from ome_zarr_models.v05.image_label import ImageLabelAttrs as LabelAttrsV05
 from ome_zarr_models.v05.multiscales import Dataset as DatasetV05
 from ome_zarr_models.v05.multiscales import Multiscale as MultiscaleV05
 from ome_zarr_models.v05.multiscales import ValidTransform as ValidTransformV05
-from pydantic import BaseModel, ValidationError
+from pydantic import BaseModel
 
 from ngio.ome_zarr_meta.ngio_specs import (
     AxesHandler,
@@ -56,36 +56,6 @@ class ImageLabelV05(BaseModel):
     ome: LabelAttrsV05
 
 
-def _is_v05_image_meta(metadata: dict) -> ImageV05WithOmero | ValidationError:
-    """Check if the metadata is a valid OME-Zarr v05 metadata.
-
-    Args:
-        metadata (dict): The metadata to check.
-
-    Returns:
-        bool: True if the metadata is a valid OME-Zarr v05 metadata, False otherwise.
-    """
-    try:
-        return ImageV05WithOmero(**metadata)
-    except ValidationError as e:
-        return e
-
-
-def _is_v05_label_meta(metadata: dict) -> ImageLabelV05 | ValidationError:
-    """Check if the metadata is a valid OME-Zarr v05 metadata.
-
-    Args:
-        metadata (dict): The metadata to check.
-
-    Returns:
-        bool: True if the metadata is a valid OME-Zarr v05 metadata, False otherwise.
-    """
-    try:
-        return ImageLabelV05(**metadata)
-    except ValidationError as e:
-        return e
-
-
 def _v05_omero_to_channels(v05_omero: OmeroV05 | None) -> ChannelsMeta | None:
     if v05_omero is None:
         return None
@@ -214,7 +184,7 @@ def v05_to_ngio_image_meta(
     axes_setup: AxesSetup | None = None,
     allow_non_canonical_axes: bool = False,
     strict_canonical_order: bool = True,
-) -> tuple[bool, NgioImageMeta | ValidationError]:
+) -> NgioImageMeta:
     """Convert a v05 image metadata to a ngio image metadata.
 
     Args:
@@ -227,9 +197,7 @@ def v05_to_ngio_image_meta(
     Returns:
         NgioImageMeta: The ngio image metadata.
     """
-    v05_image = _is_v05_image_meta(metadata)
-    if isinstance(v05_image, ValidationError):
-        return False, v05_image
+    v05_image = ImageV05WithOmero(**metadata)
     v05_image = v05_image.ome
     if len(v05_image.multiscales) > 1:
         raise NotImplementedError(
@@ -250,7 +218,7 @@ def v05_to_ngio_image_meta(
     name = v05_multiscale.name
     if name is not None and not isinstance(name, str):
         name = str(name)
-    return True, NgioImageMeta(
+    return NgioImageMeta(
         version="0.5",
         name=name,
         datasets=datasets,
@@ -263,7 +231,7 @@ def v05_to_ngio_label_meta(
     axes_setup: AxesSetup | None = None,
     allow_non_canonical_axes: bool = False,
     strict_canonical_order: bool = True,
-) -> tuple[bool, NgioLabelMeta | ValidationError]:
+) -> NgioLabelMeta:
     """Convert a v05 image metadata to a ngio image metadata.
 
     Args:
@@ -274,11 +242,9 @@ def v05_to_ngio_label_meta(
         strict_canonical_order (bool, optional): Strict canonical order.
 
     Returns:
-        NgioImageMeta: The ngio image metadata.
+        NgioLabelMeta: The ngio label metadata.
     """
-    v05_label = _is_v05_label_meta(metadata)
-    if isinstance(v05_label, ValidationError):
-        return False, v05_label
+    v05_label = ImageLabelV05(**metadata)
     v05_label = v05_label.ome
 
     if len(v05_label.multiscales) > 1:
@@ -316,7 +282,7 @@ def v05_to_ngio_label_meta(
     if name is not None and not isinstance(name, str):
         name = str(name)
 
-    return True, NgioLabelMeta(
+    return NgioLabelMeta(
         version="0.5",
         name=name,
         datasets=datasets,
@@ -452,42 +418,33 @@ class HCSV05(BaseModel):
 
 def v05_to_ngio_well_meta(
     metadata: dict,
-) -> tuple[bool, NgioWellMeta | ValidationError]:
+) -> NgioWellMeta:
     """Convert a v05 well metadata to a ngio well metadata.
 
     Args:
         metadata (dict): The v05 well metadata.
 
     Returns:
-        result (bool): True if the conversion was successful, False otherwise.
-        ngio_well_meta (NgioWellMeta): The ngio well metadata.
+        NgioWellMeta: The ngio well metadata.
     """
-    try:
-        v05_well = WellV05(**metadata)
-    except ValidationError as e:
-        return False, e
-
-    return True, NgioWellMeta(**v05_well.ome.model_dump())
+    v05_well = WellV05(**metadata).ome.well.model_dump()
+    images = v05_well.get("images", [])
+    return NgioWellMeta(images=images, version="0.5")
 
 
 def v05_to_ngio_plate_meta(
     metadata: dict,
-) -> tuple[bool, NgioPlateMeta | ValidationError]:
+) -> NgioPlateMeta:
     """Convert a v05 plate metadata to a ngio plate metadata.
 
     Args:
         metadata (dict): The v05 plate metadata.
 
     Returns:
-        result (bool): True if the conversion was successful, False otherwise.
-        ngio_plate_meta (NgioPlateMeta): The ngio plate metadata.
+        NgioPlateMeta: The ngio plate metadata.
     """
-    try:
-        v05_plate = HCSV05(**metadata)
-    except ValidationError as e:
-        return False, e
-
-    return True, NgioPlateMeta(**v05_plate.ome.model_dump())
+    v05_plate = HCSV05(**metadata).ome.plate.model_dump()
+    return NgioPlateMeta(plate=v05_plate, version="0.5")  # type: ignore
 
 
 def ngio_to_v05_well_meta(metadata: NgioWellMeta) -> dict:
@@ -499,7 +456,7 @@ def ngio_to_v05_well_meta(metadata: NgioWellMeta) -> dict:
     Returns:
         dict: The v05 well metadata.
     """
-    v05_well = WellAttrsV05(**metadata.model_dump())
+    v05_well = WellAttrsV05(well=metadata.model_dump())  # type: ignore
     v05_well = WellV05(ome=v05_well)
     return v05_well.model_dump(exclude_none=True, by_alias=True)
 

ngio/tables/_tables_container.py

@@ -258,7 +258,7 @@ class TablesContainer:
 
     def _get_table_group_handler(self, name: str) -> ZarrGroupHandler:
         """Get the group handler for a table."""
-        handler = self._group_handler.derive_handler(path=name)
+        handler = self._group_handler.get_handler(path=name)
         return handler
 
     def list(self, filter_types: TypedTable | str | None = None) -> list[str]:
@@ -326,9 +326,7 @@ class TablesContainer:
                 "Use overwrite=True to replace it."
             )
 
-        table_handler = self._group_handler.derive_handler(
-            path=name, overwrite=overwrite
-        )
+        table_handler = self._group_handler.get_handler(path=name, overwrite=overwrite)
 
         if backend is None:
             backend = table.backend_name
@@ -359,13 +357,10 @@ ImplementedTables().add_implementation(ConditionTableV1)
 def open_tables_container(
     store: StoreOrGroup,
     cache: bool = False,
-    mode: AccessModeLiteral = "a",
-    parallel_safe: bool = False,
+    mode: AccessModeLiteral = "r+",
 ) -> TablesContainer:
     """Open a table handler from a Zarr store."""
-    handler = ZarrGroupHandler(
-        store=store, cache=cache, mode=mode, parallel_safe=parallel_safe
-    )
+    handler = ZarrGroupHandler(store=store, cache=cache, mode=mode)
     return TablesContainer(handler)
 
 
@@ -373,12 +368,13 @@ def open_table(
     store: StoreOrGroup,
     backend: TableBackend | None = None,
     cache: bool = False,
-    mode: AccessModeLiteral = "a",
-    parallel_safe: bool = False,
+    mode: AccessModeLiteral = "r+",
 ) -> Table:
     """Open a table from a Zarr store."""
     handler = ZarrGroupHandler(
-        store=store, cache=cache, mode=mode, parallel_safe=parallel_safe
+        store=store,
+        cache=cache,
+        mode=mode,
     )
     meta = _get_meta(handler)
     return ImplementedTables().get_table(
@@ -391,12 +387,13 @@ def open_table_as(
     table_cls: type[TableType],
     backend: TableBackend | None = None,
     cache: bool = False,
-    mode: AccessModeLiteral = "a",
-    parallel_safe: bool = False,
+    mode: AccessModeLiteral = "r+",
 ) -> TableType:
     """Open a table from a Zarr store as a specific type."""
     handler = ZarrGroupHandler(
-        store=store, cache=cache, mode=mode, parallel_safe=parallel_safe
+        store=store,
+        cache=cache,
+        mode=mode,
     )
     return table_cls.from_handler(
         handler=handler,
@@ -410,12 +407,20 @@ def write_table(
     backend: TableBackend = DefaultTableBackend,
     cache: bool = False,
     mode: AccessModeLiteral = "a",
-    parallel_safe: bool = False,
 ) -> None:
-    """Write a table to a Zarr store."""
-    handler = ZarrGroupHandler(
-        store=store, cache=cache, mode=mode, parallel_safe=parallel_safe
-    )
+    """Write a table to a Zarr store.
+
+    A table will be created at the given store location.
+
+    Args:
+        store (StoreOrGroup): The Zarr store or group to write the table to.
+        table (Table): The table to write.
+        backend (TableBackend): The backend to use for writing the table.
+        cache (bool): Whether to use caching for the Zarr group handler.
+        mode (AccessModeLiteral): The access mode to use for the Zarr group handler.
+
+    """
+    handler = ZarrGroupHandler(store=store, cache=cache, mode=mode)
     table.set_backend(
         handler=handler,
         backend=backend,

ngio/tables/backends/_anndata.py

@@ -1,8 +1,10 @@
+import zarr
 from anndata import AnnData
 from anndata._settings import settings
 from pandas import DataFrame
 from polars import DataFrame as PolarsDataFrame
 from polars import LazyFrame
+from zarr.storage import FsspecStore, LocalStore, MemoryStore
 
 from ngio.tables.backends._abstract_backend import AbstractTableBackend
 from ngio.tables.backends._anndata_utils import (
@@ -13,7 +15,7 @@ from ngio.tables.backends._utils import (
     convert_polars_to_anndata,
     normalize_anndata,
 )
-from ngio.utils import NgioValueError
+from ngio.utils import NgioValueError, copy_group
 
 
 class AnnDataBackend(AbstractTableBackend):
@@ -50,18 +52,65 @@ class AnnDataBackend(AbstractTableBackend):
         """Load the table as an AnnData object."""
         return self.load_as_anndata()
 
+    def _write_to_local_store(
+        self, store: LocalStore, path: str, table: AnnData
+    ) -> None:
+        """Write the AnnData table to a LocalStore."""
+        store_path = f"{store.root}/{path}"
+        table.write_zarr(store_path)
+
+    def _write_to_fsspec_store(
+        self, store: FsspecStore, path: str, table: AnnData
+    ) -> None:
+        """Write the AnnData table to a FsspecStore."""
+        full_url = f"{store.path}/{path}"
+        fs = store.fs
+        mapper = fs.get_mapper(full_url)
+        table.write_zarr(mapper)
+
+    def _write_to_memory_store(
+        self, store: MemoryStore, path: str, table: AnnData
+    ) -> None:
+        """Write the AnnData table to a MemoryStore."""
+        store = MemoryStore()
+        table.write_zarr(store)
+        anndata_group = zarr.open_group(store, mode="r")
+        copy_group(
+            anndata_group,
+            self._group_handler._group,
+        )
+
     def write_from_anndata(self, table: AnnData) -> None:
         """Serialize the table from an AnnData object."""
-        full_url = self._group_handler.full_url
-        if full_url is None:
+        # Make sure to use the correct zarr format
+        settings.zarr_write_format = self._group_handler.zarr_format
+        store = self._group_handler.store
+        path = self._group_handler.group.path
+        if isinstance(store, LocalStore):
+            self._write_to_local_store(
+                store,
+                path,
+                table,
+            )
+        elif isinstance(store, FsspecStore):
+            self._write_to_fsspec_store(
+                store,
+                path,
+                table,
+            )
+        elif isinstance(store, MemoryStore):
+            self._write_to_memory_store(
+                store,
+                path,
+                table,
+            )
+        else:
             raise NgioValueError(
-                f"Ngio does not support writing file from a "
-                f"store of type {type(self._group_handler)}. "
+                f"Ngio does not support writing an AnnData table to a "
+                f"store of type {type(store)}. "
                 "Please make sure to use a compatible "
-                "store like a zarr.DirectoryStore."
+                "store like a LocalStore, or FsspecStore."
             )
-        settings.zarr_write_format = self._group_handler.zarr_format
-        table.write_zarr(full_url)
 
     def write_from_pandas(self, table: DataFrame) -> None:
         """Serialize the table from a pandas DataFrame."""

ngio/tables/backends/_anndata_utils.py

@@ -9,7 +9,6 @@ from anndata._io.utils import _read_legacy_raw
 from anndata._io.zarr import read_dataframe
 from anndata.compat import _clean_uns
 from anndata.experimental import read_dispatched
-from zarr.storage import LocalStore
 
 from ngio.utils import (
     NgioValueError,
@@ -35,10 +34,6 @@ def custom_anndata_read_zarr(
         elem_to_read (Sequence[str] | None): The elements to read from the store.
     """
     group = open_group_wrapper(store=store, mode="r")
-
-    if not isinstance(group.store, LocalStore):
-        elem_to_read = ["X", "obs", "var"]
-
     if elem_to_read is None:
         elem_to_read = [
             "X",
@@ -89,7 +84,7 @@ def custom_anndata_read_zarr(
         _clean_uns(adata)
 
     if isinstance(adata, dict):
-        adata = AnnData(**adata)
+        adata = AnnData(**adata)  # type: ignore
     if not isinstance(adata, AnnData):
         raise NgioValueError(f"Expected an AnnData object, but got {type(adata)}")
     return adata

ngio/tables/backends/_csv.py

@@ -1,20 +1,7 @@
-import pandas as pd
-import polars as pl
+from ngio.tables.backends._py_arrow_backends import PyArrowBackend
 
-from ngio.tables.backends._non_zarr_backends import NonZarrBaseBackend
 
-
-def write_lf_to_csv(path: str, table: pl.DataFrame) -> None:
-    """Write a polars DataFrame to a CSV file."""
-    table.write_csv(path)
-
-
-def write_df_to_csv(path: str, table: pd.DataFrame) -> None:
-    """Write a pandas DataFrame to a CSV file."""
-    table.to_csv(path, index=False)
-
-
-class CsvTableBackend(NonZarrBaseBackend):
+class CsvTableBackend(PyArrowBackend):
     """A class to load and write small tables in CSV format."""
 
     def __init__(
@@ -22,11 +9,8 @@ class CsvTableBackend(NonZarrBaseBackend):
     ):
         """Initialize the CsvTableBackend."""
         super().__init__(
-            lf_reader=pl.scan_csv,
-            df_reader=pd.read_csv,
-            lf_writer=write_lf_to_csv,
-            df_writer=write_df_to_csv,
             table_name="table.csv",
+            table_format="csv",
         )
 
     @staticmethod

ngio/tables/backends/_json.py

@@ -8,7 +8,7 @@ from ngio.tables.backends._utils import (
     normalize_pandas_df,
     normalize_polars_lf,
 )
-from ngio.utils import NgioFileNotFoundError
+from ngio.utils import NgioError
 
 
 class JsonTableBackend(AbstractTableBackend):
@@ -37,22 +37,19 @@ class JsonTableBackend(AbstractTableBackend):
     def _get_table_group(self):
         """Get the table group, creating it if it doesn't exist."""
         try:
-            table_group = self._group_handler.get_group(path="table")
-        except NgioFileNotFoundError:
-            table_group = self._group_handler.group.create_group("table")
+            table_group = self._group_handler.get_group(path="table", create_mode=True)
+        except NgioError as e:
+            raise NgioError(
+                "Could not get or create a 'table' group in the store "
+                f"{self._group_handler.store} path "
+                f"{self._group_handler.group.path}/table."
+            ) from e
         return table_group
 
-    def _load_as_pandas_df(self) -> DataFrame:
-        """Load the table as a pandas DataFrame."""
-        table_group = self._get_table_group()
-        table_dict = dict(table_group.attrs)
-
-        data_frame = pd.DataFrame.from_dict(table_dict)
-        return data_frame
-
     def load_as_pandas_df(self) -> DataFrame:
         """Load the table as a pandas DataFrame."""
-        data_frame = self._load_as_pandas_df()
+        table_dict = self._get_table_group().attrs.asdict()
+        data_frame = pd.DataFrame.from_dict(table_dict)
         data_frame = normalize_pandas_df(
             data_frame,
             index_key=self.index_key,

ngio/tables/backends/_parquet.py

@@ -1,32 +1,7 @@
-import pandas as pd
-import polars as pl
+from ngio.tables.backends._py_arrow_backends import PyArrowBackend
 
-from ngio.tables.backends._non_zarr_backends import NonZarrBaseBackend
 
-
-def write_lf_to_parquet(path: str, table: pl.DataFrame) -> None:
-    """Write a polars DataFrame to a Parquet file."""
-    # make categorical into string (for pandas compatibility)
-    schema = table.collect_schema()
-
-    categorical_columns = []
-    for name, dtype in zip(schema.names(), schema.dtypes(), strict=True):
-        if dtype == pl.Categorical:
-            categorical_columns.append(name)
-
-    for col in categorical_columns:
-        table = table.with_columns(pl.col(col).cast(pl.Utf8))
-
-    # write to parquet
-    table.write_parquet(path)
-
-
-def write_df_to_parquet(path: str, table: pd.DataFrame) -> None:
-    """Write a pandas DataFrame to a Parquet file."""
-    table.to_parquet(path, index=False)
-
-
-class ParquetTableBackend(NonZarrBaseBackend):
+class ParquetTableBackend(PyArrowBackend):
     """A class to load and write small tables in Parquet format."""
 
     def __init__(
@@ -34,11 +9,8 @@ class ParquetTableBackend(NonZarrBaseBackend):
     ):
         """Initialize the ParquetTableBackend."""
         super().__init__(
-            lf_reader=pl.scan_parquet,
-            df_reader=pd.read_parquet,
-            lf_writer=write_lf_to_parquet,
-            df_writer=write_df_to_parquet,
             table_name="table.parquet",
+            table_format="parquet",
         )
 
     @staticmethod