luo 0.1.8 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9c2a48667ea14c7c9d58e171baa44342929cb9ef585867543ba545559623cb8
-  data.tar.gz: d586451833334193d7da2f08efc9b0ffa0a06e66dbf3e1de1d18c8c46cf53706
+  metadata.gz: 1830a5e907eb9c92fe84162093cc7c46fa7f1970b07c58b120114dba73499e47
+  data.tar.gz: 609ec33cce3365b956494f1446983924a03c5341ed5be8d350575d3303a250a6
 SHA512:
-  metadata.gz: f45e76d27242650bf196acec577d910b7134ccfe693742eb5c2e200c9e9b68a91b8113d8a3c198231ae6fc4cf96caffea918fb6f1c40ad0db0ad5742eaf2b03c
-  data.tar.gz: ed3a621280d191459520076628630716b5e684a01623df426dd048d28df2eb55fbf2ff7dc3eaa5e235a6518a858bc8b0fd65e1bc7dec8acfc7f99e05d003c1d6
+  metadata.gz: ef9266fbe51fa277369abbe012e531cd07df5b6141af538fb4f934fc591821530440d2ff58bef00accd7e9827bfbc24858f503a616bd765e24a2aea31e9e7bda
+  data.tar.gz: c2bf5ddf9f16d7640bd52c35f259fd86d4211f1a995890e3c2151cf2a097b8b54bb060be524b3d91bbd0d61fbf3cfe082366d2e6ad48b5c63d46a3a2aeceb0a4

data/Dockerfile

@@ -0,0 +1,8 @@
+FROM ruby:3.2.2-alpine
+
+# Install dependencies
+RUN gem install luo
+
+WORKDIR /workdir
+
+ENTRYPOINT ["luo"]

data/Gemfile.lock

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

data/README.zh.md

@@ -2,10 +2,15 @@
 是一款基于大模型的开发框架（面向产品经理），当前支持大模型提供商有: OpenAI、星火大模型。通过DSL能够快速创作并且测试大模型的效果。
 
 ## 安装
+
+### 
 ```
 gem install luo
 ```
 
+###
+docker run --rm -it -v "$PWD:/workdir" luo_cli_cli -v
+
 ## 环境变量说明
 ```Bash
 OPENAI_ACCESS_TOKEN= # OpenAI的访问令牌

data/lib/luo/agent.rb

@@ -2,6 +2,8 @@
 
 module Luo
   class Agent
+    extend Dry::Initializer
+
     attr_reader :context, :action_input, :client
     def initialize(context: nil, action_input: nil, client: nil)
       @context = context
@@ -27,7 +29,7 @@ module Luo
           result = instance_eval(&block)
           if result.nil?
             messages = context.messages.to_a[0...-1] + [{role: :user, content: context.user_input}]
-            context.final_result = client.chat(messages)
+            context.final_result = client&.chat(messages)
           else
             context.final_result = result
           end
@@ -35,7 +37,7 @@ module Luo
       end
 
       alias_method :on_call_with_fallback, :on_call_with_final_result
-      
+
       def self.create_parameter_method(method_name, not_provided = Object.new, &block)
         define_method(method_name.to_sym) do |content = not_provided|
           if content === not_provided

data/lib/luo/aiui.rb

@@ -23,7 +23,7 @@ module Luo
       client.post('/external/ls_log/aiui_request', params.to_h)
     end
 
-    def chat(messages)
+    def chat(messages, temperature: nil)
       if messages.is_a?(Messages)
         messages = messages.to_a
       end

data/lib/luo/cli.rb

@@ -33,9 +33,19 @@ module Luo
         end
       end
 
+      class Run < Dry::CLI::Command
+        desc "Run Luo"
+
+        def call(*)
+          exec "ruby application.rb"
+        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"]
+
     end
 
   end

data/lib/luo/open_ai.rb

@@ -48,13 +48,13 @@ module Luo
       embeddings(params).body.dig("data").map { |v| v["embedding"] }
     end
 
-    def chat(messages)
+    def chat(messages, temperature: nil)
       if messages.is_a?(Messages)
         messages = messages.to_a
       end
       params = PARAMS.call(
         model: 'gpt-3.5-turbo',
-        temperature: config.temperature,
+        temperature: temperature || config.temperature,
         messages: messages
       )
       return params.errors unless params.success?

data/lib/luo/version.rb

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

data/lib/luo/xinghuo.rb

@@ -30,7 +30,7 @@ module Luo
       client.post('/external/ls_log/xf_completions', params.to_h)
     end
 
-    def chat(messages)
+    def chat(messages, temperature: nil)
       if messages.is_a?(Messages)
         messages = messages.to_a
       end
@@ -39,7 +39,7 @@ module Luo
         domain: config.domain,
         messages: messages,
         max_tokens: config.max_tokens,
-        random_threshold: config.temperature,
+        random_threshold: temperature || config.temperature,
         uid: config.uid.call
       )
       return params.errors unless params.success?

data/lib/luo.rb

@@ -13,6 +13,7 @@ require 'dry/cli'
 require 'yaml'
 require 'tty-markdown'
 require 'fileutils'
+require 'dry-initializer'
 
 require "zeitwerk"
 loader = Zeitwerk::Loader.for_gem

data/luo.gemspec

@@ -37,7 +37,6 @@ Gem::Specification.new do |spec|
   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 "example-gem", "~> 1.0"
 
   spec.add_development_dependency "rspec", '~> 3.12'
 

data/sig/luo/agent.rbs

@@ -1,7 +1,7 @@
 module Luo
   class Agent
     @action_input: untyped
-    @context: AgentRunnerContext
+    @context: AgentRunnerContext?
 
     attr_reader self.agent_desc: String
     attr_reader self.agent_name: String
@@ -9,6 +9,7 @@ module Luo
     def self.on_call_with_final_result: -> untyped
 
     attr_reader action_input: untyped
+    attr_reader client: _Client?
     attr_reader context: AgentRunnerContext
 
     def initialize: (AgentRunnerContext) -> untyped
@@ -19,5 +20,7 @@ module Luo
 
     attr_reader input: String
     attr_reader row_input: String?
+
+    def call: -> untyped
   end
 end

data/sig/luo/agent_runner_context.rbs

@@ -1,5 +1,6 @@
 module Luo
   class AgentRunnerContext
+    @client: untyped
     @histories: MemoryHistory
 
     @running_agents: Array[Agent]
@@ -14,6 +15,8 @@ module Luo
 
     def client: -> untyped
 
+    def client=: -> untyped
+
     def have_running_agents: -> Set[Agent]
 
     def histories: -> MemoryHistory

data/sig/luo/client.rbs

@@ -0,0 +1,5 @@
+module Luo
+  interface _Client
+    def chat: (untyped, temperature: Integer) -> String
+  end
+end

data/sig/luo/open_ai.rbs

@@ -11,6 +11,8 @@ module Luo
 
     def create_embedding: -> untyped
 
+    def create_embeddings: -> untyped
+
     def embeddings: -> untyped
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: luo
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.10
 platform: ruby
 authors:
 - MJ
@@ -181,6 +181,7 @@ files:
 - ".idea/modules.xml"
 - ".idea/vcs.xml"
 - ".rspec"
+- Dockerfile
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -222,12 +223,12 @@ files:
 - lib/luo/xinghuo.rb
 - lib/luo/xinghuo_agent_runner.rb
 - luo.gemspec
-- sample_/marqo.rb
 - sig/luo.rbs
 - sig/luo/agent.rbs
 - sig/luo/agent_runner_base.rbs
 - sig/luo/agent_runner_context.rbs
 - sig/luo/aiui.rbs
+- sig/luo/client.rbs
 - sig/luo/configurable.rbs
 - sig/luo/env.rbs
 - sig/luo/helpers.rbs

data/sample_/marqo.rb

@@ -1,98 +0,0 @@
-require 'httparty'
-
-class Marqo
-  include HTTParty
-
-  base_uri ENV.fetch('MARQO_URL')
-
-  class SearchResult < RecursiveOpenStruct
-  end
-
-  # TODO: Add a way to pass in auth
-  def initialize(auth = { username: 'admin', password: 'admin' })
-    @auth = auth
-  end
-
-  def store(index:, doc:, id:, non_tensor_fields: [])
-    return if ENV['MARQO_URL'].blank?
-    puts
-    puts "🧠🧠🧠 INDEX: #{index} 🧠🧠🧠"
-    puts "🧠🧠🧠 DOC: #{doc} 🧠🧠🧠"
-    puts "🧠🧠🧠 ID: #{id} 🧠🧠🧠"
-    puts "🧠🧠🧠 NON TENSOR FIELDS: #{non_tensor_fields} 🧠🧠🧠"
-    puts
-    options = {
-      headers: { 'Content-Type' => 'application/json' },
-      body: [doc.merge({_id: id})].to_json
-    }
-    url = "/indexes/#{index.to_s.parameterize}/documents"
-    if non_tensor_fields.any?
-      field_array = non_tensor_fields.map { |f| "non_tensor_fields=#{f}" }
-      url += "?#{field_array.join("&")}"
-    end
-    self.class.post(url, options).then do |response|
-      puts response
-      response.dig("items",0,"_id")
-    end
-  end
-
-  def search(index_name, query, filter: nil, limit: 5)
-    puts
-    puts "🔍🔍🔍 #{index_name} 🔍🔍🔍"
-    puts "🔍🔍🔍 #{query} 🔍🔍🔍"
-    puts "🔍🔍🔍 #{filter} 🔍🔍🔍"
-    puts
-    options = {
-      basic_auth: @auth,
-      headers: { 'Content-Type' => 'application/json' },
-      body: {
-        q: query,
-        filter: filter,
-        searchMethod: "TENSOR",
-        limit: limit
-      }.to_json
-    }
-    response = self.class.post("/indexes/#{index_name.to_s.parameterize}/search", options)
-    SearchResult.new(response, recurse_over_arrays: true)
-  end
-
-  def lexsearch(index_name, attributes, query)
-    options = {
-      basic_auth: @auth,
-      headers: { 'Content-Type' => 'application/json' },
-      body: {
-        q: query,
-        searchableAttributes: attributes,
-        searchMethod: "LEXICAL"
-      }.to_json
-    }
-    SearchResult.new(self.class.post("/indexes/#{index_name.to_s.parameterize}/search", options))
-  end
-
-  def delete(index_name, id_or_ids)
-    options = {
-      basic_auth: @auth,
-      headers: { 'Content-Type' => 'application/json' },
-      body: [id].flatten.to_json
-    }
-    self.class.post("/indexes/#{index_name.to_s.parameterize}/documents/delete-batch", options)
-  end
-
-  def remove(index_name)
-    options = {
-      basic_auth: @auth,
-      headers: { 'Content-Type' => 'application/json' }
-    }
-    self.class.delete("/indexes/#{index_name.to_s.parameterize}", options)
-  end
-
-  def self.client
-    @client ||= new
-  end
-
-  private
-
-  def wrap(result)
-    RecursiveOpenStruct.new(hash, recurse_over_arrays: true)
-  end
-end