The fastest, cheapest, most efficient open-source agent harness. Run more than 500 agents on a $10 VPS.
Rust agent-orchestrationai-agentsai-assistantdesktopllmlocal-firstmcppersonal-aiprivacyrustsecond-braintauri
refactor(storage): update storage backend usage to use document store methods
Steven Enamakeleb8ecdbedad4
diff --git a/crates/openhuman-core/src/integrations/composio/file_store_documents.rs b/crates/openhuman-core/src/integrations/composio/file_store_documents.rsindex 4def205f4f..e146f5a1cf 100644--- a/crates/openhuman-core/src/integrations/composio/file_store_documents.rs+++ b/crates/openhuman-core/src/integrations/composio/file_store_documents.rs@@ -33,7 +33,7 @@ use tinystoragedrivers_types::{Capability, CollectionSpec, Query, StorageError};use crate::storage::documents::Repo;use crate::storage::import_state;-use crate::storage::{state_kv::StateKv, Storage};+use crate::storage::{Storage, state_kv::StateKv};/// The `tsd.kv` owner and namespace of the state values.const KV_OWNER: &str = "composio";@@ -120,11 +120,13 @@ impl Docs {log::debug!("[composio:store] document import id={name}");let step = import_step(name);let repo = self.repo.clone();+ let body_repo = repo.clone();+ let body_step = step.clone();let claimed = import_state::with_claim(&repo, IMPORT_OWNER, &step, move |condition| {- let claimed_repo = repo.conditioned(condition)?;+ let claimed_repo = body_repo.conditioned(condition)?;let state = StateKv::over(claimed_repo.scoped(), KV_OWNER, KV_NS);let wrote = state.insert_if_absent(name, &value)?;- import_state::set_done(&claimed_repo, IMPORT_OWNER, &step)?;+ import_state::set_done(&claimed_repo, IMPORT_OWNER, &body_step)?;Ok(wrote)})?;Ok(claimed.unwrap_or(false))diff --git a/crates/openhuman-core/src/integrations/composio/file_store_documents_tests.rs b/crates/openhuman-core/src/integrations/composio/file_store_documents_tests.rsindex 9419267986..a420c02e7a 100644--- a/crates/openhuman-core/src/integrations/composio/file_store_documents_tests.rs+++ b/crates/openhuman-core/src/integrations/composio/file_store_documents_tests.rs@@ -154,9 +154,10 @@ fn an_unchanged_update_writes_nothing_and_returns_its_result() {fn the_import_marker_is_a_migrations_entry_and_stops_a_second_import() {let docs = docs_in(&MemoryStorage::new(), "local");assert!(!docs.legacy_imported(path()).unwrap());- assert!(docs- .import_if_absent(path(), serde_json::json!({ "gmail": 5 }))- .unwrap());+ assert!(+ docs.import_if_absent(path(), serde_json::json!({ "gmail": 5 }))+ .unwrap()+ );assert!(docs.legacy_imported(path()).unwrap());let loaded: BTreeMap<String, u32> = docs.load(path()).unwrap();assert_eq!(loaded["gmail"], 5);diff --git a/crates/openhuman-core/src/modules/storage_import_support.rs b/crates/openhuman-core/src/modules/storage_import_support.rsindex 768f4d92c5..157b4657ef 100644--- a/crates/openhuman-core/src/modules/storage_import_support.rs+++ b/crates/openhuman-core/src/modules/storage_import_support.rs@@ -9,10 +9,11 @@use std::path::Path;use std::sync::Arc;-use crate::storage::{DocumentStore, ErrorKind, Precondition, Storage};+use crate::storage::{DocumentStore, Precondition, Storage};use anyhow::{Result, anyhow};use serde_json::Value;use sha2::Digest;+use tinystoragedrivers::ErrorKind;use tinystoragedrivers_types::WriteOptions;/// The module's scope of the installed backend, or `None` when the processdiff --git a/crates/openhuman-core/src/modules/storage_import_tinymcp.rs b/crates/openhuman-core/src/modules/storage_import_tinymcp.rsindex 67f0bb95b3..e0ecabf451 100644--- a/crates/openhuman-core/src/modules/storage_import_tinymcp.rs+++ b/crates/openhuman-core/src/modules/storage_import_tinymcp.rs@@ -29,12 +29,11 @@use std::path::{Path, PathBuf};use std::sync::Arc;-use crate::storage::{- CollectionSpec, DocumentStore, ErrorKind, Precondition, Storage, StorageBackend,-};+use crate::storage::{CollectionSpec, DocumentStore, Precondition, Storage, StorageBackend};use anyhow::{Context, Result, anyhow};use serde_json::{Value, json};use sha2::Digest;+use tinystoragedrivers::ErrorKind;use tinystoragedrivers_api::SecretStore;use crate::core::runtime::DispatchCtx;diff --git a/crates/openhuman-core/src/storage/import/sessions.rs b/crates/openhuman-core/src/storage/import/sessions.rsindex 12987ec0ac..b906365bfb 100644--- a/crates/openhuman-core/src/storage/import/sessions.rs+++ b/crates/openhuman-core/src/storage/import/sessions.rs@@ -34,20 +34,19 @@ use std::sync::Arc;use anyhow::{Context, Result};use tinyagents_session::DriverSessionStores;use tinyagents_session::port::TurnStates;-use tinyagents_session::run_ledger::{ImportCounts, LegacyDatabaseReport, LegacySessionImport};use tinyagents_session::run_ledger::RunLedgerStore;+use tinyagents_session::run_ledger::{ImportCounts, LegacyDatabaseReport, LegacySessionImport};use tinyagents_session::transcript::{- DisplayMessage, DisplayRecord, SessionRef, TranscriptHistory,- TranscriptMessage, TranscriptMeta, TranscriptPartial, TranscriptTurn, decode_transcript_jsonl,- session_stem,+ DisplayMessage, DisplayRecord, SessionRef, TranscriptHistory, TranscriptMessage,+ TranscriptMeta, TranscriptPartial, TranscriptTurn, decode_transcript_jsonl, session_stem,};use tinyagents_session::turn_state::TurnState;use super::tinyflows::{finish, marked};use super::{Outcome, Report, Snapshot};use crate::config::Config;-use crate::storage::sessions::DEFAULT_AGENT;use crate::storage::StorageBackend;+use crate::storage::sessions::DEFAULT_AGENT;/// The marker name of the session import.pub const SESSIONS_DOMAIN: &str = "sessions";diff --git a/crates/openhuman-core/src/storage/import_state.rs b/crates/openhuman-core/src/storage/import_state.rsindex 41ffebcf12..8745f96d97 100644--- a/crates/openhuman-core/src/storage/import_state.rs+++ b/crates/openhuman-core/src/storage/import_state.rs@@ -16,7 +16,6 @@ use tinystoragedrivers::{use tinystoragedrivers_api::DocumentStore;use super::documents::Repo;-use super::DocumentStoreExt;/// How long a claim blocks other processes before it can be taken over.pub const CLAIM_TTL_MS: i64 = 10 * 60 * 1000;@@ -83,13 +82,13 @@ impl StorageBackend for ClaimBoundBackend {self.backend.capabilities()}- fn for_scope(&self, scope: &crate::storage::Scope) -> Result<Storage, StorageError> {+ fn for_scope(&self, scope: &tinystoragedrivers::Scope) -> Result<Storage, StorageError> {self.backend.for_scope_conditioned(scope, &self.condition)}fn for_scope_conditioned(&self,- scope: &crate::storage::Scope,+ scope: &tinystoragedrivers::Scope,condition: &WriteCondition,) -> Result<Storage, StorageError> {let condition = self@@ -113,7 +112,7 @@ fn record_key(owner: &str, step: &str, kind: &str) -> String {async fn ensure(scoped: &Storage) -> Result<(), StorageError> {for spec in collection_specs() {- scoped.ensure_collection(&spec).await?;+ scoped.documents().ensure_collection(&spec).await?;}Ok(())}@@ -164,7 +163,7 @@ fn decode<T: for<'de> Deserialize<'de>>(pub async fn done(scoped: &Storage, owner: &str, step: &str) -> Result<bool, StorageError> {ensure(scoped).await?;let id = record_key(owner, step, "done");- let Some(row) = scoped.get(COLLECTION, &id).await? else {+ let Some(row) = scoped.documents().get(COLLECTION, &id).await? else {return Ok(false);};let _: Completion = decode(row, "completion", owner, step)?;@@ -192,11 +191,12 @@ async fn mark_done_at(}).map_err(|error| StorageError::serialization(error.to_string()))?;for _ in 0..CAS_RETRIES {- if let Some(current) = scoped.get(COLLECTION, &id).await? {+ if let Some(current) = scoped.documents().get(COLLECTION, &id).await? {let _: Completion = decode(current, "completion", owner, step)?;return Ok(());}match scoped+ .documents().put(COLLECTION, &id, body.clone(), Precondition::Absent).await{diff --git a/crates/openhuman-core/src/storage/import_state_tests.rs b/crates/openhuman-core/src/storage/import_state_tests.rsindex 677980146e..a30e85b751 100644--- a/crates/openhuman-core/src/storage/import_state_tests.rs+++ b/crates/openhuman-core/src/storage/import_state_tests.rs@@ -1,7 +1,7 @@use super::*;use crate::storage::{Scope, StorageBackend};-use std::sync::mpsc;use std::sync::Arc;+use std::sync::mpsc;use tinystoragedrivers::CollectionSpec;use tinystoragedrivers_testkit::MemoryBackend;@@ -197,10 +197,11 @@ fn a_legacy_marker_row_is_honoured_and_removed() {.await?);assert!(!done(&owned, "storage", &step_id("storage_import", "other@x")).await?);- assert!(docs- .query_all("storage_import", &tinystoragedrivers::Query::all())- .await?- .is_empty());+ assert!(+ docs.query_all("storage_import", &tinystoragedrivers::Query::all())+ .await?+ .is_empty()+ );assert_eq!(migrate_legacy_markers(&owned).await?, 0);assert!(done(