ox-ai-workers 1.1.4.1 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56e2ee5c343058a40443b708c42546c7f76ce0c9915ab54b74a28215ce664a0a
-  data.tar.gz: 3dd61c2eb153ea379b5e53871b1fae4805dca163526de51a4e40cf8407030cdd
+  metadata.gz: f5784dfd8d79874e6db22d56d3e311777e1bddc4b68686881b7d41d6a0b25fed
+  data.tar.gz: 6ef196f9d45a183fa3bec41d5782afbf0bb60158df14847a2e3682012143a3da
 SHA512:
-  metadata.gz: 303e386cb438f35cde00787ea617a12215394e712932e15995bc9629f4d210cdccde0031262b80ea4221bc9441366f32a2c16702ecfc01917fbba4ddaebb42d6
-  data.tar.gz: 1590ee68bdf1d6e4b5c31b02839ff5b28b4f298719f68c3ac0dac2ffc3938f7f7334f4c522ecbc2409fec3cb7135884d3bcbc5fcbfc9e0bc629ea09b820c9f3a
+  metadata.gz: 878ddf667e5e7198e0b007ad3cb7b41f268929f3ea678a6be0d20667ca7ecaa3fbad190c99a8e01bf9d4152bf7ca9af1f9de1d7d3d92cdf324d26974e1472d01
+  data.tar.gz: 2f23c2a05a207bc0a258e16c67724af7c9093aac3aba0bd8d72402a1d7d6887a383bee08965fac45ce1a8423810758a35a6063254b827e6a96530a00147e0589

data/lib/oxaiworkers/iterator.rb

@@ -76,7 +76,7 @@ module OxAiWorkers
       @tasks = []
       @messages = []
       @call_id = 0
-      # Очищаем сообщения в worker, если он существует
+      # Clear messages in worker if it exists
       @worker.messages = [] if @worker&.respond_to?(:messages=)
       complete_iteration
     end
@@ -123,7 +123,7 @@ module OxAiWorkers
       # @worker.last_call = nil
       @worker.call_stack = @call_stack.dup
       @worker.stop_double_calls = @stop_double_calls
-      # Не очищаем сообщения, а сохраняем их в переменной
+      # Don't clear messages, save them in a variable
       current_messages = @worker.messages || []
       @worker.messages = []
       @worker.append(role: :system, content: "<role>\n#{@role}\n</role>") if @role.present?
@@ -134,7 +134,7 @@ module OxAiWorkers
       @tools.each do |tool|
         @worker.append(role: :user, content: tool.context) if tool.respond_to?(:context) && tool.context.present?
       end
-      # Добавляем сохраненные сообщения обратно, если они не пустые
+      # Add saved messages back if they are not empty
       @worker.append(messages: current_messages) if current_messages.present?
       @worker.append(messages: @messages)
       # @tasks.each { |task| @worker.append(role: :user, content: "<task>\n#{task}\n</task>") }
@@ -176,19 +176,19 @@ module OxAiWorkers
     end
 
     def next_iteration
-      # Проверяем call_stack перед продолжением итерации
+      # Check call_stack before continuing iteration
       if should_finish_iteration?
-        OxAiWorkers.logger.info "Iterator::Call stack is empty or contains only finish_it. Finishing iteration."
+        OxAiWorkers.logger.info 'Iterator::Call stack is empty or contains only finish_it. Finishing iteration.'
         finish_it
         return
       end
 
-      # Сначала добавляем сообщения из очереди к worker
+      # First add messages from queue to worker
       @worker.append(messages: @queue)
-      # Затем добавляем их к локальным сообщениям
+      # Then add them to local messages
       @messages += @queue
       OxAiWorkers.logger.warn "Iterator::Next iteration: #{@messages.count}/#{@queue.count}"
-      # И только потом очищаем очередь
+      # And only then clear the queue
       @queue = []
       request!
     end
@@ -196,13 +196,11 @@ module OxAiWorkers
     def should_finish_iteration?
       return false if @worker.call_stack.nil?
       return false unless @worker.respond_to?(:call_stack) && @worker.call_stack.present?
-      
+
       finish_it_function = OxAiWorkers::Iterator.full_function_name(:finish_it)
-      
-      # Проверяем, пуста ли очередь вызовов или содержит только finish_it
-      @worker.call_stack.empty? || 
-        (@worker.call_stack.size == 1 && @worker.call_stack.first == finish_it_function) ||
-        @worker.call_stack.all? { |call| call == finish_it_function }
+
+      # Check if the call queue is empty or contains only finish_it
+      @worker.call_stack.empty? || @worker.call_stack.all? { |call| call == finish_it_function }
     end
 
     def external_request
@@ -282,7 +280,7 @@ module OxAiWorkers
 
     def complete_iteration
       @queue = []
-      # Используем finish_without_cleanup вместо finish
+      # Use finish_without_cleanup instead of finish
       @worker.finish_without_cleanup if @worker.respond_to?(:finish_without_cleanup)
     end
 

data/lib/oxaiworkers/module_request.rb

@@ -55,11 +55,7 @@ module OxAiWorkers
       filtered_functions = []
       filtered_functions << @last_call if @stop_double_calls.include?(@last_call)
 
-      tool_choice = if @call_stack&.any?
-                      func1 = @call_stack.first
-                      @call_stack = @call_stack.drop(1)
-                      func1
-                    end
+      tool_choice = (@call_stack.first if @call_stack&.any?)
 
       @model.build_parameters(
         messages: @messages,
@@ -87,6 +83,11 @@ module OxAiWorkers
         @tool_calls += tool_calls
       end
       @last_call = @tool_calls.last[:name] if @tool_calls.any?
+      
+      # Remove the first element from call_stack only after successful tool call
+      if @tool_calls.any? && @call_stack&.any?
+        @call_stack = @call_stack.drop(1)
+      end
     end
   end
 end

data/lib/oxaiworkers/request.rb

@@ -9,10 +9,10 @@ module OxAiWorkers
       cleanup
     end
 
-    # Метод для завершения без очистки сообщений
+    # Method to finish without clearing messages
     def finish_without_cleanup
       @custom_id = SecureRandom.uuid
-      # Очищаем только результат и ошибки, но не сообщения
+      # Clear only result and errors, but not messages
       @result = nil
       @errors = nil
       @tool_calls = nil

data/lib/oxaiworkers/version.rb

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

metadata

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