smart_agent 0.2.6 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 352e9af56a4c21484309f623b893ce166561458624d9f9a6d9cfcabaff0a4766
-  data.tar.gz: 0ff30d3602f0e205c4ca335249203a41c95a6c6d4033847494bf64b7abfb5ff4
+  metadata.gz: 666973e72e303998abcf62405a78a124205ccdbc741c011d3a3cec05a234e7a0
+  data.tar.gz: eaf248d80cd7f5c203cfde80de6dc1ed9827539173dce3afb704e5661631cf77
 SHA512:
-  metadata.gz: db49b780b5efc00c7a1a731338cbf5aca96dff969ea2740f44f4cea81926e772db957319ee222078de39011355e55ebf8c151323a4441f7e8f36e11c36ec769f
-  data.tar.gz: ac700a1c932f24d2be2f12fe43fe5ecf2707fbee821ce77a1caf7f081bb6a9fab7d6129f51a2e8753f4eea13988406be654b4d7c35b48ba752aa98a8be5d62cf
+  metadata.gz: bcf37c58978695dd35a844a31ea998f30cc8035c8b51b4267b47ab9a90d29d0d4b59de0a67194632c641e2737de1bc1692452d31fa1640b89e344760cb2e62e4
+  data.tar.gz: c4f6a71d195797d30ebf34a82c02e5f637bd31e3085ac056092189199628b0c34b6d23d54be3936e4c13d02d8e879c228840e2c66b3c66f16334b6cb0b7010de

data/lib/smart_agent/agent.rb

@@ -153,7 +153,7 @@ module SmartAgent
         if Tool.find_tool(tool_name)
           tool_result = Tool.find_tool(tool_name).call(params, @agent)
           if tool_result
-            @agent.processor(:tool).call({ :content => tool_result })
+            @agent.processor(:tool).call({ :content => tool_result }) if @agent.processor(:tool)
             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
@@ -162,7 +162,7 @@ module SmartAgent
         if server_name = MCPClient.find_server_by_tool_name(tool_name)
           tool_result = MCPClient.new(server_name).call(tool_name, params, @agent)
           if tool_result
-            @agent.processor(:tool).call({ :content => tool_result })
+            @agent.processor(:tool).call({ :content => tool_result }) if @agent.processor(:tool)
             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 }
             results << tool_result

data/lib/smart_agent/result.rb

@@ -1,3 +1,5 @@
+require "json"
+
 module SmartAgent
   class Result
     def initialize(response)
@@ -9,16 +11,10 @@ module SmartAgent
       if @response.class == String
         return false
       else
-        tool_calls = @response.dig("choices", 0, "message", "tool_calls")
-        if tool_calls
-          unless tool_calls.empty?
-            return tool_calls
-          else
-            return false
-          end            
-        else
-          return false
-        end
+        tool_calls = normalized_tool_calls
+        return false if tool_calls.empty?
+
+        return tool_calls
       end
     end
 
@@ -33,5 +29,59 @@ module SmartAgent
     def response
       @response
     end
+
+    private
+
+    def normalized_tool_calls
+      tool_calls = openai_tool_calls
+      return tool_calls if tool_calls && !tool_calls.empty?
+
+      tool_use_blocks.map { |block| normalize_tool_use(block) }.compact
+    end
+
+    def openai_tool_calls
+      @response.dig("choices", 0, "message", "tool_calls")
+    end
+
+    def tool_use_blocks
+      content_blocks.select { |block| block["type"] == "tool_use" }
+    end
+
+    def content_blocks
+      blocks = []
+      collect_content_blocks(@response, blocks)
+      blocks.select { |block| block.is_a?(Hash) }
+    end
+
+    def collect_content_blocks(value, blocks)
+      case value
+      when Hash
+        content = value["content"]
+        blocks.concat(content) if content.is_a?(Array)
+        value.each_value { |child| collect_content_blocks(child, blocks) }
+      when Array
+        value.each { |child| collect_content_blocks(child, blocks) }
+      end
+    end
+
+    def normalize_tool_use(block)
+      name = block["name"]
+      return nil unless name
+
+      {
+        "id" => block["id"],
+        "type" => "function",
+        "function" => {
+          "name" => name,
+          "arguments" => tool_arguments(block["input"]),
+        },
+      }
+    end
+
+    def tool_arguments(input)
+      return input if input.is_a?(String)
+
+      JSON.generate(input || {})
+    end
   end
 end

data/lib/smart_agent/version.rb

@@ -1,3 +1,3 @@
 module SmartAgent
-  VERSION = "0.2.6"
+  VERSION = "0.2.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smart_agent
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.8
 platform: ruby
 authors:
 - Zhuang Biaowei
@@ -13,16 +13,16 @@ dependencies:
   name: smart_prompt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.5.2
 - !ruby/object:Gem::Dependency
   name: mcp-sdk.rb
   requirement: !ruby/object:Gem::Requirement
@@ -85,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 4.0.13
 specification_version: 4
 summary: Intelligent agent framework with DSL and MCP integration
 test_files: []