omniai-google 1.9.7 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b894f099b440d516869aeeb9590d9c6c9386ff33111bccdefff5111ae005695
-  data.tar.gz: 20595ba59b4ecdde932f645954a05923be8337a03e01a00efe668d937c46613c
+  metadata.gz: 920c87f6c8f91437a1a5580caf2c838521047d734413762776c5d3e7415bda12
+  data.tar.gz: be11205e829fbf12049d9a14b65b3432bdfdb38a377d6ed1958294a8c04d8ef1
 SHA512:
-  metadata.gz: b9845d667026a8121c4fc06388c7686e69860d2d22097fa3c49153c3d3fab9e867b0aa4fd47691df07f6d505de15ed0d06e29b973ac28d1d4d83e37bdfe4dd56
-  data.tar.gz: bdeeb06f52c05d4e955ad77eee2bdaf7a28a1987b5c1ad4333b8748b7ec61c215419f5d36768a03fa774fd821c5466694b3258cac00759df735a65c450805212
+  metadata.gz: 9001c4da34477f01fd0a0fe410885f7be12e2cc5fe575f31071d5716605567ef55a7184af34d9c758266bbac46a42fddff53884f9c51cf309cd7f51ae671149f
+  data.tar.gz: b6938cfad64524232b79053b37c59bf15151c381e1ad0c09283369ea9829e47a9686f2177ad782cfb5cf71db1a5e0ab6085c7c8ac7c3edd1e38758496b4c3a26

data/lib/omniai/google/chat/{payload_serializer.rb → response_serializer.rb}

@@ -3,14 +3,15 @@
 module OmniAI
   module Google
     class Chat
-      # Overrides payload serialize / deserialize.
-      module PayloadSerializer
-        # @param payload [OmniAI::Chat::Payload]
+      # Overrides response serialize / deserialize.
+      module ResponseSerializer
+        # @param response [OmniAI::Chat::Response]
         # @param context [OmniAI::Context]
+        #
         # @return [Hash]
-        def self.serialize(payload, context:)
-          candidates = payload.choices.map { |choice| choice.serialize(context:) }
-          usage_metadata = payload.usage&.serialize(context:)
+        def self.serialize(response, context:)
+          candidates = response.choices.map { |choice| choice.serialize(context:) }
+          usage_metadata = response.usage&.serialize(context:)
 
           {
             candidates:,
@@ -20,12 +21,13 @@ module OmniAI
 
         # @param data [Hash]
         # @param context [OmniAI::Context]
-        # @return [OmniAI::Chat::Payload]
+        #
+        # @return [OmniAI::Chat::Response]
         def self.deserialize(data, context:)
           choices = data["candidates"].map { |candidate| OmniAI::Chat::Choice.deserialize(candidate, context:) }
           usage = OmniAI::Chat::Usage.deserialize(data["usageMetadata"], context:) if data["usageMetadata"]
 
-          OmniAI::Chat::Payload.new(choices:, usage:)
+          OmniAI::Chat::Response.new(data:, choices:, usage:)
         end
       end
     end

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

@@ -0,0 +1,80 @@
+# frozen_string_literal: true
+
+module OmniAI
+  module Google
+    class Chat
+      # Combine chunks into a hash. For each chunk yield the text (delta) if a block is given and the chunk is text.
+      class Stream < OmniAI::Chat::Stream
+        # @yield [delta]
+        # @yieldparam delta [OmniAI::Chat::Delta]
+        #
+        # @return [Hash]
+        def stream!(&block)
+          @data = { "candidates" => [] }
+
+          @chunks.each do |chunk|
+            parser.feed(chunk) do |type, data, id|
+              process!(type, data, id, &block)
+            end
+          end
+
+          @data
+        end
+
+      protected
+
+        # @yield [delta]
+        # @yieldparam delta [OmniAI::Chat::Delta]
+        #
+        # @param type [String]
+        # @param data [String]
+        # @param id [String]
+        def process!(type, data, id, &)
+          log(type, data, id)
+
+          process_data!(data: JSON.parse(data), &)
+        end
+
+        # @yield [delta]
+        # @yieldparam delta [OmniAI::Chat::Delta]
+        #
+        # @param data [Hash]
+        def process_data!(data:, &block)
+          data.each do |key, value|
+            @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
+
+            merge_candidate!(candidate:, index:, &block)
+          end
+        end
+
+        # @param candidate [Hash]
+        # @param index [Integer]
+        def merge_candidate!(candidate:, index:)
+          if @data["candidates"][index].nil?
+            @data["candidates"][index] = candidate
+          else
+            merge_parts!(content: @data["candidates"][index]["content"], parts: candidate["content"]["parts"])
+          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
+          end
+        end
+      end
+    end
+  end
+end

data/lib/omniai/google/chat.rb

@@ -45,8 +45,8 @@ module OmniAI
         context.serializers[:usage] = UsageSerializer.method(:serialize)
         context.deserializers[:usage] = UsageSerializer.method(:deserialize)
 
-        context.serializers[:payload] = PayloadSerializer.method(:serialize)
-        context.deserializers[:payload] = PayloadSerializer.method(:deserialize)
+        context.serializers[:response] = ResponseSerializer.method(:serialize)
+        context.deserializers[:response] = ResponseSerializer.method(:deserialize)
 
         context.serializers[:choice] = ChoiceSerializer.method(:serialize)
         context.deserializers[:choice] = ChoiceSerializer.method(:deserialize)

data/lib/omniai/google/version.rb

@@ -2,6 +2,6 @@
 
 module OmniAI
   module Google
-    VERSION = "1.9.7"
+    VERSION = "2.0.0"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: omniai-google
 version: !ruby/object:Gem::Version
-  version: 1.9.7
+  version: 2.0.0
 platform: ruby
 authors:
 - Kevin Sylvestre
 bindir: exe
 cert_chain: []
-date: 2025-02-28 00:00:00.000000000 Z
+date: 2025-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: event_stream_parser
@@ -29,14 +29,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +67,8 @@ files:
 - lib/omniai/google/chat/function_serializer.rb
 - lib/omniai/google/chat/media_serializer.rb
 - lib/omniai/google/chat/message_serializer.rb
-- lib/omniai/google/chat/payload_serializer.rb
+- lib/omniai/google/chat/response_serializer.rb
+- lib/omniai/google/chat/stream.rb
 - lib/omniai/google/chat/text_serializer.rb
 - lib/omniai/google/chat/tool_call_result_serializer.rb
 - lib/omniai/google/chat/tool_call_serializer.rb