Add OpenAI/LiteLLM provider support with settings UI
- Add openai/ provider module with translator, client, convert, request/response translators - Add shared provider/ types (ConversationMessage, MessageRole, ProviderConfig enum) - Wire OpenAI-compatible provider dispatch alongside Bedrock in response_stream.rs - Add ai.openai.* settings (enabled, base_url, api_key, model, models) - Add OpenAI/LiteLLM settings page with model fetch, picker, and config UI - Extend model menu items and llms.rs to surface LiteLLM models - Update WARP.md with OpenAI provider architecture docs
This commit is contained in:
Ryan Ward
@@ -0,0 +1,229 @@
|
||||
use serde_json::{json, Value as JsonValue};
|
||||
|
||||
use crate::ai::provider::types::{
|
||||
ContentPart, ConversationMessage, MessageContent, MessageRole, ToolDefinition,
|
||||
};
|
||||
|
||||
pub fn build_openai_request(
|
||||
messages: Vec<ConversationMessage>,
|
||||
system_prompt: Option<String>,
|
||||
tools: Vec<ToolDefinition>,
|
||||
max_tokens: i32,
|
||||
temperature: Option<f32>,
|
||||
model: &str,
|
||||
) -> JsonValue {
|
||||
let mut openai_messages: Vec<JsonValue> = Vec::new();
|
||||
|
||||
if let Some(prompt) = system_prompt {
|
||||
if !prompt.is_empty() {
|
||||
openai_messages.push(json!({
|
||||
"role": "system",
|
||||
"content": prompt,
|
||||
}));
|
||||
}
|
||||
}
|
||||
|
||||
for msg in messages {
|
||||
match convert_message(msg) {
|
||||
ConvertedMessages::Single(m) => openai_messages.push(m),
|
||||
ConvertedMessages::Multiple(ms) => openai_messages.extend(ms),
|
||||
}
|
||||
}
|
||||
|
||||
let mut request = json!({
|
||||
"model": model,
|
||||
"messages": openai_messages,
|
||||
"max_tokens": max_tokens,
|
||||
"stream": true,
|
||||
"stream_options": { "include_usage": true },
|
||||
});
|
||||
|
||||
if let Some(temp) = temperature {
|
||||
request["temperature"] = json!(temp);
|
||||
}
|
||||
|
||||
if !tools.is_empty() {
|
||||
let tool_defs: Vec<JsonValue> = tools.into_iter().map(convert_tool_definition).collect();
|
||||
request["tools"] = json!(tool_defs);
|
||||
}
|
||||
|
||||
request
|
||||
}
|
||||
|
||||
enum ConvertedMessages {
|
||||
Single(JsonValue),
|
||||
Multiple(Vec<JsonValue>),
|
||||
}
|
||||
|
||||
fn convert_message(msg: ConversationMessage) -> ConvertedMessages {
|
||||
match msg.role {
|
||||
MessageRole::User => convert_user_message(msg.content),
|
||||
MessageRole::Assistant => convert_assistant_message(msg.content),
|
||||
}
|
||||
}
|
||||
|
||||
fn convert_user_message(content: MessageContent) -> ConvertedMessages {
|
||||
match content {
|
||||
MessageContent::Text(text) => ConvertedMessages::Single(json!({
|
||||
"role": "user",
|
||||
"content": text,
|
||||
})),
|
||||
MessageContent::ToolResult {
|
||||
tool_use_id,
|
||||
content,
|
||||
is_error,
|
||||
} => {
|
||||
let mut msg = json!({
|
||||
"role": "tool",
|
||||
"tool_call_id": tool_use_id,
|
||||
"content": content,
|
||||
});
|
||||
if is_error {
|
||||
msg["content"] = json!(format!("[ERROR] {content}"));
|
||||
}
|
||||
ConvertedMessages::Single(msg)
|
||||
}
|
||||
MessageContent::ToolUse { .. } => {
|
||||
// User messages shouldn't contain tool_use, but handle gracefully
|
||||
ConvertedMessages::Single(json!({
|
||||
"role": "user",
|
||||
"content": "[unexpected tool_use in user message]",
|
||||
}))
|
||||
}
|
||||
MessageContent::MultiPart(parts) => {
|
||||
let mut messages = Vec::new();
|
||||
let mut text_parts: Vec<String> = Vec::new();
|
||||
|
||||
for part in parts {
|
||||
match part {
|
||||
ContentPart::Text(text) => text_parts.push(text),
|
||||
ContentPart::ToolResult {
|
||||
tool_use_id,
|
||||
content,
|
||||
is_error,
|
||||
} => {
|
||||
// Flush any accumulated text as a user message first
|
||||
if !text_parts.is_empty() {
|
||||
messages.push(json!({
|
||||
"role": "user",
|
||||
"content": text_parts.join("\n"),
|
||||
}));
|
||||
text_parts.clear();
|
||||
}
|
||||
let result_content = if is_error {
|
||||
format!("[ERROR] {content}")
|
||||
} else {
|
||||
content
|
||||
};
|
||||
messages.push(json!({
|
||||
"role": "tool",
|
||||
"tool_call_id": tool_use_id,
|
||||
"content": result_content,
|
||||
}));
|
||||
}
|
||||
ContentPart::ToolUse { .. } => {
|
||||
text_parts.push("[unexpected tool_use in user message]".to_string());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if !text_parts.is_empty() {
|
||||
messages.push(json!({
|
||||
"role": "user",
|
||||
"content": text_parts.join("\n"),
|
||||
}));
|
||||
}
|
||||
|
||||
if messages.len() == 1 {
|
||||
ConvertedMessages::Single(messages.into_iter().next().unwrap())
|
||||
} else {
|
||||
ConvertedMessages::Multiple(messages)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn convert_assistant_message(content: MessageContent) -> ConvertedMessages {
|
||||
match content {
|
||||
MessageContent::Text(text) => ConvertedMessages::Single(json!({
|
||||
"role": "assistant",
|
||||
"content": text,
|
||||
})),
|
||||
MessageContent::ToolUse {
|
||||
tool_use_id,
|
||||
name,
|
||||
input,
|
||||
} => ConvertedMessages::Single(json!({
|
||||
"role": "assistant",
|
||||
"content": null,
|
||||
"tool_calls": [{
|
||||
"id": tool_use_id,
|
||||
"type": "function",
|
||||
"function": {
|
||||
"name": name,
|
||||
"arguments": input.to_string(),
|
||||
}
|
||||
}]
|
||||
})),
|
||||
MessageContent::ToolResult { .. } => {
|
||||
// Assistant messages shouldn't contain tool_result
|
||||
ConvertedMessages::Single(json!({
|
||||
"role": "assistant",
|
||||
"content": "[unexpected tool_result in assistant message]",
|
||||
}))
|
||||
}
|
||||
MessageContent::MultiPart(parts) => {
|
||||
let mut text_content = String::new();
|
||||
let mut tool_calls: Vec<JsonValue> = Vec::new();
|
||||
|
||||
for part in parts {
|
||||
match part {
|
||||
ContentPart::Text(text) => {
|
||||
if !text_content.is_empty() {
|
||||
text_content.push('\n');
|
||||
}
|
||||
text_content.push_str(&text);
|
||||
}
|
||||
ContentPart::ToolUse {
|
||||
tool_use_id,
|
||||
name,
|
||||
input,
|
||||
} => {
|
||||
tool_calls.push(json!({
|
||||
"id": tool_use_id,
|
||||
"type": "function",
|
||||
"function": {
|
||||
"name": name,
|
||||
"arguments": input.to_string(),
|
||||
}
|
||||
}));
|
||||
}
|
||||
ContentPart::ToolResult { .. } => {}
|
||||
}
|
||||
}
|
||||
|
||||
let mut msg = json!({ "role": "assistant" });
|
||||
if !text_content.is_empty() {
|
||||
msg["content"] = json!(text_content);
|
||||
} else {
|
||||
msg["content"] = JsonValue::Null;
|
||||
}
|
||||
if !tool_calls.is_empty() {
|
||||
msg["tool_calls"] = json!(tool_calls);
|
||||
}
|
||||
|
||||
ConvertedMessages::Single(msg)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn convert_tool_definition(tool: ToolDefinition) -> JsonValue {
|
||||
json!({
|
||||
"type": "function",
|
||||
"function": {
|
||||
"name": tool.name,
|
||||
"description": tool.description,
|
||||
"parameters": tool.input_schema,
|
||||
}
|
||||
})
|
||||
}
|
||||
Reference in New Issue
Block a user