Skip to content

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

refactor(inbound): reformat inbound modules to satisfy rustfmt

Steven Enamakel76af1a036d1f
diff --git a/crates/openhuman-core/src/config/schema/inbound_sources.rs b/crates/openhuman-core/src/config/schema/inbound_sources.rs
index 758a5b7f40..b282cf261f 100644
--- a/crates/openhuman-core/src/config/schema/inbound_sources.rs
+++ b/crates/openhuman-core/src/config/schema/inbound_sources.rs
@@ -87,7 +87,8 @@ impl InboundSourceConfig {
///
/// A name outside `^[a-z0-9_-]+:[a-z0-9_.*-]+$`, or under a reserved prefix.
pub fn check_source_name(name: &str) -> Result<(), String> {
- let kind_char = |c: char| c.is_ascii_lowercase() || c.is_ascii_digit() || matches!(c, '_' | '-');
+ let kind_char =
+ |c: char| c.is_ascii_lowercase() || c.is_ascii_digit() || matches!(c, '_' | '-');
let well_formed = name.split_once(':').is_some_and(|(kind, rest)| {
!kind.is_empty()
&& !rest.is_empty()
@@ -126,13 +127,15 @@ impl InboundConfig {
/// The configured sources that can run, by name; an unusable one is
/// logged and left out.
pub fn usable_sources(&self) -> impl Iterator<Item = (&str, &InboundSourceConfig)> {
- self.sources.keys().filter_map(|name| match self.source(name) {
- Ok(source) => Some((name.as_str(), source)),
- Err(error) => {
- tracing::warn!(error = %error, "[inbound] unusable source left out");
- None
- }
- })
+ self.sources
+ .keys()
+ .filter_map(|name| match self.source(name) {
+ Ok(source) => Some((name.as_str(), source)),
+ Err(error) => {
+ tracing::warn!(error = %error, "[inbound] unusable source left out");
+ None
+ }
+ })
}
/// Whether `source` is a usable external source, run on a pinned agent.
diff --git a/crates/openhuman-core/src/config/schema/inbound_sources_tests.rs b/crates/openhuman-core/src/config/schema/inbound_sources_tests.rs
index 08a5a045ef..a39fc31da2 100644
--- a/crates/openhuman-core/src/config/schema/inbound_sources_tests.rs
+++ b/crates/openhuman-core/src/config/schema/inbound_sources_tests.rs
@@ -54,7 +54,15 @@ fn source_names_are_checked() {
assert!(check_source_name(good).is_ok(), "{good}");
}
for bad in [
- "", "mentions", "X:mentions", "x:", ":m", "x:m:n", "x y:m", "x:m/n", "x:é",
+ "",
+ "mentions",
+ "X:mentions",
+ "x:",
+ ":m",
+ "x:m:n",
+ "x y:m",
+ "x:m/n",
+ "x:é",
] {
assert!(check_source_name(bad).is_err(), "{bad}");
}
diff --git a/crates/openhuman-core/src/inbound/deliver.rs b/crates/openhuman-core/src/inbound/deliver.rs
index 16bab33640..d43cf5cd5f 100644
--- a/crates/openhuman-core/src/inbound/deliver.rs
+++ b/crates/openhuman-core/src/inbound/deliver.rs
@@ -283,7 +283,10 @@ impl Deliverer {
/// The pinned source every event of `turn` comes from, with its
/// configuration, when there is one.
- async fn pinned_source(&self, events: &[InboundEvent]) -> Option<(String, InboundSourceConfig)> {
+ async fn pinned_source(
+ &self,
+ events: &[InboundEvent],
+ ) -> Option<(String, InboundSourceConfig)> {
let first = events.first()?;
if !events.iter().all(|event| event.source == first.source) {
return None;
@@ -366,7 +369,11 @@ impl Deliverer {
request: ClassifySalienceRequest,
) -> Result<ClassifySalienceResponse, String> {
let event = request.event;
- if self.pinned_source(std::slice::from_ref(&event)).await.is_some() {
+ if self
+ .pinned_source(std::slice::from_ref(&event))
+ .await
+ .is_some()
+ {
// A pinned source's events always reach its agent: no triage.
return Ok(ClassifySalienceResponse::new(SalienceClass::Actionable));
}
diff --git a/crates/openhuman-core/src/inbound/deliver_tests.rs b/crates/openhuman-core/src/inbound/deliver_tests.rs
index 85213f17d2..77d79550d4 100644
--- a/crates/openhuman-core/src/inbound/deliver_tests.rs
+++ b/crates/openhuman-core/src/inbound/deliver_tests.rs
@@ -379,7 +379,11 @@ async fn a_pinned_source_runs_its_agent_without_triage_and_keeps_the_text() {
let agent = ScriptedAgent::new([Reply::Text("draft")]);
let results = memory_results();
let response = pinned_deliverer(&triage, &agent, &results)
- .deliver(turn(vec![mention("t1"), mention("t2")], Lane::Interactive, 1))
+ .deliver(turn(
+ vec![mention("t1"), mention("t2")],
+ Lane::Interactive,
+ 1,
+ ))
.await;
assert_eq!(response.status, DeliverStatus::Accepted);
assert_eq!(triage.runs(), 0, "a pinned source was triaged");
diff --git a/crates/openhuman-core/src/inbound/events_tests.rs b/crates/openhuman-core/src/inbound/events_tests.rs
index 10d9f362b4..80215d3af2 100644
--- a/crates/openhuman-core/src/inbound/events_tests.rs
+++ b/crates/openhuman-core/src/inbound/events_tests.rs
@@ -135,7 +135,15 @@ fn a_digest_lists_every_folded_event() {
#[test]
fn an_external_event_is_keyed_by_its_source_and_key_and_round_trips() {
let payload = json!({ "author": "@alice", "conversation_id": "c1" });
- let event = external("x:mentions", "mentions", "t1", "hi @bot", payload.clone(), 42).unwrap();
+ let event = external(
+ "x:mentions",
+ "mentions",
+ "t1",
+ "hi @bot",
+ payload.clone(),
+ 42,
+ )
+ .unwrap();
assert_eq!(event.source, "x:mentions");
assert_eq!(event.event_id, "t1");
assert_eq!(event.conversation_key, "mentions");
@@ -156,6 +164,13 @@ fn an_external_event_is_keyed_by_its_source_and_key_and_round_trips() {
#[test]
fn an_oversize_external_event_is_refused() {
let big = "x".repeat(MAX_RAW_BYTES);
- let refused = external("x:mentions", "mentions", "t1", "", json!({ "blob": big }), 0);
+ let refused = external(
+ "x:mentions",
+ "mentions",
+ "t1",
+ "",
+ json!({ "blob": big }),
+ 0,
+ );
assert!(matches!(refused, Err(Unqueueable::Oversize(_))));
}
diff --git a/crates/openhuman-core/src/inbound/linked_fixture.rs b/crates/openhuman-core/src/inbound/linked_fixture.rs
index 050828e77d..44f4e0ecf9 100644
--- a/crates/openhuman-core/src/inbound/linked_fixture.rs
+++ b/crates/openhuman-core/src/inbound/linked_fixture.rs
@@ -313,7 +313,11 @@ impl Rig {
/// Attach the module with `inbound`'s sources in its pipeline, and serve
/// the host with `pinned` running them.
pub(crate) async fn pinned(inbound: InboundConfig, pinned: Pinned) -> Self {
- Self::build(ScriptedTriage::new(Vec::<Step>::new()), Some((inbound, pinned))).await
+ Self::build(
+ ScriptedTriage::new(Vec::<Step>::new()),
+ Some((inbound, pinned)),
+ )
+ .await
}
async fn build(triage: Arc<ScriptedTriage>, pinned: Option<(InboundConfig, Pinned)>) -> Self {
diff --git a/crates/openhuman-core/src/inbound/ops_tests.rs b/crates/openhuman-core/src/inbound/ops_tests.rs
index 3c86bc314e..4b458d5cf3 100644
--- a/crates/openhuman-core/src/inbound/ops_tests.rs
+++ b/crates/openhuman-core/src/inbound/ops_tests.rs
@@ -109,7 +109,11 @@ impl EventHandler<DomainEvent> for Completed {
}
}
-async fn until_results(config: &crate::config::Config, results: &Results, n: usize) -> Vec<crate::inbound::results::InboundResult> {
+async fn until_results(
+ config: &crate::config::Config,
+ results: &Results,
+ n: usize,
+) -> Vec<crate::inbound::results::InboundResult> {
let deadline = tokio::time::Instant::now() + Duration::from_secs(20);
loop {
let listed = super::results(
@@ -140,10 +144,16 @@ async fn an_offer_names_an_unconfigured_or_unusable_source() {
assert!(refused.contains("not configured"), "{refused}");
let mut params = mention("1");
params.source = "composio:gmail".into();
- assert!(offer(&config, &client, params).await.unwrap_err().contains("reserved"));
+ assert!(offer(&config, &client, params)
+ .await
+ .unwrap_err()
+ .contains("reserved"));
let mut params = mention("1");
params.event_id = " ".into();
- assert!(offer(&config, &client, params).await.unwrap_err().contains("event_id"));
+ assert!(offer(&config, &client, params)
+ .await
+ .unwrap_err()
+ .contains("event_id"));
let mut off = config.clone();
off.components.eventqueues = false;
assert!(offer(&off, &client, mention("1"))
@@ -255,10 +265,20 @@ fn results_are_limited_and_pruned_past_their_ttl() {
.unwrap();
}
let params: ResultsParams = serde_json::from_value(json!({ "limit": 1 })).unwrap();
- let listed = super::results(&config, &results, params).unwrap().value.results;
+ let listed = super::results(&config, &results, params)
+ .unwrap()
+ .value
+ .results;
assert_eq!(listed.len(), 1);
assert_eq!(listed[0].turn_id, "t1");
assert!(results.get("old").unwrap().is_none(), "not pruned");
let capped: ResultsParams = serde_json::from_value(json!({ "limit": 100_000 })).unwrap();
- assert_eq!(super::results(&config, &results, capped).unwrap().value.results.len(), 2);
+ assert_eq!(
+ super::results(&config, &results, capped)
+ .unwrap()
+ .value
+ .results
+ .len(),
+ 2
+ );
}
diff --git a/crates/openhuman-core/src/inbound/pinned.rs b/crates/openhuman-core/src/inbound/pinned.rs
index 09c5359974..0d336a33fb 100644
--- a/crates/openhuman-core/src/inbound/pinned.rs
+++ b/crates/openhuman-core/src/inbound/pinned.rs
@@ -224,10 +224,10 @@ impl Pinned {
return Delivered::Running;
};
let items: Vec<ExternalItem> = turn.events.iter().filter_map(external_of).collect();
- let key = turn
- .events
- .first()
- .map_or_else(|| turn.conversation_key.clone(), |e| e.conversation_key.clone());
+ let key = turn.events.first().map_or_else(
+ || turn.conversation_key.clone(),
+ |e| e.conversation_key.clone(),
+ );
let event_ids = items.iter().map(|item| item.id.clone()).collect();
let message = render_prompt(name, &key, source, &items);
let fresh = Stored::running(
diff --git a/crates/openhuman-core/src/inbound/pinned_tests.rs b/crates/openhuman-core/src/inbound/pinned_tests.rs
index 8defe4e9c1..359b710945 100644
--- a/crates/openhuman-core/src/inbound/pinned_tests.rs
+++ b/crates/openhuman-core/src/inbound/pinned_tests.rs
@@ -38,7 +38,12 @@ fn a_configured_prompt_takes_the_batch_in_place_of_its_placeholder() {
prompt: Some("Draft replies.\n{{events}}\nBe brief.".to_owned()),
..InboundSourceConfig::default()
};
- let prompt = render_prompt("x:mentions", "mentions", &source, &[item("1", "a"), item("2", "b")]);
+ let prompt = render_prompt(
+ "x:mentions",
+ "mentions",
+ &source,
+ &[item("1", "a"), item("2", "b")],
+ );
assert!(prompt.starts_with("Draft replies.\n[{"), "{prompt}");
assert!(prompt.ends_with("}]\nBe brief."), "{prompt}");
assert!(!prompt.contains("{{events}}"));
diff --git a/crates/openhuman-core/src/inbound/results.rs b/crates/openhuman-core/src/inbound/results.rs
index 820985c880..e881a52574 100644
--- a/crates/openhuman-core/src/inbound/results.rs
+++ b/crates/openhuman-core/src/inbound/results.rs
@@ -189,7 +189,11 @@ impl Results {
///
/// The storage backend or scope cannot be opened.
pub fn open(config: &Config) -> anyhow::Result<Self> {
- Ok(Self(Repo::current_for(&config.workspace_dir, DOMAIN, specs)?))
+ Ok(Self(Repo::current_for(
+ &config.workspace_dir,
+ DOMAIN,
+ specs,
+ )?))
}
#[cfg(test)]
diff --git a/crates/openhuman-core/src/inbound/results_tests.rs b/crates/openhuman-core/src/inbound/results_tests.rs
index f02ed9eb40..4c34f4a4a8 100644
--- a/crates/openhuman-core/src/inbound/results_tests.rs
+++ b/crates/openhuman-core/src/inbound/results_tests.rs
@@ -31,15 +31,24 @@ fn a_started_turn_is_running_until_it_finishes() {
assert_eq!(results.running().unwrap().len(), 1);
assert_eq!(results.get("t1").unwrap().unwrap().message, "the message");
- let done = results.finish("t1", Ok("draft".into()), 20).unwrap().unwrap();
+ let done = results
+ .finish("t1", Ok("draft".into()), 20)
+ .unwrap()
+ .unwrap();
assert_eq!(done.result.status, ResultStatus::Completed);
assert_eq!(done.result.text.as_deref(), Some("draft"));
assert_eq!(done.result.completed_ms, Some(20));
assert!(results.running().unwrap().is_empty());
- assert!(results.finish("nope", Ok(String::new()), 1).unwrap().is_none());
+ assert!(results
+ .finish("nope", Ok(String::new()), 1)
+ .unwrap()
+ .is_none());
results.start(&running("t2", "x:mentions", 11)).unwrap();
- let failed = results.finish("t2", Err("boom".into()), 30).unwrap().unwrap();
+ let failed = results
+ .finish("t2", Err("boom".into()), 30)
+ .unwrap()
+ .unwrap();
assert_eq!(failed.result.status, ResultStatus::Failed);
assert_eq!(failed.result.error.as_deref(), Some("boom"));
assert_eq!(failed.result.text, None);
@@ -110,7 +119,13 @@ fn results_past_their_source_ttl_are_pruned() {
results.start(&running("new", "x:mentions", 9_000)).unwrap();
results.start(&running("dm", "x:dms", 1_000)).unwrap();
let pruned = results
- .prune(10_000, |source| if source == "x:mentions" { 5_000 } else { 50_000 })
+ .prune(10_000, |source| {
+ if source == "x:mentions" {
+ 5_000
+ } else {
+ 50_000
+ }
+ })
.unwrap();
assert_eq!(pruned, 1);
assert!(results.get("old").unwrap().is_none());
diff --git a/crates/openhuman-core/src/inbound/schemas.rs b/crates/openhuman-core/src/inbound/schemas.rs
index 408f825727..85aa265fe4 100644
--- a/crates/openhuman-core/src/inbound/schemas.rs
+++ b/crates/openhuman-core/src/inbound/schemas.rs
@@ -111,9 +111,17 @@ pub fn schemas(function: &str) -> ControllerSchema {
debounced per key into batches, each run as one turn of the \
source's pinned agent. A redelivered `event_id` answers `duplicate`.",
inputs: vec![
- string_input("source", "A configured source name, e.g. `x:mentions`.", true),
+ string_input(
+ "source",
+ "A configured source name, e.g. `x:mentions`.",
+ true,
+ ),
string_input("key", "What the source's events are batched by.", true),
- string_input("event_id", "The source's own id; a redelivery is a duplicate.", true),
+ string_input(
+ "event_id",
+ "The source's own id; a redelivery is a duplicate.",
+ true,
+ ),
string_input("text", "The event's text.", true),
FieldSchema {
name: "payload",
@@ -121,7 +129,10 @@ pub fn schemas(function: &str) -> ControllerSchema {
comment: "The source's payload, handed to the agent as is.",
required: false,
},
- u64_input("received_at_ms", "When the source received it (default now)."),
+ u64_input(
+ "received_at_ms",
+ "When the source received it (default now).",
+ ),
],
outputs: vec![json_output(
"result",
@@ -135,7 +146,10 @@ pub fn schemas(function: &str) -> ControllerSchema {
inputs: vec![
string_input("source", "Only this source's results.", false),
u64_input("since_ms", "Only results started at or after this time."),
- u64_input("limit", "Maximum number of results (default 50, at most 500)."),
+ u64_input(
+ "limit",
+ "Maximum number of results (default 50, at most 500).",
+ ),
string_input("status", "`running`, `completed` or `failed`.", false),
],
outputs: vec![json_output(
diff --git a/crates/openhuman-core/src/inbound/schemas_tests.rs b/crates/openhuman-core/src/inbound/schemas_tests.rs
index 97ccb53c7e..f667efc8a3 100644
--- a/crates/openhuman-core/src/inbound/schemas_tests.rs
+++ b/crates/openhuman-core/src/inbound/schemas_tests.rs
@@ -32,7 +32,10 @@ async fn malformed_params_are_refused_before_the_module_is_reached() {
#[test]
fn the_external_source_functions_have_schemas() {
- let names: Vec<&str> = all_controller_schemas().iter().map(|s| s.function).collect();
+ let names: Vec<&str> = all_controller_schemas()
+ .iter()
+ .map(|s| s.function)
+ .collect();
for name in ["offer", "results", "result_ack"] {
assert!(names.contains(&name), "{name}");
}