smart_agent 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f34059e0f8389ab46e42221507a17545c3e5baf0ae63c5d7273018168f608d30
-  data.tar.gz: cf815b9c79556577b56328ef992dfa5f522871c4c805b8d7d1e8c24d24a45947
+  metadata.gz: 44cc7c89f68907085b769ee5cd110543c592f49028faca478227310cfd2a8b3a
+  data.tar.gz: 4a591c8fb4c18a3dcfdd568109a0aa62360ce95400163099db1e0781a15d945c
 SHA512:
-  metadata.gz: 0a5ee8bc0ac6af2c198ba15d855b5fcdf181fb27cce922e7f0f649018e3aaa8ed3836723fa4cd2b41d3b1afa2806b679980a5e64a3fdecc33cddd596287ad861
-  data.tar.gz: 9da300c1c13c8c0828d92ccd2ae7caa3bb228be51439bab7dc6ab4211f22686d76f91a4c11fab56bd67d62b412dd375fb6ab294e4805b8fffd62105d95a25670
+  metadata.gz: 315d23e65ca2ad27819849a86b9d105a71b1932c989ed90d6f130aeba1803b893cd59a4ccf0ad67914d5a74f6e1dc8ee190b4f8b8588bd94496728e012c54bdc
+  data.tar.gz: 824b08b0f0e8831a861e5cd552bdeacc2c27acac8814e2c272f630ad11f839f78564f15b773dc69a8487726ac2818addf0ae1530ab7284e7b2d4b50ab5ba28c8

data/lib/smart_agent/agent.rb

@@ -65,13 +65,12 @@ module SmartAgent
       @agent = agent
     end
 
-    def call_worker(name, params, result: nil, with_tools: true)
-      if result
-        params[:result] = result
-      end
+    def call_worker(name, params, with_tools: true, with_history: false)
+      SmartAgent.logger.info ("Call Worker name is: #{name}")
       if with_tools
+        simple_tools = []
         if @agent.tools
-          simple_tools = @agent.tools.map { |tool_name| Tool.new(tool_name).to_json }
+          simple_tools = @agent.tools.map { |tool_name| Tool.find_tool(tool_name).to_json }
         end
         if @agent.servers
           mcp_tools = @agent.servers.map { |mcp_name| MCPClient.new(mcp_name).to_json }
@@ -83,21 +82,51 @@ module SmartAgent
         end
         params[:tools] = simple_tools
       end
+      params[:with_history] = with_history
       ret = nil
-      if @agent.on_event && with_tools == false
-        SmartAgent.prompt_engine.call_worker_by_stream(name, params) do |chunk, _bytesize|
+      if @agent.on_event
+        tool_result = {}
+        tool_calls = []
+        result = SmartAgent.prompt_engine.call_worker_by_stream(name, params) do |chunk, _bytesize|
+          if tool_result.empty?
+            tool_result["id"] = chunk["id"]
+            tool_result["object"] = chunk["object"]
+            tool_result["created"] = chunk["created"]
+            tool_result["model"] = chunk["model"]
+            tool_result["choices"] = [{
+              "index" => 0,
+              "message" => {
+                "role" => "assistant",
+                "content" => "",
+                "tool_calls" => [],
+              },
+            }]
+            tool_result["usage"] = chunk["usage"]
+            tool_result["system_fingerprint"] = chunk["system_fingerprint"]
+          end
           if chunk.dig("choices", 0, "delta", "reasoning_content")
             @agent.processor(:reasoning).call(chunk) if @agent.processor(:reasoning)
           end
           if chunk.dig("choices", 0, "delta", "content")
             @agent.processor(:content).call(chunk) if @agent.processor(:content)
           end
+          if chunk_tool_calls = chunk.dig("choices", 0, "delta", "tool_calls")
+            chunk_tool_calls.each do |tool_call|
+              if tool_calls.size > tool_call["index"]
+                tool_calls[tool_call["index"]]["function"]["arguments"] += tool_call["function"]["arguments"]
+              else
+                tool_calls << tool_call
+              end
+            end
+          end
         end
+        tool_result["choices"][0]["message"]["tool_calls"] = tool_calls
+        result = tool_result
       else
         result = SmartAgent.prompt_engine.call_worker(name, params)
-        ret = Result.new(result)
-        return ret
       end
+      ret = Result.new(result)
+      return ret
     end
 
     def call_tools(result)
@@ -105,15 +134,24 @@ module SmartAgent
       SmartAgent.logger.info("call tools: " + result.to_s)
       results = []
       result.call_tools.each do |tool|
+        tool_call_id = tool["id"]
         tool_name = tool["function"]["name"].to_sym
         params = JSON.parse(tool["function"]["arguments"])
         if Tool.find_tool(tool_name)
-          @agent.processor(:tool).call({ :content => "ToolName is `#{tool_name}`" }) if @agent.processor(:tool)
-          results << Tool.new(tool_name).call(params)
+          @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)
+          SmartAgent.prompt_engine.history_messages << 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 << result
         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}`" }) if @agent.processor(:tool)
-          results << MCPClient.new(server_name).call(tool_name, params)
+          @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)
+          SmartAgent.prompt_engine.history_messages << result.response.dig("choices", 0, "message")
+          SmartAgent.prompt_engine.history_messages << { "role" => "tool", "tool_call_id" => tool_call_id, "content" => tool_result.to_s }
+          results << result
         end
         @agent.processor(:tool).call({ :content => " ... done\n" }) if @agent.processor(:tool)
       end

data/lib/smart_agent/result.rb

@@ -7,9 +7,14 @@ module SmartAgent
 
     def call_tools
       if @response.class == String
-        return nil
+        return false
       else
-        @response.dig("choices", 0, "message", "tool_calls")
+        tool_calls = @response.dig("choices", 0, "message", "tool_calls")
+        if tool_calls.empty?
+          return false
+        else
+          return tool_calls
+        end
       end
     end
 

data/lib/smart_agent/tool.rb

@@ -1,22 +1,20 @@
 module SmartAgent
   class Tool
+    attr_accessor :context, :tool_proc
+
     def initialize(name)
       SmartAgent.logger.info "Create tool's name is #{name}"
       @name = name
-      @code = self.class.tools[name]
+      @context = ToolContext.new(self)
     end
 
     def call(params)
-      @context = ToolContext.new
       @context.input_params = params
-      @context.instance_eval(&@code)
+      @context.instance_eval(&@context.proc)
     end
 
     def to_json
-      @context = ToolContext.new
-      @context.instance_eval(&@code)
       params = @context.params
-
       properties = params.each_with_object({}) do |(name, details), hash|
         hash[name] = {
           type: details[:type],
@@ -28,7 +26,7 @@ module SmartAgent
                type: "function",
                function: {
                  name: @name,
-                 description: "",
+                 description: @context.description,
                  parameters: {
                    type: "object",
                    properties: properties,
@@ -44,7 +42,9 @@ module SmartAgent
       end
 
       def define(name, &block)
-        tools[name] = block
+        tool = Tool.new(name)
+        tools[name] = tool
+        tool.context.instance_eval(&block)
       end
 
       def find_tool(name)
@@ -54,7 +54,11 @@ module SmartAgent
   end
 
   class ToolContext
-    attr_accessor :input_params
+    attr_accessor :input_params, :description, :proc
+
+    def initialize(tool)
+      @tool = tool
+    end
 
     def params
       @params ||= {}
@@ -64,8 +68,17 @@ module SmartAgent
       params[name] = { description: description, type: type }
     end
 
+    def desc(description)
+      @description = description
+    end
+
     def call_worker(name, params)
+      params[:with_history] = false
       SmartAgent.prompt_engine.call_worker(name, params)
     end
+
+    def tool_proc(&block)
+      @proc = block
+    end
   end
 end

data/lib/smart_agent/version.rb

@@ -1,3 +1,3 @@
 module SmartAgent
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: smart_agent
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Your Name
 bindir: bin
 cert_chain: []
-date: 2025-03-30 00:00:00.000000000 Z
+date: 2025-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smart_prompt