luo 0.1.24 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da7e7e0df02d38335512659fd3318128d4301348de6672b98856f89d75b1226e
-  data.tar.gz: 44709abe694e80b8bc5917a2a28221fca9f0f5ce94e1a2e3930158ff10efe75b
+  metadata.gz: 2357d89c3ae18e5aef8a31e53226a971d7738b121c07840bad3af6c1763f116b
+  data.tar.gz: b9bb7e8c1db63268c8cba723eb0c27cbd3bdc111fe487811204c887d5795d592
 SHA512:
-  metadata.gz: 95125f5f27fea04c632280849c3e278729359c9bd95f943fe2f3cd09884443bb6e8a70d5ff5330a77c173837b59a828fd9a582947cade2805e62f26612663e9c
-  data.tar.gz: 76e510443ed91db9a617274c58914950796bf979da2974ef72e4af37a4b35e478bc3b6e8887d1c7330ad1c8fb598cc75d5058cfd584b278ef7020c4823856474
+  metadata.gz: a2efc0ca521f10ce965a0ba49f9b4265a1277c493ce54a77cdcb87dcc3501c51ac1408a7ee692cb31dee56aed4652504032a95955e20bb19f5cfa64565d286fb
+  data.tar.gz: 15e7e45e309805cd021dbc10fa58d65770859b76eb0872305d5b92bb115b9185185ebd44592a4c3f2ccfd0bbe05df46c77293469d78f70ddb4ed1bf1843ad946

data/Gemfile.lock

@@ -1,13 +1,14 @@
 PATH
   remote: .
   specs:
-    luo (0.1.24)
+    luo (0.2.0)
       dotenv (~> 2.8, >= 2.8.1)
-      dry-cli (~> 1.0)
       dry-configurable (~> 1.0, >= 1.0.1)
       dry-schema (~> 1.13, >= 1.13.1)
       faraday (~> 2.7, >= 2.7.4)
       faraday-retry (~> 2.1)
+      redcarpet (~> 3.6)
+      thor (~> 1.2, >= 1.2.2)
       tty-markdown (~> 0.7.2)
       zeitwerk (~> 2.6, >= 2.6.8)
 
@@ -17,7 +18,6 @@ GEM
     concurrent-ruby (1.2.2)
     diff-lcs (1.5.0)
     dotenv (2.8.1)
-    dry-cli (1.0.0)
     dry-configurable (1.0.1)
       dry-core (~> 1.0, < 2)
       zeitwerk (~> 2.6)
@@ -55,6 +55,7 @@ GEM
     pastel (0.8.0)
       tty-color (~> 0.5)
     rake (13.0.6)
+    redcarpet (3.6.0)
     rexml (3.2.5)
     rouge (4.1.0)
     rspec (3.12.0)
@@ -76,6 +77,7 @@ GEM
       unicode-display_width (>= 1.5, < 3.0)
       unicode_utils (~> 1.4)
     strings-ansi (0.2.0)
+    thor (1.2.2)
     tty-color (0.6.0)
     tty-markdown (0.7.2)
       kramdown (>= 1.16.2, < 3.0)

data/exe/luo

@@ -4,4 +4,4 @@
 require "bundler/setup"
 require "luo"
 
-Dry::CLI.new(Luo::CLI::Commands).call
+Luo::CLI::APP.start

data/lib/luo/cli/init_app.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Luo
+  module CLI
+    class InitApp < InitBase
+      def copy_app
+        say "Copying App...", :green
+        copy_file "application.rb", "app.rb"
+      end
+    end
+  end
+end

data/lib/luo/cli/init_base.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Luo
+  module CLI
+    class InitBase < Thor::Group
+      include Thor::Actions
+      def create_dirtories
+        say "Creating directories...", :green
+        empty_directory("prompts")
+        empty_directory("agents")
+      end
+
+      def copy_files
+        say "Copying OpenAI Prompts...", :green
+        copy_file "prompts/agent_input.md.erb", "prompts/agent_input.md.erb"
+        copy_file "prompts/agent_system.md.erb", "prompts/agent_system.md.erb"
+        copy_file "prompts/agent_tool_input.md.erb", "prompts/agent_tool_input.md.erb"
+
+        say "Copying Xinghuo Prompts...", :green
+        copy_file "prompts/xinghuo_agent_input.md.erb", "prompts/xinghuo_agent_input.md.erb"
+        copy_file "prompts/xinghuo_response_error.md.erb", "prompts/xinghuo_response_error.md.erb"
+      end
+
+      def copy_agents
+        say "Copying Agents Demo...", :green
+        copy_file "time_agent.rb", "agents/time_agent.rb"
+        copy_file "weather_agent.rb", "agents/weather_agent.rb"
+      end
+
+      def copy_env
+        say "Copying luo.env...", :green
+        copy_file "env", "luo.env"
+      end
+
+      def copy_test_file
+        say "Copying test file...", :green
+        copy_file "test.yml", "test.yml"
+      end
+
+      def self.source_root
+        Pathname.new(File.join(__dir__, "../../../templates")).expand_path
+      end
+    end
+  end
+end

data/lib/luo/cli/init_notebook.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Luo
+  module CLI
+    class InitNotebook < InitBase
+
+      desc "Initialize a notebook project"
+      def copy_notebook
+        say "Copying Notebook...", :green
+        copy_file "luo.ipynb", "luo.ipynb"
+      end
+
+    end
+  end
+end

data/lib/luo/cli.rb

@@ -2,70 +2,54 @@
 
 module Luo
   module CLI
-    module Commands
-      extend Dry::CLI::Registry
+    class APP < Thor
 
-      class Version < Dry::CLI::Command
-        desc "Print version"
+      map %w[--version -v] => :__print_version
+      map 'c' => :commit
 
-        def call(*)
-          puts Luo::VERSION
-        end
+      desc "--version, -v", "print the version"
+      def __print_version
+        puts "Luo version #{Luo::VERSION}"
       end
 
-      class Init < Dry::CLI::Command
-        desc "Init Luo Project"
-
-        def call(*)
-          Luo::InitProject.run
-        end
-      end
-
-      class Commit < Dry::CLI::Command
-        desc "Commit with Luo"
-
-        argument :message, desc: "Commit message", required: true, type: :string
-
-        def call(message:, **)
-          messages = Messages.create.system(prompt: Luo::Prompts.luo_commit, context: {commit: message}).to_a
+      desc "commit <message>", "git commit with luo"
+      def commit(message)
+        messages = Messages.create.user(prompt: Luo::Prompts.luo_commit, context: {commit: message}).to_a
+        if ENV["LUO_LLM_MODE"] == "openai"
           response = OpenAI.new.chat(messages)
-          exec "git commit -m '#{response}'"
+        else
+          response = Xinghuo.new.chat(messages)
         end
+        exec "git commit -m '#{response}'"
       end
 
-      class Run < Dry::CLI::Command
-        desc "Run Luo"
-
-        def call(*)
-          exec "jupyter lab --ip=0.0.0.0 --port=8888 --no-browser --allow-root"
+      desc "init", "initialize luo"
+      option :type, aliases: "-t", default: "notebook", desc: "type of luo project", enum: %w[notebook app]
+      def init
+        if options[:type] == "notebook"
+          invoke InitNotebook
+        elsif options[:type] == "app"
+          invoke InitApp
         end
       end
 
-      class Bundle < Dry::CLI::Command
-        desc "Bundle with Luo"
-
-        def call(*)
-          exec "bundle install"
-        end
-      end
+      def self.exit_on_failure?
+        if $! && $!.is_a?(Thor::Error)
 
-      class Exec < Dry::CLI::Command
-        desc "Exec with Luo"
-        argument :task, type: :string, required: true
+          command = "luo " + ARGV.join(' ')
+          messages = Messages.create.user(prompt: Luo::Prompts.luo_error, context: {error: $!.message, command: command}).to_a
+          if ENV["LUO_LLM_MODE"] == "openai"
+            response = OpenAI.new.chat(messages)
+          else
+            response = Xinghuo.new.chat(messages)
+          end
 
-        def call(task: ,**)
-          exec task
+          shell = Thor::Shell::Color.new
+          shell.say "\n #{response}", :green
         end
+        true
       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
-
   end
-end
+end

data/lib/luo/helpers.rb

@@ -18,5 +18,13 @@ module Luo
         yield(data)
       end
     end
+
+    def gem_exists?(gem_name)
+      Gem::Specification.find_by_name(gem_name)
+      true
+    rescue Gem::LoadError
+      false
+    end
+
   end
 end

data/lib/luo/{init_project.rb → init_project._rb}

@@ -13,7 +13,7 @@ module Luo
       unless File.exist?('Gemfile')
         gemfile = <<-GEMFILE.gsub(/^ */, '')
         source 'https://rubygems.org'
-        gem 'luo', '~> #{version}'
+        gem 'luo'
         gem 'iruby'
         gem 'pry'
         GEMFILE

data/lib/luo/marqo.rb

@@ -5,7 +5,7 @@ module Luo
     include Configurable
     setting :host, default: "http://localhost:8882"
     setting :x_api_key, default: nil
-    setting :retries, default: ENV.fetch('OPENAI_REQUEST_RETRIES', 3).to_i
+    setting :retries, default: 3
 
     include HttpClient.init_client(headers: { 'X-API-KEY' => config.x_api_key })
 

data/lib/luo/open_ai.rb

@@ -8,6 +8,7 @@ module Luo
     setting :retries, default: ENV.fetch('OPENAI_REQUEST_RETRIES', 3).to_i
     setting :host, default: ENV.fetch('OPENAI_HOST', 'https://api.openai.com')
     setting :temperature, default: ENV.fetch('OPENAI_TEMPERATURE', 1).to_i
+    setting :model, default: ENV.fetch('OPENAI_CHAT_MODEL', 'gpt-3.5-turbo')
 
     include HttpClient.init_client
 
@@ -53,7 +54,7 @@ module Luo
         messages = messages.to_a
       end
       params = PARAMS.call(
-        model: 'gpt-3.5-turbo',
+        model: config.model,
         temperature: temperature || config.temperature,
         messages: messages
       )

data/lib/luo/open_ai_agent_runner.rb

@@ -6,6 +6,11 @@ module Luo
     include Configurable
 
     setting :retires, default: 3
+    setting :prompts do
+      setting :input, default: Luo::Prompts.agent_input
+      setting :system, default: Luo::Prompts.agent_system
+      setting :tool_input, default: Luo::Prompts.agent_tool_input
+    end
 
     on_init do
       @openai = OpenAI.new
@@ -13,13 +18,19 @@ module Luo
 
     on_request do
       context.messages = Messages.create(history: context.histories)
-                         .system(prompt: Luo::Prompts.agent_system)
-                         .user(prompt: Luo::Prompts.agent_input, context: {agents: self.class.agents, last_user_input: context.user_input})
+                         .system(prompt: config.prompts.system)
+                         .user(prompt: config.prompts.input, context: {agents: self.class.agents, last_user_input: context.user_input})
       context.response = @openai.chat(context.messages)
     end
 
+    ##
+    # TODO: 用markdown解析库来解析response
     on_result do
-      actions = JSON.parse(context.response)
+      begin
+        actions = JSON.parse(context.response)
+      rescue JSON::ParserError => e
+        actions = JSON.parse ParserMarkdown.new(context.response).code
+      end
       actions = [actions] if actions.is_a?(Hash)
       actions.each do |action|
         agent = self.class.agents[action['action']]&.new(
@@ -39,7 +50,7 @@ module Luo
     after_run do
       if context.retries < config.retires && context.final_result.nil?
         context.messages = context.messages.assistant(
-          prompt: Luo::Prompts.agent_tool_input,
+          prompt: config.prompts.tool_input,
           context: {
             tools_response: context.agent_results
           }

data/lib/luo/parser_markdown.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Luo
+  class ParserMarkdown
+    def initialize(text)
+      @renderer = CustomRenderer.new
+      @markdown = Redcarpet::Markdown.new(@renderer, fenced_code_blocks: true)
+      @text = text
+
+      parse @text
+    end
+
+    def code
+      @renderer.code
+    end
+
+    def language
+      @renderer.language
+    end
+
+    def parse(text)
+      @markdown.render(text)
+    end
+
+    class CustomRenderer < Redcarpet::Render::HTML
+      attr_reader :code, :language
+
+      def block_code(code, language)
+        @code = code
+        @language = language
+      end
+    end
+  end
+end

data/lib/luo/project_init.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Luo
+  class ProjectInit
+    def initialize(app_type: "notebook")
+      @app_type = app_type
+    end
+  end
+end

data/lib/luo/prompt_template.rb

@@ -2,9 +2,13 @@
 
 module Luo
   class PromptTemplate
-    def initialize(file_path)
+    def initialize(file_path = nil, text: nil)
       @file_path = file_path
-      @template = ERB.new(File.read(@file_path), trim_mode: '-')
+      if text.nil? && !@file_path.nil?
+        @template = ERB.new(File.read(@file_path), trim_mode: '-')
+      else
+        @template = ERB.new(text, trim_mode: '-')
+      end
     end
 
     def render(data = {})
@@ -31,7 +35,7 @@ module Luo
       end
 
       def load_template(file_name)
-        self.new File.join(File.dirname(__FILE__), 'templates', file_name)
+        self.new File.join(__dir__, '../../templates', 'prompts', file_name)
       end
     end
 

data/lib/luo/prompts.rb

@@ -4,7 +4,7 @@ module Luo
   module Prompts
     extend Dry::Configurable
 
-    setting :gem_templates_dir, default: "#{__dir__}/templates"
+    setting :gem_templates_dir, default: "#{__dir__}/../../templates/prompts"
     setting :prompts_dir, default: "#{Dir.pwd}/prompts"
 
     extend self
@@ -15,7 +15,8 @@ module Luo
     end
 
     def define_templates_in_dir(dir_path)
-      Dir.glob("#{dir_path}/*.md.erb") do |file|
+      path = Pathname.new(dir_path).expand_path.join("*.md.erb").to_s
+      Dir.glob(path) do |file|
         template_name = File.basename(file, '.md.erb').to_sym
         define_template(template_name, file)
       end
@@ -28,6 +29,33 @@ module Luo
     end
 
     define_templates
+
+    def method_missing(method_name, *args, &block)
+      template_file = template_file_path(method_name)
+      if template_file
+        define_template(method_name, template_file)
+        send(method_name)
+      else
+        super
+      end
+    end
+
+    def respond_to_missing?(method_name, include_private = false)
+      template_file_path(method_name) || super
+    end
+
+    private
+
+    def template_file_path(template_name)
+      gem_template_file = "#{config.gem_templates_dir}/#{template_name}.md.erb"
+      prompts_template_file = "#{config.prompts_dir}/#{template_name}.md.erb"
+
+      return prompts_template_file if File.exist?(prompts_template_file)
+      return gem_template_file if File.exist?(gem_template_file)
+
+      nil
+    end
+
   end
 end
 

data/lib/luo/version.rb

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

data/lib/luo/xinghuo.rb

@@ -4,11 +4,11 @@ module Luo
   class Xinghuo
     include Configurable
 
-    setting :access_token, default: ENV.fetch('XINGHUO_ACCESS_TOKEN')
-    setting :retries, default: ENV.fetch('XINGHUO_REQUEST_RETRIES', 3).to_i
-    setting :host, default: ENV.fetch('XINGHUO_HOST', 'https://integration-api.iflyos.cn/')
-    setting :history_limit, default: ENV.fetch('XINGHUO_LIMIT_HISTORY', '6').to_i * 2
-    setting :temperature, default: ENV.fetch('XINGHUO_TEMPERATURE', 0).to_i
+    setting :access_token, default: ENV.fetch('LISTENAI_ACCESS_TOKEN')
+    setting :retries, default: ENV.fetch('LISTENAI_REQUEST_RETRIES', 3).to_i
+    setting :host, default: ENV.fetch('LISTENAI_HOST', 'https://api.listenai.com')
+    setting :history_limit, default: ENV.fetch('LISTENAI_LIMIT_HISTORY', '6').to_i * 2
+    setting :random_threshold, default: ENV.fetch('LISTENAI_TEMPERATURE', 0).to_i
     setting :auditing, default: 'default'
     setting :domain, default: 'general'
     setting :max_tokens, default: 1024
@@ -22,15 +22,16 @@ module Luo
       optional(:domain).maybe(:string)
       optional(:max_tokens).maybe(:integer)
       optional(:random_threshold).maybe(:float)
+      optional(:uid).maybe(:string)
     end
 
     # header uid max length is 32 todo
 
     def request_chat(params)
-      client.post('/external/ls_log/xf_completions', params.to_h)
+      client.post('/v1/spark/completions', params.to_h)
     end
 
-    def chat(messages, temperature: nil)
+    def chat(messages, random_threshold: nil)
       if messages.is_a?(Messages)
         messages = messages.to_a
       end
@@ -39,7 +40,7 @@ module Luo
         domain: config.domain,
         messages: messages,
         max_tokens: config.max_tokens,
-        random_threshold: temperature || config.temperature,
+        random_threshold: random_threshold || config.random_threshold,
         uid: config.uid.call
       )
       return params.errors unless params.success?

data/lib/luo/xinghuo_agent_runner.rb

@@ -5,6 +5,10 @@ module Luo
     include Configurable
 
     setting :retires, default: 3
+    setting :prompts do
+      setting :input, default: Luo::Prompts.xinghuo_agent_input
+      setting :response_error, default: Luo::Prompts.xinghuo_response_error
+    end
 
     on_init do
       @xinghuo = Xinghuo.new
@@ -12,13 +16,13 @@ module Luo
 
     on_request do
       context.messages = Messages.create(history: context.histories)
-                                 .user(prompt: Luo::Prompts.xinghuo_agent_input, context: {agents: self.class.agents, last_user_input: context.user_input})
+                                 .user(prompt: config.prompts.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.xinghuo_agent_input, context: {agents: self.class.agents, last_user_input: context.user_input})
+                          .user(prompt: config.prompts.input, context: {agents: self.class.agents, last_user_input: context.user_input})
                           .assistant(text: response)
-                          .user(prompt: Luo::Prompts.xinghuo_response_error, context: {agents: self.class.agents, last_user_input: context.user_input})
+                          .user(prompt: config.prompts.response_error, context: {agents: self.class.agents, last_user_input: context.user_input})
         context.response = @xinghuo.chat(message)
       else
         context.response = response

data/lib/luo.rb

@@ -3,18 +3,19 @@
 # require_relative "luo/version"
 
 require 'erb'
-require 'dotenv/load'
+require 'dotenv'
 require 'json'
 require 'faraday'
 require 'faraday/retry'
 require 'dry-configurable'
 require 'dry-schema'
-require 'dry/cli'
 require 'yaml'
 require 'tty-markdown'
 require 'fileutils'
 require 'dry-initializer'
 require 'uri'
+require 'redcarpet'
+require 'thor'
 
 require "zeitwerk"
 loader = Zeitwerk::Loader.for_gem
@@ -27,4 +28,25 @@ loader.setup
 module Luo
   class Error < StandardError; end
   # Your code goes here...
+
+  module_eval do
+    Dotenv.load('luo.env', '.env')
+  end
+
+  def self.app_setup(&block)
+    include Luo
+    block.call(Loader) if block_given?
+    Loader.setup
+  end
+
+  def self.notebook_setup(&block)
+    include Luo
+    block.call(Loader) if block_given?
+    Loader.setup
+    if Helpers.gem_exists?('pry')
+      require 'pry'
+      IRuby::Kernel.instance.switch_backend!(:pry)
+    end
+  end
+
 end

data/luo.gemspec

@@ -35,8 +35,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'faraday-retry', '~> 2.1'
   spec.add_dependency 'dry-schema', '~> 1.13', '>= 1.13.1'
   spec.add_dependency 'dry-configurable', '~> 1.0', '>= 1.0.1'
-  spec.add_dependency 'dry-cli', '~> 1.0'
   spec.add_dependency 'tty-markdown', '~> 0.7.2'
+  spec.add_dependency 'redcarpet', '~> 3.6'
+  spec.add_dependency 'thor', '~> 1.2', '>= 1.2.2'
 
   spec.add_development_dependency "rspec", '~> 3.12'
 

data/sig/luo/prompt_template.rbs

@@ -1,6 +1,6 @@
 module Luo
   class PromptTemplate
-    @file_path: string
+    @file_path: String?
     @template: ERB
 
     def self.create: -> PromptTemplate

data/{lib/luo/projects → templates}/application.rb

@@ -1,4 +1,8 @@
-require_relative 'init'
+require 'luo'
+
+Luo.app_setup do |loader|
+  loader.push_dir(File.join(__dir__, 'agents'))
+end
 
 class Runner < XinghuoAgentRunner
   register WeatherAgent

data/{lib/luo/projects → templates}/env

@@ -3,4 +3,5 @@ OPENAI_TEMPERATURE=0 # OpenAI的温度
 OPENAI_LIMIT_HISTORY=6 # OpenAI的历史记录长度
 AIUI_APP_KEY= # AIUI的AppKey
 AIUI_APP_ID= # AIUI的AppID
-XINGHUO_ACCESS_TOKEN= # 星火的访问令牌
+XINGHUO_ACCESS_TOKEN= # 星火的访问令牌
+OPENAI_CHAT_MODEL=gpt-3.5-turbo

data/templates/prompts/luo_error.md.erb

@@ -0,0 +1,8 @@
+下面是一个基于ruby thor实现的命令行工具，
+用户调的命令：
+<%= command %>
+发生了下面的错误：
+<%= error %>
+
+--------------------
+用中文给用户提示信息，并且说明如何解决问题, 最好给出正确的命令示例