Skip to content

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

refactor(inference): update model creation logic for chat models

Steven Enamakel2a9fe3f4d494
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 ce9000626f..a3794c2275 100644
--- a/crates/openhuman-core/src/inference/provider/factory/chat_model.rs
+++ b/crates/openhuman-core/src/inference/provider/factory/chat_model.rs
@@ -100,11 +100,23 @@ impl OpenHumanModelFactory<'_> {
.as_deref()
.map(crate::core::runtime::CoreContext::extensions);
let (model, route_provider, resolved_model) = if let Some(result) =
- try_create_claude_agent_sdk_chat_model_from_string(role, &provider, self.config, self.egress)
+ prepare_claude_agent_sdk_chat_model(role, &provider, self.config)
{
- let model = result?;
- let concrete = if pin.is_empty() { model.profile().and_then(|p| p.model.clone()).unwrap_or_default() } else { pin.to_owned() };
- (model, CLAUDE_AGENT_SDK_PROVIDER.to_owned(), concrete)
+ let configured = result?;
+ let concrete = if pin.is_empty() { configured } else { pin.to_owned() };
+ emit_inference_egress(
+ role,
+ &format!("{CLAUDE_AGENT_SDK_PREFIX}{concrete}"),
+ self.egress,
+ );
+ (
+ Arc::new(ClaudeAgentSdkProvider::for_model(
+ (&self.config.claude_agent_sdk).into(),
+ concrete.clone(),
+ )) as Arc<dyn ChatModel<()>>,
+ CLAUDE_AGENT_SDK_PROVIDER.to_owned(),
+ concrete,
+ )
} else if let Some(result) = try_create_claude_code_chat_model_from_string(
role, &provider, self.config, (!pin.is_empty()).then_some(pin), self.egress,
) {
@@ -170,12 +182,9 @@ impl ModelFactory<()> for OpenHumanModelFactory<'_> {
model: (!route.model.is_empty()).then(|| route.model.clone()),
temperature: request.opts.temperature,
};
- let model = if let Some(profile) = model.profile().cloned() {
- Arc::new(ProfileOverrideModel::new(model, profile).with_defaults(opts))
- as Arc<dyn ChatModel<()>>
- } else {
- model
- };
+ let profile = model.profile().cloned().unwrap_or_default();
+ let model = Arc::new(ProfileOverrideModel::new(model, profile).with_defaults(opts))
+ as Arc<dyn ChatModel<()>>;
Ok((model, route))
}
}
diff --git a/crates/openhuman-core/src/inference/turn_models.rs b/crates/openhuman-core/src/inference/turn_models.rs
index 31d15363a6..68db899570 100644
--- a/crates/openhuman-core/src/inference/turn_models.rs
+++ b/crates/openhuman-core/src/inference/turn_models.rs
@@ -544,71 +544,45 @@ impl TurnModelSource {
cn.config.clone(),
));
}
- let managed = cn
- .primary_override
- .as_deref()
- .map(|provider| {
- let provider = provider.trim();
- provider.is_empty() || provider == "cloud" || provider == "openhuman"
- })
- .unwrap_or_else(|| {
- crate::inference::provider::factory::resolves_to_managed_backend(
- &cn.role, &cn.config,
- )
- });
- if managed {
- let resolved_context = cn.ctx().resolved();
- let extensions = resolved_context
- .as_deref()
- .map(crate::core::runtime::CoreContext::extensions);
- return crate::inference::provider::factory::make_openhuman_backend_model_for_thread_in(
- extensions,
- &cn.role,
- &cn.config,
- Some(model),
- true,
- thread_id,
- &crate::security::egress::EgressLedger::none(),
- )
- .map(|(inner, _)| crate::attachments::provider::wrap(&cn.ctx(), inner, cn.config.clone(), model, "openhuman"));
- }
- let built = match cn.primary_override.as_deref() {
- Some(ps) => {
- crate::inference::provider::factory::create_turn_chat_model_from_string(
- &cn.ctx(),
- &cn.role,
- ps,
- &cn.config,
- model,
- temperature,
- )
- }
- None => crate::inference::provider::factory::create_turn_chat_model(
- &cn.ctx(),
- &cn.role,
- &cn.config,
- model,
- temperature,
- ),
+ let ctx = cn.ctx();
+ let egress = crate::security::egress::EgressLedger::per_turn();
+ let factory = crate::inference::provider::factory::OpenHumanModelFactory {
+ ctx: &ctx,
+ config: &cn.config,
+ primary_provider: cn.primary_override.as_deref(),
+ egress: &egress,
+ thread_id,
};
- return built.map(|inner| {
- let provider = inner
- .profile()
- .and_then(|p| p.provider.as_deref())
- .unwrap_or("unknown")
- .to_owned();
- let resolved = inner
- .profile()
- .and_then(|p| p.model.as_deref())
- .unwrap_or(model)
- .to_owned();
- crate::attachments::provider::wrap(
- &cn.ctx(),
- inner,
- cn.config.clone(),
- &resolved,
- &provider,
- )
+ let opts = tinyagents_harness::host::BuildOpts {
+ native_tools: true,
+ temperature: Some(temperature),
+ egress_tag: None,
+ };
+ return tinyagents_harness::host::TurnModelSet::<()>::builder(
+ &factory,
+ &factory,
+ &cn.role,
+ )
+ .primary_model_pin(model)
+ .primary_opts(opts.clone())
+ .without_workload_tiers()
+ .summarization(&cn.role, Some(model.to_owned()))
+ .summarization_opts(opts)
+ .build()
+ .map(|built| {
+ built.map_models(|_, inner| {
+ let profile = inner.profile().cloned().unwrap_or_default();
+ let provider = profile.provider.as_deref().unwrap_or("unknown");
+ let resolved = profile.model.as_deref().unwrap_or(model);
+ crate::attachments::provider::wrap(
+ &ctx,
+ inner,
+ cn.config.clone(),
+ resolved,
+ provider,
+ )
+ })
+ .summarizer()
});
}
Err(anyhow::anyhow!("turn model source is missing a model"))