ox-ai-workers 1.1.2.11 → 1.1.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63d9ca70771dbbec0b74012de87f34ffe91ab276c7de091cb3549faf6e392cf8
-  data.tar.gz: 2398e642b2f629bb27e58c3bf30ac3413c0bf71c975846bea9fa79b227b2c875
+  metadata.gz: '05159101c78d6f6cf56d925fab18fd9e1bd0346889be8bbb04d1fe1e29f0f070'
+  data.tar.gz: 6ca247c2fa78ef1f1e13a5b6e0c8fffafcad6efaf9ab0f71a162135e03252892
 SHA512:
-  metadata.gz: 9cd61338687ef76e06ac571c301f5cdd526d9fbc4f44076a824e3b36a9dd329a121a6ca801db8e4a35c1394af5aa7dcce3efc7977c5149f725408962a882e696
-  data.tar.gz: 63f512d56319f96a5a4e86b300ca5cfcc76ed0b4c6ae0f6267a3053ba95bb9aa6be580dac3ab2927fec257354435e2329e73ba9ba57b3bbccaed038d1e75db8e
+  metadata.gz: b5aac3e0f145beedd1166ed4844fe8813f6b75fb21ed3b9f9e4353cbe7781a0971a464586e0d9b5e3959d193c7123e3b8472e370257dc643746d6e0250812e31
+  data.tar.gz: 35f03218b1f2de4d99741de669736a18c7aff8c7b7e5a25ca4d3f8e414fe9af5f24015248d2bf69f78c18767d006059ab6e609bd564342feca651e4665037106

data/lib/oxaiworkers/iterator.rb

@@ -76,6 +76,8 @@ module OxAiWorkers
       @tasks = []
       @messages = []
       @call_id = 0
+      # Очищаем сообщения в worker, если он существует
+      @worker.messages = [] if @worker&.respond_to?(:messages=)
       complete_iteration
     end
 
@@ -91,7 +93,7 @@ module OxAiWorkers
       else
         OxAiWorkers.logger.warn "Iterator::inner_monologue is not available: #{speach}"
       end
-      nil
+      speach
     end
 
     def outer_voice(text:)
@@ -103,7 +105,7 @@ module OxAiWorkers
         inner_monologue(speach: text)
       end
 
-      nil
+      text
     end
 
     def finish_it
@@ -121,6 +123,8 @@ module OxAiWorkers
       # @worker.last_call = nil
       @worker.call_stack = @call_stack.dup
       @worker.stop_double_calls = @stop_double_calls
+      # Не очищаем сообщения, а сохраняем их в переменной
+      current_messages = @worker.messages || []
       @worker.messages = []
       @worker.append(role: :system, content: "<role>\n#{@role}\n</role>") if @role.present?
 
@@ -130,6 +134,8 @@ module OxAiWorkers
       @tools.each do |tool|
         @worker.append(role: :user, content: tool.context) if tool.respond_to?(:context) && tool.context.present?
       end
+      # Добавляем сохраненные сообщения обратно, если они не пустые
+      @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>") }
       @worker.tools = [function_schemas]
@@ -170,9 +176,13 @@ module OxAiWorkers
     end
 
     def next_iteration
+      # Сначала добавляем сообщения из очереди к worker
+      @worker.append(messages: @queue)
+      # Затем добавляем их к локальным сообщениям
       @messages += @queue
+      OxAiWorkers.logger.warn "Iterator::Next iteration: #{@messages.count}/#{@queue.count}"
+      # И только потом очищаем очередь
       @queue = []
-      @worker.append(messages: @messages)
       request!
     end
 
@@ -241,17 +251,20 @@ module OxAiWorkers
             out:
           )
         end
-        @worker.finish
+        @worker.finish_without_cleanup if @worker.respond_to?(:finish_without_cleanup)
         iterate! if can_iterate?
       end
       result = @worker.result || @worker.errors
-      OxAiWorkers.logger.warn "Iterator::No tool calls: #{result}"
-      outer_voice text: result if result.present?
+      if result.present?
+        OxAiWorkers.logger.warn "Iterator::No tool calls: #{result}"
+        outer_voice text: result 
+      end
     end
 
     def complete_iteration
       @queue = []
-      @worker.finish
+      # Используем finish_without_cleanup вместо finish
+      @worker.finish_without_cleanup if @worker.respond_to?(:finish_without_cleanup)
     end
 
     def add_task(task)

data/lib/oxaiworkers/models/anthropic_max.rb

@@ -63,7 +63,7 @@ module OxAiWorkers
               {
                 type: 'tool_result',
                 tool_use_id: "call_#{call_id}",
-                content: out.present? ? out : "Tool call #{name} successful."
+                content: out.present? ? out : "Successful"
               }
             ]
           }

data/lib/oxaiworkers/module_request.rb

@@ -41,12 +41,14 @@ module OxAiWorkers
       @messages.each do |message|
         content = message[:content]
         if content.is_a?(String)
-          OxAiWorkers.logger.info "Request (String): #{content.truncate(500)}"
+          OxAiWorkers.logger.warn "Request (String)[#{message[:role]}]: #{content.truncate(500)}"
         elsif content.is_a?(Array)
-          types = content.map { |item| "#{item[:type]}: #{item[:content]&.truncate(500)}" }.compact.join(', ')
-          OxAiWorkers.logger.info "Request (Array): [#{types}]"
+          types = content.map do |item|
+            "#{item[:type]}: #{item[:content]&.truncate(500)}"
+          end.compact.join(', ')
+          OxAiWorkers.logger.warn "Request (Array): [#{types}]"
         else
-          OxAiWorkers.logger.info "Request (Other): #{message.inspect}"
+          OxAiWorkers.logger.warn "Request (Other): #{message.inspect}"
         end
       end
 

data/lib/oxaiworkers/request.rb

@@ -9,6 +9,16 @@ module OxAiWorkers
       cleanup
     end
 
+    # Метод для завершения без очистки сообщений
+    def finish_without_cleanup
+      @custom_id = SecureRandom.uuid
+      # Очищаем только результат и ошибки, но не сообщения
+      @result = nil
+      @errors = nil
+      @tool_calls = nil
+      @is_truncated = false
+    end
+
     def request!
       response = @model.request(params)
       parse_choices(response)

data/lib/oxaiworkers/version.rb

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

metadata

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