Skip to content

add missing list tools functiont to client and fix tools/call function #22

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

Open
BasilYes wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add missing list tools functiont to client and fix tools/call function #22

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
36 changes: 27 additions & 9 deletions src/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,30 @@ impl<T: Transport + Send + Sync> Client<T> {
}
}

/// List tools on a server
pub async fn list_tools<R: DeserializeOwned + Send + Sync>(&mut self) -> Result<R, MCPError> {
// Create tool call request
let tool_call_request =
JSONRPCRequest::new(self.next_request_id(), "tools/list".to_string(), None);

let message = JSONRPCMessage::Request(tool_call_request);
self.transport.send(&message).await?;

// Wait for response with timeout if set
let response: JSONRPCMessage = self.receive_with_timeout().await?;

match response {
JSONRPCMessage::Response(resp) => {
// Parse the result
serde_json::from_value(resp.result).map_err(MCPError::Serialization)
}
JSONRPCMessage::Error(err) => {
Err(MCPError::Protocol(format!("Tool list failed: {:?}", err)))
}
_ => Err(MCPError::Protocol("Unexpected response type".to_string())),
}
}

/// Call a tool on the server
pub async fn call_tool<P: Serialize + Send + Sync, R: DeserializeOwned + Send + Sync>(
&mut self,
Expand All @@ -127,10 +151,10 @@ impl<T: Transport + Send + Sync> Client<T> {
// Create tool call request
let tool_call_request = JSONRPCRequest::new(
self.next_request_id(),
"tool_call".to_string(),
"tools/call".to_string(),
Some(serde_json::json!({
"name": tool_name,
"parameters": serde_json::to_value(params)?
"arguments": serde_json::to_value(params)?
})),
);

Expand All @@ -142,14 +166,8 @@ impl<T: Transport + Send + Sync> Client<T> {

match response {
JSONRPCMessage::Response(resp) => {
// Extract the tool result from the response
let result_value = resp.result;
let result = result_value.get("result").ok_or_else(|| {
MCPError::Protocol("Missing 'result' field in response".to_string())
})?;

// Parse the result
serde_json::from_value(result.clone()).map_err(MCPError::Serialization)
serde_json::from_value(resp.result).map_err(MCPError::Serialization)
}
JSONRPCMessage::Error(err) => {
Err(MCPError::Protocol(format!("Tool call failed: {:?}", err)))
Expand Down