Skip to content
Merged
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
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ aionui-assistant = { path = "crates/aionui-assistant" }
aionui-app = { path = "crates/aionui-app" }

aion-agent = { git = "https://github.com/iOfficeAI/aionrs.git", tag = "v0.1.30" }
aion-providers = { git = "https://github.com/iOfficeAI/aionrs.git", tag = "v0.1.30" }
aion-types = { git = "https://github.com/iOfficeAI/aionrs.git", tag = "v0.1.30" }
aion-protocol = { git = "https://github.com/iOfficeAI/aionrs.git", tag = "v0.1.30" }
aion-config = { git = "https://github.com/iOfficeAI/aionrs.git", tag = "v0.1.30" }
Expand Down
1 change: 1 addition & 0 deletions crates/aionui-ai-agent/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ thiserror.workspace = true
tracing.workspace = true
which.workspace = true
aion-agent.workspace = true
aion-providers.workspace = true
aion-types.workspace = true
aion-protocol.workspace = true
aion-config.workspace = true
Expand Down
70 changes: 3 additions & 67 deletions crates/aionui-ai-agent/src/manager/aionrs/agent.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ use crate::protocol::events::AgentStreamEvent;
use crate::protocol::send_error::AgentSendError;
use crate::types::{AionrsResolvedConfig, SendMessageData};

use super::error::aionrs_engine_error_to_send_error;

pub struct AionrsAgentManager {
runtime: AgentRuntime,
engine: Mutex<AgentEngine>,
Expand Down Expand Up @@ -257,14 +259,13 @@ impl crate::agent_task::IAgentTask for AionrsAgentManager {
Ok(())
}
Some(Err(e)) => {
let error_msg = format!("Aionrs agent error: {e}");
error!(
conversation_id = %self.runtime.conversation_id(),
elapsed_ms,
error = %ErrorChain(&e),
"Aionrs engine.run() failed, emitting Error"
);
let send_error = aionrs_engine_error_to_send_error(error_msg);
let send_error = aionrs_engine_error_to_send_error(&e);
self.runtime.emit_error_data(send_error.stream_error().clone());
Err(send_error)
}
Expand Down Expand Up @@ -395,18 +396,6 @@ fn parse_session_mode(s: &str) -> SessionMode {
}
}

fn aionrs_engine_error_to_send_error(error_msg: String) -> AgentSendError {
let lower = error_msg.to_ascii_lowercase();
if lower.contains("provider error")
|| lower.contains("provider:")
|| lower.contains("api error:")
|| lower.contains("repeatedly returned malformed tool calls")
{
return AgentSendError::from_agent_error(AgentError::bad_gateway(error_msg));
}
AgentSendError::from_agent_error(AgentError::internal(error_msg))
}

#[cfg(test)]
mod tests {
use super::*;
Expand Down Expand Up @@ -617,57 +606,4 @@ mod tests {
other => panic!("Expected Finish, got {:?}", other),
}
}

#[test]
fn aionrs_provider_connection_error_is_user_llm_provider_error() {
let send_error = aionrs_engine_error_to_send_error(
"Aionrs agent error: Provider error: Connection error: Signable request error: failed to create canonical request"
.to_owned(),
);

assert_eq!(
send_error.code(),
Some(aionui_api_types::AgentErrorCode::UserLlmProviderConfigError)
);
assert_eq!(
send_error.ownership(),
Some(aionui_api_types::AgentErrorOwnership::UserLlmProvider)
);
assert_eq!(send_error.stream_error().retryable, Some(false));
}

#[test]
fn aionrs_api_connection_error_is_user_llm_provider_network_error() {
let send_error = aionrs_engine_error_to_send_error(
"Aionrs agent error: API error: Connection error: error decoding response body".to_owned(),
);

assert_eq!(
send_error.code(),
Some(aionui_api_types::AgentErrorCode::UserLlmProviderNetworkError)
);
assert_eq!(
send_error.ownership(),
Some(aionui_api_types::AgentErrorOwnership::UserLlmProvider)
);
assert_eq!(send_error.stream_error().retryable, Some(true));
}

#[test]
fn aionrs_repeated_malformed_tool_call_is_user_llm_provider_error() {
let send_error = aionrs_engine_error_to_send_error(
"Aionrs agent error: provider repeatedly returned malformed tool calls (3/3); stopped to avoid wasting tokens"
.to_owned(),
);

assert_eq!(
send_error.code(),
Some(aionui_api_types::AgentErrorCode::UserLlmProviderInvalidRequest)
);
assert_eq!(
send_error.ownership(),
Some(aionui_api_types::AgentErrorOwnership::UserLlmProvider)
);
assert_eq!(send_error.stream_error().retryable, Some(false));
}
}
Loading
Loading