Resolves two gaps found in a project-state review:
1. Python build was broken: PyO3/numpy 0.23 caps at Python 3.13 but the
environment has 3.14. Bumped to 0.28 and updated the two breaking APIs
(PyObject -> Py<PyAny>, allow_threads -> detach). The extension module now
imports and round-trips under Python 3.14, unblocking cargo build --workspace.
2. The "HNSW vector search over agent memories" headline was unwired:
clawhdf5-ann had zero dependents and the agent used a linear cosine+BM25 scan.
- clawhdf5-ann is now a live index: insert, mark_deleted (soft delete with a
deleted bitset, traversed but never returned), compact, and a format
version tag (v2) with backward-compatible load of v1 files.
- clawhdf5-agent wires HNSW behind the `hnsw` feature (ON by default). The
index mirrors the cache (node id == cache index) and self-heals: it rebuilds
whenever hnsw_synced_len drifts from cache.len(), so unhooked pushes can't
desync it. Non-indexable stores (no/zero-dim/mixed embeddings) and queries
whose dim doesn't match fall back to the exact linear scan.
- hybrid.rs gains merge_vector_keyword, shared by the linear and HNSW paths.
- tests/hnsw_integration.rs validates recall vs a brute-force oracle plus
insert/delete/batch behaviour.
Disable HNSW for exact search with `--no-default-features --features float16`.
Co-Authored-By: Claude Opus 4.8 (1M context) <[email protected]>
288 lines
9.4 KiB
Rust
288 lines
9.4 KiB
Rust
//! Python bindings for clawhdf5 — a pure-Rust HDF5 library.
|
|
//!
|
|
//! Provides a Pythonic API mirroring h5py:
|
|
//!
|
|
//! ```python
|
|
//! import clawhdf5
|
|
//!
|
|
//! with clawhdf5.File('data.h5', 'r') as f:
|
|
//! data = f['dataset_name'][:]
|
|
//! ```
|
|
|
|
mod attrs;
|
|
mod dataset;
|
|
mod file;
|
|
mod group;
|
|
|
|
use pyo3::prelude::*;
|
|
|
|
pub(crate) use attrs::PyAttrs;
|
|
pub(crate) use dataset::PyDataset;
|
|
pub(crate) use file::PyFile;
|
|
pub(crate) use group::PyGroup;
|
|
|
|
/// Convert a `clawhdf5_rs::Error` into a `PyErr`.
|
|
///
|
|
/// Maps different error variants to more specific Python exception types:
|
|
/// - I/O errors -> `PyIOError`
|
|
/// - Format/parsing errors -> `PyValueError`
|
|
/// - Missing dataset/path errors -> `PyKeyError`
|
|
/// - Other errors -> `PyOSError`
|
|
pub(crate) fn to_py_err(e: clawhdf5_rs::Error) -> PyErr {
|
|
use clawhdf5_rs::Error;
|
|
match &e {
|
|
Error::Io(_) => PyErr::new::<pyo3::exceptions::PyIOError, _>(e.to_string()),
|
|
Error::Format(_) => PyErr::new::<pyo3::exceptions::PyValueError, _>(e.to_string()),
|
|
Error::NotADataset(_) | Error::MissingMessage(_) => {
|
|
PyErr::new::<pyo3::exceptions::PyKeyError, _>(e.to_string())
|
|
}
|
|
Error::AlignmentError(_)
|
|
| Error::ZeroCopyNotContiguous
|
|
| Error::ZeroCopyNonNativeEndian
|
|
| Error::ZeroCopyTypeMismatch { .. }
|
|
| Error::ZeroCopyUnaligned { .. } => {
|
|
PyErr::new::<pyo3::exceptions::PyValueError, _>(e.to_string())
|
|
}
|
|
}
|
|
}
|
|
|
|
/// The data payload for a dataset being written.
|
|
#[derive(Clone)]
|
|
pub(crate) enum DatasetData {
|
|
F64(Vec<f64>),
|
|
F32(Vec<f32>),
|
|
I64(Vec<i64>),
|
|
I32(Vec<i32>),
|
|
U8(Vec<u8>),
|
|
}
|
|
|
|
/// Specification for a dataset to be written.
|
|
#[derive(Clone)]
|
|
pub(crate) struct DatasetSpec {
|
|
pub name: String,
|
|
pub data: DatasetData,
|
|
pub shape: Vec<u64>,
|
|
pub chunks: Option<Vec<u64>>,
|
|
pub deflate_level: Option<u32>,
|
|
pub attrs: Vec<(String, OwnedAttrValue)>,
|
|
}
|
|
|
|
/// Owned attribute value (used during write accumulation).
|
|
#[derive(Clone)]
|
|
pub(crate) enum OwnedAttrValue {
|
|
F64(f64),
|
|
I64(i64),
|
|
Str(String),
|
|
F64Array(Vec<f64>),
|
|
I64Array(Vec<i64>),
|
|
}
|
|
|
|
impl From<OwnedAttrValue> for clawhdf5_rs::AttrValue {
|
|
fn from(v: OwnedAttrValue) -> Self {
|
|
match v {
|
|
OwnedAttrValue::F64(x) => clawhdf5_rs::AttrValue::F64(x),
|
|
OwnedAttrValue::I64(x) => clawhdf5_rs::AttrValue::I64(x),
|
|
OwnedAttrValue::Str(s) => clawhdf5_rs::AttrValue::String(s),
|
|
OwnedAttrValue::F64Array(a) => clawhdf5_rs::AttrValue::F64Array(a),
|
|
OwnedAttrValue::I64Array(a) => clawhdf5_rs::AttrValue::I64Array(a),
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Extract a Python value into an `OwnedAttrValue`.
|
|
pub(crate) fn py_to_attr_value(val: &Bound<'_, PyAny>) -> PyResult<OwnedAttrValue> {
|
|
// Try int first (before float, since bool is int subclass in Python)
|
|
if let Ok(v) = val.extract::<i64>() {
|
|
return Ok(OwnedAttrValue::I64(v));
|
|
}
|
|
if let Ok(v) = val.extract::<f64>() {
|
|
return Ok(OwnedAttrValue::F64(v));
|
|
}
|
|
if let Ok(v) = val.extract::<String>() {
|
|
return Ok(OwnedAttrValue::Str(v));
|
|
}
|
|
// Try list of floats, list of ints
|
|
if let Ok(v) = val.extract::<Vec<f64>>() {
|
|
return Ok(OwnedAttrValue::F64Array(v));
|
|
}
|
|
if let Ok(v) = val.extract::<Vec<i64>>() {
|
|
return Ok(OwnedAttrValue::I64Array(v));
|
|
}
|
|
Err(PyErr::new::<pyo3::exceptions::PyTypeError, _>(
|
|
"unsupported attribute type; expected int, float, str, or list of int/float",
|
|
))
|
|
}
|
|
|
|
/// Convert an `AttrValue` (from the Rust lib) to a Python object.
|
|
pub(crate) fn attr_value_to_py(py: Python<'_>, val: &clawhdf5_rs::AttrValue) -> Py<PyAny> {
|
|
match val {
|
|
clawhdf5_rs::AttrValue::F64(v) => v.into_pyobject(py).unwrap().into_any().unbind(),
|
|
clawhdf5_rs::AttrValue::I64(v) => v.into_pyobject(py).unwrap().into_any().unbind(),
|
|
clawhdf5_rs::AttrValue::U64(v) => v.into_pyobject(py).unwrap().into_any().unbind(),
|
|
clawhdf5_rs::AttrValue::String(s) => s.into_pyobject(py).unwrap().into_any().unbind(),
|
|
clawhdf5_rs::AttrValue::F64Array(a) => {
|
|
let list = pyo3::types::PyList::new(py, a).unwrap();
|
|
list.into_any().unbind()
|
|
}
|
|
clawhdf5_rs::AttrValue::I64Array(a) => {
|
|
let list = pyo3::types::PyList::new(py, a).unwrap();
|
|
list.into_any().unbind()
|
|
}
|
|
clawhdf5_rs::AttrValue::StringArray(a) => {
|
|
let list = pyo3::types::PyList::new(py, a).unwrap();
|
|
list.into_any().unbind()
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Apply a `DatasetSpec` to a `DatasetBuilder`.
|
|
pub(crate) fn apply_dataset_spec(
|
|
db: &mut clawhdf5_format::type_builders::DatasetBuilder,
|
|
spec: &DatasetSpec,
|
|
) {
|
|
match &spec.data {
|
|
DatasetData::F64(v) => {
|
|
db.with_f64_data(v);
|
|
}
|
|
DatasetData::F32(v) => {
|
|
db.with_f32_data(v);
|
|
}
|
|
DatasetData::I64(v) => {
|
|
db.with_i64_data(v);
|
|
}
|
|
DatasetData::I32(v) => {
|
|
db.with_i32_data(v);
|
|
}
|
|
DatasetData::U8(v) => {
|
|
db.with_u8_data(v);
|
|
}
|
|
}
|
|
if !spec.shape.is_empty() {
|
|
db.with_shape(&spec.shape);
|
|
}
|
|
if let Some(chunks) = &spec.chunks {
|
|
db.with_chunks(chunks);
|
|
}
|
|
if let Some(level) = spec.deflate_level {
|
|
db.with_deflate(level);
|
|
}
|
|
for (name, val) in &spec.attrs {
|
|
db.set_attr(name, val.clone().into());
|
|
}
|
|
}
|
|
|
|
/// Extract numpy array data from a Python object.
|
|
pub(crate) fn extract_numpy_data(
|
|
py: Python<'_>,
|
|
data: &Bound<'_, PyAny>,
|
|
) -> PyResult<(DatasetData, Vec<u64>)> {
|
|
let np = py.import("numpy")?;
|
|
let arr = np.call_method1("ascontiguousarray", (data,))?;
|
|
let dtype_str: String = arr.getattr("dtype")?.str()?.extract()?;
|
|
let shape: Vec<usize> = arr.getattr("shape")?.extract()?;
|
|
let shape_u64: Vec<u64> = shape.iter().map(|&s| s as u64).collect();
|
|
let flat = arr.call_method0("ravel")?;
|
|
|
|
let dataset_data = match dtype_str.as_str() {
|
|
"float64" => DatasetData::F64(flat.extract::<Vec<f64>>()?),
|
|
"float32" => DatasetData::F32(flat.extract::<Vec<f32>>()?),
|
|
"int64" => DatasetData::I64(flat.extract::<Vec<i64>>()?),
|
|
"int32" => DatasetData::I32(flat.extract::<Vec<i32>>()?),
|
|
"uint8" => DatasetData::U8(flat.extract::<Vec<u8>>()?),
|
|
_ => {
|
|
return Err(PyErr::new::<pyo3::exceptions::PyTypeError, _>(format!(
|
|
"unsupported numpy dtype: {dtype_str}; expected float64, float32, int64, int32, or uint8"
|
|
)));
|
|
}
|
|
};
|
|
Ok((dataset_data, shape_u64))
|
|
}
|
|
|
|
/// The clawhdf5 Python module.
|
|
#[pymodule]
|
|
fn clawhdf5(m: &Bound<'_, PyModule>) -> PyResult<()> {
|
|
m.add_class::<PyFile>()?;
|
|
m.add_class::<PyDataset>()?;
|
|
m.add_class::<PyGroup>()?;
|
|
m.add_class::<PyAttrs>()?;
|
|
Ok(())
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn owned_attr_value_roundtrip() {
|
|
let val = OwnedAttrValue::F64(3.14);
|
|
let attr: clawhdf5_rs::AttrValue = val.into();
|
|
assert!(matches!(attr, clawhdf5_rs::AttrValue::F64(v) if (v - 3.14).abs() < 1e-10));
|
|
}
|
|
|
|
#[test]
|
|
fn owned_attr_value_i64() {
|
|
let val = OwnedAttrValue::I64(42);
|
|
let attr: clawhdf5_rs::AttrValue = val.into();
|
|
assert!(matches!(attr, clawhdf5_rs::AttrValue::I64(42)));
|
|
}
|
|
|
|
#[test]
|
|
fn owned_attr_value_str() {
|
|
let val = OwnedAttrValue::Str("hello".into());
|
|
let attr: clawhdf5_rs::AttrValue = val.into();
|
|
assert!(matches!(attr, clawhdf5_rs::AttrValue::String(ref s) if s == "hello"));
|
|
}
|
|
|
|
#[test]
|
|
fn owned_attr_value_f64_array() {
|
|
let val = OwnedAttrValue::F64Array(vec![1.0, 2.0]);
|
|
let attr: clawhdf5_rs::AttrValue = val.into();
|
|
assert!(matches!(attr, clawhdf5_rs::AttrValue::F64Array(ref v) if v == &[1.0, 2.0]));
|
|
}
|
|
|
|
#[test]
|
|
fn owned_attr_value_i64_array() {
|
|
let val = OwnedAttrValue::I64Array(vec![1, 2, 3]);
|
|
let attr: clawhdf5_rs::AttrValue = val.into();
|
|
assert!(matches!(attr, clawhdf5_rs::AttrValue::I64Array(ref v) if v == &[1, 2, 3]));
|
|
}
|
|
|
|
#[test]
|
|
fn dataset_spec_apply() {
|
|
let spec = DatasetSpec {
|
|
name: "test".into(),
|
|
data: DatasetData::F64(vec![1.0, 2.0, 3.0]),
|
|
shape: vec![3],
|
|
chunks: None,
|
|
deflate_level: None,
|
|
attrs: vec![],
|
|
};
|
|
let mut builder = clawhdf5_rs::FileBuilder::new();
|
|
let db = builder.create_dataset(&spec.name);
|
|
apply_dataset_spec(db, &spec);
|
|
let bytes = builder.finish().unwrap();
|
|
let file = clawhdf5_rs::File::from_bytes(bytes).unwrap();
|
|
let ds = file.dataset("test").unwrap();
|
|
assert_eq!(ds.read_f64().unwrap(), vec![1.0, 2.0, 3.0]);
|
|
}
|
|
|
|
#[test]
|
|
fn dataset_spec_with_chunks_and_deflate() {
|
|
let spec = DatasetSpec {
|
|
name: "compressed".into(),
|
|
data: DatasetData::I32(vec![10, 20, 30, 40, 50]),
|
|
shape: vec![5],
|
|
chunks: Some(vec![5]),
|
|
deflate_level: Some(4),
|
|
attrs: vec![("unit".into(), OwnedAttrValue::Str("m".into()))],
|
|
};
|
|
let mut builder = clawhdf5_rs::FileBuilder::new();
|
|
let db = builder.create_dataset(&spec.name);
|
|
apply_dataset_spec(db, &spec);
|
|
let bytes = builder.finish().unwrap();
|
|
let file = clawhdf5_rs::File::from_bytes(bytes).unwrap();
|
|
let ds = file.dataset("compressed").unwrap();
|
|
assert_eq!(ds.read_i32().unwrap(), vec![10, 20, 30, 40, 50]);
|
|
}
|
|
}
|