kaba 0.3.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf8ec2d335097ccfe7a540e2d2fa7253d181db9a255517fd32118707c3bbee0d
-  data.tar.gz: f6d150a528511f20b0523a1c1e30268c526386ed3d309b3faa6ff524cb2b7659
+  metadata.gz: 986fbab4a45443b0ffc9676cbe6ea2857a7eaec7ba74294561c4d8abe8bf8869
+  data.tar.gz: e5a2254a5f2dc1778083df00141c59654749e2538eb695384c3528c49a8820dd
 SHA512:
-  metadata.gz: c2fa2925775abd5bc7e04e0ff58ed3066f321dbe6c796f40eb66048945f8b3860ab8ee721b2aa4e612fac7b79f3dc57880c7b35e2e4e0ba29cc01de72db894b7
-  data.tar.gz: ba270bbcb84f5e89ad5154e1a789515c5200cf92dacaab1252f2bc60440e93d1c1fe999eaad98d9c2eb29bf73b720bb27608f22fff62f1d3d4eec52c9b5aefc1
+  metadata.gz: 42b2a10981e7133b1b34b5a9e38ea5c12a0b7965ce4b12b689a8840b2d45b672ba1b04d6a6462b2d4f93ce8fa2d34fbd77769ee09725801f217f3f25145a5a8c
+  data.tar.gz: ba4cfed522723fca973d6c265eeb5e9d97edad4326bbbd36086cf385bae31ed8d37b7607e368dd40129311d37f43711e5749fd88cbd79e29e3c0f99a74592b97

data/README.md

@@ -30,4 +30,15 @@ alias kaba='docker run -it --rm -v "${PWD}:/workdir" ghcr.io/mjason/kaba:latest'
 ## 关联项目
 - [lisa_typechat_server](https://github.com/mjason/lisa_typechat_server)
 
-如果要修改服务地址你有两个方式，一个通过 `.env` 来处理，还有就是自己设置环境变量，变量名 `LISA_TYPECHAT_ENDPOINT`
+如果要修改服务地址你有两个方式，一个通过 `.env` 来处理，还有就是自己设置环境变量，变量名 `LISA_TYPECHAT_ENDPOINT`
+
+## changelog
+
+.env 需要更新
+```
+; LISA_TYPECHAT_ENDPOINT=https://lisa-typechat.listenai.com
+LISA_ACCESS_TOKEN=聆思平台的KEY
+
+JUDGE_ACCCESS_TOKEN=可以和LISA_ACCESS_TOKEN
+JUDGE_LLM_URI_BASE=如果需要其他提供商可以填，默认不填
+```

data/exe/kaba

@@ -6,14 +6,42 @@ require 'dotenv'
 Dotenv.load
 
 require "kaba"
+require 'thor'
 
-if ARGV[0] == 'test'
-  # 运行测试程序
-  load DatasetSource.testfile
-elsif ARGV[0] == 'version'
-  # 显示版本号
-  puts Kaba::VERSION
-else
-  # 运行 DPodfile 文件，DPodfile 是一个 Ruby 文件
-  load DatasetSource.podfile
-end
+class KabaCommand < Thor
+  desc "test", "Run the test program"
+  def test
+    load DatasetSource.testfile
+  end
+
+  desc "version", "Show the version"
+  def version
+    puts Kaba::VERSION
+  end
+
+  desc "exec FILE", "Run a specified Ruby file"
+  def exec(file)
+    load file
+  end
+
+  desc "create", "Run the DPodfile (default behavior)"
+  def create
+    load DatasetSource.podfile
+  end
+
+  desc "validate", "Validate the environment"
+  def validate
+    Boot.validate
+  end
+
+  # 默认行为处理（兼容现有行为）
+  def self.start(args = ARGV, config = {})
+    if args.empty?
+      new.create
+    else
+      super
+    end
+  end
+end
+
+KabaCommand.start

data/kaba.gemspec

@@ -40,6 +40,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "dotenv", "~> 3.1"
   spec.add_dependency "ruby-openai", "~> 7.3"
   spec.add_dependency "json-repair", "~> 0.2.0"
+  spec.add_dependency "thor", '~> 1.3', '>= 1.3.2'
 
   # For more information and examples about making a new gem, check out our
   # guide at: https://bundler.io/guides/creating_gem.html

data/lib/kaba/application.rb

@@ -19,6 +19,17 @@ class Application
       end
     end
 
+    def judge_llm_client
+      @judge_llm_client ||= OpenAI::Client.new(
+        log_errors: true,
+        access_token: env!("JUDGE_ACCCESS_TOKEN"),
+        request_timeout: ENV.fetch("LISA_LLM_REQUEST_TIMEOUT", 120).to_i,
+        uri_base: ENV.fetch("JUDGE_LLM_URI_BASE", "https://api.listenai.com")
+      ) do |faraday|
+        faraday.adapter Faraday.default_adapter, clients: Async::HTTP::Faraday::PersistentClients
+      end
+    end
+
     def llm_client_extra_headers=(headers)
       OpenAI.configure do |config|
         config.extra_headers = headers

data/lib/kaba/boot.rb

@@ -0,0 +1,32 @@
+module Boot
+  module_function
+  def init
+    # 判断 .env 文件是否存在, 不存在则创建
+    unless File.exist?(".env")
+      File.open(".env", "w") do |f|
+        f.write("LISA_ACCESS_TOKEN=<Lisa access token, visit: https://platform.listenai.com/>\n")
+        f.write("JUDGE_ACCCESS_TOKEN=<Judge access token, visit: https://platform.listenai.com/>\n")
+
+        f.write("; if you are using a different typechat endpoint, please fill in the following line\n")
+        f.write("; LISA_TYPECHAT_ENDPOINT=https://lisa-typechat.listenai.com\n")
+
+        f.write("; if you are using a different LLM endpoint, please fill in the following line\n")
+        f.write("; LISA_LLM_URI_BASE=https://api.listenai.com\n")
+
+        f.write("; if you are using a different JUDGE LLM endpoint, please fill in the following line\n")
+        f.write("; JUDGE_LLM_URI_BASE=https://api.listenai.com\n")
+      end
+
+      puts "Created .env file, please fill in the necessary information."
+    end
+  end
+
+  def validate
+    puts "Validating..."
+    Application.env!('LISA_ACCESS_TOKEN')
+    Application.env!('JUDGE_ACCCESS_TOKEN')
+    puts "Validation passed."
+  rescue => e
+    puts "Validation failed: #{e.message}"
+  end
+end

data/lib/kaba/test_runner.rb

@@ -26,7 +26,8 @@ class TestRunner
     model: 'spark-general-4.0', 
     judge_model: 'spark-general-4.0',  
     judge_temperature: 0.1, 
-    temperature: 0.1
+    temperature: 0.1,
+    semaphore_limit: 5
     )
 
     progressbar = TTY::ProgressBar.new(
@@ -37,8 +38,9 @@ class TestRunner
     progressbar.start
 
     Async do
+      semaphore = Async::Semaphore.new(semaphore_limit)
       _each(limit: limit) do |row|
-        Async do |task|
+        semaphore.async do |task|
           input = @prompt.render(File.read row.input_file)
 
           target = <<~Markdown
@@ -64,7 +66,7 @@ class TestRunner
           @type_right_total += 1 if type_check_response["success"]
           
           judge_input = Judge.new(input: input, output: output, target: target).render
-          judge_response = Application.llm_client.chat(
+          judge_response = Application.judge_llm_client.chat(
             parameters: {
               model: judge_model,
               messages: [ { role: 'user', content: judge_input } ],

data/lib/kaba/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kaba
-  VERSION = "0.3.2"
+  VERSION = "0.5.0"
 end

data/lib/kaba.rb

@@ -19,6 +19,7 @@ require_relative "kaba/prompt"
 require_relative "kaba/validate"
 require_relative "kaba/judge"
 require_relative "kaba/test_runner"
+require_relative "kaba/boot"
 
 module Kaba
   class Error < StandardError; end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaba
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.5.0
 platform: ruby
 authors:
 - MJ
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-11-16 00:00:00.000000000 Z
+date: 2024-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -122,6 +122,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.0
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.2
 description: 用来做数据集的工具
 email:
 - tywf91@gmail.com
@@ -140,6 +160,7 @@ files:
 - lib/kaba/_DPodfile_
 - lib/kaba/_DTestfile_
 - lib/kaba/application.rb
+- lib/kaba/boot.rb
 - lib/kaba/dataset.rb
 - lib/kaba/dataset_source.rb
 - lib/kaba/json.rb