luo 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7dbeb4a32f94e774291744f6a0ec7b796b5967fedb221ce9af3b0fd8cb62b72c
-  data.tar.gz: 6fb5fcc54d3d85496ee7aba4d63d9044dd3f1817706d922c53624429fbcbf933
+  metadata.gz: 8adf1591ea5c1117db3c1c08e5b9e89fdcd9b1ea37ee0406d5a5754d1c616061
+  data.tar.gz: '019cd793af192d18e8926d473ef5842bffeafb9d9c7d2dd9e5e47ed2acef05b9'
 SHA512:
-  metadata.gz: a85cd8874e6afb51dd24610f066903c94319bd758c1bef2e4f1b3d7dcc61767a5538186bfe823540e228de4392f5f70d1b6f37e7396dfad39b587b90f13bb875
-  data.tar.gz: f0cd6516b6ae49c99129e45551f915f23d36800427b871815df5abc8340f5adc9478dd16e563966e14441c9b2d2fdc75549b212c81ddc001b26fe2c75f6c3877
+  metadata.gz: e92c4d58d37139ef46c2a5e2da322e9cee3b7969b8eb70dcbbcd6324ce8170b3d4b2515ae7cc934ae1fbaef885af1ee503f189566845f6cce56f734346e66ddd
+  data.tar.gz: dc91a333d4d8a906e0990c4dda46072c2a6b4afdb3d1f1eb26fdb2330f40ccf8444eb892ec22afbd3732db525ee4fc2b181df605313cbd3d454fb395d4bc3459

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    luo (0.1.3)
+    luo (0.1.4)
       dotenv (~> 2.8, >= 2.8.1)
       dry-cli (~> 1.0)
       dry-configurable (~> 1.0, >= 1.0.1)

data/lib/luo/agent.rb

@@ -20,8 +20,13 @@ module Luo
 
       def on_call_with_final_result(&block)
         define_method(:call) do
-          context.final_result = instance_eval(&block)
-          context.final_result
+          result = instance_eval(&block)
+          if result.nil?
+            messages = context.messages.to_a[0...-1] + [{role: :user, content: context.user_input}]
+            context.final_result = client.chat(messages)
+          else
+            context.final_result = result
+          end
         end
       end
 

data/lib/luo/agent_runner_base.rb

@@ -7,7 +7,8 @@ module Luo
 
     setting :language, default: "en"
 
-    def initialize
+    def initialize(histories: nil)
+      context.histories = histories unless histories.nil?
       on_init
     end
 

data/lib/luo/agent_runner_context.rb

@@ -2,6 +2,9 @@
 
 module Luo
   class AgentRunnerContext
+    include Configurable
+    setting :history_adapter, default: MemoryHistory
+
     attr_accessor :user_input, :action_input, :response, :agent_results, :final_result, :messages, :retries
 
     def initialize
@@ -10,7 +13,7 @@ module Luo
     end
 
     def histories
-      @histories ||= MemoryHistory.new
+      @histories ||= config.history_adapter.new
     end
 
     def histories=(histories)

data/lib/luo/memory_history.rb

@@ -26,6 +26,10 @@ module Luo
       @queue << element
     end
 
+    def clone
+      Marshal.load(Marshal.dump(self))
+    end
+
     def user(content)
       enqueue({role: "user", content: content})
     end

data/lib/luo/templates/luo_xinghuo_agent_input.md.erb

@@ -1,10 +1,10 @@
-在回答的我的问题的时候，你可以使用以下工具：
+根据问题选择合适的工具。
+你可以使用以下工具：
 <% agents.values.each do |agent| -%>
 - <%= agent.agent_name %>：<%= agent.agent_desc %>
 <% end -%>
-请用以下格式回答问题
+问题是：<%= last_user_input %>
+现在我应该选择什么工具呢？请用以下格式回答：
 ```
 调用工具：你要选择的工具是什么？只能在<%= agents.values.map do |a| a.agent_name end.join('，') %>中选择一个
-最终回答：你要回答的内容是什么？
 ```
-我的问题：<%= last_user_input %>

data/lib/luo/templates/luo_xinghuo_response_error.md.erb

@@ -0,0 +1,10 @@
+输出的格式错误，根据问题选择合适的工具。
+你可以使用以下工具：
+<% agents.values.each do |agent| -%>
+- <%= agent.agent_name %>：<%= agent.agent_desc %>
+<% end -%>
+刚刚的问题：<%= last_user_input %>
+现在我应该选择什么工具呢？请用以下格式回答：
+```
+调用工具：你要选择的工具是什么？只能在<%= agents.values.map do |a| a.agent_name end.join('，') %>中选择一个
+```

data/lib/luo/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Luo
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/luo/xinghuo_agent_runner.rb

@@ -13,22 +13,30 @@ module Luo
     on_request do
       context.messages = Messages.create(history: context.histories)
                                  .user(prompt: Luo::Prompts.luo_xinghuo_agent_input, context: {agents: self.class.agents, last_user_input: context.user_input})
-      context.response = @xinghuo.chat(context.messages)
+      response = @xinghuo.chat(context.messages)
+      if response.split("\n").select { |line| line.size >1  }.size > 1
+        message = Messages.create(history: context.histories)
+                          .user(prompt: Luo::Prompts.luo_xinghuo_agent_input, context: {agents: self.class.agents, last_user_input: context.user_input})
+                          .assistant(text: response)
+                          .user(prompt: Luo::Prompts.luo_xinghuo_response_error, context: {agents: self.class.agents, last_user_input: context.user_input})
+        context.response = @xinghuo.chat(message)
+      else
+        context.response = response
+      end
     end
 
     on_result do
-      agent_name = context.response.match(/调用工具：(.*)/)&.captures&.last&.strip&.gsub(/[[:punct:]]/, '')
-      agent = self.class.agents[agent_name]&.new(
-        context: context,
-        action_input: context.user_input,
-        client: @xinghuo
-      )
-      answer = context.response.match(/最终回答：(.*)/)&.captures&.first&.strip
-
-      if agent_name.nil? && !answer.nil? && agent.nil?
-        context.final_result = answer
-      else
+      agent_name = context.response.scan(/调用工具(.*)/).flatten.reject(&:empty?).map(&:to_s)&.last&.gsub(/[[:punct:]]/, '')
+      if self.class.agents.include?(agent_name)
+        agent = self.class.agents[agent_name]&.new(
+          context: context,
+          action_input: context.user_input,
+          client: @xinghuo
+        )
         add_agent(agent)
+      else
+        messages = Messages.create(history: context.histories).user(text: context.user_input)
+        context.final_result = @xinghuo.chat(messages)
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luo
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - MJ
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-06 00:00:00.000000000 Z
+date: 2023-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk
@@ -208,6 +208,7 @@ files:
 - lib/luo/templates/luo_commit.md.erb
 - lib/luo/templates/luo_xinghuo_agent_input.md.erb
 - lib/luo/templates/luo_xinghuo_agent_tool_input.md.erb
+- lib/luo/templates/luo_xinghuo_response_error.md.erb
 - lib/luo/templates/prompt.demo.erb
 - lib/luo/version.rb
 - lib/luo/xinghuo.rb