omniai-google 3.7.0 → 3.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81bb938d26c6804a6942a17e57e1b1393f0e77925467a60659443f28c76d3752
-  data.tar.gz: ce70db23296a73089d2cbc6eaf344ae269af945c112dfc0942a17e31dc116dfe
+  metadata.gz: 8f0e603d848a10021b4039331d5ace03d9fcebdc6ff0657128bc9cb1da5b8a4d
+  data.tar.gz: 53712cee681975309f887148fd7bf68e7c8b73030feff12287d3b46f7b6af7e0
 SHA512:
-  metadata.gz: 0f5101592e2603341f545b3402a0c4b3b3516dd3fee36532d2a5691803e11610124db98d89af4e532bd16ccfff2663a37308d999dee79aea700a3066df559771
-  data.tar.gz: 78109e536527bc9853e84111e664c25c3574a0f7c952fadbaf2a025478be0172c7cd1a203c4bdf88aa185b242f2fb74f9b88f6d88205a0ec8c479bfe2391b6a0
+  metadata.gz: ef4e3f492ed3c3be562ed3f1137b8264126e7b4e80134195800661bb0341b77bdce81d38ccc12ca254752f80e594e4e83adcc09afd24edff5eccf42addb51aa2
+  data.tar.gz: fcd20b06d373fb62752e26cfc89ca8bdac82a9bcfad1a2d6cb8d6c520a1c698d6dfcf606038f03bafd322695b20d6eba43d2e391ca860fc8ce57ca1ef78ca3ca

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

@@ -86,13 +86,41 @@ module OmniAI
           parts = candidate["content"]["parts"] ||= []
           last_part = parts.last
 
-          if (last_part&.key?("text") && part.key?("text")) ||
-              (last_part&.key?("thought") && part.key?("thought"))
+          if can_concatenate?(last_part, part)
             last_part["text"] += part["text"]
           else
             parts << part
           end
         end
+
+        # True when `part` should concatenate into `last_part` rather than appear
+        # as a new part. Two parts merge only when they're the same kind: both
+        # text parts AND they agree on whether they're a reasoning (thought) chunk
+        # or an answer chunk. Without the thought-state check, an answer chunk
+        # arriving after thought chunks would coalesce into the trailing thought,
+        # marking the visible answer as `thought: true` and causing callers to see
+        # an empty `response.text`.
+        #
+        # @param last_part [Hash, nil]
+        # @param part [Hash]
+        # @return [Boolean]
+        def can_concatenate?(last_part, part)
+          return false if last_part.nil?
+          return false unless last_part.key?("text") && part.key?("text")
+
+          thought_part?(last_part) == thought_part?(part)
+        end
+
+        # Gemini may omit the "thought" key entirely on answer parts (so it's nil),
+        # or set it explicitly to `false`, or `true` for thought parts. Normalize to
+        # a single boolean so the comparison in can_concatenate? treats nil and false
+        # as equivalent (both = "this is an answer part, not a thought part").
+        #
+        # @param part [Hash]
+        # @return [Boolean]
+        def thought_part?(part)
+          part["thought"] == true
+        end
       end
     end
   end

data/lib/omniai/google/client.rb

@@ -86,8 +86,8 @@ module OmniAI
       # @param input [String, Array<String>, Array<Integer>] required
       # @param model [String] optional
       # @param options [Hash] provider-specific options (e.g. task_type: "RETRIEVAL_DOCUMENT")
-      def embed(input, model: Embed::DEFAULT_MODEL, **options)
-        Embed.process!(input, model:, client: self, **options)
+      def embed(input, model: Embed::DEFAULT_MODEL, **)
+        Embed.process!(input, model:, client: self, **)
       end
 
       # @raise [OmniAI::Error]

data/lib/omniai/google/embed.rb

@@ -44,7 +44,7 @@ module OmniAI
         prompt_tokens = data.dig("usageMetadata", "promptTokenCount")
         total_tokens = data.dig("usageMetadata", "totalTokenCount")
 
-        Usage.new(prompt_tokens: prompt_tokens, total_tokens: total_tokens)
+        Usage.new(prompt_tokens:, total_tokens:)
       end
 
       # @return [Context]
@@ -73,13 +73,14 @@ module OmniAI
       #
       # @return [Symbol] :embed_content, :predict, or :batch_embed_contents
       def endpoint
-        @endpoint ||= if @client.vertex? && @model.start_with?("gemini-embedding-2")
-          :embed_content
-        elsif @client.vertex?
-          :predict
-        else
-          :batch_embed_contents
-        end
+        @endpoint ||=
+          if @client.vertex? && @model.start_with?("gemini-embedding-2")
+            :embed_content
+          elsif @client.vertex?
+            :predict
+          else
+            :batch_embed_contents
+          end
       end
 
       # @return [Context]
@@ -106,7 +107,7 @@ module OmniAI
         raise ArgumentError, "embedContent does not support batch input" if @input.is_a?(Array) && @input.length > 1
 
         text = @input.is_a?(Array) ? @input.first : @input
-        result = { content: { parts: [{ text: text }] } }
+        result = { content: { parts: [{ text: }] } }
         result[:taskType] = @options[:task_type] if @options[:task_type]
         result
       end
@@ -126,11 +127,11 @@ module OmniAI
           requests: inputs.map do |text|
             request = {
               model: "models/#{@model}",
-              content: { parts: [{ text: text }] },
+              content: { parts: [{ text: }] },
             }
             request[:taskType] = @options[:task_type] if @options[:task_type]
             request
-          end
+          end,
         }
       end
 
@@ -139,15 +140,15 @@ module OmniAI
         { key: (@client.api_key unless @client.credentials?) }.compact
       end
 
+      PROCEDURES = {
+        embed_content: "embedContent",
+        predict: "predict",
+        batch_embed_contents: "batchEmbedContents",
+      }.freeze
+
       # @return [String]
       def path
-        procedure = case endpoint
-                    when :embed_content then "embedContent"
-                    when :predict then "predict"
-                    when :batch_embed_contents then "batchEmbedContents"
-                    end
-
-        "/#{@client.path}/models/#{@model}:#{procedure}"
+        "/#{@client.path}/models/#{@model}:#{PROCEDURES[endpoint]}"
       end
     end
   end

data/lib/omniai/google/version.rb

@@ -2,6 +2,6 @@
 
 module OmniAI
   module Google
-    VERSION = "3.7.0"
+    VERSION = "3.7.2"
   end
 end

metadata

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