Skip to content

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

refactor(storage): use scoped storage for thread stores

Steven Enamakelaef8ca26a156
diff --git a/crates/openhuman-core/src/storage/sessions/tenant_router.rs b/crates/openhuman-core/src/storage/sessions/tenant_router.rs
index 0497cd4a2b..ce55e97315 100644
--- a/crates/openhuman-core/src/storage/sessions/tenant_router.rs
+++ b/crates/openhuman-core/src/storage/sessions/tenant_router.rs
@@ -16,7 +16,9 @@ use tinyagents_harness::store::SchemaAdmission;
use tinyagents_session::port::{AgentStorageFactory, AgentStores, SessionStoreProvider};
use tinyagents_session::DriverSessionStores;
use tinyagents_storage_kit::{Blocking, Scope as PortScope, ScopedStorage};
-use tinystoragedrivers::{Scope, StorageBackend, StorageError};
+use tinystoragedrivers::{StorageBackend, StorageError};
+
+use crate::storage::Scope;
/// Session stores over one backend, routed to a per-tenant provider.
pub struct TenantSessionStores {
diff --git a/crates/openhuman-core/src/storage/sessions/workspace.rs b/crates/openhuman-core/src/storage/sessions/workspace.rs
index 4d75fc1aea..7cd23a3a62 100644
--- a/crates/openhuman-core/src/storage/sessions/workspace.rs
+++ b/crates/openhuman-core/src/storage/sessions/workspace.rs
@@ -218,8 +218,15 @@ fn tenant_scope_for(workspace_dir: &Path, what: &str) -> Option<(String, ScopedS
return None;
}
};
- match backend.for_scope(&session_scope(&key)) {
- Ok(scoped) => Some((key, scoped)),
+ let scope = session_scope(&key);
+ match backend.for_scope(&scope) {
+ Ok(scoped) => match tinyagents_storage_kit::Scope::new(scope.as_str()) {
+ Ok(port_scope) => Some((key, ScopedStorage::new(scoped, port_scope))),
+ Err(error) => {
+ log::warn!("[session_store] {what} scope invalid agent={key}: {error}");
+ None
+ }
+ },
Err(error) => {
log::warn!("[session_store] {what} scope refused agent={key}: {error}");
None
@@ -432,6 +439,7 @@ pub fn session_scope(key: &str) -> tinystoragedrivers::Scope {
crate::storage::tenant_scope(profile.as_deref())
.agent(&agent)
.unwrap_or_else(|_| unreachable!("a non-empty agent id is a valid segment"))
+ .to_storage_scope()
}
#[cfg(test)]
diff --git a/crates/openhuman-core/src/threads/store/backend.rs b/crates/openhuman-core/src/threads/store/backend.rs
index f05127c386..302ae019de 100644
--- a/crates/openhuman-core/src/threads/store/backend.rs
+++ b/crates/openhuman-core/src/threads/store/backend.rs
@@ -24,6 +24,7 @@ use tinyagents_session::threads::{
CreateConversationThread, CrossThreadHit, DriverConversationStore, ThreadMessage,
ThreadMessagePatch,
};
+use tinyagents_storage_kit::{Scope as AgentScope, ScopedStorage};
use crate::core::runtime::DispatchCtx;
use crate::storage::documents::Repo;
@@ -110,7 +111,10 @@ pub(crate) fn import_legacy_into(
.map_err(|e| format!("{LOG_PREFIX} open the storage scope: {e}"))?;
let repo = Repo::on(backend, &scope, DOMAIN, super::legacy_import::collections)
.map_err(|e| format!("{LOG_PREFIX} {e:#}"))?;
- let store = DriverConversationStore::new(scoped.clone());
+ let store = DriverConversationStore::new(ScopedStorage::new(
+ scoped.clone(),
+ AgentScope::new(scope.as_str()).map_err(|e| format!("{LOG_PREFIX} invalid scope: {e}"))?,
+ ));
let docs = Arc::clone(scoped.documents());
storage::block_on(async move {
DriverConversationStore::prepare_schema(docs.as_ref()).await?;
@@ -150,7 +154,11 @@ impl ConversationStore {
.map_err(|e| format!("{LOG_PREFIX} open the storage scope: {e}"))?;
let repo = Repo::on(&backend, &scope, DOMAIN, super::legacy_import::collections)
.map_err(|e| format!("{LOG_PREFIX} {e:#}"))?;
- let store = DriverConversationStore::new(scoped.clone());
+ let store = DriverConversationStore::new(ScopedStorage::new(
+ scoped.clone(),
+ AgentScope::new(scope.as_str())
+ .map_err(|e| format!("{LOG_PREFIX} invalid scope: {e}"))?,
+ ));
repo.once_per_backend("schema", || {
let docs = Arc::clone(scoped.documents());
storage::block_on(async move {
diff --git a/crates/openhuman-core/src/threads/store/legacy_import.rs b/crates/openhuman-core/src/threads/store/legacy_import.rs
index 28352d80cc..e794fa8eb8 100644
--- a/crates/openhuman-core/src/threads/store/legacy_import.rs
+++ b/crates/openhuman-core/src/threads/store/legacy_import.rs
@@ -17,6 +17,7 @@ use sha2::{Digest, Sha256};
use tinyagents_session::threads::{
ConversationPersistence, CreateConversationThread, DriverConversationStore, ThreadMessage,
};
+use tinyagents_storage_kit::{Scope as AgentScope, ScopedStorage};
use tinystoragedrivers::CollectionSpec;
use crate::storage::documents::Repo;
@@ -178,7 +179,11 @@ pub(super) fn import_once(
&root, &thread.id,
))?);
}
- let store = DriverConversationStore::new(claimed_repo.scoped().clone());
+ let agent_scope = AgentScope::new(crate::storage::Scope::local().as_str())?;
+ let store = DriverConversationStore::new(ScopedStorage::new(
+ claimed_repo.scoped().clone(),
+ agent_scope,
+ ));
let (threads_n, messages_n) =
crate::storage::block_on_anyhow(
async move { copy(&store, threads, messages).await },