Skip to content

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

refactor(inference): build provider context through its constructor

Steven Enamakel1ee6bc196731
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 caf894a588..4fe42d7fef 100644
--- a/crates/openhuman-core/src/agent/session_host/test_support.rs
+++ b/crates/openhuman-core/src/agent/session_host/test_support.rs
@@ -31,7 +31,7 @@ fn model_fixture_entry() -> ChatModelEntry<ProviderContext> {
let model = request
.model_override
.or(request.default_model)
- .or(request.context.config.default_model.as_deref())
+ .or(request.context.config.config.default_model.as_deref())
.unwrap_or("test/session-fixture");
Ok((Arc::new(SessionFixtureModel), model.to_string()))
}),
@@ -67,7 +67,7 @@ fn model_fixture_entry() -> ChatModelEntry<ProviderContext> {
.map(|hint_role| {
if hint_role == "chat" {
config
- .default_model
+ .config.default_model
.as_deref()
.filter(|configured| !configured.starts_with("hint:"))
.map(str::to_string)
@@ -77,7 +77,7 @@ fn model_fixture_entry() -> ChatModelEntry<ProviderContext> {
}
}),
None if role == "agentic" => Some("test/session-fixture".into()),
- None => match config.default_model.as_deref() {
+ None => match config.config.default_model.as_deref() {
Some("fixture-reasoning") => Some("test/selected-reasoning".into()),
Some(model) => Some(model.to_string()),
None => Some("test/session-fixture".into()),
diff --git a/crates/openhuman-core/src/inference/model_context_tests.rs b/crates/openhuman-core/src/inference/model_context_tests.rs
index 0e7d0ad013..923e25606d 100644
--- a/crates/openhuman-core/src/inference/model_context_tests.rs
+++ b/crates/openhuman-core/src/inference/model_context_tests.rs
@@ -109,7 +109,7 @@ fn model_supports_vision_uses_the_scoped_provider_capability_hook() {
&extensions,
crate::inference::provider::factory::PROVIDER_OPENHUMAN,
ChatModelEntry {
- build: Arc::new(|_| Err(anyhow::anyhow!("test factory"))),
+ build: Arc::new(|_| panic!("metadata-only provider entry")),
probe: None,
models: Some(ProviderModelMetadata {
default_model: Arc::new(|| None),
diff --git a/crates/openhuman-core/src/inference/provider/factory/chat_model.rs b/crates/openhuman-core/src/inference/provider/factory/chat_model.rs
index eb8754ee2a..062818cdcd 100644
--- a/crates/openhuman-core/src/inference/provider/factory/chat_model.rs
+++ b/crates/openhuman-core/src/inference/provider/factory/chat_model.rs
@@ -505,10 +505,9 @@ pub async fn probe_inference_readiness(
log::debug!("[flows][inference-probe] role={role} managed provider registered no probe");
return Ok(());
};
- let provider_context = crate::inference::registry::ProviderContext {
- config: config.clone(),
- egress: crate::security::egress::EgressLedger::none(),
- };
+ let provider_context = crate::inference::registry::ProviderContext::new(
+ config, &crate::security::egress::EgressLedger::none(),
+ );
let model_id = entry
.models
.as_ref()
diff --git a/crates/openhuman-core/src/inference/provider/factory/managed_backend.rs b/crates/openhuman-core/src/inference/provider/factory/managed_backend.rs
index 5e4ebd2071..2f3c4bf782 100644
--- a/crates/openhuman-core/src/inference/provider/factory/managed_backend.rs
+++ b/crates/openhuman-core/src/inference/provider/factory/managed_backend.rs
@@ -67,7 +67,7 @@ pub(super) fn managed_chat_model_for(
return Err(managed_unavailable_error());
};
let model = match entry.models.as_ref() {
- Some(models) => (models.resolve_model)(role, &crate::inference::registry::ProviderContext { config: config.clone(), egress: egress.clone() }, model_override),
+ Some(models) => (models.resolve_model)(role, &crate::inference::registry::ProviderContext::new(config, egress), model_override),
None => model_override
.or(config.default_model.as_deref())
.map(str::trim)
@@ -82,10 +82,7 @@ pub(super) fn managed_chat_model_for(
egress,
crate::security::egress::EgressDescriptor::inference("openhuman", &model, true),
);
- let context = crate::inference::registry::ProviderContext {
- config: config.clone(),
- egress: egress.clone(),
- };
+ let context = crate::inference::registry::ProviderContext::new(config, egress);
let request = crate::inference::registry::ChatModelRequest {
role,
model_override: Some(&model),
@@ -186,10 +183,7 @@ pub(crate) fn make_openhuman_backend_model_for_options(
}
config.secrets.encrypt = options.secrets_encrypt;
let egress = EgressLedger::none();
- let context = crate::inference::registry::ProviderContext {
- config: config.clone(),
- egress,
- };
+ let context = crate::inference::registry::ProviderContext::new(&config, &egress);
let request = crate::inference::registry::ChatModelRequest {
role: "delegate",
model_override: Some(model),
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 b984277c41..2933f4cba2 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
@@ -20,10 +20,10 @@ async fn managed_factory_and_probe_use_the_explicit_provider_entry() {
name.to_string(),
))
}),
- probe: Some(Arc::new(move |_, model, _| {
+ probe: Some(Arc::new(move |request| {
let actual = probed.clone();
Box::pin(async move {
- assert_eq!(model, name);
+ assert_eq!(request.model, name);
actual.store(true, Ordering::SeqCst);
Ok(())
})
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 95da44f89c..b0b33c951d 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
@@ -55,7 +55,7 @@ async fn managed_construction_ledger_collapses_repeat_disclosures() {
.map(str::trim)
.filter(|model| !model.is_empty() && !model.starts_with("hint:"))
.map(str::to_string)
- .or_else(|| config.default_model.clone())
+ .or_else(|| config.config.default_model.clone())
}),
context_window: Arc::new(|_| None),
default_pricing: Arc::new(|| None),
diff --git a/crates/openhuman-core/src/inference/provider/factory_tests.rs b/crates/openhuman-core/src/inference/provider/factory_tests.rs
index 292ab3203d..c90e5a0dd0 100644
--- a/crates/openhuman-core/src/inference/provider/factory_tests.rs
+++ b/crates/openhuman-core/src/inference/provider/factory_tests.rs
@@ -74,7 +74,7 @@ fn install_test_managed_provider() -> Arc<std::sync::Mutex<Vec<bool>>> {
Some(model) if !model.starts_with("hint:") => Some(model.into()),
Some(_) => None,
None => config
- .default_model
+ .config.default_model
.clone()
.or_else(|| Some("fixture/managed-default".into())),
}),
diff --git a/crates/openhuman-core/src/inference/provider/models/catalog_listing.rs b/crates/openhuman-core/src/inference/provider/models/catalog_listing.rs
index dbdc7cec45..e6f69f79ce 100644
--- a/crates/openhuman-core/src/inference/provider/models/catalog_listing.rs
+++ b/crates/openhuman-core/src/inference/provider/models/catalog_listing.rs
@@ -158,7 +158,7 @@ pub async fn list_configured_models_from_config(
) {
Some(catalog) => {
let request = catalog_request(config, Some(&entry))?;
- run_registered_catalog(PROVIDER_OPENHUMAN, config, request, catalog).await
+ run_registered_catalog(crate::inference::provider::factory::PROVIDER_OPENHUMAN, config, request, catalog).await
}
None => Ok(no_managed_catalog()),
};
diff --git a/crates/openhuman-core/src/inference/provider_model_tests.rs b/crates/openhuman-core/src/inference/provider_model_tests.rs
index 7ba0212e15..6074623d71 100644
--- a/crates/openhuman-core/src/inference/provider_model_tests.rs
+++ b/crates/openhuman-core/src/inference/provider_model_tests.rs
@@ -41,7 +41,7 @@ fn registered_model_defaults_and_aliases_are_context_scoped() {
&extensions,
crate::inference::provider::factory::PROVIDER_OPENHUMAN,
ChatModelEntry {
- build: Arc::new(|_| Err(anyhow::anyhow!("test factory"))),
+ build: Arc::new(|_| panic!("metadata-only provider entry")),
probe: None,
models: Some(ProviderModelMetadata {
default_model: Arc::new(|| Some("scoped/model".to_string())),
diff --git a/crates/openhuman-core/src/inference/readiness_tests.rs b/crates/openhuman-core/src/inference/readiness_tests.rs
index a02a3f2fef..a4155dba5a 100644
--- a/crates/openhuman-core/src/inference/readiness_tests.rs
+++ b/crates/openhuman-core/src/inference/readiness_tests.rs
@@ -38,7 +38,7 @@ async fn cached_probe_serves_definitive_negative_results() {
"fixture-model".to_string(),
))
}),
- probe: Some(Arc::new(move |_, _, _| {
+ probe: Some(Arc::new(move |_| {
counter.fetch_add(1, Ordering::SeqCst);
Box::pin(async { Err("API key not configured for provider".to_string()) })
})),
diff --git a/crates/openhuman-core/src/inference/registry_tests.rs b/crates/openhuman-core/src/inference/registry_tests.rs
index 96843c578c..9dfba10f69 100644
--- a/crates/openhuman-core/src/inference/registry_tests.rs
+++ b/crates/openhuman-core/src/inference/registry_tests.rs
@@ -1,5 +1,6 @@
use super::*;
use tinyinference_llm::model::ChatModel;
+use tinyinference_llm::model::discover::DiscoveryRequest;
use crate::inference::context_window::model_limits_request;
use crate::inference::provider::factory::{
create_chat_model_from_string, make_openhuman_backend_model_for_thread, PROVIDER_OPENHUMAN,
@@ -51,7 +52,7 @@ fn fake_entry(seen: SeenModelRequests) -> ChatModelEntry<ProviderContext> {
Some(model) if !model.starts_with("hint:") => Some(model.to_string()),
Some(_) => None,
None => config
- .default_model
+ .config.default_model
.clone()
.or_else(|| Some("host/fake-default".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 f566a863c0..39386d6946 100644
--- a/crates/openhuman-core/src/inference/turn_models_tests.rs
+++ b/crates/openhuman-core/src/inference/turn_models_tests.rs
@@ -215,7 +215,7 @@ async fn role_pins_apply_when_the_primary_uses_config_routing() {
model
.filter(|model| !model.starts_with("hint:"))
.map(str::to_string)
- .or_else(|| config.default_model.clone())
+ .or_else(|| config.config.default_model.clone())
.or_else(|| Some("fixture/managed-default".into()))
}),
context_window: Arc::new(|_| None),
diff --git a/crates/openhuman-core/src/web_chat/suggestions_tests.rs b/crates/openhuman-core/src/web_chat/suggestions_tests.rs
index 7e87043d8d..740097fbb1 100644
--- a/crates/openhuman-core/src/web_chat/suggestions_tests.rs
+++ b/crates/openhuman-core/src/web_chat/suggestions_tests.rs
@@ -110,7 +110,7 @@ fn install_suggestions_model_fixture() {
resolve_model: Arc::new(|_, config, model| {
model
.map(str::to_string)
- .or_else(|| config.default_model.clone())
+ .or_else(|| config.config.default_model.clone())
.or_else(|| Some("fixture/suggestions".to_string()))
}),
context_window: Arc::new(|_| None),