refactor: refactor tool macros and router implementation (#261)
* refactor: refactor tool macros and router implementation - Updated the `#[tool(tool_box)]` macro to `#[tool_router]` across various modules for consistency. - Enhanced the `Calculator`, `Counter`, and `GenericService` structs to utilize `ToolRouter` for handling tool calls. - Introduced `Parameters` struct for better parameter handling in tool functions. - Added new methods for listing tools and calling tools in server handlers. - Improved test cases to reflect changes in tool routing and parameter handling. - Updated documentation and examples to align with the new router structure. * fix: fix fmt and build error * fix: fix test failure * docs: documents for macros, fix ci * fix: fix ci * fix: fix wrongly replaced documents * fix: remove useless file * fix: change the parameter format for tool_router * fix: update extract_doc_line to handle existing documentation and clean up unused code in server handler * doc: update document for macro and examples * doc: update readme and add contribute guide * fix: fix type
This commit is contained in:
parent
6d3190504c
commit
1f7f4d3055
1 changed files with 1498 additions and 1147 deletions
|
|
@ -1,9 +1,11 @@
|
|||
#[cfg(test)]
|
||||
mod tests {
|
||||
use rmcp::{ServerHandler, tool};
|
||||
use rmcp::{ServerHandler, handler::server::router::tool::ToolRouter, tool, tool_handler};
|
||||
|
||||
#[derive(Debug, Clone, Default)]
|
||||
pub struct AnnotatedServer {}
|
||||
pub struct AnnotatedServer {
|
||||
tool_router: ToolRouter<AnnotatedServer>,
|
||||
}
|
||||
|
||||
impl AnnotatedServer {
|
||||
// Tool with inline comments for documentation
|
||||
|
|
@ -11,29 +13,14 @@ mod tests {
|
|||
/// This is used to test tool annotations
|
||||
#[tool(
|
||||
name = "direct-annotated-tool",
|
||||
annotations = {
|
||||
title: "Annotated Tool",
|
||||
readOnlyHint: true
|
||||
}
|
||||
annotations(title = "Annotated Tool", read_only_hint = true)
|
||||
)]
|
||||
pub async fn direct_annotated_tool(&self, #[tool(param)] input: String) -> String {
|
||||
pub async fn direct_annotated_tool(&self, input: String) -> String {
|
||||
format!("Direct: {}", input)
|
||||
}
|
||||
}
|
||||
|
||||
impl ServerHandler for AnnotatedServer {
|
||||
async fn call_tool(
|
||||
&self,
|
||||
request: rmcp::model::CallToolRequestParam,
|
||||
context: rmcp::service::RequestContext<rmcp::RoleServer>,
|
||||
) -> Result<rmcp::model::CallToolResult, rmcp::Error> {
|
||||
let tcc = rmcp::handler::server::tool::ToolCallContext::new(self, request, context);
|
||||
match tcc.name() {
|
||||
"direct-annotated-tool" => Self::direct_annotated_tool_tool_call(tcc).await,
|
||||
_ => Err(rmcp::Error::invalid_params("method not found", None)),
|
||||
}
|
||||
}
|
||||
}
|
||||
#[tool_handler]
|
||||
impl ServerHandler for AnnotatedServer {}
|
||||
|
||||
#[test]
|
||||
fn test_direct_tool_attributes() {
|
||||
|
|
|
|||
Loading…
Reference in a new issue