Skip to content

refactor: flatten display impl for tool call errors #1125

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

Merged
joshua-mo-143 merged 1 commit into from
Dec 10, 2025
Merged

refactor: flatten display impl for tool call errors #1125

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
24 changes: 20 additions & 4 deletions rig-core/src/tool/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

pub mod server;
use std::collections::HashMap;
use std::fmt;

use futures::Future;
use serde::{Deserialize, Serialize};
Expand All @@ -25,18 +26,33 @@ use crate::{
pub enum ToolError {
#[cfg(not(target_family = "wasm"))]
/// Error returned by the tool
#[error("ToolCallError: {0}")]
ToolCallError(#[from] Box<dyn std::error::Error + Send + Sync>),

#[cfg(target_family = "wasm")]
/// Error returned by the tool
#[error("ToolCallError: {0}")]
ToolCallError(#[from] Box<dyn std::error::Error>),

#[error("JsonError: {0}")]
/// Error caused by a de/serialization fail
JsonError(#[from] serde_json::Error),
}

impl fmt::Display for ToolError {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
match self {
ToolError::ToolCallError(e) => {
let error_str = e.to_string();
// This is required due to being able to use agents as tools
// which means it is possible to get recursive tool call errors
if error_str.starts_with("ToolCallError: ") {
write!(f, "{}", error_str)
} else {
write!(f, "ToolCallError: {}", error_str)
}
}
ToolError::JsonError(e) => write!(f, "JsonError: {e}"),
}
}
}

/// Trait that represents a simple LLM tool
///
/// # Example
Expand Down