ox-ai-workers 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b8d21359f7e98b3195db02a899f41441dc3ff52765c2ce52a8d3ad459aec13e
-  data.tar.gz: ae5875a656c07bacc42f5c4ec836607978eb55afb881a6b73e0458d1b898f5d4
+  metadata.gz: cdc74e4ff15dab4e67681666575aacb9a57d05183caaaa18982cbff7bdeea280
+  data.tar.gz: 3e7e8f0c6cec85b1b6b6857d395f5ee05a48904e157d99a72d82bd60429d0970
 SHA512:
-  metadata.gz: 5a00ba9ee3b5c07c4e186731e986f275f54e57cac40d8b37d8cf8376440d32ee18ded43a9a65eeef5fe331e740bea988c7cb88bfab3f1403573187359b4c61d2
-  data.tar.gz: ce80d29252a85f4856f916eec0e7c734e2808644b41383ca4f2362417ba164ca2740409b7d41b158bb7c556bd5a6e13a401f9a0873e20c5424eb0b01e5aa8046
+  metadata.gz: af5d143c8a8ad34c6f65f5b576076785848b16736025177358bcf2cc87c062b8ded0f2dec8f9b4d44635c3ed8ade86085daed0b075e1f7c59b152149d5f41397
+  data.tar.gz: d6754f9a006e04829d02ff7b32844b4179c0318371cbc8b573de37fc4552a3c3d9533d8665d847682e5e2af937a1c133ee14d7c28883bce0fdbd426ab1e5812e

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## [Unreleased]
 
+## [0.1.1] - 2024-07-29
+
+- Fix Delayed Requests
+- Configurable model, max_tokens, temperature
+
 ## [0.1.0] - 2024-07-29
 
 - Initial release
+

data/README.md

@@ -32,12 +32,51 @@ I18n.default_locale = :en # for pure Ruby
 require 'ox-ai-workers'
 
 # Initialize the assistant
-sysop = OxAiWorkers::Assistant::Sysop.new()
+sysop = OxAiWorkers::Assistant::Sysop.new(delayed: false, model: "gpt-4o")
 
 # Add a task
 sysop.addTask("Add a cron job to synchronize files daily.")
 ```
 
+```ruby
+worker = OxAiWorkers::DelayedRequest.new(batch_id: "xxx-xxx-xxx", model: "gpt-4o-mini", max_tokens: 4096, temperature: 0.7)
+# or
+# worker = OxAiWorkers::Request.new(model: "gpt-4o-mini", max_tokens: 4096, temperature: 0.7)
+my_tool = OxAiWorkers::Tool::Eval.new()
+iterator = OxAiWorkers::Iterator.new(worker: worker, tools: [my_tool])
+iterator.role = "You are a software agent inside my computer"
+iterator.addTask("Show files in current dir")
+```
+
+### With Config
+
+For a more robust setup, you can configure the gem with your API keys, for example in an oxaiworkers.rb initializer file. Never hardcode secrets into your codebase - instead use something like [dotenv](https://github.com/motdotla/dotenv) to pass the keys safely into your environments.
+
+```ruby
+OxAiWorkers.configure do |config|
+    config.access_token = ENV.fetch("OPENAI")
+    config.model = "gpt-4o"
+    config.max_tokens = 4096
+    config.temperature = 0.7
+end
+```
+
+Then you can create an assistant like this:
+
+```ruby
+assistant = OxAiWorkers::Assistant::Sysop.new()
+```
+
+```ruby
+iterator = OxAiWorkers::Iterator.new(
+  worker: OxAiWorkers::Request.new, 
+  tools: [OxAiWorkers::Tool::Eval.new],
+  role: "You are a software agent inside my computer"
+  )
+
+iterator.addTask("Show files in current dir")
+```
+
 ## Features
 
 - **Generative Intelligence**: Leverages OpenAI's capabilities to enhance task execution.
@@ -66,14 +105,12 @@ en:
         description: "Save facts, nuances, and actions before clearing messages"
         text: "Listing important facts and nuances"
       monologue:
-        steps:
-          - "Step 1: Develop your own solution to the problem. Take initiative and make assumptions."
-          - "Step 1.1: Wrap all your work for this step in the innerMonologue function."
-          - "Step 2: Relate your solution to the task, improve it, and call the necessary functions step by step."
-          - "Step 2.1: Interact with the user using the outerVoice and actionRequest functions during the process."
-          - "Step 3: When the solution is ready, report it using the outerVoice function."
-          - "Step 3.1: Save facts, nuances, and actions using the packHistory function."
-          - "Step 4: Conclude the work with the actionRequest function, without repeating the response if it was already given with outerVoice."
+        - "Step 1: Develop your own solution to the problem. Take initiative and make assumptions."
+        - "Step 1.1: Wrap all your work for this step in the innerMonologue function."
+        - "Step 2: Relate your solution to the task, improve it, and call the necessary functions step by step."
+        - "Step 2.1: Interact with the user using the outerVoice and actionRequest functions during the process."
+        - "Step 3: When the solution is ready, report it using the outerVoice function."
+        - "Step 4: Save facts, nuances, and actions using the packHistory function."
     tool:
       eval:
         ruby:

data/lib/ox-ai-workers.rb

@@ -23,14 +23,23 @@ require_relative "oxaiworkers/version.rb"
 require_relative "oxaiworkers/assistant/sysop.rb"
 
 module OxAiWorkers
+  DEFAULT_MODEL = "gpt-4o-mini"
+  DEFAULT_MAX_TOKEN = 4096
+  DEFAULT_TEMPERATURE = 0.7
+
   class Error < StandardError; end
   class ConfigurationError < Error; end
 
   class Configuration
     attr_writer :access_token
+    attr_accessor :model, :max_tokens, :temperature
 
     def initialize
       @access_token = nil
+      @model = DEFAULT_MODEL
+      @max_tokens = DEFAULT_MAX_TOKEN
+      @temperature = DEFAULT_TEMPERATURE
+
       [Array, NilClass, String, Symbol, Hash].each{|c| 
         c.send(:include, OxAiWorkers::PresentCompat) unless c.method_defined?(:present?)
       }

data/lib/oxaiworkers/assistant/sysop.rb

@@ -2,9 +2,9 @@ module OxAiWorkers
   module Assistant
     class Sysop
       attr_accessor :iterator
-      def initialize delayed: false, model: "gpt-4o-mini"
+      def initialize delayed: false, model: nil
         worker = delayed ? OxAiWorkers::DelayedRequest.new : OxAiWorkers::Request.new
-        worker.model = model
+        worker.model = model || OxAiWorkers.configuration.model
         @iterator = OxAiWorkers::Iterator.new(worker: worker, tools: [OxAiWorkers::Tool::Eval.new])
         @iterator.role = I18n.t("oxaiworkers.assistant.sysop.role")
         # @iterator.addTask("покажи мне файлы на диске")

data/lib/oxaiworkers/delayed_request.rb

@@ -1,11 +1,12 @@
 class OxAiWorkers::DelayedRequest < OxAiWorkers::StateBatch
-  def initialize(batch_id: nil, model: DEFAULT_MODEL, max_tokens: DEFAULT_MAX_TOKEN, temperature: DEFAULT_TEMPERATURE)
+  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: {
@@ -38,7 +39,7 @@ class OxAiWorkers::DelayedRequest < OxAiWorkers::StateBatch
 
   def finish
     @custom_id = SecureRandom.uuid
-    end_batch!
+    end_batch! unless batch_idle?
   end
 
   def uploadToStorage
@@ -86,7 +87,8 @@ class OxAiWorkers::DelayedRequest < OxAiWorkers::StateBatch
 			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")
+				# @result = line.dig("response", "body", "choices", 0, "message", "content")
+        parseChoices(line.dig("response", "body"))
         complete_batch!
 			end
 		elsif !batch["error_file_id"].nil?

data/lib/oxaiworkers/iterator.rb

@@ -31,7 +31,6 @@ class OxAiWorkers::Iterator < OxAiWorkers::StateTools
     @tasks = []
     @milestones = []
 
-    # @tools = OxAiWorkers::Tool.constants.map(&OxAiWorkers::Tool.method(:const_get)).select { |c| c.is_a? Class }.map{|c|c.new}
     super()
   end
 
@@ -60,7 +59,7 @@ class OxAiWorkers::Iterator < OxAiWorkers::StateTools
 
   def packHistory text:
     puts Rainbow("summarize: #{text}").blue
-    @milestones << "#{Time.now} #{__method__}: #{text}"
+    @milestones << "#{__method__}: #{text}"
     @messages = []
     @worker.finish()
     rebuildWorker()
@@ -110,7 +109,7 @@ class OxAiWorkers::Iterator < OxAiWorkers::StateTools
   def processResult(transition)
     puts "call: #{__method__} state: #{state_name}"
     @result = @worker.result || @worker.errors
-    if @worker.external_call.present?
+    if @worker.tool_calls.present?
       @queue << {role: :system, content: @worker.tool_calls_raw.to_s}
       @worker.tool_calls.each do |external_call|
         tool = @tools.select{|t| t.class.tool_name == external_call[:class] && t.respond_to?(external_call[:name]) }.first
@@ -119,6 +118,7 @@ class OxAiWorkers::Iterator < OxAiWorkers::StateTools
           @queue << {role: :system, content: out.to_s} if out.present?
         end
       end
+      @worker.finish()
       iterate! if can_iterate?
 
       # tool = @tools.select{|t| t.class.tool_name == @worker.external_call[:class] && t.respond_to?(@worker.external_call[:name]) }.first
@@ -127,19 +127,19 @@ class OxAiWorkers::Iterator < OxAiWorkers::StateTools
       #   @queue << {role: :system, content: out.to_s} if out.present?
       #   iterate!
       # end
-    elsif @result.present?
-        actionRequest action: @result
+    elsif @worker.result.present?
+        actionRequest action: @worker.result
     end
   end
 
   def completeIteration
+    @queue = []
     @worker.finish()
   end
   
   def addTask task, auto_execute: true
     @tasks << task
     @messages << {role: :user, content: task}
-    task
     execute() if auto_execute
   end
 
@@ -162,3 +162,21 @@ class OxAiWorkers::Iterator < OxAiWorkers::StateTools
   end
 
 end
+
+# r = OxAiWorkers::Iterator.new(worker: OxAiWorkers::Request.new)
+# r.addTask("сколько будет 2+2?")
+# r.execute
+# r.result
+
+
+# @worker.append(role: "user", content: "сколько будет 2+2?")
+# @worker.request!
+# @worker.completed?
+# @worker.result
+# @worker.finish
+# 
+# r = OxAiWorkers::Iterator.new(worker: OxAiWorkers::Request.new)
+# r.role = "ты программный агент внутри моего компьютера"
+# r.tools = [OxAiWorkers::Tool::Eval.new]
+# r.addTask("покажи мне файлы на диске, используй код на ruby")
+# r.execute

data/lib/oxaiworkers/module_request.rb

@@ -1,16 +1,13 @@
 class OxAiWorkers::ModuleRequest
   attr_accessor :result, :client, :messages, :model, :max_tokens, :custom_id, :temperature, :tools, :errors
   attr_accessor :tool_calls_raw, :tool_calls
-  DEFAULT_MODEL = "gpt-4o-mini"
-  DEFAULT_MAX_TOKEN = 4096
-  DEFAULT_TEMPERATURE = 0.7
 
-  def initializeRequests(model: DEFAULT_MODEL, max_tokens: DEFAULT_MAX_TOKEN, temperature: DEFAULT_TEMPERATURE)
+  def initializeRequests(model: nil, max_tokens: nil, temperature: nil)
     puts "call: ModuleRequest::#{__method__}"
-    @max_tokens = max_tokens
+    @max_tokens = max_tokens || OxAiWorkers.configuration.max_tokens
     @custom_id = SecureRandom.uuid
-    @model = model
-    @temperature = temperature
+    @model = model || OxAiWorkers.configuration.model
+    @temperature = temperature || OxAiWorkers.configuration.temperature
     @client = nil
     
     OxAiWorkers.configuration.access_token ||= ENV["OPENAI"]
@@ -31,6 +28,8 @@ class OxAiWorkers::ModuleRequest
     @result = nil
     @errors = nil
     @messages = []
+    @tool_calls = nil
+    @tool_calls_raw = nil
   end
 
   def append role: nil, content: nil, messages: nil

data/lib/oxaiworkers/request.rb

@@ -18,6 +18,6 @@ class OxAiWorkers::Request < OxAiWorkers::ModuleRequest
   end
 
   def completed?
-    @result.present? or @errors.present? or @external_call.present?
+    @result.present? or @errors.present? or @tool_calls.present?
   end
 end

data/lib/oxaiworkers/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module OxAiWorkers
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end
 

data/locales/en.system.yml

@@ -14,14 +14,12 @@ en:
         description: "Save facts, nuances, and actions before clearing messages"
         text: "Listing important facts and nuances"
       monologue:
-        steps:
-          - "Step 1: Develop your own solution to the problem. Take initiative and make assumptions."
-          - "Step 1.1: Wrap all your work for this step in the innerMonologue function."
-          - "Step 2: Relate your solution to the task, improve it, and call the necessary functions step by step."
-          - "Step 2.1: Interact with the user using the outerVoice and actionRequest functions during the process."
-          - "Step 3: When the solution is ready, report it using the outerVoice function."
-          - "Step 3.1: Save facts, nuances, and actions using the packHistory function."
-          - "Step 4: Conclude the work with the actionRequest function, without repeating the response if it was already given with outerVoice."
+        - "Step 1: Develop your own solution to the problem. Take initiative and make assumptions."
+        - "Step 1.1: Wrap all your work for this step in the innerMonologue function."
+        - "Step 2: Relate your solution to the task, improve it, and call the necessary functions step by step."
+        - "Step 2.1: Interact with the user using the outerVoice and actionRequest functions during the process."
+        - "Step 3: When the solution is ready, report it using the outerVoice function."
+        - "Step 4: Save facts, nuances, and actions using the packHistory function."
     tool:
       eval:
         ruby:

data/locales/ru.system.yml

@@ -19,8 +19,7 @@ ru:
         - Шаг 2. Соотнеси свое решение с задачей, улучшай его и вызывай необходимые функции шаг за шагом.
         - Шаг 2.1. Во время работы используй функции outerVoice и actionRequest.
         - Шаг 3. Когда решение готово, сообщи о нем с помощью функции outerVoice.
-        - Шаг 3.1. Сохрани факты, нюансы и действия с помощью функции packHistory.
-        - Шаг 4. Заверши работу с помощью функции actionRequest, не повторяя ответ, если он уже был дан.
+        - Шаг 4. Сохрани факты, нюансы и действия с помощью функции packHistory.
     tool:
       eval:
         ruby:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ox-ai-workers
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Denis Smolev