remove self in Tool trait

Author: cyborg42

async-openai/src/tools.rs

@@ -28,34 +28,29 @@ pub trait Tool: Send + Sync {
     type Error: ToString + Send + Sync;
 
     /// Returns the name of the tool.
-    fn name(&self) -> String {
+    fn name() -> String {
         Self::Args::schema_name()
     }
 
     /// Returns an optional description of the tool.
-    fn description(&self) -> Option<String> {
+    fn description() -> Option<String> {
         None
     }
 
-    /// Returns the JSON schema for the tool's parameters.
-    fn parameters(&self) -> serde_json::Value {
-        json!(schema_for!(Self::Args))
-    }
-
     /// Returns an optional boolean indicating whether the tool should be strict about the arguments.
-    fn strict(&self) -> Option<bool> {
+    fn strict() -> Option<bool> {
         None
     }
 
     /// Creates a ChatCompletionTool definition for the tool.
-    fn definition(&self) -> ChatCompletionTool {
+    fn definition() -> ChatCompletionTool {
         ChatCompletionTool {
             r#type: ChatCompletionToolType::Function,
             function: FunctionObject {
-                name: self.name(),
-                description: self.description(),
-                parameters: Some(self.parameters()),
-                strict: self.strict(),
+                name: Self::name(),
+                description: Self::description(),
+                parameters: Some(json!(schema_for!(Self::Args))),
+                strict: Self::strict(),
             },
         }
     }
@@ -85,7 +80,7 @@ trait ToolDyn: Send + Sync {
 // Implementation of ToolDyn for any type that implements Tool
 impl<T: Tool> ToolDyn for T {
     fn definition(&self) -> ChatCompletionTool {
-        T::definition(self)
+        T::definition()
     }
 
     fn call(
@@ -129,8 +124,8 @@ impl ToolManager {
     }
 
     /// Adds a new tool to the manager.
-    pub fn add_tool(&mut self, tool: impl Tool + 'static) {
-        self.tools.insert(tool.name(), Arc::new(tool));
+    pub fn add_tool<T: Tool + 'static>(&mut self, tool: T) {
+        self.tools.insert(T::name(), Arc::new(tool));
     }
 
     /// Removes a tool from the manager.

examples/tool-call-stream/src/main.rs

@@ -146,11 +146,11 @@ impl Tool for WeatherTool {
     type Output = WeatherResponse;
     type Error = String;
 
-    fn name(&self) -> String {
+    fn name() -> String {
         "get_current_weather".to_string()
     }
 
-    fn description(&self) -> Option<String> {
+    fn description() -> Option<String> {
         Some("Get the current weather in a given location".to_string())
     }
 

examples/tool-call/src/main.rs

@@ -116,11 +116,11 @@ impl Tool for WeatherTool {
     type Output = WeatherResponse;
     type Error = String;
 
-    fn name(&self) -> String {
+    fn name() -> String {
         "get_current_weather".to_string()
     }
 
-    fn description(&self) -> Option<String> {
+    fn description() -> Option<String> {
         Some("Get the current weather in a given location".to_string())
     }