Skip to content

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

refactor(storage): update state import logic to use conditioned claims

Steven Enamakel2f5fe3a92ef5
diff --git a/crates/openhuman-core/src/agent/orchestration/subagent_sessions/store_documents.rs b/crates/openhuman-core/src/agent/orchestration/subagent_sessions/store_documents.rs
index 6f1191223d..1d10910906 100644
--- a/crates/openhuman-core/src/agent/orchestration/subagent_sessions/store_documents.rs
+++ b/crates/openhuman-core/src/agent/orchestration/subagent_sessions/store_documents.rs
@@ -266,13 +266,14 @@ impl Docs {
sessions: &[DurableSubagentSession],
) -> Result<()> {
let step = import_step(source);
- let claimed = import_state::with_claim(&self.0, OWNER, &step, || {
+ let claimed = import_state::with_claim(&self.0, OWNER, &step, |condition| {
+ let claimed_repo = self.0.conditioned(condition)?;
// The process that held the claim before us may have finished.
- if self.legacy_imported(source)? {
+ if import_state::is_done(&claimed_repo, OWNER, &step)? {
return Ok(());
}
- self.save(sessions)?;
- import_state::set_done(&self.0, OWNER, &step)
+ Self(claimed_repo.clone()).save(sessions)?;
+ import_state::set_done(&claimed_repo, OWNER, &step)
})?;
if claimed.is_none() {
log::debug!(
diff --git a/crates/openhuman-core/src/integrations/composio/file_store_documents.rs b/crates/openhuman-core/src/integrations/composio/file_store_documents.rs
index c259fac555..4def205f4f 100644
--- a/crates/openhuman-core/src/integrations/composio/file_store_documents.rs
+++ b/crates/openhuman-core/src/integrations/composio/file_store_documents.rs
@@ -119,10 +119,12 @@ impl Docs {
pub(super) fn import_if_absent(&self, name: &str, value: serde_json::Value) -> Result<bool> {
log::debug!("[composio:store] document import id={name}");
let step = import_step(name);
- let state = self.state.clone();
- let claimed = import_state::with_claim(&self.repo, IMPORT_OWNER, &step, move || {
+ let repo = self.repo.clone();
+ let claimed = import_state::with_claim(&repo, IMPORT_OWNER, &step, move |condition| {
+ let claimed_repo = 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(&self.repo, IMPORT_OWNER, &step)?;
+ import_state::set_done(&claimed_repo, IMPORT_OWNER, &step)?;
Ok(wrote)
})?;
Ok(claimed.unwrap_or(false))
diff --git a/crates/openhuman-core/src/storage/state_kv.rs b/crates/openhuman-core/src/storage/state_kv.rs
index 899c5ab246..14fcdb75fa 100644
--- a/crates/openhuman-core/src/storage/state_kv.rs
+++ b/crates/openhuman-core/src/storage/state_kv.rs
@@ -320,12 +320,12 @@ impl StateKv {
name: &str,
legacy: &Path,
) -> Result<()> {
- self.import_once(name, || {
+ self.import_once(name, |state| {
match std::fs::read(legacy) {
Ok(bytes) if bytes.iter().all(u8::is_ascii_whitespace) => {}
Ok(bytes) => match serde_json::from_slice::<Value>(&bytes) {
Ok(value) if serde_json::from_value::<T>(value.clone()).is_ok() => {
- let wrote = self.insert_if_absent(name, &value)?;
+ let wrote = state.insert_if_absent(name, &value)?;
log::debug!(
"[storage::state_kv] imported {}/{}/{name} (written={wrote})",
self.owner,
@@ -411,31 +411,41 @@ impl StateKv {
/// # Errors
///
/// A storage error, or whatever `body` returns.
- pub fn import_once(&self, name: &str, body: impl FnOnce() -> Result<()>) -> Result<()> {
+ pub fn import_once(
+ &self,
+ name: &str,
+ body: impl FnOnce(&StateKv) -> Result<()>,
+ ) -> Result<()> {
let key = format!("{}/{}/{name}", self.owner, self.ns);
let step = import_state::step_id(IMPORT_KIND, &key);
self.repo.once_per_backend(&key, || {
if import_state::is_done(&self.repo, self.owner, &step)? {
return Ok(());
}
- import_state::with_claim(&self.repo, self.owner, &step, || {
- if import_state::is_done(&self.repo, self.owner, &step)? {
+ import_state::with_claim(&self.repo, self.owner, &step, |condition| {
+ let claimed_repo = self.repo.conditioned(condition)?;
+ let claimed_state = Self {
+ repo: claimed_repo.clone(),
+ owner: self.owner,
+ ns: self.ns,
+ };
+ if import_state::is_done(&claimed_repo, self.owner, &step)? {
return Ok(());
}
- body()?;
- import_state::set_done(&self.repo, self.owner, &step)
+ body(&claimed_state)?;
+ import_state::set_done(&claimed_repo, self.owner, &step)
})?;
Ok(())
})
}
fn import_file_with(&self, name: &str, legacy: &Path, strict: bool) -> Result<()> {
- self.import_once(name, || {
+ self.import_once(name, |state| {
match std::fs::read(legacy) {
Ok(bytes) if bytes.iter().all(u8::is_ascii_whitespace) => {}
Ok(bytes) => match serde_json::from_slice::<Value>(&bytes) {
Ok(value) => {
- let wrote = self.insert_if_absent(name, &value)?;
+ let wrote = state.insert_if_absent(name, &value)?;
log::debug!(
"[storage::state_kv] imported {}/{}/{name} (written={wrote})",
self.owner,