luo 0.2.5 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4078773adb559f48cefc4e2bf43e64c0476bd4eb6f4e9ccfa215558c93c2d346
-  data.tar.gz: 4732dba7c93e21066cc828bc8042617ad29c93a6b50c799c518b8d96332cd640
+  metadata.gz: 4569a6fd6ae87797597f59bc73f8c1b6ac8d805f3410ecc716ffc7e1ddf428c1
+  data.tar.gz: 9695305bfe27cec9708fbc6fea8d1b000ff8450b17befdaa1a0c822da815f157
 SHA512:
-  metadata.gz: 521b30ee3642e76b70ff2ddd6d906b0394e7ad3ecee9ff4e69eb4155482c385947ab3051aafd1c38083c9e7e8aca90ca28b1edf8144d662ef76c8e9659be70a3
-  data.tar.gz: 325450266621354fcda412c1b40c4df88079c2eb985690e43f1b6fae4d7f87a5bf6de7a04ea077c5426a61e5e76c9d93df3908aa560189135228218382e9619e
+  metadata.gz: 281fca6621c8aaccc3c21559c4a0e8ef80738fdf648bb5db68fd639b3692bb4a5f5890c5ad20b94dab9159ae27a5569b99c1a3cf1408603af5894be76f315586
+  data.tar.gz: 80a2b4894e507b1874e21ba0928bc8b5c16cc88fda9870e5ee2c8b333dd1dcc0e2d80c3d5f954ce6abf8f35b56f93127d1aad1ebca34278c7d7427241429c904

data/Gemfile.lock

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

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,7 +64,12 @@ 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

data/lib/luo/version.rb

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

data/lib/luo/xinghuo.rb

@@ -23,15 +23,35 @@ module Luo
       optional(:max_tokens).maybe(:integer)
       optional(:random_threshold).maybe(:float)
       optional(:uid).maybe(:string)
+      optional(:stream).maybe(:bool)
+    end
+
+    EMBEDDING_PARAMS = Dry::Schema.Params do
+      required(:input).filled(:string)
     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 embedding(params)
+      client.post('/v1/embedding', params.to_h)
+    end
+
+    def create_embedding(text, model: 'text-embedding-ada-002')
+      params = EMBEDDING_PARAMS.call(input: text)
+      return params.errors unless params.success?
+      response = embedding(params)
+      if response.success?
+        response.body.dig("data")
+      else
+        raise "create_embeddings failed: #{response.body}"
+      end
+    end
+
+    def chat(messages, random_threshold: nil, &block)
       if messages.is_a?(Messages)
         messages = messages.to_a
       end
@@ -41,10 +61,36 @@ 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
@@ -54,6 +100,15 @@ module Luo
           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

@@ -10,17 +10,26 @@ module Luo
       setting :response_error, default: Luo::Prompts.xinghuo_response_error
     end
     setting :client, default: Luo::Xinghuo.new
+    setting :stream_callback, default: nil
+
+    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.search(context.user_input))
                                  .user(prompt: config.prompts.input, context: {agents: self.class.agents, last_user_input: context.user_input})
-      response = client.chat(context.messages)
+      response = request(context.messages)
       if response.split("\n").select { |line| line.size >1  }.size > 1
         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 = client.chat(message)
+        context.response = request(message)
       else
         context.response = response
       end
@@ -37,7 +46,7 @@ module Luo
         add_agent(agent)
       else
         messages = Messages.create(history: context.histories.search(context.user_input)).user(text: context.user_input)
-        context.final_result = client.chat(messages)
+        context.final_result = request(messages)
       end
     end
 

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.5
+  version: 0.2.7
 platform: ruby
 authors:
 - MJ
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-31 00:00:00.000000000 Z
+date: 2023-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk