ox-ai-workers 0.2.5 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 344c37f9e68f279cdbc7e84247ba973c57e7d3c635de4178c1c6ae48c503cf10
-  data.tar.gz: a1bd748d4d078c9f911549f9a0d02be9dd3ce2c02cdaac13b10eb048fe23881f
+  metadata.gz: 22ef23635cb8c4a085d92a6891d5a7b42ea4a2421c31566b2e0a0c64019ffde4
+  data.tar.gz: d3ee3406e6408da1f4abf1327e0b327cfdc9d70cab53368167a0074e995c0ac7
 SHA512:
-  metadata.gz: 78703cebb3370c3ca967346e77f5816720a824ebefb9170d304add87aa7e4cbb1f54f7f2904bbf11e8bed5030730f24e6f9b40ea7ff59126968c70d43960ffd1
-  data.tar.gz: 7331e973af417507cc7c2232080b104a4d0e173eb7c1117513089374b648a3f759b31b8cffa2c1f0bb551178f63f169e7a81c2e4134381f50df5c3a95998bd3c
+  metadata.gz: 4ce35c11d98add4706ac5202f0ba93017f4563cc0c1340b159fa5218a6fa98e2fd1f2c4523a70963656e8ace51509c5a994aac6974e682f04984ab7836ddb4e0
+  data.tar.gz: ad68072b8c05b903c84f225d0978014a9f8d4f2bf36404b5ef2d6a9956405035f1c4e61287c58fd0e25b6500426eb2a2dcf758741a3437088cf03e15caa253e6

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 ## [Unreleased]
 
+## [0.3.1] - 2024-07-30
+
+- Friendly I18n
+
+## [0.3.0] - 2024-07-30
+
+- on_inner_monologue: ->(text:) { puts Rainbow("monologue: #{text}").yellow }
+- on_outer_voice: ->(text:) { puts Rainbow("voice: #{text}").green }
+- on_action_request: ->(text:) { puts Rainbow("action: #{text}").red }
+- on_pack_history: ->(text:) { puts Rainbow("summary: #{text}").blue }
+
 ## [0.2.5] - 2024-07-30
 
 - Improved start template

data/README.md

@@ -28,8 +28,9 @@ Here's a basic example of how to use OxAiWorkers:
 
 ```ruby
 # Load localization files and set default locale
-I18n.load_path += Dir[File.expand_path("locales") + "/*.yml"] # only for pure Ruby
-I18n.default_locale = :en # only for pure Ruby
+# Uncomment this if you want to change the locale
+# require 'oxaiworkers/load_i18n' # only for pure Ruby
+# I18n.default_locale = :ru       # only for pure Ruby
 
 # Require the main gem
 require 'ox-ai-workers'
@@ -101,10 +102,18 @@ assistant.addResponse("blah-blah-blah")
 Or you can create a lower-level iterator for more control:
 
 ```ruby
+my_worker = OxAiWorkers::Request.new
+my_tool = OxAiWorkers::Tool::Eval.new
+
 iterator = OxAiWorkers::Iterator.new(
-  worker: OxAiWorkers::Request.new, 
-  tools: [OxAiWorkers::Tool::Eval.new],
-  role: "You are a software agent inside my computer" )
+    worker: my_worker, 
+    tools: [my_tool],
+    role: "You are a software agent inside my computer",
+    on_inner_monologue: ->(text:) { puts Rainbow("monologue: #{text}").yellow },
+    on_outer_voice: ->(text:) { puts Rainbow("voice: #{text}").green },
+    on_action_request: ->(text:) { puts Rainbow("action: #{text}").red },
+    on_pack_history: ->(text:) { puts Rainbow("summary: #{text}").blue } 
+  )
 
 iterator.addTask("Show files in current directory.")
 # ...
@@ -131,7 +140,7 @@ As a worker, you can use different classes depending on your needs:
 oxaiworkers init
 ```
 
-This will create a `.oxaiworkers-local` directory with the necessary initial settings. 
+This will create a `.oxaiworkers-local` directory with the necessary initial source code. 
 
 Additionally, you can initialize a more comprehensive example using the command:
 

data/exe/oxaiworkers

@@ -14,7 +14,7 @@ if ARGV.first == 'init'
     puts "Error: The #{dir} directory already exists."
   else
     FileUtils.mkdir_p "#{dir}/locales"
-    FileUtils.copy_entry "#{source}/locales", "#{dest}/locales"
+    # FileUtils.copy_entry "#{source}/locales", "#{dest}/locales"
     if ARGV.last == 'full'
       FileUtils.copy_entry "#{source}/template", dest.to_s
     else

data/exe/start

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require 'i18n'
-I18n.load_path += Dir["#{File.expand_path('.oxaiworkers-local/locales')}/*.yml"]
-I18n.default_locale = :en
+# Uncomment this if you want to change the locale
+# require 'oxaiworkers/load_i18n'
+# I18n.default_locale = :ru
 
 # Start your code here
 require 'ox-ai-workers'

data/lib/ox-ai-workers.rb

@@ -1,31 +1,31 @@
 # frozen_string_literal: true
 
-require "faraday"
-require "faraday/multipart"
-require "rainbow"
-require "openai"
-require "yaml"
-require "json"
-
-require_relative "oxaiworkers/version"
-require_relative "oxaiworkers/present_compat.rb"
-require_relative "oxaiworkers/module_request.rb"
-require_relative "oxaiworkers/state_helper.rb"
-require_relative "oxaiworkers/state_batch.rb"
-require_relative "oxaiworkers/state_tools.rb"
-require_relative "oxaiworkers/tool_definition.rb"
-require_relative "oxaiworkers/delayed_request.rb"
-require_relative "oxaiworkers/dependency_helper.rb"
-require_relative "oxaiworkers/iterator.rb"
-require_relative "oxaiworkers/request.rb"
-require_relative "oxaiworkers/tool/eval.rb"
-require_relative "oxaiworkers/version.rb"
-
-require_relative "oxaiworkers/assistant/module_base.rb"
-require_relative "oxaiworkers/assistant/sysop.rb"
+require 'faraday'
+require 'faraday/multipart'
+require 'rainbow'
+require 'openai'
+require 'yaml'
+require 'json'
+
+require_relative 'oxaiworkers/version'
+require_relative 'oxaiworkers/load_i18n'
+require_relative 'oxaiworkers/present_compat'
+require_relative 'oxaiworkers/module_request'
+require_relative 'oxaiworkers/state_helper'
+require_relative 'oxaiworkers/state_batch'
+require_relative 'oxaiworkers/state_tools'
+require_relative 'oxaiworkers/tool_definition'
+require_relative 'oxaiworkers/delayed_request'
+require_relative 'oxaiworkers/dependency_helper'
+require_relative 'oxaiworkers/iterator'
+require_relative 'oxaiworkers/request'
+require_relative 'oxaiworkers/tool/eval'
+
+require_relative 'oxaiworkers/assistant/module_base'
+require_relative 'oxaiworkers/assistant/sysop'
 
 module OxAiWorkers
-  DEFAULT_MODEL = "gpt-4o-mini"
+  DEFAULT_MODEL = 'gpt-4o-mini'
   DEFAULT_MAX_TOKEN = 4096
   DEFAULT_TEMPERATURE = 0.7
 
@@ -33,8 +33,7 @@ module OxAiWorkers
   class ConfigurationError < Error; end
 
   class Configuration
-    attr_writer :access_token
-    attr_accessor :model, :max_tokens, :temperature
+    attr_accessor :model, :max_tokens, :temperature, :access_token
 
     def initialize
       @access_token = nil
@@ -42,15 +41,10 @@ module OxAiWorkers
       @max_tokens = DEFAULT_MAX_TOKEN
       @temperature = DEFAULT_TEMPERATURE
 
-      [Array, NilClass, String, Symbol, Hash].each{|c| 
+      [Array, NilClass, String, Symbol, Hash].each do |c|
         c.send(:include, OxAiWorkers::PresentCompat) unless c.method_defined?(:present?)
-      }
-      String.send(:include, OxAiWorkers::CamelizeCompat) unless String.method_defined?(:camelize)
-      
-    end
-
-    def access_token
-      return @access_token
+      end
+      String.include OxAiWorkers::CamelizeCompat unless String.method_defined?(:camelize)
     end
   end
 

data/lib/oxaiworkers/assistant/sysop.rb

@@ -9,7 +9,11 @@ module OxAiWorkers
         @iterator = OxAiWorkers::Iterator.new(
           worker: initWorker(delayed: delayed, model: model),
           role: I18n.t('oxaiworkers.assistant.sysop.role'),
-          tools: [OxAiWorkers::Tool::Eval.new]
+          tools: [OxAiWorkers::Tool::Eval.new],
+          on_inner_monologue: ->(text:) { puts Rainbow("monologue: #{text}").yellow },
+          on_outer_voice: ->(text:) { puts Rainbow("voice: #{text}").green },
+          on_action_request: ->(text:) { puts Rainbow("action: #{text}").red },
+          on_pack_history: ->(text:) { puts Rainbow("summary: #{text}").blue }
         )
       end
     end

data/lib/oxaiworkers/compatibility.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ruby
   module OxAiWorkers
     VERSION = ::OxAiWorkers::VERSION

data/lib/oxaiworkers/delayed_request.rb

@@ -1,107 +1,109 @@
-class OxAiWorkers::DelayedRequest < OxAiWorkers::StateBatch
-  def initialize(batch_id: nil, model: nil, max_tokens: nil, temperature: nil)
-    initializeRequests(model: model, max_tokens: max_tokens, temperature: temperature)
-    @custom_id = nil if batch_id.present?
-    @batch_id = batch_id
-    @file_id = nil
-    super()
-  end
-  
-  def postBatch
-    response = @client.batches.create(
-                          parameters: {
-                              input_file_id: @file_id,
-                              endpoint: "/v1/chat/completions",
-                              completion_window: "24h"
-                            }
-                          )
-    @batch_id = response["id"]
-  end
+# frozen_string_literal: true
 
-  def cancelBatch
-    not_found_is_ok{ @client.batches.cancel(id: @batch_id) }
-  end
+module OxAiWorkers
+  class DelayedRequest < OxAiWorkers::StateBatch
+    def initialize(batch_id: nil, model: nil, max_tokens: nil, temperature: nil)
+      initializeRequests(model: model, max_tokens: max_tokens, temperature: temperature)
+      @custom_id = nil if batch_id.present?
+      @batch_id = batch_id
+      @file_id = nil
+      super()
+    end
 
-  def cleanStorage
-    if @batch_id.present?
-      batch = @client.batches.retrieve(id: @batch_id)
-      if !batch["output_file_id"].nil?
-        not_found_is_ok{ @client.files.delete(id: batch["output_file_id"]) }
-      elsif !batch["error_file_id"].nil?
-        not_found_is_ok{ @client.files.delete(id: batch["error_file_id"]) }
-      end
-      not_found_is_ok{ @client.files.delete(id: batch["input_file_id"]) }
-      not_found_is_ok{ @client.files.delete(id: @file_id) } if @file_id.present? && @file_id != batch["input_file_id"]
-    elsif @file_id.present?
-      not_found_is_ok{ @client.files.delete(id: @file_id) }
+    def postBatch
+      response = @client.batches.create(
+        parameters: {
+          input_file_id: @file_id,
+          endpoint: '/v1/chat/completions',
+          completion_window: '24h'
+        }
+      )
+      @batch_id = response['id']
     end
-  end
 
-  def finish
-    @custom_id = SecureRandom.uuid
-    end_batch! unless batch_idle?
-  end
+    def cancelBatch
+      not_found_is_ok { @client.batches.cancel(id: @batch_id) }
+    end
 
-  def uploadToStorage
-    item = {
-      "custom_id": @custom_id, 
-      "method": "POST", 
-      "url": "/v1/chat/completions", 
-      "body": params
-    }
+    def cleanStorage
+      if @batch_id.present?
+        batch = @client.batches.retrieve(id: @batch_id)
+        if !batch['output_file_id'].nil?
+          not_found_is_ok { @client.files.delete(id: batch['output_file_id']) }
+        elsif !batch['error_file_id'].nil?
+          not_found_is_ok { @client.files.delete(id: batch['error_file_id']) }
+        end
+        not_found_is_ok { @client.files.delete(id: batch['input_file_id']) }
+        if @file_id.present? && @file_id != batch['input_file_id']
+          not_found_is_ok do
+            @client.files.delete(id: @file_id)
+          end
+        end
+      elsif @file_id.present?
+        not_found_is_ok { @client.files.delete(id: @file_id) }
+      end
+    end
 
-    file = Tempfile.new(["batch_#{@custom_id}", ".jsonl"])
-    file.write item.to_json
-    file.close
-    begin
-      response = @client.files.upload(parameters: { file: file.path, purpose: "batch"} )
-      @file_id = response["id"]
-      process_batch!
-    rescue OpenAI::Error => e
-      puts e.inspect
-      fail_batch!
+    def finish
+      @custom_id = SecureRandom.uuid
+      end_batch! unless batch_idle?
     end
-    file.unlink
-  end
 
-  def request!
-    prepare_batch! if @messages.any?
-  end
+    def uploadToStorage
+      item = {
+        "custom_id": @custom_id,
+        "method": 'POST',
+        "url": '/v1/chat/completions',
+        "body": params
+      }
 
-  def cancel
-    cancel_batch!
-  end
+      file = Tempfile.new(["batch_#{@custom_id}", '.jsonl'])
+      file.write item.to_json
+      file.close
+      begin
+        response = @client.files.upload(parameters: { file: file.path, purpose: 'batch' })
+        @file_id = response['id']
+        process_batch!
+      rescue OpenAI::Error => e
+        puts e.inspect
+        fail_batch!
+      end
+      file.unlink
+    end
 
-  def completed?
-    return false if @batch_id.nil?
-    batch = @client.batches.retrieve(id: @batch_id)
-    if batch["status"] == "failed"
-      @errors = batch["errors"]["data"].map{|e| e["message"]}
-      fail_batch!
-      return true
-    elsif batch["status"] != "completed"
-      return false 
+    def request!
+      prepare_batch! if @messages.any?
     end
 
-    if !batch["output_file_id"].nil?
-			output = @client.files.content(id: batch["output_file_id"])
-			output.each do |line|
-				@custom_id = line["custom_id"]
-				# @result = line.dig("response", "body", "choices", 0, "message", "content")
-        parseChoices(line.dig("response", "body"))
-        complete_batch!
-			end
-		elsif !batch["error_file_id"].nil?
-			@errors = @client.files.content(id: batch["error_file_id"])
-      fail_batch!
-		end
-    return true
+    def cancel
+      cancel_batch!
+    end
+
+    def completed?
+      return false if @batch_id.nil?
+
+      batch = @client.batches.retrieve(id: @batch_id)
+      if batch['status'] == 'failed'
+        @errors = batch['errors']['data'].map { |e| e['message'] }
+        fail_batch!
+        return true
+      elsif batch['status'] != 'completed'
+        return false
+      end
+
+      if !batch['output_file_id'].nil?
+        output = @client.files.content(id: batch['output_file_id'])
+        output.each do |line|
+          @custom_id = line['custom_id']
+          # @result = line.dig("response", "body", "choices", 0, "message", "content")
+          parseChoices(line.dig('response', 'body'))
+          complete_batch!
+        end
+      elsif !batch['error_file_id'].nil?
+        @errors = @client.files.content(id: batch['error_file_id'])
+        fail_batch!
+      end
+      true
+    end
   end
 end
-
-# r = OxAiWorkers::DelayedRequest.new
-# r.append(role: "user", content: "сколько будет 2+2?")
-# r.request!
-# r.completed?
-# r.result
-# r.finish