ox-ai-workers 0.8.6 → 0.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c0c7e3c6445442544161a0c6bb1bf7e85d6b64654263fa000cdafaa6a6903ef
-  data.tar.gz: aeca3a033ff65370a03db4f54530dd211fab181431799ec0317a866083c23770
+  metadata.gz: 02c7ccd3357fb07615d22878578cd9138f2f8f0790a7439f08aabe3267a4ecbf
+  data.tar.gz: 64cebe6e9f10d7748a19c96c9b779d7b32e57d5e94db56b290a70cc9e63210e2
 SHA512:
-  metadata.gz: 0401a214d80347b240f53e45ff44b3b536fbf3094473ae46945c0a59d865952f852dc3e1c162058c478c4563b2bd3c469e2cc3ba8d9df221837f77f6b889794c
-  data.tar.gz: f1dad1689589b10070f90de6ba5fbafc7a77ae928b9a8bdb72d357591ef040dbf4a6f19898d4edf46b7164794d90a6268145a8eac2a6a6499efd1c3079c33b76
+  metadata.gz: 8e4f16c02b75981099a6c389c94ec27fe2626bcf24fd46e32eda54b0d48ac02ed70c090003f7431cad3eaa14ceb6f8ffa4268d2a6a3bd4056c5ce0e77345937c
+  data.tar.gz: 305e41419ef2a18fc004718af0e45b1e3b969412463b8e234e6050a7adb2e20687b8f52c38a38d198f22ca69bebd487c51c9d30f741b03a2a1925ab3c43ee216

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+
+## [0.8.7] - 2025-04-25
+
+- Fixed tool calls parsing
+
 ## [0.8.5] - 2025-04-18
 
 - Fixed tool calls parsing

data/lib/oxaiworkers/module_request.rb

@@ -81,53 +81,62 @@ module OxAiWorkers
       return if choices.nil? || choices.empty?
 
       choices.each do |choice|
+        # Parse basic info and accumulate raw tool calls
         parse_one_choice(choice)
       end
 
-      # @tool_calls is already populated by parse_one_choice
-      # @result, @finish_reason, @is_truncated are updated with the last relevant values
+      # Only parse tool calls if the response wasn't truncated
+      _parse_tool_calls unless @is_truncated || @tool_calls_raw.empty?
     end
 
     def parse_one_choice(choice)
       message = choice['message']
       return unless message # Skip if there's no message in this choice
 
-      # Accumulate raw tool calls
-      if message['tool_calls']
-        @tool_calls_raw.concat(message['tool_calls'])
-        message['tool_calls'].each do |tool_call|
-          next unless tool_call['type'] == 'function' # Ensure it's a function call
-
-          function = tool_call['function']
-          next unless function && function['name'] && function['arguments']
-
-          begin
-            # Attempt to parse arguments, handle potential JSON errors
-            args = JSON.parse(function['arguments'], symbolize_names: true)
-          rescue JSON::ParserError => e
-            OxAiWorkers.logger.error("Failed to parse tool call arguments: #{e.message}", for: self.class)
-            OxAiWorkers.logger.debug("Raw arguments: #{function['arguments']}", for: self.class)
-            args = {} # Assign empty args or handle error as appropriate
-          end
-
-          # Accumulate parsed tool calls
-          @tool_calls << {
-            class: function['name'].split('__').first,
-            name: function['name'].split('__').last,
-            args: args
-          }
-        end
-      end
+      # Accumulate raw tool calls if present
+      @tool_calls_raw.concat(message['tool_calls']) if message['tool_calls']
 
       # Update result with the content if present
       current_result = message['content']
       @result = current_result if current_result.present?
 
-      # Update finish reason and truncation status
+      # Update finish reason and truncation status based on the *last* choice's reason
       current_finish_reason = choice['finish_reason']
       if current_finish_reason.present?
         @finish_reason = current_finish_reason
-        @is_truncated = @finish_reason == 'length'
+        @is_truncated = (@finish_reason == 'length')
+      end
+    end
+
+    private
+
+    # Parses the accumulated raw tool calls into the structured @tool_calls array.
+    # This should only be called after confirming the response is not truncated.
+    def _parse_tool_calls
+      @tool_calls = [] # Ensure it's clean before parsing
+      @tool_calls_raw.each do |tool_call|
+        next unless tool_call['type'] == 'function' # Ensure it's a function call
+
+        function = tool_call['function']
+        next unless function && function['name'] && function['arguments']
+
+        begin
+          # Attempt to parse arguments, handle potential JSON errors
+          args = JSON.parse(function['arguments'], symbolize_names: true)
+        rescue JSON::ParserError => e
+          OxAiWorkers.logger.error("Failed to parse tool call arguments: #{e.message}", for: self.class)
+          OxAiWorkers.logger.debug("Raw arguments: #{function['arguments']}", for: self.class)
+          # Decide how to handle parsing errors, e.g., skip this call or add with empty args
+          # Skipping for now, as partial args are likely useless.
+          next
+        end
+
+        # Accumulate parsed tool calls
+        @tool_calls << {
+          class: function['name'].split('__').first,
+          name: function['name'].split('__').last,
+          args: args
+        }
       end
     end
   end

data/lib/oxaiworkers/version.rb

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

metadata

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