Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
30 changes: 19 additions & 11 deletions src/crates/ai-adapters/src/client/sse.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
use crate::client::utils::elapsed_ms_u64;
use crate::client::StreamResponse;
use crate::provider_error::ProviderError;
use crate::stream::UnifiedResponse;
use anyhow::{anyhow, Result};
use anyhow::{anyhow, Error, Result};
use chrono::{DateTime, Utc};
use log::{debug, error, warn};
use reqwest::{
Expand Down Expand Up @@ -81,8 +82,10 @@ where
.text()
.await
.unwrap_or_else(|e| format!("Failed to read error response: {}", e));
error!("{} client error {}: {}", label, status, error_text);
return Err(anyhow!("{} client error {}: {}", label, status, error_text));
let provider_error =
ProviderError::from_http_error(label, status.as_u16(), &error_text);
error!("{} client error {}: {}", label, status, provider_error);
return Err(Error::new(provider_error));
}

if status.is_success() {
Expand All @@ -100,7 +103,9 @@ where
.text()
.await
.unwrap_or_else(|e| format!("Failed to read error response: {}", e));
let error = anyhow!("{} error {}: {}", label, status, error_text);
let provider_error =
ProviderError::from_http_error(label, status.as_u16(), &error_text);
let error = Error::new(provider_error);
warn!(
"{} request failed: {}ms, attempt {}/{}, error: {}",
label,
Expand Down Expand Up @@ -162,14 +167,17 @@ where
});
}

let error_msg = format!(
"{} failed after {} attempts: {}",
label,
max_tries,
last_error.unwrap_or_else(|| anyhow!("Unknown error"))
);
let error_msg = match &last_error {
Some(error) => format!("{} failed after {} attempts: {}", label, max_tries, error),
None => format!(
"{} failed after {} attempts: Unknown error",
label, max_tries
),
};
error!("{}", error_msg);
Err(anyhow!(error_msg))
Err(last_error
.unwrap_or_else(|| anyhow!("Unknown error"))
.context(format!("{} failed after {} attempts", label, max_tries)))
}

#[cfg(test)]
Expand Down
2 changes: 2 additions & 0 deletions src/crates/ai-adapters/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
#![doc = include_str!("../README.md")]

pub mod client;
pub mod provider_error;
pub mod providers;
pub mod stream;
pub mod tool_call_accumulator;
pub mod types;

pub use client::{AIClient, StreamOptions, StreamResponse};
pub use provider_error::{ProviderError, ProviderErrorKind};
pub use stream::{UnifiedResponse, UnifiedTokenUsage, UnifiedToolCall};
pub use types::{
resolve_request_url, AIConfig, ConnectionTestMessageCode, ConnectionTestResult, GeminiResponse,
Expand Down
Loading
Loading