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
272
crates/rmcp/src/handler/server/router/tool.rs
Normal file
272
crates/rmcp/src/handler/server/router/tool.rs
Normal file
|
|
@ -0,0 +1,272 @@
|
|||
use std::{borrow::Cow, sync::Arc};
|
||||
|
||||
use futures::{FutureExt, future::BoxFuture};
|
||||
use schemars::JsonSchema;
|
||||
|
||||
use crate::{
|
||||
handler::server::tool::{
|
||||
CallToolHandler, DynCallToolHandler, ToolCallContext, schema_for_type,
|
||||
},
|
||||
model::{CallToolResult, Tool, ToolAnnotations},
|
||||
};
|
||||
|
||||
pub struct ToolRoute<S> {
|
||||
#[allow(clippy::type_complexity)]
|
||||
pub call: Arc<DynCallToolHandler<S>>,
|
||||
pub attr: crate::model::Tool,
|
||||
}
|
||||
|
||||
impl<S> std::fmt::Debug for ToolRoute<S> {
|
||||
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||
f.debug_struct("ToolRoute")
|
||||
.field("name", &self.attr.name)
|
||||
.field("description", &self.attr.description)
|
||||
.field("input_schema", &self.attr.input_schema)
|
||||
.finish()
|
||||
}
|
||||
}
|
||||
|
||||
impl<S> Clone for ToolRoute<S> {
|
||||
fn clone(&self) -> Self {
|
||||
Self {
|
||||
call: self.call.clone(),
|
||||
attr: self.attr.clone(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl<S: Send + Sync + 'static> ToolRoute<S> {
|
||||
pub fn new<C, A>(attr: impl Into<Tool>, call: C) -> Self
|
||||
where
|
||||
C: CallToolHandler<S, A> + Send + Sync + Clone + 'static,
|
||||
{
|
||||
Self {
|
||||
call: Arc::new(move |context: ToolCallContext<S>| {
|
||||
let call = call.clone();
|
||||
context.invoke(call).boxed()
|
||||
}),
|
||||
attr: attr.into(),
|
||||
}
|
||||
}
|
||||
pub fn new_dyn<C>(attr: impl Into<Tool>, call: C) -> Self
|
||||
where
|
||||
C: for<'a> Fn(
|
||||
ToolCallContext<'a, S>,
|
||||
) -> BoxFuture<'a, Result<CallToolResult, crate::Error>>
|
||||
+ Send
|
||||
+ Sync
|
||||
+ 'static,
|
||||
{
|
||||
Self {
|
||||
call: Arc::new(call),
|
||||
attr: attr.into(),
|
||||
}
|
||||
}
|
||||
pub fn name(&self) -> &str {
|
||||
&self.attr.name
|
||||
}
|
||||
}
|
||||
|
||||
pub trait IntoToolRoute<S, A> {
|
||||
fn into_tool_route(self) -> ToolRoute<S>;
|
||||
}
|
||||
|
||||
impl<S, C, A, T> IntoToolRoute<S, A> for (T, C)
|
||||
where
|
||||
S: Send + Sync + 'static,
|
||||
C: CallToolHandler<S, A> + Send + Sync + Clone + 'static,
|
||||
T: Into<Tool>,
|
||||
{
|
||||
fn into_tool_route(self) -> ToolRoute<S> {
|
||||
ToolRoute::new(self.0.into(), self.1)
|
||||
}
|
||||
}
|
||||
|
||||
impl<S> IntoToolRoute<S, ()> for ToolRoute<S>
|
||||
where
|
||||
S: Send + Sync + 'static,
|
||||
{
|
||||
fn into_tool_route(self) -> ToolRoute<S> {
|
||||
self
|
||||
}
|
||||
}
|
||||
|
||||
pub struct ToolAttrGenerateFunctionAdapter;
|
||||
impl<S, F> IntoToolRoute<S, ToolAttrGenerateFunctionAdapter> for F
|
||||
where
|
||||
S: Send + Sync + 'static,
|
||||
F: Fn() -> ToolRoute<S>,
|
||||
{
|
||||
fn into_tool_route(self) -> ToolRoute<S> {
|
||||
(self)()
|
||||
}
|
||||
}
|
||||
|
||||
pub trait CallToolHandlerExt<S, A>: Sized
|
||||
where
|
||||
Self: CallToolHandler<S, A> + Send + Sync + Clone + 'static,
|
||||
{
|
||||
fn name(self, name: impl Into<Cow<'static, str>>) -> WithToolAttr<Self, S, A>;
|
||||
}
|
||||
|
||||
impl<C, S, A> CallToolHandlerExt<S, A> for C
|
||||
where
|
||||
C: CallToolHandler<S, A> + Send + Sync + Clone + 'static,
|
||||
{
|
||||
fn name(self, name: impl Into<Cow<'static, str>>) -> WithToolAttr<Self, S, A> {
|
||||
WithToolAttr {
|
||||
attr: Tool::new(
|
||||
name.into(),
|
||||
"",
|
||||
schema_for_type::<crate::model::JsonObject>(),
|
||||
),
|
||||
call: self,
|
||||
_marker: std::marker::PhantomData,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub struct WithToolAttr<C, S, A>
|
||||
where
|
||||
C: CallToolHandler<S, A> + Send + Sync + Clone + 'static,
|
||||
{
|
||||
pub attr: crate::model::Tool,
|
||||
pub call: C,
|
||||
pub _marker: std::marker::PhantomData<fn(S, A)>,
|
||||
}
|
||||
|
||||
impl<C, S, A> IntoToolRoute<S, A> for WithToolAttr<C, S, A>
|
||||
where
|
||||
C: CallToolHandler<S, A> + Send + Sync + Clone + 'static,
|
||||
S: Send + Sync + 'static,
|
||||
{
|
||||
fn into_tool_route(self) -> ToolRoute<S> {
|
||||
ToolRoute::new(self.attr, self.call)
|
||||
}
|
||||
}
|
||||
|
||||
impl<C, S, A> WithToolAttr<C, S, A>
|
||||
where
|
||||
C: CallToolHandler<S, A> + Send + Sync + Clone + 'static,
|
||||
{
|
||||
pub fn description(mut self, description: impl Into<Cow<'static, str>>) -> Self {
|
||||
self.attr.description = Some(description.into());
|
||||
self
|
||||
}
|
||||
pub fn parameters<T: JsonSchema>(mut self) -> Self {
|
||||
self.attr.input_schema = schema_for_type::<T>().into();
|
||||
self
|
||||
}
|
||||
pub fn parameters_value(mut self, schema: serde_json::Value) -> Self {
|
||||
self.attr.input_schema = crate::model::object(schema).into();
|
||||
self
|
||||
}
|
||||
pub fn annotation(mut self, annotation: impl Into<ToolAnnotations>) -> Self {
|
||||
self.attr.annotations = Some(annotation.into());
|
||||
self
|
||||
}
|
||||
}
|
||||
#[derive(Debug)]
|
||||
pub struct ToolRouter<S> {
|
||||
#[allow(clippy::type_complexity)]
|
||||
pub map: std::collections::HashMap<Cow<'static, str>, ToolRoute<S>>,
|
||||
|
||||
pub transparent_when_not_found: bool,
|
||||
}
|
||||
|
||||
impl<S> Default for ToolRouter<S> {
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
map: std::collections::HashMap::new(),
|
||||
transparent_when_not_found: false,
|
||||
}
|
||||
}
|
||||
}
|
||||
impl<S> Clone for ToolRouter<S> {
|
||||
fn clone(&self) -> Self {
|
||||
Self {
|
||||
map: self.map.clone(),
|
||||
transparent_when_not_found: self.transparent_when_not_found,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl<S> IntoIterator for ToolRouter<S> {
|
||||
type Item = ToolRoute<S>;
|
||||
type IntoIter = std::collections::hash_map::IntoValues<Cow<'static, str>, ToolRoute<S>>;
|
||||
|
||||
fn into_iter(self) -> Self::IntoIter {
|
||||
self.map.into_values()
|
||||
}
|
||||
}
|
||||
|
||||
impl<S> ToolRouter<S>
|
||||
where
|
||||
S: Send + Sync + 'static,
|
||||
{
|
||||
pub fn new() -> Self {
|
||||
Self {
|
||||
map: std::collections::HashMap::new(),
|
||||
transparent_when_not_found: false,
|
||||
}
|
||||
}
|
||||
pub fn with_route<R, A>(mut self, route: R) -> Self
|
||||
where
|
||||
R: IntoToolRoute<S, A>,
|
||||
{
|
||||
self.add_route(route.into_tool_route());
|
||||
self
|
||||
}
|
||||
|
||||
pub fn add_route(&mut self, item: ToolRoute<S>) {
|
||||
self.map.insert(item.attr.name.clone(), item);
|
||||
}
|
||||
|
||||
pub fn merge(&mut self, other: ToolRouter<S>) {
|
||||
for item in other.map.into_values() {
|
||||
self.add_route(item);
|
||||
}
|
||||
}
|
||||
|
||||
pub fn remove_route<H, A>(&mut self, name: &str) {
|
||||
self.map.remove(name);
|
||||
}
|
||||
pub fn has_route(&self, name: &str) -> bool {
|
||||
self.map.contains_key(name)
|
||||
}
|
||||
pub async fn call(
|
||||
&self,
|
||||
context: ToolCallContext<'_, S>,
|
||||
) -> Result<CallToolResult, crate::Error> {
|
||||
let item = self
|
||||
.map
|
||||
.get(context.name())
|
||||
.ok_or_else(|| crate::Error::invalid_params("tool not found", None))?;
|
||||
(item.call)(context).await
|
||||
}
|
||||
|
||||
pub fn list_all(&self) -> Vec<crate::model::Tool> {
|
||||
self.map.values().map(|item| item.attr.clone()).collect()
|
||||
}
|
||||
}
|
||||
|
||||
impl<S> std::ops::Add<ToolRouter<S>> for ToolRouter<S>
|
||||
where
|
||||
S: Send + Sync + 'static,
|
||||
{
|
||||
type Output = Self;
|
||||
|
||||
fn add(mut self, other: ToolRouter<S>) -> Self::Output {
|
||||
self.merge(other);
|
||||
self
|
||||
}
|
||||
}
|
||||
|
||||
impl<S> std::ops::AddAssign<ToolRouter<S>> for ToolRouter<S>
|
||||
where
|
||||
S: Send + Sync + 'static,
|
||||
{
|
||||
fn add_assign(&mut self, other: ToolRouter<S>) {
|
||||
self.merge(other);
|
||||
}
|
||||
}
|
||||
Loading…
Reference in a new issue