omniai-google 2.6.1 → 2.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c901bbfae98e15ee5741f97f8a28189814495b3f2b15a40cba9ffe9e4d5e62d4
-  data.tar.gz: 3c5d7e4544a778bc05dda49e2b8d3e6e7675307d0f0985ff55676e9fbcc6ca98
+  metadata.gz: 1f578af1eb17aad95c7d8d95241481ea6fa606f9dbdca2bfb098e664874cbfe1
+  data.tar.gz: 8ffb8c563e0e1464aeaecd38d7b764227b3a13302a130c43d5a1989f9abb6cfc
 SHA512:
-  metadata.gz: bf21ab638a26791419a04139405064bb974120b0be0a45e77981da82d204bb494c1436a270538a31540a7cc7d4c1b351aa594d773de0851ab4d79797cd767209
-  data.tar.gz: c267e9b001991241574a7fe5895c4e3e56336191d647627c0be202db5b84d3ae568659640edde6728ac58d71067cb5d36f1aa280dfda6ebcab36c788fd321975
+  metadata.gz: 8db2a30f2424c265690d6d9d7910c1de1774ddc452405c64a37a323fcaa1a9f0571128ceb03d47dda98ba5c943708b26a127f881c954d533977d2ca81c377401
+  data.tar.gz: 3a6245e97f79785079a3490eed18cdc32f5da909863959fbef281f40df7a5da2dff4416725dd56b173c73a7dd0c06b945a52143d37a229c539e4a4eed9ea5d3d

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

@@ -44,34 +44,48 @@ module OmniAI
             @data[key] = value unless key.eql?("candidates")
           end
 
-          data["candidates"].each_with_index do |candidate, index|
-            candidate["content"]["parts"].each do |part|
-              block&.call(OmniAI::Chat::Delta.new(text: part["text"])) if part["text"]
-            end
+          data["candidates"].each do |candidate|
+            process_candidate!(candidate:, &block)
+          end
+        end
 
-            merge_candidate!(candidate:, index:, &block)
+        # @yield [delta]
+        # @yieldparam delta [OmniAI::Chat::Delta]
+        #
+        # @param candidate [Hash]
+        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:)
         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.1"
+    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.1
+  version: 2.6.3
 platform: ruby
 authors:
 - Kevin Sylvestre
 bindir: exe
 cert_chain: []
-date: 2025-05-08 00:00:00.000000000 Z
+date: 2025-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: event_stream_parser