omniai-google 2.6.2 → 2.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb64970aa23a098c48810b8d2d299665c383d188d7a908c1d331375235083dc5
-  data.tar.gz: 10161c3268426a21701d82ecf7a87f24b4afc901f17e283eeeb999ad717d96c0
+  metadata.gz: 1f578af1eb17aad95c7d8d95241481ea6fa606f9dbdca2bfb098e664874cbfe1
+  data.tar.gz: 8ffb8c563e0e1464aeaecd38d7b764227b3a13302a130c43d5a1989f9abb6cfc
 SHA512:
-  metadata.gz: a261a66b7a8ddfb723a2327dda567a8494bba59420626a6f57dbd4f76838b9f603ef5c619b08af245ecb2a72865d7a9bf905c320d6bd1d4df943bf60141fc649
-  data.tar.gz: 9ff5956e21aeefa6fe4829dfe5f629a94ddb35b49e24fad1e5e5f48b065c58c393265aeb7b1bbfa2a4b9136dcfb74798f904bc960c05f14870b69987a1d4160d
+  metadata.gz: 8db2a30f2424c265690d6d9d7910c1de1774ddc452405c64a37a323fcaa1a9f0571128ceb03d47dda98ba5c943708b26a127f881c954d533977d2ca81c377401
+  data.tar.gz: 3a6245e97f79785079a3490eed18cdc32f5da909863959fbef281f40df7a5da2dff4416725dd56b173c73a7dd0c06b945a52143d37a229c539e4a4eed9ea5d3d

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

@@ -44,8 +44,8 @@ module OmniAI
             @data[key] = value unless key.eql?("candidates")
           end
 
-          data["candidates"].each_with_index do |candidate, index|
-            process_candidate!(candidate:, index:, &block)
+          data["candidates"].each do |candidate|
+            process_candidate!(candidate:, &block)
           end
         end
 
@@ -53,37 +53,39 @@ module OmniAI
         # @yieldparam delta [OmniAI::Chat::Delta]
         #
         # @param candidate [Hash]
-        # @param index [Integer]
-        def process_candidate!(candidate:, index:, &block)
-          parts = candidate["content"]["parts"]
-          return unless parts
-
+        def process_candidate!(candidate:, &block)
           candidate["content"]["parts"].each do |part|
             block&.call(OmniAI::Chat::Delta.new(text: part["text"])) if part["text"]
           end
 
-          merge_candidate!(candidate:, index:)
+          merge_candidate!(candidate:)
         end
 
         # @param candidate [Hash]
-        # @param index [Integer]
-        def merge_candidate!(candidate:, index:)
+        def merge_candidate!(candidate:)
+          index = candidate["index"]
+          raise candidate.inspect if index.nil?
+
           if @data["candidates"][index].nil?
             @data["candidates"][index] = candidate
           else
-            merge_parts!(content: @data["candidates"][index]["content"], parts: candidate["content"]["parts"])
+            merge_parts!(parts: candidate["content"]["parts"], candidate: @data["candidates"][index])
           end
         end
 
-        # @param content [Hash]
         # @param parts [Array<Hash>]
-        def merge_parts!(content:, parts:)
-          parts.each_with_index do |part, index|
-            if content["parts"][index].nil?
-              content["parts"][index] = part
-            else
-              content["parts"][index]["text"] += part["text"]
-            end
+        # @param candidate [Hash]
+        def merge_parts!(parts:, candidate:)
+          parts.each { |part| merge_part!(part:, candidate:) }
+        end
+
+        # @param part [Hash]
+        # @param into [Hash]
+        def merge_part!(part:, candidate:)
+          if candidate["content"]["parts"][-1]&.key?("text") && part["text"]
+            candidate["content"]["parts"][-1]["text"] += part["text"]
+          else
+            candidate["content"]["parts"] << part
           end
         end
       end

data/lib/omniai/google/version.rb

@@ -2,6 +2,6 @@
 
 module OmniAI
   module Google
-    VERSION = "2.6.2"
+    VERSION = "2.6.3"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: omniai-google
 version: !ruby/object:Gem::Version
-  version: 2.6.2
+  version: 2.6.3
 platform: ruby
 authors:
 - Kevin Sylvestre
 bindir: exe
 cert_chain: []
-date: 2025-05-12 00:00:00.000000000 Z
+date: 2025-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: event_stream_parser