omniai-google 3.5.1 → 3.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82ee690e391c20d752962b27396514b2c8ed7f402e279b44115ca717622fabc3
-  data.tar.gz: b559de433576791ac3676ae2d5829369f1951a4824091a0c01add03f7e4a2b50
+  metadata.gz: 75cf7d6dde07411b0b22958ecc3ea72600956f7bd3a7d68c0bb034b0230e2b5f
+  data.tar.gz: 32d419138aa379822c21fac7fc94402c3423ff9b7cc127bb382d1be24f3c18a1
 SHA512:
-  metadata.gz: 8ac9197937f962bd597c4a876dfc1b29edcb5802aae8b39e9e2962a118208cf0b17829b3a0dda4849c82091ffb60c12f050643712dc0c0c467cea0880bd8fd0b
-  data.tar.gz: 62600d5597689f129a3412b8718058f7de8c34e9e4e42ad0434b945b52c09cb7f4cd60e4dfe23d688d27026d4694b69e1a16febae76a3aa7e90f9680a2a77cb0
+  metadata.gz: 61b0c47b210b5610c331d31af784c249d854e40a8f1246dd39cf68d7b6be032d224cc52455b63917cad748ffb6b575ba0dc5b3e92b9b9a254d53363a5f6eb4ea
+  data.tar.gz: 505c2c82358dfcbcf83b10a90ebb87b1d76c00e46e7318708c465c8c1eb68e4f8ba0a5bb71c0767c694701e98669d3c9fe6e5fec2ce747a6aea59ee0e35fa7c7

data/lib/omniai/google/chat/message_serializer.rb

@@ -34,8 +34,7 @@ module OmniAI
             end
           end
 
-          tool_call_list = parts.select { |part| part.is_a?(OmniAI::Chat::ToolCall) }
-          content = parts.reject { |part| part.is_a?(OmniAI::Chat::ToolCall) }
+          tool_call_list, content = parts.partition { |part| part.is_a?(OmniAI::Chat::ToolCall) }
 
           OmniAI::Chat::Message.new(content:, role:, tool_call_list:)
         end

data/lib/omniai/google/chat/stream.rb

@@ -44,7 +44,7 @@ module OmniAI
             @data[key] = value unless key.eql?("candidates")
           end
 
-          data["candidates"].each_with_index do |candidate, index|
+          data["candidates"]&.each_with_index do |candidate, index|
             process_candidate!(candidate:, index:, &block)
           end
         end
@@ -53,12 +53,12 @@ module OmniAI
         # @yieldparam delta [OmniAI::Chat::Delta]
         #
         # @param candidate [Hash]
+        # @param index [Integer]
         def process_candidate!(candidate:, index:, &block)
           return unless candidate["content"]
 
-          candidate["content"]["parts"].each do |part|
+          candidate["content"]["parts"]&.each do |part|
             if part["thought"]
-              # Google uses thought: true as a flag, content is in text
               block&.call(OmniAI::Chat::Delta.new(thinking: part["text"]))
             elsif part["text"]
               block&.call(OmniAI::Chat::Delta.new(text: part["text"]))
@@ -74,27 +74,23 @@ module OmniAI
           if @data["candidates"][index].nil?
             @data["candidates"][index] = candidate
           else
-            merge_parts!(parts: candidate["content"]["parts"], candidate: @data["candidates"][index])
+            (candidate["content"]["parts"] || []).each do |part|
+              merge_part!(part:, candidate: @data["candidates"][index])
+            end
           end
         end
 
-        # @param parts [Array<Hash>]
-        # @param candidate [Hash]
-        def merge_parts!(parts:, candidate:)
-          parts.each { |part| merge_part!(part:, candidate:) }
-        end
-
         # @param part [Hash]
-        # @param into [Hash]
+        # @param candidate [Hash]
         def merge_part!(part:, candidate:)
-          last_part = candidate["content"]["parts"][-1]
+          parts = candidate["content"]["parts"] ||= []
+          last_part = parts.last
 
-          if last_part&.key?("text") && part["text"]
+          if (last_part&.key?("text") && part.key?("text")) ||
+              (last_part&.key?("thought") && part.key?("thought"))
             last_part["text"] += part["text"]
-          elsif last_part&.key?("thought") && part["thought"]
-            last_part["thought"] += part["thought"]
           else
-            candidate["content"]["parts"] << part
+            parts << part
           end
         end
       end

data/lib/omniai/google/chat.rb

@@ -110,7 +110,7 @@ module OmniAI
 
       # @return [Array<OmniAI::Tool>]
       def custom_tools
-        @tools.filter { |tool| tool.is_a?(OmniAI::Tool) }
+        @tools.grep(OmniAI::Tool)
       end
 
       # @return [Array<Symbol, String>]

data/lib/omniai/google/credentials.rb

@@ -23,7 +23,7 @@ module OmniAI
         case value
         when IO, StringIO then ::Google::Auth::ServiceAccountCredentials.make_creds(json_key_io: value, scope: SCOPE)
         when Hash then parse(JSON.generate(value))
-        when Pathname then parse(File.open(value))
+        when Pathname then File.open(value) { |file| parse(file) }
         when String then parse(StringIO.new(value))
         else value
         end

data/lib/omniai/google/version.rb

@@ -2,6 +2,6 @@
 
 module OmniAI
   module Google
-    VERSION = "3.5.1"
+    VERSION = "3.5.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniai-google
 version: !ruby/object:Gem::Version
-  version: 3.5.1
+  version: 3.5.2
 platform: ruby
 authors:
 - Kevin Sylvestre