smart_agent 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b00ab32278897761aac333a1d4fd62a3bcec66dcd6768cb9cf4ff37f0de73d0
-  data.tar.gz: 6910abf5ce56fbb8b2b3016bc9f3556468ecc8aa0af338f44594bf82bd797149
+  metadata.gz: 1826472ee93e682836acaee95a2ffe9b9889d5b90fbf946129c60c6d2d72d6be
+  data.tar.gz: 50d79300276d6d3c2f6b81d3311187f033b0ee8ff2f1dcfb236d563ff4cd7f44
 SHA512:
-  metadata.gz: 33e2f4a134b67630803dd4753f827d16e1afe1ddde7807e8b9856ec5f8845978cae5de6fec5e4df37b95343e7831fbd018cf359e6b1f0ca77ecbc972d4b9ae02
-  data.tar.gz: 05b6424061a1a74050b6ca7e71ff79c45e2f0ec230fee83663ca6b802a53be71a2b4f37f21e59457ecfcdcc940d44d75bccd09cb9f91b02f971a204ea1c14326
+  metadata.gz: c6225659a1b67fe096165c22171536b7b957e8679233affca58e2b219ee81b503699c8b5d74a76660ef826c8d85d9a46f1058a05c3ae96ec9ca28830aff11c58
+  data.tar.gz: 2be30f9eef187409ae14f29e9af9c790dbdb34d243868f415e8c28288c89a2e6f32ef86a8206bae9b3d4da9f82f427d056ee21ce6633924616ec3b9572dd77b4

data/lib/smart_agent/agent.rb

@@ -71,7 +71,7 @@ module SmartAgent
 
     def call_worker(name, params, with_tools: true, with_history: false)
       SmartAgent.logger.info("Call Worker name is: #{name}")
-      SmartAgent.logger.info("Call Worker params is: #{params}") 
+      SmartAgent.logger.info("Call Worker params is: #{params}")
       if with_tools
         simple_tools = []
         if @agent.tools
@@ -106,6 +106,42 @@ module SmartAgent
       return ret
     end
 
+    def safe_parse(input)
+      # 保存原始输入用于调试
+      original_input = input.dup
+
+      # 步骤1: 清理输入
+      cleaned = input.strip
+
+      # 步骤2: 处理外层引号（如果存在）
+      if cleaned.start_with?('"') && cleaned.end_with?('"')
+        cleaned = cleaned[1...-1]
+      end
+
+      # 步骤3: 反转义双重转义字符
+      # 关键：只处理需要反转义的字符，保持JSON合法性
+      cleaned = cleaned
+        .gsub(/\\"/, '"') # 反转义引号
+        .gsub(/\\\\/, '\\')    # 反转义反斜杠
+      # 不反转义\n, \t, \r等，因为它们是JSON合法的转义序列
+
+      # 步骤4: 尝试解析
+      begin
+        return JSON.parse(cleaned)
+      rescue JSON::ParserError => e
+        # 如果清理后失败，尝试原始输入
+        begin
+          return JSON.parse(original_input)
+        rescue JSON::ParserError
+          puts "Failed to parse JSON: #{e.message}"
+          puts "Original: #{original_input}"
+          puts "Cleaned: #{cleaned}"
+          # 返回原始字符串以便后续处理
+          return original_input
+        end
+      end
+    end
+
     def call_tools(result)
       @agent.processor(:tool).call({ :status => :start }) if @agent.processor(:tool)
       SmartAgent.logger.info("call tools: " + result.to_s)
@@ -113,23 +149,24 @@ module SmartAgent
       result.call_tools.each do |tool|
         tool_call_id = tool["id"]
         tool_name = tool["function"]["name"].to_sym
-        params = JSON.parse(tool["function"]["arguments"])
+        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)
-          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
+          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)
-          @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 }
-          results << tool_result
+          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")
+            SmartAgent.prompt_engine.history_messages << { "role" => "tool", "tool_call_id" => tool_call_id, "content" => tool_result.to_s }
+            results << tool_result
+          end
         end
         @agent.processor(:tool).call({ :content => " ... done\n" }) if @agent.processor(:tool)
       end
@@ -137,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

@@ -4,19 +4,19 @@ module SmartAgent
       SmartAgent.logger.info "Create mcp server's name is #{name}"
       @name = name
       @code = self.class.servers[name]
-    end
-
-    def to_json
       @context = MCPContext.new
       @context.instance_eval(&@code)
       command_path = @context.command_path
       if @context.mcp_type == :stdio
-        client = MCP::StdioClient.new(command_path)
+        @client = MCP::StdioClient.new(command_path)
       else
-        client = MCP::SSEClient.new(command_path)
+        @client = MCP::SSEClient.new(command_path)
       end
-      client.start
-      mcp_server_json = client.list_tools
+      @client.start
+    end
+
+    def to_json
+      mcp_server_json = @client.list_tools
       if mcp_server_json
         mcp_server_json["tools"].each do |tool|
           MCPClient.set_server(tool["name"].to_sym, @name)
@@ -25,17 +25,12 @@ module SmartAgent
       convertFormat(mcp_server_json)
     end
 
-    def call(tool_name, params)
-      @context = MCPContext.new
-      @context.instance_eval(&@code)
-      command_path = @context.command_path
-      if @context.mcp_type == :stdio
-        client = MCP::StdioClient.new(command_path)
-      else
-        client = MCP::SSEClient.new(command_path)
+    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.start
-      client.call_method(
+      @client.call_method(
         {
           "name": tool_name.to_s,
           "arguments": params,
@@ -43,6 +38,10 @@ module SmartAgent
       )
     end
 
+    def close
+      @client.stop
+    end
+
     class << self
       def servers
         @servers ||= {}
@@ -54,6 +53,8 @@ module SmartAgent
 
       def define(name, &block)
         servers[name] = block
+        client = MCPClient.new(name)
+        client.to_json
       end
 
       def set_server(tool_name, server_name)

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,6 +94,15 @@ module SmartAgent
       SmartAgent.prompt_engine.call_worker(name, params)
     end
 
+    def call_tool(name, params = {})
+      if Tool.find_tool(name)
+        return Tool.find_tool(name).call(params)
+      end
+      if server_name = MCPClient.find_server_by_tool_name(name)
+        return MCPClient.new(server_name).call(name, params)
+      end
+    end
+
     def tool_proc(&block)
       @proc = block
     end

data/lib/smart_agent/version.rb

@@ -1,3 +1,3 @@
 module SmartAgent
-  VERSION = "0.2.0"
+  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.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Zhuang Biaowei
@@ -23,6 +23,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mcp-sdk.rb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -71,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.7.1
 specification_version: 4
 summary: Intelligent agent framework with DSL and MCP integration
 test_files: []