luo 0.2.4 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b2af1ba5e628a075900879b4f2b54efceac535fe816fe9863535c51c33e6de1
-  data.tar.gz: a8a7e2c548676dfd4adb6ca35e41e3cd3451930f845be02d06af7d38ca0c4e44
+  metadata.gz: 8d99e88006e5445420b8659fd680122ca1b047e15d9e97e7b62b6fd2144930b9
+  data.tar.gz: e7b6e686e73e1daa3bc3d345e8a1523267220e768bdd474d345dc263f2e9ab6b
 SHA512:
-  metadata.gz: b0fa9249b55d4ee157c57966e2ac362f5827fce4cb2b82382d9f6ee7637b29ac6084a04130d67d4d91a1b91bfbbc1088b14f45d85419b3702332b9d9d3118fbd
-  data.tar.gz: fcb78e2300c5dddce4a32ce6eadb208af15453751d49cab20b6e8c8ab7b9521ef4f08cd6eb231452e82f87ecf375b52ac99c5b189da9f9b869621cf8e17d8f60
+  metadata.gz: 20eafa8f4fafc7483e3acf28f532729eb6a993dad888d93f5c28d7bd7608643909d7fe771db4772c0e896658d9c3a6587760c9e85c115e81e7d29ea4813afc7a
+  data.tar.gz: 0b6cf883f769c6cbad3a178faa16ae6cd02dc7f240335e2b17b30f096b1d4f2b126a07cde18ecf8b5dacf4d8ead7d7a0add0f308abbeb4dd406f818c9778fe68

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    luo (0.2.4)
+    luo (0.2.6)
       dotenv (~> 2.8, >= 2.8.1)
       dry-configurable (~> 1.0, >= 1.0.1)
       dry-schema (~> 1.13, >= 1.13.1)

data/lib/luo/agent_runner_base.rb

@@ -6,6 +6,8 @@ module Luo
     include Configurable
 
     setting :language, default: "en"
+    setting :client, default: nil
+    setting :context_adapter, default: -> { Luo::AgentRunnerContext.new }
 
     def initialize(histories: nil)
       context.histories = histories unless histories.nil?
@@ -15,13 +17,18 @@ module Luo
     def on_init
     end
 
+    def client
+      raise Luo::ClientNotSetError, "client not set" if self.class.config.client.nil?
+      self.class.config.client
+    end
+
     def context
-      @context ||= Luo::AgentRunnerContext.new
+      @context ||= config.context_adapter.call
     end
 
     def reset_context
       histories = context.histories
-      @context = Luo::AgentRunnerContext.new
+      @context = config.context_adapter.call
       @context.histories = histories
       @context
     end
@@ -59,6 +66,16 @@ module Luo
       context.have_running_agents << agent
     end
 
+    def save_history
+      context.histories.save(context.user_input, context.final_result) if save_history?
+    end
+
+    # @private
+    private
+    def save_history?
+      true
+    end
+
     class << self
 
       def agents
@@ -85,6 +102,12 @@ module Luo
         end
       end
 
+      def disable_history
+        define_method(:save_history?) do
+          false
+        end
+      end
+
     end
   end
 end

data/lib/luo/agent_runner_context.rb

@@ -3,7 +3,7 @@
 module Luo
   class AgentRunnerContext
     include Configurable
-    setting :history_adapter, default: MemoryHistory
+    setting :history_adapter, default: ->(context) { MemoryHistory.new(context) }
 
     attr_accessor :user_input, :action_input, :response, :agent_results, :final_result, :messages, :retries
 
@@ -13,7 +13,7 @@ module Luo
     end
 
     def histories
-      @histories ||= config.history_adapter.new
+      @histories ||= config.history_adapter.call(self)
     end
 
     def histories=(histories)

data/lib/luo/llm_func/cain.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Luo
+  module LLMFunc
+    class Cain
+      include Dry::Configurable
+
+      setting :system, default: nil
+      setting :prompt
+      setting :adapter, default: Luo::OpenAI.llm_func_adapter
+      setting :temperature, default: 0
+
+
+      def call(env)
+        temperature = env.fetch(:temperature, nil)
+        history = env.fetch(:history, nil)
+        messages = Messages.create(history: history).user(prompt: config.prompt, context: env.to_h)
+
+        if config.system
+          messages = messages.system(text: config.system)
+        end
+
+        output = config.adapter.call(messages, temperature || config.temperature)
+        env.set(:output, output)
+      end
+
+    end
+
+  end
+end

data/lib/luo/llm_func/cain_builder.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+module Luo
+  module LLMFunc
+    class CainBuilder
+      def initialize
+        @system = nil
+        @prompt = nil
+        @adapter = Luo::OpenAI.llm_func_adapter
+        @temperature = 0
+
+        @middlewares = []
+      end
+
+      def system(text=nil)
+        @system = text
+        self
+      end
+
+      def prompt(prompt=nil)
+        @prompt = prompt
+        self
+      end
+
+      def adapter(adapter=nil)
+        @adapter = adapter
+        self
+      end
+
+      def temperature(temperature=nil)
+        @temperature = temperature
+        self
+      end
+
+      def use(middleware)
+        @middlewares << middleware
+        self
+      end
+
+      def build
+        cain = Cain.new.configure do |c|
+          c.system = @system
+          c.prompt = @prompt
+          c.adapter = @adapter
+          c.temperature = @temperature
+        end
+
+        _next_ = cain
+        @middlewares.reverse_each do |middleware|
+          _next_ = middleware.new(_next_)
+        end
+
+        Proc.new do |**input|
+          env = Luo::Middleware::Env.new(**input)
+          _next_.call(env)
+        end
+      end
+
+      def call(**input)
+        build.call(**input)
+      end
+
+    end
+  end
+end

data/lib/luo/llm_func.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Luo
+  module LLMFunc
+    extend self
+
+    def cain
+      CainBuilder.new
+    end
+
+  end
+end

data/lib/luo/memory_history.rb

@@ -7,12 +7,14 @@ module Luo
   class MemoryHistory
     include Configurable
 
-    setting :max_size, default: 12
+    setting :max_size, default: 6
 
+    attr_reader :context
     ##
     # 初始化一个队列
     # @param [Integer] max_size 队列的最大长度
-    def initialize(max_size = config.max_size)
+    def initialize(context = nil, max_size: config.max_size)
+      @context = context
       @queue = []
       @max_size = max_size
     end
@@ -30,6 +32,15 @@ module Luo
       Marshal.load(Marshal.dump(self))
     end
 
+    def save(input, output)
+      @context_model ||= true
+      enqueue({input: input, output: output})
+    end
+
+    def context_model
+      @context_model
+    end
+
     def user(content)
       enqueue({role: "user", content: content})
     end
@@ -49,7 +60,17 @@ module Luo
     end
 
     def to_a
-      @queue
+      return @queue unless context_model
+
+      @queue.reduce([]) do |rt, node|
+        rt << {role: "user", content: node[:input]}
+        rt << {role: "assistant", content: node[:output]}
+        rt
+      end
+    end
+
+    def search(_input)
+      to_a
     end
 
     def to_json

data/lib/luo/messages.rb

@@ -41,8 +41,12 @@ module Luo
     end
 
     class << self
-      def create(history: [])
-        self.new(history: history)
+      def create(history: nil)
+        if history
+          self.new(history: history)
+        else
+          self.new(history: [])
+        end
       end
     end
 

data/lib/luo/middleware/base.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+module Luo
+  module Middleware
+    class Base
+      extend Dry::Configurable
+      def initialize(app)
+        raise ArgumentError, "app must respond to `call`" unless app.respond_to? :call
+        @app = app
+      end
+
+      def call(env)
+        env = Env.validate_env!(env)
+        env = Env.validate_env! _before_call_(env)
+        env = Env.validate_env! _call_(env)
+        env = Env.validate_env! @app.call(env)
+        Env.validate_env! _after_call_(env)
+      end
+
+      def _before_call_(env)
+        env
+      end
+
+      def _after_call_(env)
+        env
+      end
+
+      def _call_(env)
+        env
+      end
+
+      class << self
+
+        def create_method(name, &block)
+          define_method name do |env|
+            _env_ = block.call(env)
+            if _env_.is_a? Env
+              _env_
+            else
+              env
+            end
+          end
+        end
+
+        def before(&block)
+          create_method :_before_call_, &block
+        end
+
+        def after(&block)
+          create_method :_after_call_, &block
+        end
+
+        def call(&block)
+          create_method :_call_, &block
+        end
+
+      end
+
+    end
+  end
+end

data/lib/luo/middleware/env.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module Luo
+  module Middleware
+    class Env
+      attr_accessor :meta
+      def initialize(**meta)
+        @meta = meta
+      end
+
+      def set(key, value)
+        @meta[key] = value
+        self
+      end
+
+      def get(key)
+        @meta[key]
+      end
+
+      def input
+        @meta[:input]
+      end
+
+      def output
+        @meta[:output]
+      end
+
+      def fetch(key, default=nil)
+        @meta.fetch(key, default)
+      end
+
+      def fetch_and_delete!(key, default=nil)
+        @meta.fetch(key, default).tap do
+          @meta.delete(key)
+        end
+      end
+
+      def to_s
+        @meta.to_s
+      end
+
+      def to_h
+        @meta
+      end
+
+      def create_method(name, &block)
+        self.class.send(:define_method, name, &block)
+      end
+
+      def self.validate_env!(env)
+        raise ArgumentError, "env must be a Luo::Middleware::Env" unless env.is_a? Luo::Middleware::Env
+        env
+      end
+    end
+  end
+end

data/lib/luo/middleware/logger.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+module Luo
+  module Middleware
+    class Logger < Base
+
+      setting :level, default: ::Logger::INFO
+      setting :logger, default: ::Logger.new(STDOUT)
+
+      call do |env|
+        logger = config.logger
+        logger.level = config.level
+        env.create_method(:logger) do
+          logger
+        end
+      end
+
+    end
+  end
+end

data/lib/luo/middleware/memory_history.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Luo
+  module Middleware
+    module MemoryHistory
+      extend self
+
+      def create(history)
+        Class.new(Base) do
+          @history = history
+          def initialize(app)
+            @app = app
+          end
+
+          before do |env|
+            env.set(:history, @history)
+          end
+
+          after do |env|
+            @history.user env.fetch(:input)
+            @history.assistant env.fetch(:output)
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/luo/middleware.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module Luo
+  module Middleware
+  end
+end

data/lib/luo/open_ai.rb

@@ -46,7 +46,12 @@ module Luo
       end
       params = EMBEDDING_PARAMS.call(input: text, model: model)
       return params.errors unless params.success?
-      embeddings(params).body.dig("data").map { |v| v["embedding"] }
+      response = embeddings(params)
+      if response.success?
+        response.body.dig("data").map { |v| v["embedding"] }
+      else
+        raise "create_embeddings failed: #{response.body}"
+      end
     end
 
     def chat(messages, temperature: nil)
@@ -59,9 +64,24 @@ module Luo
         messages: messages
       )
       return params.errors unless params.success?
-      chat_completions(params).body.dig("choices", 0, "message", "content")
+      response = chat_completions(params)
+      if response.success?
+        response.body.dig("choices", 0, "message", "content")
+      else
+        raise "request_chat failed: #{response.body}"
+      end
+    end
+
+    class << self
+      def llm_func_adapter
+        client = self.new
+        Proc.new do |messages, temperature|
+          client.chat(messages, temperature: temperature)
+        end
+      end
     end
 
+
   end
 
 end

data/lib/luo/open_ai_agent_runner.rb

@@ -12,19 +12,15 @@ module Luo
       setting :tool_input, default: Luo::Prompts.agent_tool_input
     end
 
-    on_init do
-      @openai = OpenAI.new
-    end
+    setting :client, default: Luo::OpenAI.new
 
     on_request do
-      context.messages = Messages.create(history: context.histories)
+      context.messages = Messages.create(history: context.histories.search(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)
+      context.response = client.chat(context.messages)
     end
 
-    ##
-    # TODO: 用markdown解析库来解析response
     on_result do
       begin
         actions = JSON.parse(context.response)
@@ -36,13 +32,13 @@ module Luo
         agent = self.class.agents[action['action']]&.new(
           context: context,
           action_input: action['action_input'],
-          client: @openai
+          client: client
         )
         add_agent(agent) if agent
         if action['action'] == "Final Answer"
           context.final_result = action['action_input']
-          context.histories.user(context.user_input)
-          context.histories.assistant(context.final_result)
+
+          save_history
         end
       end
     end
@@ -55,7 +51,7 @@ module Luo
             tools_response: context.agent_results
           }
         )
-        context.response = @openai.chat(context.messages)
+        context.response = client.chat(context.messages)
         context.retries += 1
         on_result
         on_run

data/lib/luo/version.rb

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

data/lib/luo/xinghuo.rb

@@ -23,15 +23,16 @@ module Luo
       optional(:max_tokens).maybe(:integer)
       optional(:random_threshold).maybe(:float)
       optional(:uid).maybe(:string)
+      optional(:stream).maybe(:bool)
     end
 
     # header uid max length is 32 todo
 
-    def request_chat(params)
-      client.post('/v1/spark/completions', params.to_h)
+    def request_chat(params, &block)
+      client.post('/v1/spark/completions', params.to_h, &block)
     end
 
-    def chat(messages, random_threshold: nil)
+    def chat(messages, random_threshold: nil, &block)
       if messages.is_a?(Messages)
         messages = messages.to_a
       end
@@ -41,10 +42,54 @@ module Luo
         messages: messages,
         max_tokens: config.max_tokens,
         random_threshold: random_threshold || config.random_threshold,
-        uid: config.uid.call
+        uid: config.uid.call,
+        stream: block_given?
       )
       return params.errors unless params.success?
-      request_chat(params).body.dig('choices', 0, 'message', 'content')
+
+      body = {}
+      if block_given?
+        content = ""
+        response = request_chat(params) do |req|
+          req.options.on_data = Proc.new do |chunk, *|
+            if chunk =~ /data: (.+?)\n(?!data: \[DONE\])/
+              json = JSON.parse($1)
+              content += json.dig('choices', 0, 'delta', 'content')
+              body.merge!(json)
+            end
+            block.call(chunk)
+          end
+        end
+        body['choices'][0]['delta']['content'] = content
+        body['choices'][0]['message'] = body['choices'][0].delete('delta')
+      else
+        response = request_chat(params)
+      end
+
+      if response.success?
+        body = response.body if body.empty?
+        body.dig('choices', 0, 'message', 'content')
+      else
+        raise "request_chat failed: #{response.body}"
+      end
+    end
+
+    class << self
+      def llm_func_adapter
+        client = self.new
+        Proc.new do |messages, temperature|
+          client.chat(messages, random_threshold: temperature)
+        end
+      end
+
+      def llm_func_adapter_stream
+        client = self.new
+        Proc.new do |messages, temperature|
+          client.chat(messages, random_threshold: temperature) do |chunk|
+            yield chunk
+          end
+        end
+      end
     end
 
   end

data/lib/luo/xinghuo_agent_runner.rb

@@ -9,21 +9,27 @@ module Luo
       setting :input, default: Luo::Prompts.xinghuo_agent_input
       setting :response_error, default: Luo::Prompts.xinghuo_response_error
     end
+    setting :client, default: Luo::Xinghuo.new
+    setting :stream_callback, default: nil
 
-    on_init do
-      @xinghuo = Xinghuo.new
+    def request(messages)
+      if config.stream_callback&.respond_to? :call
+        client.chat(messages, &config.stream_callback)
+      else
+        client.chat(messages)
+      end
     end
 
     on_request do
-      context.messages = Messages.create(history: context.histories)
+      context.messages = Messages.create(history: context.histories.search(context.user_input))
                                  .user(prompt: config.prompts.input, context: {agents: self.class.agents, last_user_input: context.user_input})
-      response = @xinghuo.chat(context.messages)
+      response = request(context.messages)
       if response.split("\n").select { |line| line.size >1  }.size > 1
-        message = Messages.create(history: context.histories)
+        message = Messages.create(history: context.histories.search(context.user_input))
                           .user(prompt: config.prompts.input, context: {agents: self.class.agents, last_user_input: context.user_input})
                           .assistant(text: response)
                           .user(prompt: config.prompts.response_error, context: {agents: self.class.agents, last_user_input: context.user_input})
-        context.response = @xinghuo.chat(message)
+        context.response = request(message)
       else
         context.response = response
       end
@@ -35,12 +41,12 @@ module Luo
         agent = self.class.agents[agent_name]&.new(
           context: context,
           action_input: context.user_input,
-          client: @xinghuo
+          client: client
         )
         add_agent(agent)
       else
-        messages = Messages.create(history: context.histories).user(text: context.user_input)
-        context.final_result = @xinghuo.chat(messages)
+        messages = Messages.create(history: context.histories.search(context.user_input)).user(text: context.user_input)
+        context.final_result = request(messages)
       end
     end
 
@@ -50,8 +56,7 @@ module Luo
         context.final_result = answer if answer
       end
 
-      context.histories.user(context.user_input)
-      context.histories.assistant(context.final_result)
+      save_history
     end
   end
 
@@ -60,7 +65,7 @@ module Luo
     agent_desc '你可以问我任何问题，我都会尽力回答你'
 
     on_call_with_final_result do
-      messages = Messages.create(history: context.histories).user(text: context.user_input)
+      messages = Messages.create(history: context.histories.search(context.user_input)).user(text: context.user_input)
       client.chat(messages)
     end
 

data/lib/luo.rb

@@ -16,6 +16,7 @@ require 'dry-initializer'
 require 'uri'
 require 'redcarpet'
 require 'thor'
+require 'logger'
 
 require "zeitwerk"
 loader = Zeitwerk::Loader.for_gem
@@ -23,10 +24,12 @@ loader.inflector.inflect("open_ai" => "OpenAI")
 loader.inflector.inflect("aiui" => "AIUI")
 loader.inflector.inflect("cli" => "CLI")
 loader.inflector.inflect("open_ai_agent_runner" => "OpenAIAgentRunner")
+loader.inflector.inflect('llm_func' => 'LLMFunc')
 loader.setup
 
 module Luo
   class Error < StandardError; end
+  class ClientNotSetError < StandardError; end
   # Your code goes here...
 
   module_eval do

data/templates/application.rb

@@ -5,6 +5,9 @@ Luo.app_setup do |loader|
 end
 
 class Runner < XinghuoAgentRunner
+
+  setting :stream_callback, default: ->(chunk) { puts chunk }
+
   register WeatherAgent
   register TimeAgent
   register XinghuoFinalAgent

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luo
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.6
 platform: ruby
 authors:
 - MJ
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-25 00:00:00.000000000 Z
+date: 2023-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk
@@ -236,10 +236,18 @@ files:
 - lib/luo/error_handle.rb
 - lib/luo/helpers.rb
 - lib/luo/http_client.rb
+- lib/luo/llm_func.rb
+- lib/luo/llm_func/cain.rb
+- lib/luo/llm_func/cain_builder.rb
 - lib/luo/loader.rb
 - lib/luo/marqo.rb
 - lib/luo/memory_history.rb
 - lib/luo/messages.rb
+- lib/luo/middleware.rb
+- lib/luo/middleware/base.rb
+- lib/luo/middleware/env.rb
+- lib/luo/middleware/logger.rb
+- lib/luo/middleware/memory_history.rb
 - lib/luo/open_ai.rb
 - lib/luo/open_ai_agent_runner.rb
 - lib/luo/parser_markdown.rb