@@ -236,6 +236,11 @@ impl ClientMessage {
236236 pub fn is_initialize_request ( & self ) -> bool {
237237 matches ! ( self , Self :: Request ( request) if request. request. is_initialize_request( ) )
238238 }
239+ 240+ /// Returns `true` if the message is an `InitializedNotification`
241+ pub fn is_initialized_notification ( & self ) -> bool {
242+ matches ! ( self , Self :: Notification ( notofication) if notofication. notification. is_initialized_notification( ) )
243+ }
239244}
240245
241246impl From < ClientJsonrpcNotification > for ClientMessage {
@@ -519,7 +524,7 @@ impl TryFrom<NotificationFromClient> for ClientNotification {
519524}
520525
521526impl NotificationFromClient {
522- /// Checks if the current notification is an `InitializedNotification` from the client, indicating that the client has been initialized.
527+ /// Returns `true` if the message is an `InitializedNotification`
523528 pub fn is_initialized_notification ( & self ) -> bool {
524529 matches ! (
525530 self ,
@@ -1318,10 +1323,15 @@ pub enum MessageFromClient {
13181323}
13191324
13201325impl MessageFromClient {
1321- /// Returns `true` if the request is an `InitializeRequest`.
1326+ /// Returns `true` if the message is an `InitializeRequest`.
13221327 pub fn is_initialize_request ( & self ) -> bool {
13231328 matches ! ( self , Self :: RequestFromClient ( request) if request. is_initialize_request( ) )
13241329 }
1330+ 1331+ /// Returns `true` if the message is an `InitializedNotification`
1332+ pub fn is_initialized_notification ( & self ) -> bool {
1333+ matches ! ( self , Self :: NotificationFromClient ( notofication) if notofication. is_initialized_notification( ) )
1334+ }
13251335}
13261336
13271337impl From < RequestFromClient > for MessageFromClient {
@@ -1450,12 +1460,60 @@ impl CallToolError {
14501460 }
14511461
14521462 /// Specific constructor to create a `CallToolError` for an `UnknownTool` error.
1453- pub fn unknown_tool ( tool_name : String ) -> Self {
1463+ pub fn unknown_tool ( tool_name : impl Into < String > ) -> Self {
14541464 // Create a `CallToolError` from an `UnknownTool` error (wrapped in a `Box`).
1455- CallToolError ( Box :: new ( UnknownTool ( tool_name) ) )
1465+ CallToolError ( Box :: new ( UnknownTool ( tool_name. into ( ) ) ) )
1466+ }
1467+ 1468+ pub fn invalid_arguments ( tool_name : impl Into < String > , message : Option < impl Into < String > > ) -> Self {
1469+ let tool_name = tool_name. into ( ) ;
1470+ let message = message. map ( |m| m. into ( ) ) ;
1471+ 1472+ let full_message = match message {
1473+ Some ( msg) => format ! ( "Invalid arguments for tool '{tool_name}': {msg}" ) ,
1474+ None => format ! ( "Invalid arguments for tool '{tool_name}'" ) ,
1475+ } ;
1476+ Self :: from_message ( full_message)
1477+ }
1478+ 1479+ /// Creates a new `CallToolError` from a string message.
1480+ ///
1481+ /// This is useful for generating ad-hoc or one-off errors without defining a custom error type.
1482+ /// Internally, it wraps the string in a lightweight error type that implements the `Error` trait.
1483+ ///
1484+ /// # Examples
1485+ ///
1486+ /// ```
1487+ /// let err = CallToolError::from_message("Something went wrong");
1488+ /// println!("{:?}", err);
1489+ /// ```
1490+ ///
1491+ /// # Parameters
1492+ ///
1493+ /// - `message`: Any type that can be converted into a `String` (e.g., `&str` or `String`)
1494+ ///
1495+ /// # Returns
1496+ ///
1497+ /// A `CallToolError` wrapping a dynamic error created from the provided message.
1498+ pub fn from_message ( message : impl Into < String > ) -> Self {
1499+ struct MsgError ( String ) ;
1500+ impl std:: fmt:: Debug for MsgError {
1501+ fn fmt ( & self , f : & mut std:: fmt:: Formatter < ' _ > ) -> std:: fmt:: Result {
1502+ write ! ( f, "{}" , self . 0 )
1503+ }
1504+ }
1505+ impl std:: fmt:: Display for MsgError {
1506+ fn fmt ( & self , f : & mut std:: fmt:: Formatter < ' _ > ) -> std:: fmt:: Result {
1507+ write ! ( f, "{}" , self . 0 )
1508+ }
1509+ }
1510+ impl std:: error:: Error for MsgError { }
1511+ 1512+ CallToolError :: new ( MsgError ( message. into ( ) ) )
14561513 }
14571514}
14581515
1516+ 14591517/// Converts a `CallToolError` into a `RpcError`.
14601518///
14611519/// The conversion creates an internal error variant of `RpcError`
@@ -1508,8 +1566,6 @@ impl<T: Into<String>> From<T> for TextContent {
15081566 }
15091567}
15101568
1511- 1512- 15131569#[ derive( serde:: Serialize , serde:: Deserialize , Debug , Clone ) ]
15141570#[ serde( untagged) ]
15151571#[ allow( clippy:: large_enum_variant) ]
@@ -1568,8 +1624,6 @@ impl Display for ClientMessages {
15681624 }
15691625}
15701626
1571- 1572- 15731627#[ derive( serde:: Serialize , serde:: Deserialize , Debug , Clone ) ]
15741628#[ serde( untagged) ]
15751629#[ allow( clippy:: large_enum_variant) ]
@@ -1628,8 +1682,6 @@ impl Display for ServerMessages {
16281682 }
16291683}
16301684
1631- 1632- 16331685#[ derive( serde:: Serialize , serde:: Deserialize , Debug , Clone ) ]
16341686#[ serde( untagged) ]
16351687#[ allow( clippy:: large_enum_variant) ]
0 commit comments