Skip to content

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

refactor(inference): rename ProviderModelHooks to ProviderModelMetadata

Steven Enamakelea0eb8e45d97
diff --git a/crates/openhuman-core/src/agent/session_host/test_support.rs b/crates/openhuman-core/src/agent/session_host/test_support.rs
index 5ad486aba0..98d05aaf1e 100644
--- a/crates/openhuman-core/src/agent/session_host/test_support.rs
+++ b/crates/openhuman-core/src/agent/session_host/test_support.rs
@@ -1,7 +1,7 @@
use super::*;
use crate::inference::provider::factory::PROVIDER_OPENHUMAN;
-use crate::inference::registry::{ChatModelEntry, ChatModelRequest, ProviderModelHooks};
+use crate::inference::registry::{ChatModelEntry, ChatModelRequest, ProviderModelMetadata};
use std::sync::Arc;
use tinyinference_llm::model::{ChatModel, ModelRequest, ModelResponse};
@@ -36,7 +36,7 @@ fn model_fixture_entry() -> ChatModelEntry {
Ok((Arc::new(SessionFixtureModel), model.to_string()))
}),
probe: None,
- models: Some(ProviderModelHooks {
+ models: Some(ProviderModelMetadata {
default_model: Arc::new(|| Some("test/session-fixture".into())),
role_for_model: Arc::new(|model| {
if model == "fixture-reasoning" {
diff --git a/crates/openhuman-core/src/inference/model_context_tests.rs b/crates/openhuman-core/src/inference/model_context_tests.rs
index 35675db2e4..0e7d0ad013 100644
--- a/crates/openhuman-core/src/inference/model_context_tests.rs
+++ b/crates/openhuman-core/src/inference/model_context_tests.rs
@@ -101,7 +101,7 @@ fn managed_vision_capability_is_absent_without_provider_policy() {
#[test]
fn model_supports_vision_uses_the_scoped_provider_capability_hook() {
use crate::core::slots::Extensions;
- use crate::inference::registry::{register_chat_model_in, ChatModelEntry, ProviderModelHooks};
+ use crate::inference::registry::{register_chat_model_in, ChatModelEntry, ProviderModelMetadata};
use std::sync::Arc;
let extensions = Extensions::new();
@@ -111,7 +111,7 @@ fn model_supports_vision_uses_the_scoped_provider_capability_hook() {
ChatModelEntry {
build: Arc::new(|_| Err(anyhow::anyhow!("test factory"))),
probe: None,
- models: Some(ProviderModelHooks {
+ models: Some(ProviderModelMetadata {
default_model: Arc::new(|| None),
role_for_model: Arc::new(|_| None),
is_alias: Arc::new(|_| false),
diff --git a/crates/openhuman-core/src/inference/provider/factory_explicit_ctx_tests.rs b/crates/openhuman-core/src/inference/provider/factory_explicit_ctx_tests.rs
index f3505f4ce3..601c3c0017 100644
--- a/crates/openhuman-core/src/inference/provider/factory_explicit_ctx_tests.rs
+++ b/crates/openhuman-core/src/inference/provider/factory_explicit_ctx_tests.rs
@@ -4,7 +4,7 @@ use super::*;
async fn managed_factory_and_probe_use_the_explicit_provider_entry() {
use crate::core::runtime::{CoreContext, DispatchCtx, DomainSet};
use crate::core::slots::Extensions;
- use crate::inference::registry::{ChatModelEntry, ProviderModelHooks};
+ use crate::inference::registry::{ChatModelEntry, ProviderModelMetadata};
use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::Arc;
use tinyinference_llm::message::Message;
@@ -28,7 +28,7 @@ async fn managed_factory_and_probe_use_the_explicit_provider_entry() {
Ok(())
})
})),
- models: Some(ProviderModelHooks {
+ models: Some(ProviderModelMetadata {
default_model: Arc::new(move || Some(name.to_string())),
role_for_model: Arc::new(|_| None),
is_alias: Arc::new(|_| false),
@@ -134,7 +134,7 @@ async fn hosted_cloud_slug_uses_explicit_auth_policy_and_model_entry() {
use crate::core::runtime::{CoreContext, DispatchCtx, DomainSet};
use crate::core::slots::Extensions;
use crate::inference::registry::{
- register_catalog_in, CatalogEntry, ChatModelEntry, ProviderModelHooks,
+ register_catalog_in, CatalogEntry, ChatModelEntry, ProviderModelMetadata,
};
use std::sync::Arc;
use tinyinference_llm::message::Message;
@@ -151,7 +151,7 @@ async fn hosted_cloud_slug_uses_explicit_auth_policy_and_model_entry() {
))
}),
probe: None,
- models: Some(ProviderModelHooks {
+ models: Some(ProviderModelMetadata {
default_model: Arc::new(move || Some(name.to_string())),
role_for_model: Arc::new(|_| None),
is_alias: Arc::new(|_| false),
diff --git a/crates/openhuman-core/src/inference/provider/factory_managed_ledger_tests.rs b/crates/openhuman-core/src/inference/provider/factory_managed_ledger_tests.rs
index 18d1e9d79e..95da44f89c 100644
--- a/crates/openhuman-core/src/inference/provider/factory_managed_ledger_tests.rs
+++ b/crates/openhuman-core/src/inference/provider/factory_managed_ledger_tests.rs
@@ -44,7 +44,7 @@ async fn managed_construction_ledger_collapses_repeat_disclosures() {
Ok((Arc::new(LedgerTestModel), model))
}),
probe: None,
- models: Some(crate::inference::registry::ProviderModelHooks {
+ models: Some(crate::inference::registry::ProviderModelMetadata {
default_model: Arc::new(|| Some("fixture-model".to_string())),
role_for_model: Arc::new(|_| None),
is_alias: Arc::new(|_| false),
diff --git a/crates/openhuman-core/src/inference/provider/factory_tests.rs b/crates/openhuman-core/src/inference/provider/factory_tests.rs
index ca536c5588..292ab3203d 100644
--- a/crates/openhuman-core/src/inference/provider/factory_tests.rs
+++ b/crates/openhuman-core/src/inference/provider/factory_tests.rs
@@ -41,7 +41,7 @@ impl ChatModel<()> for ManagedRouteFixtureModel {
fn install_test_managed_provider() -> Arc<std::sync::Mutex<Vec<bool>>> {
use crate::config::schema::cloud_providers::AuthStyle;
- use crate::inference::registry::{ChatModelEntry, ProviderModelHooks};
+ use crate::inference::registry::{ChatModelEntry, ProviderModelMetadata};
use std::sync::Mutex;
let native_modes = Arc::new(Mutex::new(Vec::new()));
@@ -61,7 +61,7 @@ fn install_test_managed_provider() -> Arc<std::sync::Mutex<Vec<bool>>> {
))
}),
probe: None,
- models: Some(ProviderModelHooks {
+ models: Some(ProviderModelMetadata {
default_model: Arc::new(|| Some("fixture/managed-default".into())),
role_for_model: Arc::new(|model| {
(model == "hint:reasoning").then(|| "reasoning".into())
diff --git a/crates/openhuman-core/src/inference/provider_model_tests.rs b/crates/openhuman-core/src/inference/provider_model_tests.rs
index a68f478608..2f3e7d5226 100644
--- a/crates/openhuman-core/src/inference/provider_model_tests.rs
+++ b/crates/openhuman-core/src/inference/provider_model_tests.rs
@@ -33,7 +33,7 @@ fn abstract_hint_markers_do_not_become_raw_model_ids() {
#[test]
fn registered_model_defaults_and_aliases_are_context_scoped() {
use crate::core::slots::Extensions;
- use crate::inference::registry::{register_chat_model_in, ChatModelEntry, ProviderModelHooks};
+ use crate::inference::registry::{register_chat_model_in, ChatModelEntry, ProviderModelMetadata};
use std::sync::Arc;
let extensions = Extensions::new();
@@ -43,7 +43,7 @@ fn registered_model_defaults_and_aliases_are_context_scoped() {
ChatModelEntry {
build: Arc::new(|_| Err(anyhow::anyhow!("test factory"))),
probe: None,
- models: Some(ProviderModelHooks {
+ models: Some(ProviderModelMetadata {
default_model: Arc::new(|| Some("scoped/model".to_string())),
role_for_model: Arc::new(|model| {
(model == "scoped-alias").then(|| "reasoning".to_string())
@@ -224,7 +224,7 @@ fn native_provider_metadata_resolves_by_context_and_preserves_request_fields() {
use crate::core::slots::Extensions;
use crate::inference::registry::{
register_chat_model, register_chat_model_in, unregister_chat_model, ChatModelEntry,
- ProviderContext, ProviderModelHooks,
+ ProviderContext, ProviderModelMetadata,
};
use serde_json::json;
use std::sync::Arc;
@@ -233,7 +233,7 @@ fn native_provider_metadata_resolves_by_context_and_preserves_request_fields() {
ChatModelEntry {
build: Arc::new(|_| panic!("metadata lookup must not build a model")),
probe: None,
- models: Some(ProviderModelHooks {
+ models: Some(ProviderModelMetadata {
default_model: Arc::new(move || Some(format!("{label}/default"))),
role_for_model: Arc::new(move |model| {
(model == format!("{label}/alias")).then(|| format!("{label}/role"))
diff --git a/crates/openhuman-core/src/inference/readiness_tests.rs b/crates/openhuman-core/src/inference/readiness_tests.rs
index aabcb9798b..a02a3f2fef 100644
--- a/crates/openhuman-core/src/inference/readiness_tests.rs
+++ b/crates/openhuman-core/src/inference/readiness_tests.rs
@@ -5,7 +5,7 @@ use tempfile::TempDir;
async fn cached_probe_serves_definitive_negative_results() {
use crate::core::runtime::{CoreContext, DispatchCtx, DomainSet};
use crate::core::slots::Extensions;
- use crate::inference::registry::{register_chat_model_in, ChatModelEntry, ProviderModelHooks};
+ use crate::inference::registry::{register_chat_model_in, ChatModelEntry, ProviderModelMetadata};
use std::sync::atomic::{AtomicUsize, Ordering};
use std::sync::Arc;
@@ -42,7 +42,7 @@ async fn cached_probe_serves_definitive_negative_results() {
counter.fetch_add(1, Ordering::SeqCst);
Box::pin(async { Err("API key not configured for provider".to_string()) })
})),
- models: Some(ProviderModelHooks {
+ models: Some(ProviderModelMetadata {
default_model: Arc::new(|| Some("fixture-model".to_string())),
role_for_model: Arc::new(|_| None),
is_alias: Arc::new(|_| false),
diff --git a/crates/openhuman-core/src/inference/registry_tests.rs b/crates/openhuman-core/src/inference/registry_tests.rs
index a8e6b7a0ce..8aa23d5d7c 100644
--- a/crates/openhuman-core/src/inference/registry_tests.rs
+++ b/crates/openhuman-core/src/inference/registry_tests.rs
@@ -37,7 +37,7 @@ fn fake_entry(seen: SeenModelRequests) -> ChatModelEntry {
))
}),
probe: None,
- models: Some(ProviderModelHooks {
+ models: Some(ProviderModelMetadata {
default_model: Arc::new(|| Some("host/fake-default".to_string())),
role_for_model: Arc::new(|model| {
(model == "hint:reasoning").then(|| "reasoning".to_string())
diff --git a/crates/openhuman-core/src/inference/turn_models_tests.rs b/crates/openhuman-core/src/inference/turn_models_tests.rs
index b85f3dd1ab..022e44da7a 100644
--- a/crates/openhuman-core/src/inference/turn_models_tests.rs
+++ b/crates/openhuman-core/src/inference/turn_models_tests.rs
@@ -32,12 +32,12 @@ fn scoped_model_entry(
name: &'static str,
supports_vision: bool,
) -> crate::inference::registry::ChatModelEntry {
- use crate::inference::registry::ProviderModelHooks;
+ use crate::inference::registry::ProviderModelMetadata;
crate::inference::registry::ChatModelEntry {
build: Arc::new(move |_| Ok((Arc::new(NamedModel(name)), name.to_string()))),
probe: None,
- models: Some(ProviderModelHooks {
+ models: Some(ProviderModelMetadata {
default_model: Arc::new(move || Some(name.to_string())),
role_for_model: Arc::new(move |model| {
if model == "fixture-role" {
@@ -200,7 +200,7 @@ async fn role_pins_apply_when_the_primary_uses_config_routing() {
))
}),
probe: None,
- models: Some(crate::inference::registry::ProviderModelHooks {
+ models: Some(crate::inference::registry::ProviderModelMetadata {
default_model: Arc::new(|| Some("fixture/managed-default".into())),
role_for_model: Arc::new(|model| {
model
diff --git a/crates/openhuman-core/src/web_chat/suggestions_tests.rs b/crates/openhuman-core/src/web_chat/suggestions_tests.rs
index acec4ca521..1584c0ada1 100644
--- a/crates/openhuman-core/src/web_chat/suggestions_tests.rs
+++ b/crates/openhuman-core/src/web_chat/suggestions_tests.rs
@@ -7,7 +7,7 @@ use tinyinference_llm::model::{ChatModel, ModelRequest, ModelResponse};
use super::*;
use crate::inference::provider::factory::test_provider_override;
use crate::inference::provider::factory::PROVIDER_OPENHUMAN;
-use crate::inference::registry::{ChatModelEntry, ChatModelRequest, ProviderModelHooks};
+use crate::inference::registry::{ChatModelEntry, ChatModelRequest, ProviderModelMetadata};
use crate::web_chat::subscribe_web_channel_events;
// ── parse_suggestions / strip_markdown_fence: pure unit tests ──────────────
@@ -101,7 +101,7 @@ fn install_suggestions_model_fixture() {
))
}),
probe: None,
- models: Some(ProviderModelHooks {
+ models: Some(ProviderModelMetadata {
default_model: Arc::new(|| Some("fixture/suggestions".to_string())),
role_for_model: Arc::new(|_| None),
is_alias: Arc::new(|_| false),
diff --git a/crates/openhuman-embed/tests/common/mod.rs b/crates/openhuman-embed/tests/common/mod.rs
index 4edc19c8d8..3382002603 100644
--- a/crates/openhuman-embed/tests/common/mod.rs
+++ b/crates/openhuman-embed/tests/common/mod.rs
@@ -260,7 +260,7 @@ pub struct PointedInference;
impl PointedInference {
pub fn install(base_url: &str) {
use openhuman_embed::__host::inference_registry::{
- register_chat_model, ChatModelEntry, ChatModelRequest, ProviderModelHooks,
+ register_chat_model, ChatModelEntry, ChatModelRequest, ProviderModelMetadata,
PROVIDER_OPENHUMAN,
};
use tinyinference_llm::providers::openai::OpenAiModel;
@@ -289,7 +289,7 @@ impl PointedInference {
ChatModelEntry {
build: std::sync::Arc::new(build),
probe: None,
- models: Some(ProviderModelHooks {
+ models: Some(ProviderModelMetadata {
default_model: std::sync::Arc::new(|| Some("embed-test-model".to_string())),
role_for_model: std::sync::Arc::new(|_| None),
is_alias: std::sync::Arc::new(|_| false),
diff --git a/crates/openhuman-tinyhumans/src/inference/mod.rs b/crates/openhuman-tinyhumans/src/inference/mod.rs
index 55bcabc827..c997d3e814 100644
--- a/crates/openhuman-tinyhumans/src/inference/mod.rs
+++ b/crates/openhuman-tinyhumans/src/inference/mod.rs
@@ -28,7 +28,7 @@ use openhuman_embed::__host::config::Config;
use openhuman_embed::__host::inference_registry::{
register_backend_error_classifier, register_catalog, register_chat_model,
register_config_normalizer, register_embedding, BoxFuture, ChatModelEntry, ChatModelFactory,
- ChatModelRequest, ProviderContext, ProviderModelHooks, ReadinessProbe, PROVIDER_OPENHUMAN,
+ ChatModelRequest, ProviderContext, ProviderModelMetadata, ReadinessProbe, PROVIDER_OPENHUMAN,
};
use tinyinference_llm::model::ChatModel;
@@ -120,7 +120,7 @@ pub(crate) fn register(_options: &InstallOptions) {
ChatModelEntry {
build,
probe: Some(readiness_probe()),
- models: Some(ProviderModelHooks {
+ models: Some(ProviderModelMetadata {
default_model: Arc::new(tiers::default_model),
role_for_model: Arc::new(tiers::role_for_model),
is_alias: Arc::new(tiers::is_alias),