Skip to content

The fastest, cheapest, most efficient open-source agent harness. Run more than 500 agents on a $10 VPS.

refactor(storage): use driver types directly in import paths

Steven Enamakelc2f6adc1d663
diff --git a/crates/openhuman-core/src/channels/runtime/startup/delivery_import.rs b/crates/openhuman-core/src/channels/runtime/startup/delivery_import.rs
index c25a03774b..0b041f249a 100644
--- a/crates/openhuman-core/src/channels/runtime/startup/delivery_import.rs
+++ b/crates/openhuman-core/src/channels/runtime/startup/delivery_import.rs
@@ -144,7 +144,7 @@ async fn import_into(
}
async fn import_payload(
- scoped: &tinystoragedrivers::ScopedStorage,
+ scoped: &crate::storage::Storage,
path: &Path,
) -> anyhow::Result<Outcome> {
let bytes = match tokio::fs::read(path).await {
diff --git a/crates/openhuman-core/src/storage/import/sessions.rs b/crates/openhuman-core/src/storage/import/sessions.rs
index b906365bfb..5152a0c971 100644
--- a/crates/openhuman-core/src/storage/import/sessions.rs
+++ b/crates/openhuman-core/src/storage/import/sessions.rs
@@ -111,9 +111,13 @@ fn import(backend: &Arc<dyn StorageBackend>, config: &Config) -> Result<Outcome>
tasks: rows.tasks,
tool_effects: rows.tool_effects,
};
- let report =
- crate::storage::block_on(async move { ledger.import_legacy_batch(batch).await })?
- .context("[sessions] import sessions.db")?;
+ let report = crate::storage::block_on_anyhow(async move {
+ ledger
+ .import_legacy_batch(batch)
+ .await
+ .map_err(|error| anyhow::anyhow!("{error}"))
+ })
+ .context("[sessions] import sessions.db")?;
let (database_found, database_written) = database_totals(&report);
found += database_found;
written += database_written;
diff --git a/crates/openhuman-core/src/storage/import_state.rs b/crates/openhuman-core/src/storage/import_state.rs
index 8745f96d97..fdbbc89a7a 100644
--- a/crates/openhuman-core/src/storage/import_state.rs
+++ b/crates/openhuman-core/src/storage/import_state.rs
@@ -15,7 +15,7 @@ use tinystoragedrivers::{
};
use tinystoragedrivers_api::DocumentStore;
-use super::documents::Repo;
+use super::{DocumentStoreExt, documents::Repo};
/// How long a claim blocks other processes before it can be taken over.
pub const CLAIM_TTL_MS: i64 = 10 * 60 * 1000;
@@ -324,7 +324,7 @@ struct ClaimToken {
impl ClaimToken {
fn write_condition(&self) -> Result<WriteCondition> {
- let scope = crate::storage::Scope::new(&self.scope)?;
+ let scope = tinystoragedrivers::Scope::new(&self.scope)?;
let filter = Filter::eq("holder", self.holder.clone())
.and(Filter::eq("epoch", serde_json::json!(self.epoch)));
Ok(WriteCondition::new(
diff --git a/crates/openhuman-core/src/storage/scope_move.rs b/crates/openhuman-core/src/storage/scope_move.rs
index 5209a92190..12de284e1b 100644
--- a/crates/openhuman-core/src/storage/scope_move.rs
+++ b/crates/openhuman-core/src/storage/scope_move.rs
@@ -17,6 +17,7 @@
use std::collections::HashSet;
use std::sync::Arc;
+use anyhow::Context;
use sha2::Digest;
use tinystoragedrivers_types::{Capability, CollectionSpec, ErrorKind, WriteOptions};