smart_agent 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aad42cabbf228718122054fac2c219a4dac68e2b4cd0314160a2929972eb9583
-  data.tar.gz: 177428d5673d9529d7fded1abac348e8168b0186995ef581e5addaf54bef9355
+  metadata.gz: bc51f77bbfd49a0c1c2c151b020d2073f7997804e17d762a7be8ca36ad8e4ecb
+  data.tar.gz: f50d74c5c9d6dcb998ecbe9832cb2cbc0631019b8fd980ba4d7ed90bef81f792
 SHA512:
-  metadata.gz: 3cdbda0be5802a5bdcb52b3c5bfc92e075824803a0f4e5cbac13bda79180f099d19d4c8d4fe1adaf14c2a6e0c2c8a20892f1e1554de0bc30ab57d0c2acb7c6a0
-  data.tar.gz: 29c74e9f6dd2839c139d37f05c0ba309e8d2e0f11e7120badb5ca6d988984d2e382b63c6572168e3ec3403ca8e58e390258e39f86b5d1c99c9bef9f2540a6068
+  metadata.gz: 88727a08ccbf0215cfc43bbc1ce1bf73de0d740a6bdbdd97596f549af1c2586637d34735451320b7bb6846a15013fbe74d6293f0e11e12905b07a6b603a359ab
+  data.tar.gz: ce309f0ebec190be1870aba2afdc3b22878d0e2872fdba5679248296c398e4cf20db8483773cb22e482258ea24e3373780f55a7d863b0477db20a09382e6b102

data/lib/smart_agent/agent.rb

@@ -85,29 +85,32 @@ module SmartAgent
       params[:with_history] = with_history
       ret = nil
       if @agent.on_event
-        tool_result = {}
+        full_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"] = [{
+          if full_result.empty?
+            full_result["id"] = chunk["id"]
+            full_result["object"] = chunk["object"]
+            full_result["created"] = chunk["created"]
+            full_result["model"] = chunk["model"]
+            full_result["choices"] = [{
               "index" => 0,
               "message" => {
                 "role" => "assistant",
                 "content" => "",
+                "reasoning_content" => "",
                 "tool_calls" => [],
               },
             }]
-            tool_result["usage"] = chunk["usage"]
-            tool_result["system_fingerprint"] = chunk["system_fingerprint"]
+            full_result["usage"] = chunk["usage"]
+            full_result["system_fingerprint"] = chunk["system_fingerprint"]
           end
           if chunk.dig("choices", 0, "delta", "reasoning_content")
+            full_result["choices"][0]["message"]["reasoning_content"] += chunk.dig("choices", 0, "delta", "reasoning_content")
             @agent.processor(:reasoning).call(chunk) if @agent.processor(:reasoning)
           end
           if chunk.dig("choices", 0, "delta", "content")
+            full_result["choices"][0]["message"]["content"] += 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")
@@ -120,8 +123,8 @@ module SmartAgent
             end
           end
         end
-        tool_result["choices"][0]["message"]["tool_calls"] = tool_calls
-        result = tool_result
+        full_result["choices"][0]["message"]["tool_calls"] = tool_calls
+        result = full_result
       else
         result = SmartAgent.prompt_engine.call_worker(name, params)
       end
@@ -141,17 +144,18 @@ module SmartAgent
           @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" => "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 << result
+          results << tool_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}`\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" => "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 << result
+          results << tool_result
         end
         @agent.processor(:tool).call({ :content => " ... done\n" }) if @agent.processor(:tool)
       end

data/lib/smart_agent/mcp_client.rb

@@ -10,7 +10,11 @@ module SmartAgent
       @context = MCPContext.new
       @context.instance_eval(&@code)
       command_path = @context.command_path
-      client = MCP::Client.new(command_path)
+      if @context.mcp_type == :stdio
+        client = MCP::StdioClient.new(command_path)
+      else
+        client = MCP::SSEClient.new(command_path)
+      end
       client.start
       mcp_server_json = client.list_tools
       if mcp_server_json
@@ -25,7 +29,11 @@ module SmartAgent
       @context = MCPContext.new
       @context.instance_eval(&@code)
       command_path = @context.command_path
-      client = MCP::Client.new(command_path)
+      if @context.mcp_type == :stdio
+        client = MCP::StdioClient.new(command_path)
+      else
+        client = MCP::SSEClient.new(command_path)
+      end
       client.start
       client.call_method(
         {
@@ -63,6 +71,10 @@ module SmartAgent
       @mcp_type = mcp_type
     end
 
+    def mcp_type
+      @mcp_type
+    end
+
     def command_path
       @command_path
     end
@@ -70,5 +82,9 @@ module SmartAgent
     def command(path)
       @command_path = path
     end
+
+    def url(url)
+      @command_path = url
+    end
   end
 end

data/lib/smart_agent/version.rb

@@ -1,3 +1,3 @@
 module SmartAgent
-  VERSION = "0.1.4"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: smart_agent
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Your Name
 bindir: bin
 cert_chain: []
-date: 2025-04-09 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smart_prompt
@@ -71,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.4
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Intelligent agent framework with DSL and MCP integration
 test_files: []