smart_agent 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92f316229977853df082c594f3dfe42677dcb1d92e6e0ffe7e8c12dbf09db3cd
-  data.tar.gz: 42890f035e21b320b205b62f9de845cd7d2d0f492c13967e9147f52822af4702
+  metadata.gz: 1826472ee93e682836acaee95a2ffe9b9889d5b90fbf946129c60c6d2d72d6be
+  data.tar.gz: 50d79300276d6d3c2f6b81d3311187f033b0ee8ff2f1dcfb236d563ff4cd7f44
 SHA512:
-  metadata.gz: 0a837125205d17f4b9c3c3a3417c014f718c406a874fbc88a7339d59ee2dee1d5fd01fd4eb13654a28349bbbda97f1acc71b8b03b7a3ef14f21afe5f1dbbdf11
-  data.tar.gz: e721b313294d3f149cf986e9d4a3140a83fb68368542b527f5c2205fc1ff850c3a4f8982f08185bb0ac28fe681b21e95c604b557d81f19cd7a4e87b7eccc9111
+  metadata.gz: c6225659a1b67fe096165c22171536b7b957e8679233affca58e2b219ee81b503699c8b5d74a76660ef826c8d85d9a46f1058a05c3ae96ec9ca28830aff11c58
+  data.tar.gz: 2be30f9eef187409ae14f29e9af9c790dbdb34d243868f415e8c28288c89a2e6f32ef86a8206bae9b3d4da9f82f427d056ee21ce6633924616ec3b9572dd77b4

data/lib/smart_agent/agent.rb

@@ -151,19 +151,16 @@ module SmartAgent
         tool_name = tool["function"]["name"].to_sym
         params = safe_parse(tool["function"]["arguments"])
         if Tool.find_tool(tool_name)
-          @agent.processor(:tool).call({ :content => "ToolName is `#{tool_name}`\n" }) if @agent.processor(:tool)
-          @agent.processor(:tool).call({ :content => "params is `#{params}`\n" }) if @agent.processor(:tool)
-          tool_result = Tool.find_tool(tool_name).call(params)
+          tool_result = Tool.find_tool(tool_name).call(params, @agent)
           if tool_result
+            @agent.processor(:tool).call({ :content => tool_result })
             SmartAgent.prompt_engine.history_messages << { "role" => "assistant", "content" => "", "tool_calls" => [tool] } #result.response.dig("choices", 0, "message")
             SmartAgent.prompt_engine.history_messages << { "role" => "tool", "tool_call_id" => tool_call_id, "content" => tool_result.to_s.force_encoding("UTF-8") }
             results << tool_result
           end
         end
         if server_name = MCPClient.find_server_by_tool_name(tool_name)
-          @agent.processor(:tool).call({ :content => "MCP Server is `#{server_name}`, ToolName is `#{tool_name}`\n" }) if @agent.processor(:tool)
-          @agent.processor(:tool).call({ :content => "params is `#{params}`\n" }) if @agent.processor(:tool)
-          tool_result = MCPClient.new(server_name).call(tool_name, params)
+          tool_result = MCPClient.new(server_name).call(tool_name, params, @agent)
           if tool_result
             @agent.processor(:tool).call({ :content => tool_result })
             SmartAgent.prompt_engine.history_messages << { "role" => "assistant", "content" => "", "tool_calls" => [tool] } # result.response.dig("choices", 0, "message")
@@ -177,6 +174,15 @@ module SmartAgent
       return results
     end
 
+    def call_tool(name, params = {})
+      if Tool.find_tool(name)
+        return Tool.find_tool(name).call(params, @agent)
+      end
+      if server_name = MCPClient.find_server_by_tool_name(name)
+        return MCPClient.new(server_name).call(name, params, @agent)
+      end
+    end
+
     def params
       @params ||= {}
     end

data/lib/smart_agent/mcp_client.rb

@@ -25,7 +25,11 @@ module SmartAgent
       convertFormat(mcp_server_json)
     end
 
-    def call(tool_name, params)
+    def call(tool_name, params, agent = nil)
+      if agent
+        agent.processor(:tool).call({ :content => "MCP Server is `#{@name}`, ToolName is `#{tool_name}`\n" }) if agent.processor(:tool)
+        agent.processor(:tool).call({ :content => "params is `#{params}`\n" }) if agent.processor(:tool)
+      end
       @client.call_method(
         {
           "name": tool_name.to_s,

data/lib/smart_agent/tool.rb

@@ -8,7 +8,11 @@ module SmartAgent
       @context = ToolContext.new(self)
     end
 
-    def call(params)
+    def call(params, agent = nil)
+      if agent
+        agent.processor(:tool).call({ :content => "ToolName is `#{@name}`\n" }) if agent.processor(:tool)
+        agent.processor(:tool).call({ :content => "params is `#{params}`\n" }) if agent.processor(:tool)
+      end
       @context.input_params = params
       @context.instance_eval(&@context.proc)
     end
@@ -90,7 +94,7 @@ module SmartAgent
       SmartAgent.prompt_engine.call_worker(name, params)
     end
 
-    def call_tool(name, params)
+    def call_tool(name, params = {})
       if Tool.find_tool(name)
         return Tool.find_tool(name).call(params)
       end

data/lib/smart_agent/version.rb

@@ -1,3 +1,3 @@
 module SmartAgent
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smart_agent
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Zhuang Biaowei