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
style(storage): reformat import and journal maintenance code
Steven Enamakelfa04fa3bf893
diff --git a/crates/openhuman-core/src/storage/import/sessions.rs b/crates/openhuman-core/src/storage/import/sessions.rsindex cfe6235e76..7c4f33093a 100644--- a/crates/openhuman-core/src/storage/import/sessions.rs+++ b/crates/openhuman-core/src/storage/import/sessions.rs@@ -36,8 +36,8 @@ use tinyagents_session::port::{SessionStoreProvider, TurnStates};use tinyagents_session::run_ledger::RunLedgerStore;use tinyagents_session::run_ledger::{ImportCounts, LegacyDatabaseReport, LegacySessionImport};use tinyagents_session::transcript::{- session_stem, DisplayMessage, DisplayRecord, SessionRef,- TranscriptHistory, TranscriptMessage, TranscriptMeta, TranscriptPartial, TranscriptTurn,+ session_stem, DisplayMessage, DisplayRecord, SessionRef, TranscriptHistory, TranscriptMessage,+ TranscriptMeta, TranscriptPartial, TranscriptTurn,};use tinyagents_session::turn_state::TurnState;use tinyagents_session::DriverSessionStores;@@ -272,12 +272,16 @@ fn decode_transcript(let mut records = Vec::new();for (line_no, line) in text.lines().enumerate() {let line = line.trim();- if line.is_empty() { continue; }+ if line.is_empty() {+ continue;+ }let value: serde_json::Value = serde_json::from_str(line).with_context(|| format!("parse transcript {} line {}", path.display(), line_no + 1))?;if let Some(header) = value.get("_meta") {- meta = Some(serde_json::from_value(header.clone())- .with_context(|| format!("decode transcript metadata in {}", path.display()))?);+ meta =+ Some(serde_json::from_value(header.clone()).with_context(|| {+ format!("decode transcript metadata in {}", path.display())+ })?);continue;}if value.get("kind").and_then(serde_json::Value::as_str) == Some("tools") {@@ -285,56 +289,118 @@ fn decode_transcript(continue;}if value.get("kind").and_then(serde_json::Value::as_str) == Some("compaction") {- let replacement = value.get("replacement").and_then(serde_json::Value::as_array)- .into_iter().flatten().filter_map(|row| decode_display_message(row).ok()).collect();- records.push(DisplayRecord::Compaction(tinyagents_session::transcript::CompactionMarker {- replacement,- ts: value.get("ts").and_then(serde_json::Value::as_str).map(str::to_owned),- request_id: value.get("request_id").and_then(serde_json::Value::as_str).map(str::to_owned),- }));+ let replacement = value+ .get("replacement")+ .and_then(serde_json::Value::as_array)+ .into_iter()+ .flatten()+ .filter_map(|row| decode_display_message(row).ok())+ .collect();+ records.push(DisplayRecord::Compaction(+ tinyagents_session::transcript::CompactionMarker {+ replacement,+ ts: value+ .get("ts")+ .and_then(serde_json::Value::as_str)+ .map(str::to_owned),+ request_id: value+ .get("request_id")+ .and_then(serde_json::Value::as_str)+ .map(str::to_owned),+ },+ ));continue;}if let Ok(message) = decode_display_message(&value) {records.push(DisplayRecord::Message(Box::new(message)));}}- let meta = meta.ok_or_else(|| anyhow::anyhow!("transcript {} has no _meta header", path.display()))?;+ let meta =+ meta.ok_or_else(|| anyhow::anyhow!("transcript {} has no _meta header", path.display()))?;Ok((meta, tools, records))}fn decode_display_message(value: &serde_json::Value) -> Result<DisplayMessage> {- let mut message: TranscriptMessage = serde_json::from_value(value.clone())- .context("decode transcript message")?;- if message.role.is_empty() { anyhow::bail!("transcript message has no role"); }+ let mut message: TranscriptMessage =+ serde_json::from_value(value.clone()).context("decode transcript message")?;+ if message.role.is_empty() {+ anyhow::bail!("transcript message has no role");+ }let content = message.content.clone();if message.role == "system" {- if let Some(cleaned) = crate::config::migrations::phase_out_profile_md::strip_profile_md_block(&content) {+ if let Some(cleaned) =+ crate::config::migrations::phase_out_profile_md::strip_profile_md_block(&content)+ {message.content = cleaned;}}- let turn_usage = value.get("usage").cloned()+ let turn_usage = value+ .get("usage")+ .cloned().and_then(|usage| serde_json::from_value(usage).ok()).map(|usage| tinyagents_session::transcript::TurnUsage {- provider: value.get("provider").and_then(serde_json::Value::as_str).unwrap_or_default().to_owned(),- model: value.get("model").and_then(serde_json::Value::as_str).unwrap_or_default().to_owned(),+ provider: value+ .get("provider")+ .and_then(serde_json::Value::as_str)+ .unwrap_or_default()+ .to_owned(),+ model: value+ .get("model")+ .and_then(serde_json::Value::as_str)+ .unwrap_or_default()+ .to_owned(),usage,- ts: value.get("ts").and_then(serde_json::Value::as_str).unwrap_or_default().to_owned(),- reasoning_content: value.get("reasoning_content").and_then(serde_json::Value::as_str).map(str::to_owned),+ ts: value+ .get("ts")+ .and_then(serde_json::Value::as_str)+ .unwrap_or_default()+ .to_owned(),+ reasoning_content: value+ .get("reasoning_content")+ .and_then(serde_json::Value::as_str)+ .map(str::to_owned),tool_calls: Vec::new(),- iteration: value.get("iteration").and_then(serde_json::Value::as_u64).unwrap_or_default() as u32,+ iteration: value+ .get("iteration")+ .and_then(serde_json::Value::as_u64)+ .unwrap_or_default() as u32,});message.turn_usage = turn_usage.clone();- let reasoning_content = value.get("reasoning_content").and_then(serde_json::Value::as_str).map(str::to_owned);+ let reasoning_content = value+ .get("reasoning_content")+ .and_then(serde_json::Value::as_str)+ .map(str::to_owned);Ok(DisplayMessage {- interrupted: value.get("interrupted").and_then(serde_json::Value::as_bool).unwrap_or(false),- request_id: value.get("request_id").and_then(serde_json::Value::as_str).map(str::to_owned),- iteration: value.get("iteration").and_then(serde_json::Value::as_u64).map(|n| n as u32),- ts: value.get("ts").and_then(serde_json::Value::as_str).map(str::to_owned),+ interrupted: value+ .get("interrupted")+ .and_then(serde_json::Value::as_bool)+ .unwrap_or(false),+ request_id: value+ .get("request_id")+ .and_then(serde_json::Value::as_str)+ .map(str::to_owned),+ iteration: value+ .get("iteration")+ .and_then(serde_json::Value::as_u64)+ .map(|n| n as u32),+ ts: value+ .get("ts")+ .and_then(serde_json::Value::as_str)+ .map(str::to_owned),reasoning_content,turn_usage,- failure: value.get("failure").and_then(serde_json::Value::as_bool).unwrap_or(false),- failure_detail: value.get("failure_detail").and_then(serde_json::Value::as_str).map(str::to_owned),- background: value.get("background").cloned().and_then(|raw| serde_json::from_value(raw).ok()),+ failure: value+ .get("failure")+ .and_then(serde_json::Value::as_bool)+ .unwrap_or(false),+ failure_detail: value+ .get("failure_detail")+ .and_then(serde_json::Value::as_str)+ .map(str::to_owned),+ background: value+ .get("background")+ .cloned()+ .and_then(|raw| serde_json::from_value(raw).ok()),message,})}diff --git a/crates/openhuman-core/src/storage/journal_maintenance.rs b/crates/openhuman-core/src/storage/journal_maintenance.rsindex d665f3152b..3ae4538f92 100644--- a/crates/openhuman-core/src/storage/journal_maintenance.rs+++ b/crates/openhuman-core/src/storage/journal_maintenance.rs@@ -9,8 +9,8 @@ use std::collections::BTreeSet;use std::sync::Arc;use std::time::Duration;-use tinyagents_harness::observability::{DriverStatusStore, HarnessStatusStore};use tinyagents_harness::events::ExecutionStatus;+use tinyagents_harness::observability::{DriverStatusStore, HarnessStatusStore};use tinyagents_harness::store::DriverAppendStore;use tinystoragedrivers::{CollectionSpec, ErrorKind, Precondition, StorageBackend};@@ -285,16 +285,35 @@ async fn maintain_run_journals() -> Result<JournalMaintenanceReport, crate::storage::StorageError> {let mut report = JournalMaintenanceReport::default();for name in streams.streams(DriverAppendStore::JOURNAL_PREFIX).await? {- let Some(run_id) = name.strip_prefix(DriverAppendStore::JOURNAL_PREFIX) else { continue };- let status = statuses.get_status(run_id).await+ let Some(run_id) = name.strip_prefix(DriverAppendStore::JOURNAL_PREFIX) else {+ continue;+ };+ let status = statuses+ .get_status(run_id)+ .await.map_err(|error| crate::storage::StorageError::backend(error.to_string()))?;- if backfill && !matches!(status.as_ref().map(|status| status.status), Some(ExecutionStatus::Running | ExecutionStatus::Pending)) {- if streams.seal(&name).await?.sealed_ms.is_some() { report.backfilled += 1; }+ if backfill+ && !matches!(+ status.as_ref().map(|status| status.status),+ Some(ExecutionStatus::Running | ExecutionStatus::Pending)+ )+ {+ if streams.seal(&name).await?.sealed_ms.is_some() {+ report.backfilled += 1;+ }+ }+ if retention_ms == 0 {+ continue;+ }+ let Some(info) = streams.info(&name).await? else {+ continue;+ };+ let Some(sealed_ms) = info.sealed_ms else {+ continue;+ };+ if i128::from(now_ms) - i128::from(sealed_ms) < i128::from(retention_ms) {+ continue;}- if retention_ms == 0 { continue; }- let Some(info) = streams.info(&name).await? else { continue };- let Some(sealed_ms) = info.sealed_ms else { continue };- if i128::from(now_ms) - i128::from(sealed_ms) < i128::from(retention_ms) { continue; }if streams.delete_sealed_stream(&name, sealed_ms).await? {report.deleted += 1;} else {@@ -304,7 +323,6 @@ async fn maintain_run_journals(Ok(report)}-/// Scopes this process can safely maintain, plus the profile handles that/// keep their lease fences alive for the duration of a pass.///