luogu 0.1.19 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fdfa637f68a431adad34ebf8e7349f74dec597f61949c56c9e2cd98b8adfd11e
-  data.tar.gz: 2c70ae6c20b90e694a73406f5b99cc37b432647e364a19d7a2ec850da9376910
+  metadata.gz: 50079e5c23717d6caf07800b5878ba3b6398252caea1ff033175e16cbbe360b7
+  data.tar.gz: 4fa6b63d827b806de779caa38e085126c0fd112b02baad9984fece843801d7f7
 SHA512:
-  metadata.gz: 0f0b8d18cc5d7781600f37e810ede2d4983c4e4d0ef6373dfd4ac8fdf09f8761331fa93a38e734ad564c515da01283f7558a9b59b2cc7396aa4fe38f10aa191f
-  data.tar.gz: 0d29516aad6e9b1adb0111b730651a8c95ed3c462064b1f99bbed18476e604b587aca6510560b86b91603dc69931edfcfa001bea38838b220e166902551f5745
+  metadata.gz: eb4de03374038e36faa54427c667017e03f1ab6a1980b606e69d8975f28395adba2c6be9f3065b2d1a578f43c3c89385abe9ac429d888529f172734167bad0dd
+  data.tar.gz: 18c4ee842a0e12b64cce016798a52f6efd9b89d97018e2b800c64226d743f042f866977418c550a0d2e2db7fa2bd041a3fe2729f28fbbc7345048611a96696a1

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    luogu (0.1.18)
+    luogu (0.2.0)
       dotenv (~> 2.8, >= 2.8.1)
       dry-cli (~> 1.0)
+      dry-configurable (~> 1.0, >= 1.0.1)
       http (~> 5.1, >= 5.1.1)
       tty-prompt (~> 0.23.1)
 
@@ -12,10 +13,17 @@ GEM
   specs:
     addressable (2.8.4)
       public_suffix (>= 2.0.2, < 6.0)
+    concurrent-ruby (1.2.2)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     dotenv (2.8.1)
     dry-cli (1.0.0)
+    dry-configurable (1.0.1)
+      dry-core (~> 1.0, < 2)
+      zeitwerk (~> 2.6)
+    dry-core (1.0.0)
+      concurrent-ruby (~> 1.0)
+      zeitwerk (~> 2.6)
     ffi (1.15.5)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
@@ -49,6 +57,7 @@ GEM
       unf_ext
     unf_ext (0.0.8.2)
     wisper (2.0.1)
+    zeitwerk (2.6.7)
 
 PLATFORMS
   arm64-darwin-22

data/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 Mj
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.md

@@ -1,19 +1,20 @@
 # Luogu
-> 锣鼓，现在的写代码就如古代的求神仪式一样，以前敲锣打鼓求天，现在敲锣打鼓求大模型
 
-用来开发 prompt 工程的工具
+> 锣鼓，现在的写代码就如古代的求神仪式一样，以前敲锣打鼓求天，现在敲锣打鼓求大模型，PS.本文档也是通过GPT来做优化的，具体查看`prompt.md`和`prompt.plugin.rb`
 
-### 更新记录
-- 0.1.15 http库替换成HTTP.rb并且加入了重试机制，默认为3次，可通过设置环境变量 OPENAI_REQUEST_RETRIES 来设置次数
-- 0.1.16 增加对agent的支持
+Luogu是一个针对产品经理的Prompt设计工具，可以帮助你更方便地编写和测试Prompt。
 
-### 安装
-- 安装ruby，要求2.6以上，Mac自带不需要再安装
-- gem install luogu
-- 如果使用 mac 可能你需要使用sudu权限
-- 如果需要在终端显示markdown，需要 [glow](https://github.com/charmbracelet/glow)
+## 安装
+
+1. 安装Ruby，要求2.6以上，Mac自带不需要再安装
+2. 在终端中运行`gem install luogu`命令安装Luogu
+3. 如果使用Mac可能需要使用sudo权限
+4. 如果需要在终端显示markdown，需要安装[glow](https://github.com/charmbracelet/glow)
+
+## 使用
+
+Luogu提供了以下命令：
 
-### 使用
 ```Bash
 Commands:
   luogu build PROMPT_FILE [TARGET_FILE]                      # 编译 Prompt.md 成能够提交给 ChatGPT API 的 messages. 默认输出为 <同文件名>.json
@@ -23,52 +24,28 @@ Commands:
   luogu version                                              # 打印版本
 ```
 
-你可以在项目目录的.env中设置下面的环境变量，或者直接系统设置
+你可以在项目目录的.env中设置下面的环境变量，或者直接系统设置：
+
 ```
 OPENAI_ACCESS_TOKEN=zheshiyigetoken
 OPENAI_TEMPERATURE=0.7
 OPENAI_LIMIT_HISTORY=6
 ```
 
-prompt.md 示例
-```
-@s
-你是一个罗纳尔多的球迷
+## 进入run模式
 
-@a
-好的
-
-@u
-罗纳尔多是谁？
+在run模式下，你可以使用以下命令：
 
-@a
-是大罗，不是C罗
-```
-
-如果需要处理历史记录的是否进入上下文可以使用，在 prompt.md写入
-
-
-@callback
-```ruby
-if assistant_message =~ /```ruby/
-  puts "记录本次记录"
-  self.push_history(user_message, assistant_message)
-else
-  puts "抛弃本次记录"
-end
-```
+- save：保存对话
+- row history：查看对话历史
+- history：查看当前上下文
+- exit：退出
 
+## 插件模式
 
-### 进入run模式
-- save 保存对话
-- row history  查看对话历史
-- history 查看当前上下文
-- exit 退出
+在run和test中可以使用插件模式，可以使用--plugin=<file>.plugin.rb。默认情况下，你可以使用<文件名>.plugin.rb来实现一个prompt.md的插件。
 
-## 插件模式
-在 run 和 test 中可以使用，可以使用 --plugin=<file>.plugin.rb
-默认情况下你可以使用 <文件名>.plugin.rb 来实现一个prompt.md的插件
-在插件中有两个对象
+在插件中有两个对象：
 
 ```ruby
 #gpt
@@ -88,7 +65,8 @@ OpenStruct.new(
 # 如果需要在方法中使用使用变量传递，必须使用context包括你要的变量名，比如 context.name = "luogu"
 ```
 
-支持的回调
+支持的回调：
+
 ```ruby
 # 所有方法都必须返回context
 # 可以使用
@@ -127,8 +105,44 @@ end
 after_save_historydo |gpt, context|
   context
 end
+```
+
+## 示例
+
+下面是一个prompt.md的示例：
 
+```
+@s
+你是一个罗纳尔多的球迷
 
+@a
+好的
+
+@u
+罗纳尔多是谁？
+
+@a
+是大罗，不是C罗
 ```
 
-## MIT 协议
+如果需要处理历史记录的是否进入上下文可以使用，在prompt.md写入：
+
+@callback
+```ruby
+if assistant_message =~ /```ruby/
+  puts "记录本次记录"
+  self.push_history(user_message, assistant_message)
+else
+  puts "抛弃本次记录"
+end
+```
+
+## 更新记录
+
+- 0.1.15：http库替换成HTTP.rb并且加入了重试机制，默认为3次，可通过设置环境变量OPENAI_REQUEST_RETRIES来设置次数
+- 0.1.16：增加对agent的支持
+- 0.2.0：重构了代码，agent的支持基本达到可用状态，具体看`bin/agent.rb`示例，有破坏性更新，不兼容0.1.x的agent写法
+
+## License
+
+This project is licensed under the terms of the MIT license. See the [LICENSE](LICENSE) file for details.

data/lib/luogu/agent_runner.rb

@@ -1,27 +1,44 @@
-module Luogu
-  class AgentRunner
-    attr_accessor :system_prompt_template, :user_input_prompt_template
-    attr_reader :session, :histories
-
-    def initialize(system_prompt_template: nil, user_input_prompt_template: nil, tools_response_prompt_template: nil, session: Session.new)
-      @system_prompt_template = system_prompt_template || load_system_prompt_default_template
-      @user_input_prompt_template = user_input_prompt_template || load_user_input_prompt_default_template
-      @tools_response_prompt_template = tools_response_prompt_template || load_tools_response_prompt_default
-
-      @agents = []
-      @session = session
-
-      @chatgpt_request_body = Luogu::OpenAI::ChatRequestBody.new(temperature: 0)
-      @chatgpt_request_body.stop = ["\nObservation:", "\n\tObservation:"]
-      @limit_history = ENV.fetch('OPENAI_LIMIT_HISTORY', '6').to_i * 2
-      @histories = HistoryQueue.new @limit_history
+# frozen_string_literal: true
 
+module Luogu
+  class AgentRunner < Base
+    setting :templates do
+      setting :system, default: PromptTemplate.load_template('agent_system.md.erb')
+      setting :user, default: PromptTemplate.load_template('agent_input.md.erb')
+      setting :tool, default: PromptTemplate.load_template('agent_tool_input.md.erb')
+    end
+
+    setting :run_agent_retries, default: Application.config.run_agent_retries
+
+    setting :provider do
+      setting :parameter_model, default: ->() {
+        OpenAI::ChatRequestParams.new(
+          model: 'gpt-3.5-turbo',
+          stop: %W[\nObservation: \n\tObservation:],
+          temperature: 0
+        )
+      }
+      setting :request, default: ->(params) { OpenAI.chat(params: params) }
+      setting :parse, default: ->(response) { OpenAI.chat_response_handle(response) }
+      setting :find_final_answer, default: ->(content) { OpenAI.find_final_answer(content) }
+      setting :history_limit, default: Application.config.openai.history_limit
+    end
+
+    attr_reader :request_params, :agents
+    def initialize()
+      @request_params = provider.parameter_model.call
+      @histories = HistoryQueue.new provider.history_limit
       @last_user_input = ''
+      @agents = []
       @tools_response = []
     end
 
-    def openai_configuration(&block)
-      block.call @chatgpt_request_body
+    def provider
+      config.provider
+    end
+
+    def templates
+      config.templates
     end
 
     def register(agent)
@@ -30,126 +47,69 @@ module Luogu
       self
     end
 
-    def request(messages)
-      @chatgpt_request_body.messages = messages
-      response = client.chat(params: @chatgpt_request_body.to_h)
-      if response.code == 200
-        response.parse
-      else
-        logger.error response.body.to_s
-        raise OpenAI::RequestError
-      end
-    end
-
-    def user_input_prompt_template
-      @user_input_prompt_template.result binding
-    end
-
-    def system_prompt_template
-      @system_prompt_template.result binding
+    def run(text)
+      @last_user_input = text
+      messages = create_messages(
+        [{role: "user", content: templates.user.result(binding)}]
+      )
+      request(messages)
     end
+    alias_method :chat, :run
 
-    def tools_response_prompt_template
-      @tools_response_prompt_template.result binding
+    def create_messages(messages)
+      [
+        { role: "system", content: templates.system.result(binding) }
+      ] + @histories.to_a + messages
     end
 
-    def find_final_answer(content)
-      if content.is_a?(Hash) && content['action'] == 'Final Answer'
-        content['action_input']
+    def request(messages, run_agent_retries: 0)
+      logger.debug "request chat: #{messages}"
+      @request_params.messages = messages
+      response = provider.request.call(@request_params.to_h)
+      unless response.code == 200
+        logger.error response.body
+        raise RequestError
+      end
+      content = provider.parse.call(response)
+      logger.debug content
+      if (answer = self.find_and_save_final_answer(content))
+        logger.info "final answer: #{answer}"
+        answer
       elsif content.is_a?(Array)
-        result = content.find { |element| element["action"] == "Final Answer" }
-        if result
-          result["action_input"]
-        else
-          nil
-        end
-      else
-        nil
+        run_agents(content, messages, run_agent_retries: run_agent_retries)
       end
     end
 
     def find_and_save_final_answer(content)
-      if answer = self.find_final_answer(content)
-        self.save_history(answer)
+      if (answer = provider.find_final_answer.call(content))
+        @histories.enqueue({role: "user", content: @last_user_input})
+        @histories.enqueue({role: "assistant", content: answer})
         answer
       else
         nil
       end
     end
 
-    def save_history(finnal_answer)
-      @histories.enqueue({role: "user", content: @last_user_input})
-      @histories.enqueue({role: "assistant", content: finnal_answer})
-    end
-
-    def parse_json(markdown)
-      json_regex = /```json(.+?)```/im
-      json_blocks = markdown.scan(json_regex)
-      result_json = nil
-      json_blocks.each do |json_block|
-        json_string = json_block[0]
-        result_json = JSON.parse(json_string)
-      end
-      
-      if result_json.nil?
-        JSON.parse markdown
-      else
-        result_json
-      end
-    end
-
-    def create_messages(messages)
-      [{role: "system", content: self.system_prompt_template}] + @histories.to_a + messages
-    end
-
-    def request_chat(messages)
-      logger.debug "request chat: #{messages}"
-      response = request messages
-      content = self.parse_json response.dig("choices", 0, "message", "content")
-      logger.debug content
-      if answer = self.find_and_save_final_answer(content)
-        logger.info "finnal answer: #{answer}"
-      elsif content.is_a?(Array)
-        self.run_agents(content, messages)
-      end
-    end
-
-    def chat(message)
-      @last_user_input = message
-      messages = self.create_messages([{role: "user", content: self.user_input_prompt_template}])
-      self.request_chat(messages)
-    end
-
-    def run_agents(agents, _messages_)
-      if answer = self.find_and_save_final_answer(agents)
-        logger.info "finnal answer: #{answer}"
+    def run_agents(agents, _messages_, run_agent_retries: 0)
+      return if run_agent_retries > config.run_agent_retries
+      run_agent_retries += 1
+      if (answer = find_and_save_final_answer(agents))
+        logger.info "final answer: #{answer}"
         return
       end
       @tools_response = []
       agents.each do |agent|
         agent_class = Module.const_get(agent['action'])
-        logger.info "running #{agent_class}"
+        logger.info "#{run_agent_retries} running #{agent_class} input: #{agent['action_input']}"
         response = agent_class.new.call(agent['action_input'])
         @tools_response << {name: agent['action'], response: response}
       end
-      messages = _messages_ + [{role: "assistant", content: agents.to_json}, {role: "user", content: self.tools_response_prompt_template}]
-      self.request_chat messages
-    end
-
-    private
-    def load_system_prompt_default_template
-      PromptTemplate.load_template('agent_system.md.erb')
+      messages = _messages_ + [
+        { role: "assistant", content: agents.to_json },
+        { role: "user", content: templates.tool.result(binding) }
+      ]
+      request messages, run_agent_retries: run_agent_retries
     end
 
-    def load_user_input_prompt_default_template
-      PromptTemplate.load_template('agent_input.md.erb')
-    end
-
-    def load_tools_response_prompt_default
-      PromptTemplate.load_template('agent_tool_input.md.erb')
-    end
-  end
-
-  class AssertionError < StandardError
   end
-end
+end

data/lib/luogu/application.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Luogu
+  module Application
+    extend Dry::Configurable
+
+    setting :openai do
+      setting :access_token, default: ENV.fetch('OPENAI_ACCESS_TOKEN')
+      setting :retries, default: ENV.fetch('OPENAI_REQUEST_RETRIES', 3).to_i
+      setting :host, default: ENV.fetch('OPENAI_HOST', 'https://api.openai.com')
+      setting :history_limit, default: ENV.fetch('OPENAI_LIMIT_HISTORY', '6').to_i * 2
+      setting :temperature, default: ENV.fetch('OPENAI_TEMPERATURE', 1).to_i
+    end
+
+    setting :run_agent_retries, default: ENV.fetch('RUN_AGENT_RETRIES', 5).to_i
+
+    setting :logger, reader: true,
+            default: ENV.fetch('LOG_LEVEL', Logger::INFO),
+            constructor: proc { |value|
+              logger = Logger.new(STDOUT)
+              logger.level = value
+              logger
+            }
+  end
+end

data/lib/luogu/base.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Luogu
+
+  class Base
+    extend Dry::Configurable
+
+    def logger
+      Application.logger
+    end
+
+    def config
+      self.class.config
+    end
+  end
+
+end

data/lib/luogu/{chatgpt.rb → chatllm.rb}

@@ -1,64 +1,76 @@
 module Luogu
-  class ChatGPT
+  class ChatLLM < Base
+
+    setting :provider do
+      setting :parameter_model, default: ->() {
+        OpenAI::ChatRequestParams.new(
+          model: 'gpt-3.5-turbo',
+          temperature: Application.config.openai.temperature
+        )
+      }
+      setting :request, default: ->(params) { OpenAI.chat(params: params) }
+      setting :parse, default: ->(response) { OpenAI.get_content(response) }
+      setting :find_final_answer, default: ->(content) { OpenAI.find_final_answer(content) }
+      setting :history_limit, default: Application.config.openai.history_limit
+    end
 
-    attr_accessor :limit_history, :prompt, :row_history, :history, :temperature, :model_name, :context
+    attr_accessor :context
+    attr_reader :plugin
 
     def initialize(file, history_path='.', plugin_file_path=nil)
       @plugin_file_path = plugin_file_path || file.sub(File.extname(file), ".plugin.rb")
-
       if File.exist?(@plugin_file_path)
         @plugin = Plugin.new(@plugin_file_path).load()
       else
         @plugin = Plugin.new(@plugin_file_path)
       end
-
-      @temperature = ENV.fetch('OPENAI_TEMPERATURE', '0.7').to_f
-      @limit_history = ENV.fetch('OPENAI_LIMIT_HISTORY', '6').to_i * 2
-      @model_name = "gpt-3.5-turbo"
-      
       @history_path = history_path
       @prompt_file = file
-
       @prompt = PromptParser.new(file)
       @row_history = []
-      @history = HistoryQueue.new @limit_history
+      @histories = HistoryQueue.new provider.history_limit
+
+      @request_params = provider.parameter_model.call
 
       @context = OpenStruct.new
 
-      if @plugin.setup_proc
-        @plugin.setup_proc.call(self, @context) 
-      end
+      run_plugin :setup
+    end
+
+    def run_plugin(method_name, &block)
+      plugin.run method_name: method_name, llm: self, context: @context, &block
+    end
+
+    def provider
+      config.provider
     end
 
     def request(messages)
-      params = {
-        model: @model_name,
-        messages: messages,
-        temperature: @temperature,
-      }
-      
-      if @plugin.before_request_proc
-        @context.request_params = params
-        params = @plugin.before_request_proc.call(self, @context).request_params
+      @request_params.messages = messages
+      @context.request_params = @request_params
+      run_plugin :before_request
+      response = provider.request.call(@request_params.to_h)
+      unless response.code == 200
+        logger.error response.body.to_s
+        raise RequestError
       end
-      response = client.chat(parameters: params).parse
       @context.response = response
-      @plugin.after_request_proc.call(self, @context) if @plugin.after_request_proc
-      response.dig("choices", 0, "message", "content")
+      run_plugin :after_request
+
+      provider.parse.call(response)
     end
 
     def chat(user_message)
-      if @plugin.before_input_proc
-        @context.user_input = user_message
-        user_message = @plugin.before_input_proc.call(self, @context).user_input
-      end
-      messages = (@prompt.render + @history.to_a) << {role: "user", content: user_message}
-      if @plugin.after_input_proc
-        @context.request_messages = messages
-        messages = @plugin.after_input_proc.call(self, @context).request_messages
+      @context.user_input = user_message
+      run_plugin :before_input do |context|
+        user_message = context.user_input
       end
 
-      assistant_message = self.request(messages)
+      messages = (@prompt.render + @histories.to_a) << { role: "user", content: user_message}
+      run_plugin :after_input do
+        messages = @context.request_messages
+      end
+      assistant_message = request(messages)
       
       self.push_row_history(user_message, assistant_message)
 
@@ -68,12 +80,15 @@ module Luogu
       elsif @plugin.before_save_history_proc
         @context.user_input = user_message
         @context.response_message = assistant_message
-        @plugin.before_save_history_proc.call(self, @context)
+
+        run_plugin :before_save_history
       else
         puts "执行默认的历史记录"
         self.push_history(user_message, assistant_message)
       end
 
+      run_plugin :after_save_history
+
       assistant_message
     end
 
@@ -83,8 +98,8 @@ module Luogu
     end
 
     def push_history(user_message, assistant_message)
-      @history.enqueue({role: "user", content: user_message})
-      @history.enqueue({role: "assistant", content: assistant_message})
+      @histories.enqueue({ role: "user", content: user_message})
+      @histories.enqueue({ role: "assistant", content: assistant_message})
       if @plugin.after_save_history_proc
         @context.user_input = user_message
         @context.response_message = response_message
@@ -118,11 +133,11 @@ module Luogu
         when "save"
           file_name = File.basename(@prompt_file, ".*")
           self.class.save @row_history, File.join(@history_path, "#{file_name}.row_history.md")
-          self.class.save @history.to_a, File.join(@history_path, "#{file_name}.history.md")
+          self.class.save @histories.to_a, File.join(@history_path, "#{file_name}.history.md")
         when "row history"
           p @row_history
         when "history"
-          p @history.to_a
+          p @histories.to_a
         when "exit"
           puts "再见！"
           break
@@ -147,7 +162,7 @@ module Luogu
       file_name = File.basename(@prompt_file, ".*")
 
       self.class.save @row_history, File.join(@history_path, "#{file_name}-#{now}.row_history.md")
-      self.class.save @history.to_a, File.join(@history_path, "#{file_name}-#{now}.history.md")
+      self.class.save @histories.to_a, File.join(@history_path, "#{file_name}-#{now}.history.md")
     end
 
     class << self

data/lib/luogu/cli.rb

@@ -35,7 +35,7 @@ module Luogu
         option :plugin, type: :string, desc: "运行的时候载入对应的插件"
 
         def call(prompt_file: nil, **options)
-          chatgpt = ChatGPT.new(prompt_file, options.fetch(:out), options.fetch(:plugin, nil))
+          chatgpt = ChatLLM.new(prompt_file, options.fetch(:out), options.fetch(:plugin, nil))
           chatgpt.run
         end
 
@@ -51,7 +51,7 @@ module Luogu
           json = JSON.parse(File.read(json_file), symbolize_names: true)
           prompt_file ||=  json_file.sub(File.extname(json_file), ".md")
 
-          chatgpt = ChatGPT.save(json, prompt_file)
+          chatgpt = ChatLLM.save(json, prompt_file)
         end
 
       end
@@ -67,7 +67,7 @@ module Luogu
         def call(prompt_file: nil, test_file:nil, **options)
           test_file ||= prompt_file.sub(File.extname(prompt_file), ".test.yml")
 
-          chatgpt = ChatGPT.new(prompt_file, options.fetch(:out), options.fetch(:plugin, nil))
+          chatgpt = ChatLLM.new(prompt_file, options.fetch(:out), options.fetch(:plugin, nil))
           messages = YAML.load_file(test_file)
           chatgpt.playload messages
         end
@@ -83,7 +83,7 @@ module Luogu
         end
       end
 
-      register "version", Version, aliases: ["v", "-v", "--version"]
+      register "version", Version, aliases: %w[v -v --version]
       register "build", Build, aliases: ["b"]
       register "run", Run, aliases: ["r"]
       register "generate", Generate, aliases: ["g"]

data/lib/luogu/error.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+module Luogu
+  class AssertionError < StandardError
+  end
+
+  class RequestError < StandardError
+  end
+
+  class PluginError < StandardError
+  end
+end

data/lib/luogu/init.rb

@@ -3,40 +3,31 @@ require 'dotenv/load'
 require "tty-prompt"
 require 'json'
 require 'yaml'
-require "dry/cli"
 require 'fileutils'
 require 'ostruct'
 require 'benchmark'
 require 'erb'
 require 'logger'
 
+require "dry/cli"
+require 'dry-configurable'
+
+require_relative 'base'
+require_relative 'error'
+require_relative 'application'
+
 require_relative "prompt_template"
-require_relative 'openai'
 require_relative 'plugin'
 require_relative 'history_queue'
 require_relative "prompt_parser"
-require_relative "chatgpt"
+require_relative "chatllm"
 require_relative "cli"
 
 require_relative "agent"
-require_relative "session"
 require_relative "agent_runner"
 
-
-
-def client
-  $client ||= Luogu::OpenAI::Client.new
-end
-
-def logger_init
-  logger = Logger.new(STDOUT)
-  logger.level = ENV['LOG_LEVEL'] ? Logger.const_get(ENV['LOG_LEVEL']) : Logger::INFO
-  logger
-end
-
-def logger
-  $logger ||= logger_init
-end
+require_relative 'openai'
+require_relative 'terminal'
 
 class String
   def cover_chinese

data/lib/luogu/openai.rb

@@ -1,14 +1,10 @@
-module Luogu::OpenAI
-
-  class ChatRequestBody < Struct.new(:model, :messages, :temperature, 
-    :top_p, :n, :stream, :stop, :max_tokens, 
-    :presence_penalty, :frequency_penalty, :logit_bias, :user)
-
-    def initialize(*args)
-      defaults = { model: "gpt-3.5-turbo", messages: []}
-      super(*defaults.merge(args.first || {}).values_at(*self.class.members))
-    end
+# frozen_string_literal: true
 
+module Luogu::OpenAI
+  class ChatRequestParams < Struct.new(:model, :messages, :temperature,
+                                     :top_p, :n, :stream, :stop,
+                                     :max_tokens, :presence_penalty,
+                                     :frequency_penalty, :logit_bias, :user)
     def to_h
       super.reject { |_, v| v.nil? }
     end
@@ -16,31 +12,67 @@ module Luogu::OpenAI
     alias to_hash to_h
   end
 
-  class RequestError < StandardError
+  def chat(parameters: nil, params: nil, retries: nil)
+    params ||= parameters
+    retries_left = retries || Luogu::Application.config.openai.retries
+    begin
+      client.post('/v1/chat/completions', json: params)
+    rescue HTTP::Error => e
+      if retries_left > 0
+        puts "retrying ..."
+        retries_left -= 1
+        sleep(1)
+        retry
+      else
+        puts "Connection error #{e}"
+        return nil
+      end
+    end
+  end
+
+  def client
+    @client ||= HTTP.auth("Bearer #{Luogu::Application.config.openai.access_token}")
+                    .persistent Luogu::Application.config.openai.host
   end
 
-  class Client
-    def initialize
-      @access_token = ENV.fetch('OPENAI_ACCESS_TOKEN')
-      @client = HTTP.auth("Bearer #{@access_token}").persistent "https://api.openai.com"
+  def parse_json(markdown)
+    json_regex = /```json(.+?)```/im
+    json_blocks = markdown.scan(json_regex)
+    result_json = nil
+    json_blocks.each do |json_block|
+      json_string = json_block[0]
+      result_json = JSON.parse(json_string)
     end
 
-    def chat(parameters: nil, params: nil, retries: 3)
-      params ||= parameters
-      retries_left = ENV.fetch('OPENAI_REQUEST_RETRIES', retries)
-      begin
-        @client.post('/v1/chat/completions', json: params)
-      rescue HTTP::Error => e
-        if retries_left > 0
-          puts "retrying ..."
-          retries_left -= 1
-          sleep(1)
-          retry
-        else
-          puts "Connection error #{e}"
-          return nil
-        end
+    if result_json.nil?
+      JSON.parse markdown
+    else
+      result_json
+    end
+  end
+
+  def chat_response_handle(response)
+    parse_json get_content(response)
+  end
+
+  def get_content(response)
+    response.parse.dig("choices", 0, "message", "content")
+  end
+
+  def find_final_answer(content)
+    if content.is_a?(Hash) && content['action'] == 'Final Answer'
+      content['action_input']
+    elsif content.is_a?(Array)
+      result = content.find { |element| element["action"] == "Final Answer" }
+      if result
+        result["action_input"]
+      else
+        nil
       end
+    else
+      nil
     end
   end
+
+  module_function :chat, :client, :parse_json, :chat_response_handle, :find_final_answer, :get_content
 end

data/lib/luogu/plugin.rb

@@ -1,52 +1,40 @@
 module Luogu
   class Plugin
-    attr_reader :before_input_proc, :before_save_history_proc, :after_input_proc, :after_save_history_proc,
-     :setup_proc, :before_request_proc, :after_request_proc
+    attr_reader :plugin_file_path, :before_input_proc, :before_save_history_proc, :after_input_proc,
+                :after_save_history_proc, :setup_proc, :before_request_proc, :after_request_proc
 
-    def initialize(plugin_file_path)
-      @plugin_file_path = plugin_file_path
-
-      @before_input_proc = nil
-      @before_save_history_proc = nil
-
-      @after_input_proc = nil
-      @after_save_history_proc = nil
-
-      @setup_proc = nil
-    end
-
-    def before_input(&block)
-      @before_input_proc = block
-    end
-
-    def before_save_history(&block)
-      @before_save_history_proc = block
-    end
-
-    def after_input(&block)
-      @after_input_proc = block
-    end
-
-    def after_save_history(&block)
-      @after_save_history_proc = block
-    end
-
-    def setup(&block)
-      @setup_proc = block
+    # 定义一个元编程方法来动态定义属性设置方法
+    def self.define_attr_setter(attr_name)
+      define_method("#{attr_name}") do |&block|
+        instance_variable_set("@#{attr_name}_proc", block)
+      end
     end
 
-    def before_request(&block)
-      @before_request_proc = block
+    def initialize(plugin_file_path)
+      @plugin_file_path = plugin_file_path
     end
 
-    def after_request(&block)
-      @after_request_proc = block
-    end
+    # 使用元编程方法来动态定义属性设置方法
+    define_attr_setter :before_input
+    define_attr_setter :before_save_history
+    define_attr_setter :after_input
+    define_attr_setter :after_save_history
+    define_attr_setter :setup
+    define_attr_setter :before_request
+    define_attr_setter :after_request
 
     def load()
-      self.instance_eval File.read(@plugin_file_path)
+      self.instance_eval File.read(plugin_file_path)
       self
     end
-    
+
+    def run(method_name: nil, llm: nil, context: nil, &block)
+      method_name = "#{method_name}_proc".to_sym
+      if send(method_name).respond_to?(:call)
+        rt = send(method_name).call(llm, context)
+        block.call(rt) unless block.nil?
+        rt
+      end
+    end
   end
-end
+end

data/lib/luogu/terminal.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Luogu
+  class Terminal < Base
+    def initialize(desc: "请输入你的指令>")
+      @desc = desc
+      @default_action = nil
+      @actions = []
+    end
+
+    def action(action_name, &block)
+      @actions << { action_name: action_name, action_method: block }
+    end
+
+    def default(&block)
+      @default_action = block
+    end
+
+    def run
+      loop do
+        # 从命令行读取输入
+        input = ask(@desc).cover_chinese
+
+        if input == 'exit'
+          break
+        end
+
+        if (action = @actions.find { |h| h[:action_name].to_s == input })
+          action.fetch(:action_method)&.call(input)
+        else
+          @default_action&.call(input)
+        end
+      end
+    end
+
+    def ask(message)
+      TTY::Prompt.new.ask(message)
+    end
+  end
+end

data/lib/luogu/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Luogu
-  VERSION = "0.1.19"
+  VERSION = "0.2.0"
 end

data/luogu.gemspec

@@ -36,6 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'tty-prompt', '~> 0.23.1'
   spec.add_dependency 'dry-cli', '~> 1.0'
   spec.add_dependency 'http', '~> 5.1', '>= 5.1.1'
+  spec.add_dependency 'dry-configurable', '~> 1.0', '>= 1.0.1'
 
   # For more information and examples about making a new gem, check out our
   # guide at: https://bundler.io/guides/creating_gem.html

data/prompt.md

@@ -0,0 +1,2 @@
+@s
+你是一个Ruby开源方向的专家，接下来我发给你我的ReadME，你帮我优化

data/prompt.plugin.rb

@@ -0,0 +1,9 @@
+before_input do |gpt, context|
+  context.user_input = File.read("./README.md")
+  context
+end
+
+after_request do |gpt, context|
+  puts context.response
+  context
+end

data/sig/luogu/client.rbs

@@ -0,0 +1,9 @@
+module Luogu
+  class Client
+    self.@client: untyped
+
+    def self.client: -> untyped
+
+    def chat: -> untyped
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luogu
 version: !ruby/object:Gem::Version
-  version: 0.1.19
+  version: 0.2.0
 platform: ruby
 authors:
 - MJ
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-21 00:00:00.000000000 Z
+date: 2023-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -78,6 +78,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.1.1
+- !ruby/object:Gem::Dependency
+  name: dry-configurable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.1
 description: 使用markdown来快速实现 Prompt工程研发
 email:
 - tywf91@gmail.com
@@ -88,27 +108,34 @@ extra_rdoc_files: []
 files:
 - Gemfile
 - Gemfile.lock
+- LICENSE
 - README.md
 - Rakefile
 - exe/luogu
 - lib/luogu.rb
 - lib/luogu/agent.rb
 - lib/luogu/agent_runner.rb
-- lib/luogu/chatgpt.rb
+- lib/luogu/application.rb
+- lib/luogu/base.rb
+- lib/luogu/chatllm.rb
 - lib/luogu/cli.rb
+- lib/luogu/error.rb
 - lib/luogu/history_queue.rb
 - lib/luogu/init.rb
 - lib/luogu/openai.rb
 - lib/luogu/plugin.rb
 - lib/luogu/prompt_parser.rb
 - lib/luogu/prompt_template.rb
-- lib/luogu/session.rb
 - lib/luogu/templates/agent_input.md.erb
 - lib/luogu/templates/agent_system.md.erb
 - lib/luogu/templates/agent_tool_input.md.erb
+- lib/luogu/terminal.rb
 - lib/luogu/version.rb
 - luogu.gemspec
+- prompt.md
+- prompt.plugin.rb
 - sig/luogu.rbs
+- sig/luogu/client.rbs
 homepage: https://github.com/mjason/luogu
 licenses: []
 metadata:

data/lib/luogu/session.rb

@@ -1,4 +0,0 @@
-module Luogu
-  class Session
-  end
-end