d0zingcat/claude-code
1
0
Fork 0
mirror of https://github.com/instructkr/claude-code.git synced 2026-06-04 11:36:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: route local OpenAI-compatible models

Browse Source
This commit is contained in:
bellman
2026-06-03 23:16:46 +09:00
parent 9522674c87
commit bcc5bfde9c
7 changed files with 264 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
rust/crates/rusty-claude-cli/src/main.rs
View File

@@ -2098,6 +2098,9 @@ fn validate_model_syntax(model: &str) -> Result<(), String> {
if is_bare_provider_model(trimmed) {
return Ok(());
}
if is_local_openai_model_syntax(trimmed) {
return Ok(());
}
// Check provider/model format: provider_id/model_id
let parts: Vec<&str> = trimmed.split('/').collect();
if parts.len() != 2 || parts[0].is_empty() || parts[1].is_empty() {
@@ -2128,6 +2131,13 @@ fn is_bare_provider_model(model: &str) -> bool {
model.starts_with("claude-") || model.starts_with("gpt-")
}
fn is_local_openai_model_syntax(model: &str) -> bool {
if let Some(rest) = model.strip_prefix("local/") {
return !rest.is_empty() && rest.split('/').all(|segment| !segment.is_empty());
}
std::env::var_os("OPENAI_BASE_URL").is_some() && (model.contains(':') || model.contains('.'))
}
fn config_alias_for_current_dir(alias: &str) -> Option<String> {
if alias.is_empty() {
return None;
@@ -13577,6 +13587,35 @@ mod tests {
!err_garbage.contains("Did you mean"),
"Unrelated model errors should not get a hint: {err_garbage}"
);
let original_openai_base_url = std::env::var_os("OPENAI_BASE_URL");
std::env::set_var("OPENAI_BASE_URL", "http://127.0.0.1:11434/v1");
match parse_args(&[
"prompt".to_string(),
"test".to_string(),
"--model".to_string(),
"qwen2.5-coder:7b".to_string(),
])
.expect("Ollama-style tag should parse when OPENAI_BASE_URL is set")
{
CliAction::Prompt { model, .. } => assert_eq!(model, "qwen2.5-coder:7b"),
other => panic!("expected CliAction::Prompt, got: {other:?}"),
}
match parse_args(&[
"prompt".to_string(),
"test".to_string(),
"--model".to_string(),
"local/Qwen/Qwen3.6-27B-FP8".to_string(),
])
.expect("local/ slash-containing model should parse")
{
CliAction::Prompt { model, .. } => assert_eq!(model, "local/Qwen/Qwen3.6-27B-FP8"),
other => panic!("expected CliAction::Prompt, got: {other:?}"),
}
match original_openai_base_url {
Some(value) => std::env::set_var("OPENAI_BASE_URL", value),
None => std::env::remove_var("OPENAI_BASE_URL"),
}
}
#[test]