ox-ai-workers 0.2.5 → 0.3.1

data/lib/oxaiworkers/state_batch.rb

@@ -1,61 +1,65 @@
+# frozen_string_literal: true
+
 require 'state_machine/core'
 
-class OxAiWorkers::StateBatch < OxAiWorkers::ModuleRequest
-  include OxAiWorkers::StateHelper
-  extend StateMachine::MacroMethods
+module OxAiWorkers
+  class StateBatch < OxAiWorkers::ModuleRequest
+    include OxAiWorkers::StateHelper
+    extend StateMachine::MacroMethods
 
-  alias_method :state_initialize, :initialize
-  attr_accessor :file_id, :batch_id
+    alias state_initialize initialize
+    attr_accessor :file_id, :batch_id
 
-  state_machine :batch_state, initial: ->(t){t.batch_id.present? ? :requested : :idle}, namespace: :batch do
-    before_transition from: any, do: :log_me
+    state_machine :batch_state, initial: ->(t) { t.batch_id.present? ? :requested : :idle }, namespace: :batch do
+      before_transition from: any, do: :log_me
 
-    after_transition on: :end, do: :cleanup
-    before_transition on: :process, do: :postBatch
-    after_transition on: :cancel, do: [:cancelBatch, :complete_batch!]
-    after_transition on: :complete, do: [:cleanStorage]
-    after_transition on: :prepare, do: :uploadToStorage
+      after_transition on: :end, do: :cleanup
+      before_transition on: :process, do: :postBatch
+      after_transition on: :cancel, do: %i[cancelBatch complete_batch!]
+      after_transition on: :complete, do: [:cleanStorage]
+      after_transition on: :prepare, do: :uploadToStorage
 
-    event :end do
-      transition [:finished, :canceled] => :idle
-    end
+      event :end do
+        transition %i[finished canceled] => :idle
+      end
 
-    event :prepare do
-      transition :idle => :prepared
-    end
+      event :prepare do
+        transition idle: :prepared
+      end
 
-    event :process do
-      transition :prepared => :requested
-    end
+      event :process do
+        transition prepared: :requested
+      end
 
-    event :complete do
-      transition [:requested, :failed] => :finished
-    end
+      event :complete do
+        transition %i[requested failed] => :finished
+      end
 
-    event :cancel do
-      transition [:requested, :failed, :prepared] => :canceled
-    end
+      event :cancel do
+        transition %i[requested failed prepared] => :canceled
+      end
 
-    event :fail do
-      transition [:requested, :prepared] => :failed
-    end
+      event :fail do
+        transition %i[requested prepared] => :failed
+      end
 
-    state :requested
-    state :idle
-    state :prepared
-    state :canceled
-    state :finished
-    state :failed
-  end
+      state :requested
+      state :idle
+      state :prepared
+      state :canceled
+      state :finished
+      state :failed
+    end
 
-  def cleanup
-    @file_id = nil
-    @batch_id = nil
-    super()
-  end
+    def cleanup
+      @file_id = nil
+      @batch_id = nil
+      super()
+    end
 
-  def initialize
-    puts "call: StateBatch::#{__method__}"
-    super()
+    def initialize
+      puts "call: StateBatch::#{__method__}"
+      super()
+    end
   end
-end
+end

data/lib/oxaiworkers/state_helper.rb

@@ -1,5 +1,9 @@
-module OxAiWorkers::StateHelper
-  def log_me(transition)
-    # puts "`#{transition.event}` was called to transition from :#{transition.from} to :#{transition.to}"
+# frozen_string_literal: true
+
+module OxAiWorkers
+  module StateHelper
+    def log_me(transition)
+      # puts "`#{transition.event}` was called to transition from :#{transition.from} to :#{transition.to}"
+    end
   end
-end
+end

data/lib/oxaiworkers/state_tools.rb

@@ -1,47 +1,50 @@
-require 'state_machine/core'
-
-class OxAiWorkers::StateTools
-  include OxAiWorkers::StateHelper
-  extend StateMachine::MacroMethods
-
-  state_machine :state, initial: :idle do
-    before_transition from: any, do: :log_me
-    
-    after_transition on: :iterate, do: :nextIteration
-    after_transition on: :request, do: :externalRequest
-    after_transition on: :prepare, do: :init
-    after_transition on: :analyze, do: :processResult
-    after_transition on: :complete, do: :completeIteration
-
-    event :prepare do
-      transition [:idle, :finished] => :prepared
-    end
-
-    event :request do
-      transition :prepared => :requested
-    end
-
-    event :analyze do
-      transition [:requested] => :analyzed
-    end
-
-    event :complete do
-      transition [:analyzed] => :finished
-    end
+# frozen_string_literal: true
 
-    event :iterate do
-      transition :analyzed => :prepared
-    end
+require 'state_machine/core'
 
-    event :end do
-      transition :finished => :idle
+module OxAiWorkers
+  class StateTools
+    include OxAiWorkers::StateHelper
+    extend StateMachine::MacroMethods
+
+    state_machine :state, initial: :idle do
+      before_transition from: any, do: :log_me
+
+      after_transition on: :iterate, do: :nextIteration
+      after_transition on: :request, do: :externalRequest
+      after_transition on: :prepare, do: :init
+      after_transition on: :analyze, do: :processResult
+      after_transition on: :complete, do: :completeIteration
+
+      event :prepare do
+        transition %i[idle finished] => :prepared
+      end
+
+      event :request do
+        transition prepared: :requested
+      end
+
+      event :analyze do
+        transition [:requested] => :analyzed
+      end
+
+      event :complete do
+        transition [:analyzed] => :finished
+      end
+
+      event :iterate do
+        transition analyzed: :prepared
+      end
+
+      event :end do
+        transition finished: :idle
+      end
+
+      state :idle
+      state :prepared
+      state :requested
+      state :analyzed
+      state :finished
     end
-    
-    state :idle
-    state :prepared
-    state :requested
-    state :analyzed
-    state :finished
   end
-
-end
+end

data/lib/oxaiworkers/tool/eval.rb

@@ -2,28 +2,30 @@
 
 require 'open3'
 
-module OxAiWorkers::Tool
-  class Eval
-    extend OxAiWorkers::ToolDefinition
-    include OxAiWorkers::DependencyHelper
+module OxAiWorkers
+  module Tool
+    class Eval
+      extend OxAiWorkers::ToolDefinition
+      include OxAiWorkers::DependencyHelper
 
-    define_function :ruby, description: I18n.t('oxaiworkers.tool.eval.ruby.description') do
-      property :input, type: 'string', description: I18n.t('oxaiworkers.tool.eval.ruby.input'), required: true
-    end
+      define_function :ruby, description: I18n.t('oxaiworkers.tool.eval.ruby.description') do
+        property :input, type: 'string', description: I18n.t('oxaiworkers.tool.eval.ruby.input'), required: true
+      end
 
-    define_function :sh, description: I18n.t('oxaiworkers.tool.eval.sh.description') do
-      property :input, type: 'string', description: I18n.t('oxaiworkers.tool.eval.sh.input'), required: true
-    end
+      define_function :sh, description: I18n.t('oxaiworkers.tool.eval.sh.description') do
+        property :input, type: 'string', description: I18n.t('oxaiworkers.tool.eval.sh.input'), required: true
+      end
 
-    def ruby(input:)
-      puts Rainbow("Executing ruby: \"#{input}\"").red
-      eval(input)
-    end
+      def ruby(input:)
+        puts Rainbow("Executing ruby: \"#{input}\"").red
+        eval(input)
+      end
 
-    def sh(input:)
-      puts Rainbow("Executing sh: \"#{input}\"").red
-      stdout_and_stderr_s, = Open3.capture2e(input)
-      stdout_and_stderr_s
+      def sh(input:)
+        puts Rainbow("Executing sh: \"#{input}\"").red
+        stdout_and_stderr_s, = Open3.capture2e(input)
+        stdout_and_stderr_s
+      end
     end
   end
 end

data/lib/oxaiworkers/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OxAiWorkers
-  VERSION = '0.2.5'
+  VERSION = '0.3.1'
 end

data/locales/en.assistant.yml

@@ -0,0 +1,5 @@
+en:
+  oxaiworkers:
+    assistant:
+      sysop:
+        role: "You are a software agent inside my computer"

data/locales/{en.system.yml → en.iterator.yml}

@@ -20,14 +20,3 @@ en:
         - "Step 2.1: Interact with the user using the ox_ai_workers_iterator__outerVoice and ox_ai_workers_iterator__actionRequest functions during the process."
         - "Step 3: When the solution is ready, report it using the ox_ai_workers_iterator__outerVoice function."
         - "Step 4: Save facts, nuances, and actions using the ox_ai_workers_iterator__packHistory function."
-    tool:
-      eval:
-        ruby:
-          description: "Execute Ruby code and return the result of the last expression"
-          input: "Ruby source code"
-        sh:
-          description: "Execute a sh command and get the result (stdout + stderr)"
-          input: "Source command"
-    assistant:
-      sysop:
-        role: "You are a software agent inside my computer"

data/locales/en.tool.yml

@@ -0,0 +1,10 @@
+en:
+  oxaiworkers:
+    tool:
+      eval:
+        ruby:
+          description: "Execute Ruby code and return the result of the last expression"
+          input: "Ruby source code"
+        sh:
+          description: "Execute a sh command and get the result (stdout + stderr)"
+          input: "Source command"

data/locales/ru.assistant.yml

@@ -0,0 +1,5 @@
+ru:
+  oxaiworkers:
+    assistant:
+      sysop:
+        role: Ты программный агент внутри моего компьютера

data/locales/{ru.system.yml → ru.iterator.yml}

@@ -20,14 +20,3 @@ ru:
         - Шаг 2.1. Во время работы используй функции ox_ai_workers_iterator__outerVoice и ox_ai_workers_iterator__actionRequest.
         - Шаг 3. Когда решение готово, сообщи о нем с помощью функции ox_ai_workers_iterator__outerVoice
         - Шаг 4. Сохрани факты, нюансы и действия с помощью функции ox_ai_workers_iterator__packHistory и предложи дальнейшие действия с помощью функции ox_ai_workers_iterator__actionRequest.
-    tool:
-      eval:
-        ruby:
-          description: Выполнить код на ruby и вернуть результат последней строки
-          input: Исходный код на Ruby
-        sh:
-          description: Выполнить sh-команду и получить результат (stdout + stderr)
-          input: Исходная команда
-    assistant:
-      sysop:
-        role: Ты программный агент внутри моего компьютера

data/locales/ru.tool.yml

@@ -0,0 +1,10 @@
+ru:
+  oxaiworkers:
+    tool:
+      eval:
+        ruby:
+          description: Выполнить код на ruby и вернуть результат последней строки
+          input: Исходный код на Ruby
+        sh:
+          description: Выполнить sh-команду и получить результат (stdout + stderr)
+          input: Исходная команда

data/template/my_assistant.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'rainbow'
 require_relative 'tools/my_tool'
 
 class MyAssistant
@@ -9,7 +10,11 @@ class MyAssistant
     @iterator = OxAiWorkers::Iterator.new(
       worker: initWorker(delayed: delayed, model: model),
       role: 'You are a software agent inside my computer',
-      tools: [MyTool.new]
+      tools: [MyTool.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/template/start

@@ -1,22 +1,28 @@
 #!/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
+# Required external gems
 require 'ox-ai-workers'
 require 'irb'
+
+# ### Start your code here ###
+
+# Required my libs
 require_relative 'my_assistant'
 
 puts "OxAiWorkers #{OxAiWorkers::VERSION}"
 
+# Configure
 OxAiWorkers.configure do |config|
   config.access_token = ENV.fetch('OPENAI')
   config.model = 'gpt-4o-mini'
 end
 
+# Main algorithm
 @assistant = MyAssistant.new
 
 IRB.start(__FILE__)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ox-ai-workers
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.1
 platform: ruby
 authors:
 - Denis Smolev
@@ -126,6 +126,7 @@ files:
 - lib/oxaiworkers/delayed_request.rb
 - lib/oxaiworkers/dependency_helper.rb
 - lib/oxaiworkers/iterator.rb
+- lib/oxaiworkers/load_i18n.rb
 - lib/oxaiworkers/module_request.rb
 - lib/oxaiworkers/present_compat.rb
 - lib/oxaiworkers/request.rb
@@ -136,8 +137,12 @@ files:
 - lib/oxaiworkers/tool_definition.rb
 - lib/oxaiworkers/version.rb
 - lib/ruby/ox-ai-workers.rb
-- locales/en.system.yml
-- locales/ru.system.yml
+- locales/en.assistant.yml
+- locales/en.iterator.yml
+- locales/en.tool.yml
+- locales/ru.assistant.yml
+- locales/ru.iterator.yml
+- locales/ru.tool.yml
 - template/my_assistant.rb
 - template/start
 - template/tools/my_tool.rb