feat: add public build_search

Cargo.toml

@@ -2,17 +2,15 @@
 name = "stacrs"
 version = "0.3.0"
 edition = "2021"
-publish = false
 
 [lib]
 name = "stacrs"
 crate-type = ["cdylib"]
 
 [dependencies]
 geojson = "0.24.1"
-pyo3 = "0.22.6"
-pythonize = "0.22.0"
-serde = "1.0.215"
+pyo3 = "0.23.3"
+pythonize = "0.23.0"
 serde_json = "1.0.133"
 stac = { version = "0.11.0", features = [
     "geoparquet-compression",
@@ -21,7 +19,8 @@ stac = { version = "0.11.0", features = [
 stac-api = { version = "0.6.2", features = ["client"] }
 stac-duckdb = "0.0.3"
 stac-types = "0.1.0"
-tokio = { version = "1.41.1", features = ["rt"] }
+thiserror = "2.0.4"
+tokio = { version = "1.42.0", features = ["rt"] }
 
 # We don't use duckdb directly, but we need to pin the version to v1.0 for now: https://github.com/stac-utils/stac-rs/issues/385
 duckdb = { version = "=1.0.0", features = ["bundled"] }

scripts/test

@@ -0,0 +1,5 @@
+#!/usr/bin/env sh
+
+set -e
+
+uv run maturin dev --uv && uv run pytest "$@"

src/error.rs

@@ -1,53 +1,40 @@
-use std::convert::Infallible;
-
 use pyo3::{exceptions::PyException, PyErr};
+use thiserror::Error;
 
-pub struct Error(pub String);
+#[derive(Debug, Error)]
+pub enum Error {
+    #[error(transparent)]
+    Geojson(#[from] geojson::Error),
 
-impl From<stac::Error> for Error {
-    fn from(value: stac::Error) -> Self {
-        Error(value.to_string())
-    }
-}
+    #[error(transparent)]
+    Pythonize(#[from] pythonize::PythonizeError),
 
-impl From<stac_api::Error> for Error {
-    fn from(value: stac_api::Error) -> Self {
-        Error(value.to_string())
-    }
-}
+    #[error(transparent)]
+    SerdeJson(#[from] serde_json::Error),
 
-impl From<stac_duckdb::Error> for Error {
-    fn from(value: stac_duckdb::Error) -> Self {
-        Error(value.to_string())
-    }
-}
+    #[error(transparent)]
+    Stac(#[from] stac::Error),
 
-impl From<stac_types::Error> for Error {
-    fn from(value: stac_types::Error) -> Self {
-        Error(value.to_string())
-    }
-}
+    #[error(transparent)]
+    StacApi(#[from] stac_api::Error),
 
-impl From<geojson::Error> for Error {
-    fn from(value: geojson::Error) -> Self {
-        Error(value.to_string())
-    }
-}
+    #[error(transparent)]
+    StacDuckdb(#[from] stac_duckdb::Error),
 
-impl From<serde_json::Error> for Error {
-    fn from(value: serde_json::Error) -> Self {
-        Error(value.to_string())
-    }
-}
-
-impl From<Infallible> for Error {
-    fn from(_: Infallible) -> Self {
-        unreachable!()
-    }
+    #[error(transparent)]
+    StacTypes(#[from] stac_types::Error),
 }
 
 impl From<Error> for PyErr {
     fn from(value: Error) -> Self {
-        PyException::new_err(value.0)
+        match value {
+            Error::Geojson(err) => PyException::new_err(err.to_string()),
+            Error::Pythonize(err) => PyException::new_err(err.to_string()),
+            Error::SerdeJson(err) => PyException::new_err(err.to_string()),
+            Error::Stac(err) => PyException::new_err(err.to_string()),
+            Error::StacApi(err) => PyException::new_err(err.to_string()),
+            Error::StacDuckdb(err) => PyException::new_err(err.to_string()),
+            Error::StacTypes(err) => PyException::new_err(err.to_string()),
+        }
     }
 }

src/lib.rs

@@ -12,6 +12,7 @@ use error::Error;
 use libduckdb_sys as _;
 use openssl as _;
 use pyo3::prelude::*;
+pub use search::build_search;
 
 type Result<T> = std::result::Result<T, Error>;
 

src/migrate.rs

@@ -11,9 +11,7 @@ pub fn migrate<'py>(
     let py = value.py();
     let value: Value = pythonize::depythonize(value)?;
     let version = version
-        .map(|version| version.parse())
-        .transpose()
-        .map_err(Error::from)?
+        .map(|version| version.parse().unwrap())
         .unwrap_or_default();
     let value = value.migrate(&version).map_err(Error::from)?;
     let value = pythonize::pythonize(py, &value)?;
@@ -29,9 +27,7 @@ pub fn migrate_href<'py>(
 ) -> PyResult<Bound<'py, PyDict>> {
     let value: Value = stac::read(href).map_err(Error::from)?;
     let version = version
-        .map(|version| version.parse())
-        .transpose()
-        .map_err(Error::from)?
+        .map(|version| version.parse().unwrap())
         .unwrap_or_default();
     let value = value.migrate(&version).map_err(Error::from)?;
     let value = pythonize::pythonize(py, &value)?;