Skip to content

fix(aionrs): set chat path for non-v1 OpenAI-compatible roots #338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
taekchef wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(aionrs): set chat path for non-v1 OpenAI-compatible roots #338

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions crates/aionui-ai-agent/src/factory/aionrs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ use crate::manager::aionrs::{AionrsAgentManager, sanitize_session_messages};
use crate::types::{AionrsCompatOverrides, AionrsResolvedConfig, BuildTaskOptions};

const TEAM_CAPABLE_BACKENDS: &[&str] = &["claude", "codex", "gemini", "aionrs", "codebuddy"];
const NON_V1_OPENAI_COMPAT_API_ROOTS: &[&str] = &["/api/paas/v4", "/api/v3", "/v2"];

pub(super) async fn build(
deps: Arc<AgentFactoryDeps>,
Expand Down Expand Up @@ -230,6 +231,10 @@ fn resolve_aionrs_url_and_compat(
compat.max_tokens_field = Some("max_completion_tokens".to_owned());
}

if mapped_provider == "openai" && has_non_v1_openai_compat_api_root(raw_base_url) {
compat.api_path = Some("/chat/completions".to_owned());
}

(base_url, compat)
}

Expand All @@ -242,6 +247,17 @@ fn is_openai_host(url: &str) -> bool {
.unwrap_or(false)
}

fn has_non_v1_openai_compat_api_root(url: &str) -> bool {
let trimmed = url.trim_end_matches('/');
let rest = trimmed.split_once("://").map(|(_, rest)| rest).unwrap_or(trimmed);
let Some(path_start) = rest.find('/') else {
return false;
};
let path = &rest[path_start..];
let path = path.split(['?', '#']).next().unwrap_or(path);
NON_V1_OPENAI_COMPAT_API_ROOTS.iter().any(|root| path.ends_with(root))
}

/// Strip trailing `/v1`, `/v1/`, or lone `/` from a base URL so that
/// aionrs can append its own path suffix (`/v1/messages`, `/v1/chat/completions`).
fn normalize_aionrs_base_url(url: &str) -> String {
Expand Down Expand Up @@ -415,6 +431,21 @@ mod tests {
assert!(compat.max_tokens_field.is_none());
}

#[test]
fn resolve_non_v1_openai_compat_roots_use_root_chat_path() {
for raw_base_url in [
"https://open.bigmodel.cn/api/paas/v4",
"https://ark.cn-beijing.volces.com/api/v3",
"https://qianfan.baidubce.com/v2",
"https://open.bigmodel.cn/api/paas/v4/",
] {
let (base_url, compat) = resolve_aionrs_url_and_compat("custom", raw_base_url, "openai", false);
assert_eq!(base_url.as_deref(), Some(raw_base_url.trim_end_matches('/')));
assert_eq!(compat.api_path.as_deref(), Some("/chat/completions"));
assert!(compat.max_tokens_field.is_none());
}
}

#[test]
fn resolve_gemini_prepends_path_and_sets_api_path() {
let (base_url, compat) =
Expand Down