smart_agent 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e36441cd494df0719fcfe3ecff04976392e091372706e04e65949c6d17f32e95
-  data.tar.gz: dabe51abbd3e8cb0b8184f042b32361a0a50fe9cbc4f7b86e8fa93b88ee222aa
+  metadata.gz: 44cc7c89f68907085b769ee5cd110543c592f49028faca478227310cfd2a8b3a
+  data.tar.gz: 4a591c8fb4c18a3dcfdd568109a0aa62360ce95400163099db1e0781a15d945c
 SHA512:
-  metadata.gz: '09335af182cc6402c814098f1de24dbf62e5ef5187fb6297c3f4b2b301e04d8b37e1da242b0d7bb0ea55d42722ca90c7ce451fbdd7d7832ff84dd1f1f6643751'
-  data.tar.gz: 910c95df53d2564bc1f842c56925866d8ac255365c9329e7113450dbb9fffd9d8221d51c3c72e3342c4bbfec0b33bf79642eeb736457b188c76f4025cf96c71a
+  metadata.gz: 315d23e65ca2ad27819849a86b9d105a71b1932c989ed90d6f130aeba1803b893cd59a4ccf0ad67914d5a74f6e1dc8ee190b4f8b8588bd94496728e012c54bdc
+  data.tar.gz: 824b08b0f0e8831a861e5cd552bdeacc2c27acac8814e2c272f630ad11f839f78564f15b773dc69a8487726ac2818addf0ae1530ab7284e7b2d4b50ab5ba28c8

data/README.md

@@ -1,76 +1,89 @@
-# Smart Agent Framework
+# SmartAgent Framework
 
-[![Ruby Version](https://img.shields.io/badge/Ruby-3.2%2B-red)](https://www.ruby-lang.org)
-[![Gem Version](https://img.shields.io/gem/v/smart_agent)](https://rubygems.org/gems/smart_agent)
-[![License](https://img.shields.io/badge/License-MIT-blue.svg)](LICENSE)
+SmartAgent is an intelligent agent framework developed in Ruby, supporting tool calling and natural language interaction.
 
-An intelligent agent framework built on [smart_prompt](https://github.com/zhuangbiaowei/smart_prompt), featuring DSL definition, function calling and MCP protocol integration.
+## Features
 
-## Key Features
+- Supports defining smart agents (SmartAgent) and tools (Tool)
+- Built-in utility tools:
+  - Weather query (get_weather)
+  - Math calculations (get_sum)
+  - Code generation and execution (get_code)
+- Integrated with OpenDigger MCP service
+- Supports natural language interaction in both English and Chinese
+- Extensible tool system
 
-- **Declarative DSL** - Define agents and workflows using concise Ruby syntax
-- **Function Calling** - Seamless integration with LLM capabilities
-- **MCP Protocol** - Built-in Model Context Protocol support
-- **Task Orchestration** - Coordinate multiple agents for complex tasks
-- **Extensible Architecture** - Support custom functions and protocol handlers
+## Installation
+
+Ensure you have Ruby (>= 2.7) and Bundler installed:
+
+```bash
+gem install bundler
+```
+
+Then run:
+
+```bash
+bundle install
+```
+
+Or install the gem directly:
+
+```bash
+gem install smart_agent
+```
+
+## Usage Examples
 
-## Quick Start
+### Basic Usage
 
 ```ruby
 require 'smart_agent'
 
-SmartAgent.define :weather_bot do
-  result = call_worker(:weather, params, with_tools: true)
-  if result.call_tools? 
-    weather_result = call_tools(result)
-    return call_worker(:weather_summary, params, weather_result, with_tools: false)
-  else
-    return result
-  end
-end
+agent = SmartAgent.build_agent(:smart_bot, tools: [:get_code])
 
-SmartAgent::Tool.define :get_weather do |location, date|
-  param_define :location, "City or More Specific Address", :str
-  param_define :date, "Specific Date or Today or Tomorrow", :date
-  # Call the Weather API
-end
+# Weather query
+puts agent.please("What's the weather in Shanghai tomorrow?")
 
-engine = SmartPrompt::Engine.new("./config/llm_config.yml")
-SmartAgent.engine = engine
-agent = SmartAgent.create(:weather_bot, [:get_weather])
+# Math calculation
+puts agent.please("Calculate the sum of 130 and 51")
 
-puts agent.please("Get tomorrow's weather forecast in Shanghai")
+# Code generation and execution
+puts agent.please("Calculate the area of a triangle with base 132 and height 7.6 using a Ruby function")
 ```
 
-## Installation
+### Custom Tools
 
-Add to your Gemfile:
 ```ruby
-gem 'smart_agent'
+SmartAgent::Tool.define :my_tool do
+  param_define :param1, "Parameter description", :string
+  param_define :param2, "Another parameter", :integer
+  
+  if input_params
+    # Tool logic
+    "Processing result"
+  end
+end
 ```
 
-Then execute:
-```bash
-bundle install
-```
+## MCP Integration
 
-Or install directly:
-```bash
-gem install smart_agent
-```
+Supports getting GitHub project metrics via OpenDigger MCP service:
 
-## Documentation
+```ruby
+
+SmartAgent::MCPClient.define :opendigger do
+  type :stdio
+  command "node ~/open-digger-mcp-server/dist/index.js"
+end
 
-Full documentation available at: [docs.smartagent.dev](https://docs.smartagent.dev)
+puts agent.please("Query OpenRank metrics changes for Vue project on GitHub")
+```
 
 ## Contributing
 
-1. Fork the repository
-2. Create feature branch (`git checkout -b feature/amazing-feature`)
-3. Commit changes (`git commit -m 'Add some amazing feature'`)
-4. Push branch (`git push origin feature/amazing-feature`)
-5. Open a Pull Request
+Issues and pull requests are welcome.
 
 ## License
 
-Released under the MIT License. See [LICENSE](LICENSE) for details.
+MIT License. See LICENSE file for details.

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,41 +82,80 @@ 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)
+            @agent.processor(:reasoning).call(chunk) if @agent.processor(:reasoning)
           end
           if chunk.dig("choices", 0, "delta", "content")
-            @agent.processor(:content).call(chunk)
+            @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)
-      @agent.processor(:tool).call({ :status => :start })
+      @agent.processor(:tool).call({ :status => :start }) if @agent.processor(:tool)
       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}`" })
-          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}`" })
-          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" })
+        @agent.processor(:tool).call({ :content => " ... done\n" }) if @agent.processor(:tool)
       end
-      @agent.processor(:tool).call({ :status => :end })
+      @agent.processor(:tool).call({ :status => :end }) if @agent.processor(:tool)
       return results
     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 ||= {}
@@ -63,5 +67,18 @@ module SmartAgent
     def param_define(name, description, type)
       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.1"
+  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.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Your Name
 bindir: bin
 cert_chain: []
-date: 2025-03-28 00:00:00.000000000 Z
+date: 2025-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smart_prompt