- harden URL/request handling for composio and whatsapp integrations - reduce cleartext logging exposure across providers/tools/gateway - hash and constant-time compare gateway webhook secrets - expand nested secret encryption coverage in config - align feature aliases and add regression tests for security paths - fix bubblewrap all-features test invocation surfaced during deep validation
617 lines
19 KiB
Rust
617 lines
19 KiB
Rust
use crate::providers::traits::{
|
|
ChatMessage, ChatRequest as ProviderChatRequest, ChatResponse as ProviderChatResponse,
|
|
Provider, ToolCall as ProviderToolCall,
|
|
};
|
|
use crate::tools::ToolSpec;
|
|
use async_trait::async_trait;
|
|
use reqwest::Client;
|
|
use serde::{Deserialize, Serialize};
|
|
|
|
pub struct AnthropicProvider {
|
|
credential: Option<String>,
|
|
base_url: String,
|
|
client: Client,
|
|
}
|
|
|
|
#[derive(Debug, Serialize)]
|
|
struct ChatRequest {
|
|
model: String,
|
|
max_tokens: u32,
|
|
#[serde(skip_serializing_if = "Option::is_none")]
|
|
system: Option<String>,
|
|
messages: Vec<Message>,
|
|
temperature: f64,
|
|
}
|
|
|
|
#[derive(Debug, Serialize)]
|
|
struct Message {
|
|
role: String,
|
|
content: String,
|
|
}
|
|
|
|
#[derive(Debug, Deserialize)]
|
|
struct ChatResponse {
|
|
content: Vec<ContentBlock>,
|
|
}
|
|
|
|
#[derive(Debug, Deserialize)]
|
|
struct ContentBlock {
|
|
#[serde(rename = "type")]
|
|
kind: String,
|
|
#[serde(default)]
|
|
text: Option<String>,
|
|
}
|
|
|
|
#[derive(Debug, Serialize)]
|
|
struct NativeChatRequest {
|
|
model: String,
|
|
max_tokens: u32,
|
|
#[serde(skip_serializing_if = "Option::is_none")]
|
|
system: Option<String>,
|
|
messages: Vec<NativeMessage>,
|
|
temperature: f64,
|
|
#[serde(skip_serializing_if = "Option::is_none")]
|
|
tools: Option<Vec<NativeToolSpec>>,
|
|
}
|
|
|
|
#[derive(Debug, Serialize)]
|
|
struct NativeMessage {
|
|
role: String,
|
|
content: Vec<NativeContentOut>,
|
|
}
|
|
|
|
#[derive(Debug, Serialize)]
|
|
#[serde(tag = "type")]
|
|
enum NativeContentOut {
|
|
#[serde(rename = "text")]
|
|
Text { text: String },
|
|
#[serde(rename = "tool_use")]
|
|
ToolUse {
|
|
id: String,
|
|
name: String,
|
|
input: serde_json::Value,
|
|
},
|
|
#[serde(rename = "tool_result")]
|
|
ToolResult {
|
|
tool_use_id: String,
|
|
content: String,
|
|
},
|
|
}
|
|
|
|
#[derive(Debug, Serialize)]
|
|
struct NativeToolSpec {
|
|
name: String,
|
|
description: String,
|
|
input_schema: serde_json::Value,
|
|
}
|
|
|
|
#[derive(Debug, Deserialize)]
|
|
struct NativeChatResponse {
|
|
#[serde(default)]
|
|
content: Vec<NativeContentIn>,
|
|
}
|
|
|
|
#[derive(Debug, Deserialize)]
|
|
struct NativeContentIn {
|
|
#[serde(rename = "type")]
|
|
kind: String,
|
|
#[serde(default)]
|
|
text: Option<String>,
|
|
#[serde(default)]
|
|
id: Option<String>,
|
|
#[serde(default)]
|
|
name: Option<String>,
|
|
#[serde(default)]
|
|
input: Option<serde_json::Value>,
|
|
}
|
|
|
|
impl AnthropicProvider {
|
|
pub fn new(credential: Option<&str>) -> Self {
|
|
Self::with_base_url(credential, None)
|
|
}
|
|
|
|
pub fn with_base_url(credential: Option<&str>, base_url: Option<&str>) -> Self {
|
|
let base_url = base_url
|
|
.map(|u| u.trim_end_matches('/'))
|
|
.unwrap_or("https://api.anthropic.com")
|
|
.to_string();
|
|
Self {
|
|
credential: credential
|
|
.map(str::trim)
|
|
.filter(|k| !k.is_empty())
|
|
.map(ToString::to_string),
|
|
base_url,
|
|
client: Client::builder()
|
|
.timeout(std::time::Duration::from_secs(120))
|
|
.connect_timeout(std::time::Duration::from_secs(10))
|
|
.build()
|
|
.unwrap_or_else(|_| Client::new()),
|
|
}
|
|
}
|
|
|
|
fn is_setup_token(token: &str) -> bool {
|
|
token.starts_with("sk-ant-oat01-")
|
|
}
|
|
|
|
fn apply_auth(
|
|
&self,
|
|
request: reqwest::RequestBuilder,
|
|
credential: &str,
|
|
) -> reqwest::RequestBuilder {
|
|
if Self::is_setup_token(credential) {
|
|
request
|
|
.header("Authorization", format!("Bearer {credential}"))
|
|
.header("anthropic-beta", "oauth-2025-04-20")
|
|
} else {
|
|
request.header("x-api-key", credential)
|
|
}
|
|
}
|
|
|
|
fn convert_tools(tools: Option<&[ToolSpec]>) -> Option<Vec<NativeToolSpec>> {
|
|
let items = tools?;
|
|
if items.is_empty() {
|
|
return None;
|
|
}
|
|
Some(
|
|
items
|
|
.iter()
|
|
.map(|tool| NativeToolSpec {
|
|
name: tool.name.clone(),
|
|
description: tool.description.clone(),
|
|
input_schema: tool.parameters.clone(),
|
|
})
|
|
.collect(),
|
|
)
|
|
}
|
|
|
|
fn parse_assistant_tool_call_message(content: &str) -> Option<Vec<NativeContentOut>> {
|
|
let value = serde_json::from_str::<serde_json::Value>(content).ok()?;
|
|
let tool_calls = value
|
|
.get("tool_calls")
|
|
.and_then(|v| serde_json::from_value::<Vec<ProviderToolCall>>(v.clone()).ok())?;
|
|
|
|
let mut blocks = Vec::new();
|
|
if let Some(text) = value
|
|
.get("content")
|
|
.and_then(serde_json::Value::as_str)
|
|
.map(str::trim)
|
|
.filter(|t| !t.is_empty())
|
|
{
|
|
blocks.push(NativeContentOut::Text {
|
|
text: text.to_string(),
|
|
});
|
|
}
|
|
for call in tool_calls {
|
|
let input = serde_json::from_str::<serde_json::Value>(&call.arguments)
|
|
.unwrap_or_else(|_| serde_json::Value::Object(serde_json::Map::new()));
|
|
blocks.push(NativeContentOut::ToolUse {
|
|
id: call.id,
|
|
name: call.name,
|
|
input,
|
|
});
|
|
}
|
|
Some(blocks)
|
|
}
|
|
|
|
fn parse_tool_result_message(content: &str) -> Option<NativeMessage> {
|
|
let value = serde_json::from_str::<serde_json::Value>(content).ok()?;
|
|
let tool_use_id = value
|
|
.get("tool_call_id")
|
|
.and_then(serde_json::Value::as_str)?
|
|
.to_string();
|
|
let result = value
|
|
.get("content")
|
|
.and_then(serde_json::Value::as_str)
|
|
.unwrap_or("")
|
|
.to_string();
|
|
Some(NativeMessage {
|
|
role: "user".to_string(),
|
|
content: vec![NativeContentOut::ToolResult {
|
|
tool_use_id,
|
|
content: result,
|
|
}],
|
|
})
|
|
}
|
|
|
|
fn convert_messages(messages: &[ChatMessage]) -> (Option<String>, Vec<NativeMessage>) {
|
|
let mut system_prompt = None;
|
|
let mut native_messages = Vec::new();
|
|
|
|
for msg in messages {
|
|
match msg.role.as_str() {
|
|
"system" => {
|
|
if system_prompt.is_none() {
|
|
system_prompt = Some(msg.content.clone());
|
|
}
|
|
}
|
|
"assistant" => {
|
|
if let Some(blocks) = Self::parse_assistant_tool_call_message(&msg.content) {
|
|
native_messages.push(NativeMessage {
|
|
role: "assistant".to_string(),
|
|
content: blocks,
|
|
});
|
|
} else {
|
|
native_messages.push(NativeMessage {
|
|
role: "assistant".to_string(),
|
|
content: vec![NativeContentOut::Text {
|
|
text: msg.content.clone(),
|
|
}],
|
|
});
|
|
}
|
|
}
|
|
"tool" => {
|
|
if let Some(tool_result) = Self::parse_tool_result_message(&msg.content) {
|
|
native_messages.push(tool_result);
|
|
} else {
|
|
native_messages.push(NativeMessage {
|
|
role: "user".to_string(),
|
|
content: vec![NativeContentOut::Text {
|
|
text: msg.content.clone(),
|
|
}],
|
|
});
|
|
}
|
|
}
|
|
_ => {
|
|
native_messages.push(NativeMessage {
|
|
role: "user".to_string(),
|
|
content: vec![NativeContentOut::Text {
|
|
text: msg.content.clone(),
|
|
}],
|
|
});
|
|
}
|
|
}
|
|
}
|
|
|
|
(system_prompt, native_messages)
|
|
}
|
|
|
|
fn parse_text_response(response: ChatResponse) -> anyhow::Result<String> {
|
|
response
|
|
.content
|
|
.into_iter()
|
|
.find(|c| c.kind == "text")
|
|
.and_then(|c| c.text)
|
|
.ok_or_else(|| anyhow::anyhow!("No response from Anthropic"))
|
|
}
|
|
|
|
fn parse_native_response(response: NativeChatResponse) -> ProviderChatResponse {
|
|
let mut text_parts = Vec::new();
|
|
let mut tool_calls = Vec::new();
|
|
|
|
for block in response.content {
|
|
match block.kind.as_str() {
|
|
"text" => {
|
|
if let Some(text) = block.text.map(|t| t.trim().to_string()) {
|
|
if !text.is_empty() {
|
|
text_parts.push(text);
|
|
}
|
|
}
|
|
}
|
|
"tool_use" => {
|
|
let name = block.name.unwrap_or_default();
|
|
if name.is_empty() {
|
|
continue;
|
|
}
|
|
let arguments = block
|
|
.input
|
|
.unwrap_or_else(|| serde_json::Value::Object(serde_json::Map::new()));
|
|
tool_calls.push(ProviderToolCall {
|
|
id: block.id.unwrap_or_else(|| uuid::Uuid::new_v4().to_string()),
|
|
name,
|
|
arguments: arguments.to_string(),
|
|
});
|
|
}
|
|
_ => {}
|
|
}
|
|
}
|
|
|
|
ProviderChatResponse {
|
|
text: if text_parts.is_empty() {
|
|
None
|
|
} else {
|
|
Some(text_parts.join("\n"))
|
|
},
|
|
tool_calls,
|
|
}
|
|
}
|
|
}
|
|
|
|
#[async_trait]
|
|
impl Provider for AnthropicProvider {
|
|
async fn chat_with_system(
|
|
&self,
|
|
system_prompt: Option<&str>,
|
|
message: &str,
|
|
model: &str,
|
|
temperature: f64,
|
|
) -> anyhow::Result<String> {
|
|
let credential = self.credential.as_ref().ok_or_else(|| {
|
|
anyhow::anyhow!(
|
|
"Anthropic credentials not set. Set ANTHROPIC_API_KEY or ANTHROPIC_OAUTH_TOKEN (setup-token)."
|
|
)
|
|
})?;
|
|
|
|
let request = ChatRequest {
|
|
model: model.to_string(),
|
|
max_tokens: 4096,
|
|
system: system_prompt.map(ToString::to_string),
|
|
messages: vec![Message {
|
|
role: "user".to_string(),
|
|
content: message.to_string(),
|
|
}],
|
|
temperature,
|
|
};
|
|
|
|
let mut request = self
|
|
.client
|
|
.post(format!("{}/v1/messages", self.base_url))
|
|
.header("anthropic-version", "2023-06-01")
|
|
.header("content-type", "application/json")
|
|
.json(&request);
|
|
|
|
request = self.apply_auth(request, credential);
|
|
|
|
let response = request.send().await?;
|
|
|
|
if !response.status().is_success() {
|
|
return Err(super::api_error("Anthropic", response).await);
|
|
}
|
|
|
|
let chat_response: ChatResponse = response.json().await?;
|
|
Self::parse_text_response(chat_response)
|
|
}
|
|
|
|
async fn chat(
|
|
&self,
|
|
request: ProviderChatRequest<'_>,
|
|
model: &str,
|
|
temperature: f64,
|
|
) -> anyhow::Result<ProviderChatResponse> {
|
|
let credential = self.credential.as_ref().ok_or_else(|| {
|
|
anyhow::anyhow!(
|
|
"Anthropic credentials not set. Set ANTHROPIC_API_KEY or ANTHROPIC_OAUTH_TOKEN (setup-token)."
|
|
)
|
|
})?;
|
|
|
|
let (system_prompt, messages) = Self::convert_messages(request.messages);
|
|
let native_request = NativeChatRequest {
|
|
model: model.to_string(),
|
|
max_tokens: 4096,
|
|
system: system_prompt,
|
|
messages,
|
|
temperature,
|
|
tools: Self::convert_tools(request.tools),
|
|
};
|
|
|
|
let req = self
|
|
.client
|
|
.post(format!("{}/v1/messages", self.base_url))
|
|
.header("anthropic-version", "2023-06-01")
|
|
.header("content-type", "application/json")
|
|
.json(&native_request);
|
|
|
|
let response = self.apply_auth(req, credential).send().await?;
|
|
if !response.status().is_success() {
|
|
return Err(super::api_error("Anthropic", response).await);
|
|
}
|
|
|
|
let native_response: NativeChatResponse = response.json().await?;
|
|
Ok(Self::parse_native_response(native_response))
|
|
}
|
|
|
|
fn supports_native_tools(&self) -> bool {
|
|
true
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn creates_with_key() {
|
|
let p = AnthropicProvider::new(Some("anthropic-test-credential"));
|
|
assert!(p.credential.is_some());
|
|
assert_eq!(p.credential.as_deref(), Some("anthropic-test-credential"));
|
|
assert_eq!(p.base_url, "https://api.anthropic.com");
|
|
}
|
|
|
|
#[test]
|
|
fn creates_without_key() {
|
|
let p = AnthropicProvider::new(None);
|
|
assert!(p.credential.is_none());
|
|
assert_eq!(p.base_url, "https://api.anthropic.com");
|
|
}
|
|
|
|
#[test]
|
|
fn creates_with_empty_key() {
|
|
let p = AnthropicProvider::new(Some(""));
|
|
assert!(p.credential.is_none());
|
|
}
|
|
|
|
#[test]
|
|
fn creates_with_whitespace_key() {
|
|
let p = AnthropicProvider::new(Some(" anthropic-test-credential "));
|
|
assert!(p.credential.is_some());
|
|
assert_eq!(p.credential.as_deref(), Some("anthropic-test-credential"));
|
|
}
|
|
|
|
#[test]
|
|
fn creates_with_custom_base_url() {
|
|
let p = AnthropicProvider::with_base_url(
|
|
Some("anthropic-credential"),
|
|
Some("https://api.example.com"),
|
|
);
|
|
assert_eq!(p.base_url, "https://api.example.com");
|
|
assert_eq!(p.credential.as_deref(), Some("anthropic-credential"));
|
|
}
|
|
|
|
#[test]
|
|
fn custom_base_url_trims_trailing_slash() {
|
|
let p = AnthropicProvider::with_base_url(None, Some("https://api.example.com/"));
|
|
assert_eq!(p.base_url, "https://api.example.com");
|
|
}
|
|
|
|
#[test]
|
|
fn default_base_url_when_none_provided() {
|
|
let p = AnthropicProvider::with_base_url(None, None);
|
|
assert_eq!(p.base_url, "https://api.anthropic.com");
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn chat_fails_without_key() {
|
|
let p = AnthropicProvider::new(None);
|
|
let result = p
|
|
.chat_with_system(None, "hello", "claude-3-opus", 0.7)
|
|
.await;
|
|
assert!(result.is_err());
|
|
let err = result.unwrap_err().to_string();
|
|
assert!(
|
|
err.contains("credentials not set"),
|
|
"Expected key error, got: {err}"
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn setup_token_detection_works() {
|
|
assert!(AnthropicProvider::is_setup_token("sk-ant-oat01-abcdef"));
|
|
assert!(!AnthropicProvider::is_setup_token("sk-ant-api-key"));
|
|
}
|
|
|
|
#[test]
|
|
fn apply_auth_uses_bearer_and_beta_for_setup_tokens() {
|
|
let provider = AnthropicProvider::new(None);
|
|
let request = provider
|
|
.apply_auth(
|
|
provider.client.get("https://api.anthropic.com/v1/models"),
|
|
"sk-ant-oat01-test-token",
|
|
)
|
|
.build()
|
|
.expect("request should build");
|
|
|
|
assert_eq!(
|
|
request
|
|
.headers()
|
|
.get("authorization")
|
|
.and_then(|v| v.to_str().ok()),
|
|
Some("Bearer sk-ant-oat01-test-token")
|
|
);
|
|
assert_eq!(
|
|
request
|
|
.headers()
|
|
.get("anthropic-beta")
|
|
.and_then(|v| v.to_str().ok()),
|
|
Some("oauth-2025-04-20")
|
|
);
|
|
assert!(request.headers().get("x-api-key").is_none());
|
|
}
|
|
|
|
#[test]
|
|
fn apply_auth_uses_x_api_key_for_regular_tokens() {
|
|
let provider = AnthropicProvider::new(None);
|
|
let request = provider
|
|
.apply_auth(
|
|
provider.client.get("https://api.anthropic.com/v1/models"),
|
|
"sk-ant-api-key",
|
|
)
|
|
.build()
|
|
.expect("request should build");
|
|
|
|
assert_eq!(
|
|
request
|
|
.headers()
|
|
.get("x-api-key")
|
|
.and_then(|v| v.to_str().ok()),
|
|
Some("sk-ant-api-key")
|
|
);
|
|
assert!(request.headers().get("authorization").is_none());
|
|
assert!(request.headers().get("anthropic-beta").is_none());
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn chat_with_system_fails_without_key() {
|
|
let p = AnthropicProvider::new(None);
|
|
let result = p
|
|
.chat_with_system(Some("You are ZeroClaw"), "hello", "claude-3-opus", 0.7)
|
|
.await;
|
|
assert!(result.is_err());
|
|
}
|
|
|
|
#[test]
|
|
fn chat_request_serializes_without_system() {
|
|
let req = ChatRequest {
|
|
model: "claude-3-opus".to_string(),
|
|
max_tokens: 4096,
|
|
system: None,
|
|
messages: vec![Message {
|
|
role: "user".to_string(),
|
|
content: "hello".to_string(),
|
|
}],
|
|
temperature: 0.7,
|
|
};
|
|
let json = serde_json::to_string(&req).unwrap();
|
|
assert!(
|
|
!json.contains("system"),
|
|
"system field should be skipped when None"
|
|
);
|
|
assert!(json.contains("claude-3-opus"));
|
|
assert!(json.contains("hello"));
|
|
}
|
|
|
|
#[test]
|
|
fn chat_request_serializes_with_system() {
|
|
let req = ChatRequest {
|
|
model: "claude-3-opus".to_string(),
|
|
max_tokens: 4096,
|
|
system: Some("You are ZeroClaw".to_string()),
|
|
messages: vec![Message {
|
|
role: "user".to_string(),
|
|
content: "hello".to_string(),
|
|
}],
|
|
temperature: 0.7,
|
|
};
|
|
let json = serde_json::to_string(&req).unwrap();
|
|
assert!(json.contains("\"system\":\"You are ZeroClaw\""));
|
|
}
|
|
|
|
#[test]
|
|
fn chat_response_deserializes() {
|
|
let json = r#"{"content":[{"type":"text","text":"Hello there!"}]}"#;
|
|
let resp: ChatResponse = serde_json::from_str(json).unwrap();
|
|
assert_eq!(resp.content.len(), 1);
|
|
assert_eq!(resp.content[0].kind, "text");
|
|
assert_eq!(resp.content[0].text.as_deref(), Some("Hello there!"));
|
|
}
|
|
|
|
#[test]
|
|
fn chat_response_empty_content() {
|
|
let json = r#"{"content":[]}"#;
|
|
let resp: ChatResponse = serde_json::from_str(json).unwrap();
|
|
assert!(resp.content.is_empty());
|
|
}
|
|
|
|
#[test]
|
|
fn chat_response_multiple_blocks() {
|
|
let json =
|
|
r#"{"content":[{"type":"text","text":"First"},{"type":"text","text":"Second"}]}"#;
|
|
let resp: ChatResponse = serde_json::from_str(json).unwrap();
|
|
assert_eq!(resp.content.len(), 2);
|
|
assert_eq!(resp.content[0].text.as_deref(), Some("First"));
|
|
assert_eq!(resp.content[1].text.as_deref(), Some("Second"));
|
|
}
|
|
|
|
#[test]
|
|
fn temperature_range_serializes() {
|
|
for temp in [0.0, 0.5, 1.0, 2.0] {
|
|
let req = ChatRequest {
|
|
model: "claude-3-opus".to_string(),
|
|
max_tokens: 4096,
|
|
system: None,
|
|
messages: vec![],
|
|
temperature: temp,
|
|
};
|
|
let json = serde_json::to_string(&req).unwrap();
|
|
assert!(json.contains(&format!("{temp}")));
|
|
}
|
|
}
|
|
}
|