omniai-google 3.14.0 → 3.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5954a8c865af0699193eec624f9ddbb6e7bb52f0df650d16a61ad3237b15aedd
-  data.tar.gz: 3e455a236f2c073735e44054c55489c93418252259fd556df734d38ea7895043
+  metadata.gz: dc72ad3bc8cfe3181908f748f705708827ea8f10a3c533b9d1d4352d6f5d9df0
+  data.tar.gz: c29f890a61470dc3ddce22d5753ca4410a04ba91b93faab6381411805e41fdbd
 SHA512:
-  metadata.gz: c99cb0f8e5d8e802ff247874ab5c4e4530fd5b91cadc617d506187125ed9603cc5468c09586f36f2ca2ddcde0549c7aba48d1b50285450a7d830b5c2fad3112b
-  data.tar.gz: d32ccfaf6210fade5a0a7dfaf4c868a9474880d440f4465b959966bc1085509df3d67e50795555402b7ad069da47dedf1c91b2f1c8666799f47a16eb6ac43b7b
+  metadata.gz: bdee9a2925e8ea39873fb8e34b94378aa0549d0b1443a3c20b55bef586dda1208514e042ee63c6780ed6ec8f457b24a7af85f9def73d82c1c77e4a6ca84a6db2
+  data.tar.gz: 3402943f6994d0489fc2382731e41e116667e3e93b09908dc6549c1f890f7ba2bdb397e27af9d4999fb925a7be19489c2f1566dae6e56dcf9cdb61bf731e20c2

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

@@ -18,11 +18,69 @@ module OmniAI
             end
           end
 
+          validate!
           @data
         end
 
       protected
 
+        # Google reports a post-200 failure as an `error` object in the stream, which
+        # `process_data!` otherwise copies into @data and returns as an empty success.
+        def validate!
+          error = @data["error"]
+          if error
+            raise StreamError.new("the stream carried an error: #{error_summary(error)}",
+              provider_message: error["message"])
+          end
+
+          # No candidates at all (a usageMetadata-only stream) is incomplete too.
+          candidates = @data["candidates"] || []
+          incomplete = candidates.select { |candidate| incomplete?(candidate) }
+          return unless candidates.empty? || incomplete.any?
+
+          raise IncompleteStreamError,
+            "the stream ended without a finish reason: #{candidates_summary(incomplete)}"
+        end
+
+        # Only thought-only-and-empty counts. A missing finishReason alone would also condemn
+        # an unterminated stream that did deliver an answer, and discarding a usable answer to
+        # retry is the more expensive mistake.
+        def incomplete?(candidate)
+          return false if candidate["finishReason"]
+
+          parts = candidate.dig("content", "parts") || []
+          parts.none? { |part| part["functionCall"] || answer_part?(part) }
+        end
+
+        # "" is truthy in Ruby, so an empty text part must not count as an answer.
+        def answer_part?(part)
+          !thought_part?(part) && !part["text"].to_s.strip.empty?
+        end
+
+        # Code and status only. Google's `message` can echo request content back, and consumers
+        # log these, so it is omitted for the same reason candidates_summary omits part text.
+        #
+        # @param error [Hash]
+        # @return [String]
+        def error_summary(error)
+          "code=#{error['code'].inspect} status=#{error['status'].inspect}"
+        end
+
+        # Structure only: consumers log these messages and part text may be sensitive.
+        #
+        # @param candidates [Array<Hash>]
+        # @return [String]
+        def candidates_summary(candidates)
+          return "candidates=0" if candidates.empty?
+
+          candidates.map.with_index do |candidate, index|
+            parts = candidate.dig("content", "parts") || []
+            "candidate=#{index} parts=#{parts.size} " \
+              "thought_parts=#{parts.count { |part| part['thought'] }} " \
+              "finish_reason=#{candidate['finishReason'].inspect}"
+          end.join("; ")
+        end
+
         # @yield [delta]
         # @yieldparam delta [OmniAI::Chat::Delta]
         #

data/lib/omniai/google/incomplete_stream_error.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module OmniAI
+  module Google
+    # Raised when a stream ends with no `finishReason` and produced nothing but thinking.
+    # Rescue StreamError to catch this and stream errors together. `#provider_message` is
+    # always nil here -- there is no provider error to carry.
+    class IncompleteStreamError < StreamError; end
+  end
+end

data/lib/omniai/google/stream_error.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module OmniAI
+  module Google
+    # Raised when a streamed generation does not complete.
+    #
+    # Deliberately has no `#response`: the request returned 200 and the failure arrived inside
+    # the stream. Consumers branch on that to decide whether to retry.
+    class StreamError < OmniAI::Error
+      # Google's own explanation of the failure, verbatim.
+      #
+      # Named for what it holds rather than borrowing `value` from FinishReason, which is a
+      # provider enum rather than prose. Kept off `#message` because consumers log that and
+      # this text can echo request content -- a deliberate departure from HTTPError, which puts
+      # the whole response body into its message.
+      #
+      # @return [String, nil]
+      attr_reader :provider_message
+
+      # @param message [String, nil]
+      # @param provider_message [String, nil]
+      def initialize(message = nil, provider_message: nil)
+        @provider_message = provider_message
+        super(message)
+      end
+    end
+  end
+end

data/lib/omniai/google/version.rb

@@ -2,6 +2,6 @@
 
 module OmniAI
   module Google
-    VERSION = "3.14.0"
+    VERSION = "3.15.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniai-google
 version: !ruby/object:Gem::Version
-  version: 3.14.0
+  version: 3.15.0
 platform: ruby
 authors:
 - Kevin Sylvestre
@@ -122,6 +122,8 @@ files:
 - lib/omniai/google/config.rb
 - lib/omniai/google/credentials.rb
 - lib/omniai/google/embed.rb
+- lib/omniai/google/incomplete_stream_error.rb
+- lib/omniai/google/stream_error.rb
 - lib/omniai/google/transcribe.rb
 - lib/omniai/google/transcribe_helpers.rb
 - lib/omniai/google/upload.rb