luo 0.1.14 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c91c54c45567fd291412b61b01cc553364e9a979edc37f2497e77b6f53659a85
-  data.tar.gz: 6981cc000220d2864c4bbec1c8c0a95c7613aa4a51e746760d70cea6d3b073ca
+  metadata.gz: 16877925d84cc45e2f2feebb170ef2009e8a1111335e0ca8dd913d578c5d0257
+  data.tar.gz: bb1a045bfd1d40ca767e2c04735dc241006f750bbf8713291d08ea58afcf8e35
 SHA512:
-  metadata.gz: 41f5f13d5f886ccd4ee531ea346e195f1fa40e9f763812fa417ee5eba860e645254b94002f331fa7075ebfc4e0cda24568027404de4ed8a64866f651227464d4
-  data.tar.gz: 74e21e66f71de150cfd7de551d235367b43d22808b09e0e09a0d16a500a39335e873f7f82d847fcdac742dfc958b05dae12f1c2cd760f18d0dca6eb344da879c
+  metadata.gz: 5bb212832775ae2c7919eafeb11a6ad476d1ee3380d98d553a0136bf7e6dcc5179ce0e37d6f9bd8ff969c4edc8b899b8d4871dc5d1fe6cc9fbb81a5c8b68f850
+  data.tar.gz: b8e6c6f1b701395e559ea56ede7c5b58dcc2fb690eda7b728a32135187a48e1cfa1f552ccc33ea17f95e1e98d9c93eeef4a3ca4d2ce1048a61045f7be0561238

data/.idea/luo.iml

@@ -8,6 +8,7 @@
       <sourceFolder url="file://$MODULE_DIR$/features" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/spec" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/bundle_gems/cache" />
     </content>
     <orderEntry type="jdk" jdkName="ruby-3.2.1-p31" jdkType="RUBY_SDK" />
     <orderEntry type="sourceFolder" forTests="false" />

data/Gemfile.lock

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

data/README.zh.md

@@ -9,7 +9,12 @@ gem install luo
 ```
 
 ###
-docker run --rm -it -v "$PWD:/workdir" luo_cli_cli -v
+把下面这行代码添加到 ~/.zshrc 或者 ~/.bashrc 中
+
+```
+alias luo='docker run --rm -it -v "$PWD:/workdir" ghcr.io/mjason/luo:latest'
+```
+
 
 ## 环境变量说明
 ```Bash

data/lib/luo/cli.rb

@@ -49,11 +49,21 @@ module Luo
         end
       end
 
+      class Exec < Dry::CLI::Command
+        desc "Exec with Luo"
+        argument :task, type: :string, required: true
+
+        def call(task: ,**)
+          exec task
+        end
+      end
+
       register "version", Version, aliases: %w[v -v --version]
       register "commit", Commit, aliases: ["c"]
       register "init", Init, aliases: ["i"]
       register "run", Run, aliases: ["r"]
       register "bundle", Bundle, aliases: ["b"]
+      register "exec", Exec, aliases: ["e"]
 
     end
 

data/lib/luo/init_project.rb

@@ -24,7 +24,7 @@ module Luo
     def create_templates
       puts "create templates directory"
       unless File.directory?('templates')
-        FileUtils.cp_r(File.join(__dir__, 'templates', '.'), 'templates')
+        FileUtils.cp_r(File.join(__dir__, 'projects', 'prompts'), 'prompts')
       end
     end
 

data/lib/luo/open_ai_agent_runner.rb

@@ -13,8 +13,8 @@ module Luo
 
     on_request do
       context.messages = Messages.create(history: context.histories)
-                         .system(prompt: Luo::Prompts.luo_agent_system)
-                         .user(prompt: Luo::Prompts.luo_agent_input, context: {agents: self.class.agents, last_user_input: context.user_input})
+                         .system(prompt: Luo::Prompts.agent_system)
+                         .user(prompt: Luo::Prompts.agent_input, context: {agents: self.class.agents, last_user_input: context.user_input})
       context.response = @openai.chat(context.messages)
     end
 
@@ -39,7 +39,7 @@ module Luo
     after_run do
       if context.retries < config.retires && context.final_result.nil?
         context.messages = context.messages.assistant(
-          prompt: Luo::Prompts.luo_agent_tool_input,
+          prompt: Luo::Prompts.agent_tool_input,
           context: {
             tools_response: context.agent_results
           }

data/lib/luo/prompts.rb

@@ -2,15 +2,16 @@
 
 module Luo
   module Prompts
-    TEMPLATES_DIR = "#{__dir__}/templates"
-    PWD = ENV['LUO_ENV'] == 'test' ? "#{Dir.pwd}/spec/luo" : Dir.pwd
-    RUNTIME_TEMPLATES_DIR = "#{PWD}/templates"
+    extend Dry::Configurable
+
+    setting :gem_templates_dir, default: "#{__dir__}/templates"
+    setting :prompts_dir, default: "#{Dir.pwd}/prompts"
 
     extend self
 
     def define_templates
-      define_templates_in_dir(TEMPLATES_DIR)
-      define_templates_in_dir(RUNTIME_TEMPLATES_DIR)
+      define_templates_in_dir(config.gem_templates_dir)
+      define_templates_in_dir(config.prompts_dir)
     end
 
     def define_templates_in_dir(dir_path)

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

@@ -0,0 +1,39 @@
+TOOLS
+------
+Assistant can ask the user to use tools to look up information that may be helpful in answering the users original question. The tools the human can use are:
+
+<% agents.values.each do |agent| -%>
+> <%= agent.agent_name %>: <%= agent.agent_desc %>
+<% end -%>
+
+RESPONSE FORMAT INSTRUCTIONS
+----------------------------
+
+When responding to me please, please output a response in one of two formats:
+
+**Option 1:**
+Use this if you want humans to use the tools.
+Markdown code snippet formatted in the following schema:
+
+```json
+[{
+  "action": string \ The action to take. Must be one of <%= agents.values.map do |a| a.agent_name end.join(', ') %>
+  "action_input": string \ The input to the action
+}]
+```
+
+**Option #2:**
+Use this if you want to respond directly to the human. Markdown code snippet formatted in the following schema:
+
+```json
+{
+  "action": "Final Answer",
+  "action_input": string \ You should put what you want to return to use here <%= Luo::AgentRunnerBase.language_info %>
+}
+```
+
+USER'S INPUT
+--------------------
+Here is the user's input (Remember to respond to a single or multiple actions with a json blob of markdown code snippets, and NOTHING else):
+
+<%= last_user_input %>

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

@@ -0,0 +1,4 @@
+Assistant is a large language model trained by OpenAI.
+Assistant is designed to be able to assist with a wide range of tasks, from answering simple questions to providing in-depth explanations and discussions on a wide range of topics. As a language model, Assistant is able to generate human-like text based on the input it receives, allowing it to engage in natural-sounding conversations and provide responses that are coherent and relevant to the topic at hand.
+Assistant is constantly learning and improving, and its capabilities are constantly evolving. It is able to process and understand large amounts of text, and can use this knowledge to provide accurate and informative responses to a wide range of questions. Additionally, Assistant is able to generate its own text based on the input it receives, allowing it to engage in discussions and provide explanations and descriptions on a wide range of topics.
+Overall, Assistant is a powerful system that can help with a wide range of tasks and provide valuable insights and information on a wide range of topics. Whether you need help with a specific question or just want to have a conversation about a particular topic, Assistant is here to assist.

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

@@ -0,0 +1,10 @@
+TOOL RESPONSE: 
+---------------------
+<% tools_response.each do |r| -%>
+> <%= r[:agent_name] %>: <%= r[:agent_response] %>
+<% end -%>
+
+USER'S INPUT
+--------------------
+
+Okay, so what is the response to my last comment? If using information obtained from the tools you must mention it explicitly without mentioning the tool names - I have forgotten all TOOL RESPONSES! Remember to respond to a single or multiple actions with a json blob of markdown code snippets, and NOTHING else.

data/lib/luo/templates/xinghuo_agent_input.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/templates/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.14"
+  VERSION = "0.1.16"
 end

data/lib/luo/xinghuo_agent_runner.rb

@@ -12,13 +12,13 @@ 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})
+                                 .user(prompt: Luo::Prompts.xinghuo_agent_input, context: {agents: self.class.agents, last_user_input: context.user_input})
       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})
+                          .user(prompt: Luo::Prompts.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})
+                          .user(prompt: Luo::Prompts.xinghuo_response_error, context: {agents: self.class.agents, last_user_input: context.user_input})
         context.response = @xinghuo.chat(message)
       else
         context.response = response

data/luo

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# 性能低
+#if [ -z "$(ls -A $PWD/bundle_gems)" ]; then
+#  echo "copy bundle gems"
+#  docker run --rm -v "$PWD/bundle_gems:/usr/local/bundle_1" ghcr.io/mjason/luo:latest e "cp -r /usr/local/bundle/* /usr/local/bundle_1/"
+#fi
+#
+#docker run --rm -it \
+#  -v "$PWD:/workdir" \
+#  -v "$PWD/bundle_gems:/usr/local/bundle/" \
+#  ghcr.io/mjason/luo:latest \
+#  "$@"
+
+# 性能高
+docker run --rm -it \
+  -v "$PWD:/workdir" \
+  ghcr.io/mjason/luo:latest \
+  "$@"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luo
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.16
 platform: ruby
 authors:
 - MJ
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-10 00:00:00.000000000 Z
+date: 2023-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk
@@ -206,22 +206,28 @@ files:
 - lib/luo/projects/application.rb
 - lib/luo/projects/env
 - lib/luo/projects/init.rb
+- lib/luo/projects/prompts/agent_input.md.erb
+- lib/luo/projects/prompts/agent_system.md.erb
+- lib/luo/projects/prompts/agent_tool_input.md.erb
+- lib/luo/projects/prompts/xinghuo_agent_input.md.erb
+- lib/luo/projects/prompts/xinghuo_response_error.md.erb
 - lib/luo/projects/test.yml
 - lib/luo/projects/time_agent.rb
 - lib/luo/projects/weather_agent.rb
 - lib/luo/prompt_template.rb
 - lib/luo/prompts.rb
-- lib/luo/templates/luo_agent_input.md.erb
-- lib/luo/templates/luo_agent_system.md.erb
-- lib/luo/templates/luo_agent_tool_input.md.erb
+- lib/luo/templates/agent_input.md.erb
+- lib/luo/templates/agent_system.md.erb
+- lib/luo/templates/agent_tool_input.md.erb
+- lib/luo/templates/demo.md.erb
 - 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/templates/xinghuo_agent_input.md.erb
+- lib/luo/templates/xinghuo_response_error.md.erb
 - lib/luo/version.rb
 - lib/luo/xinghuo.rb
 - lib/luo/xinghuo_agent_runner.rb
+- luo
 - luo.gemspec
 - sig/luo.rbs
 - sig/luo/agent.rbs