Expose response header metadata on SDK responses

Author: ktamulonis

lib/openai/helpers/streaming/chat_completion_stream.rb

@@ -8,6 +8,8 @@ class ChatCompletionStream
 
         def initialize(raw_stream:, response_format: nil, input_tools: nil)
           @raw_stream = raw_stream
+          @headers = raw_stream.headers
+          @status = raw_stream.status
           @state = ChatCompletionStreamState.new(
             response_format: response_format,
             input_tools: input_tools

lib/openai/helpers/streaming/response_stream.rb

@@ -10,6 +10,8 @@ def initialize(raw_stream:, text_format: nil, starting_after: nil)
           @text_format = text_format
           @starting_after = starting_after
           @raw_stream = raw_stream
+          @headers = raw_stream.headers
+          @status = raw_stream.status
           @iterator = iterator
           @state = ResponseStreamState.new(
             text_format: text_format

lib/openai/internal/transport/base_client.rb

@@ -510,10 +510,24 @@ def request(req)
             page.new(client: self, req: req, headers: headers, page_data: decoded)
           else
             unwrapped = OpenAI::Internal::Util.dig(decoded, unwrap)
-            OpenAI::Internal::Type::Converter.coerce(model, unwrapped)
+            attach_response_metadata(OpenAI::Internal::Type::Converter.coerce(model, unwrapped), headers)
           end
         end
 
+        # @api private
+        #
+        # @param result [Object]
+        # @param headers [Hash{String=>String}]
+        #
+        # @return [Object]
+        private
+
+        def attach_response_metadata(result, headers)
+          return result unless result.respond_to?(:__set_response_headers)
+
+          result.__set_response_headers(headers)
+        end
+
         # @api private
         #
         # @return [String]

lib/openai/internal/type/base_model.rb

@@ -8,6 +8,11 @@ class BaseModel
         extend OpenAI::Internal::Type::Converter
         extend OpenAI::Internal::Util::SorbetRuntimeSupport
 
+        # @api public
+        #
+        # @return [Hash{String=>String}, nil]
+        attr_reader :response_headers
+
         class << self
           # @api private
           #
@@ -486,6 +491,15 @@ def initialize(data = {})
           end
         end
 
+        # @api private
+        #
+        # @param headers [Hash{String=>String}]
+        # @return [self]
+        def __set_response_headers(headers)
+          @response_headers = headers
+          self
+        end
+
         class << self
           # @api private
           #

lib/openai/internal/type/base_page.rb

@@ -9,6 +9,11 @@ module Type
       #
       # This module provides a base implementation for paginated responses in the SDK.
       module BasePage
+        # @api public
+        #
+        # @return [Hash{String=>String}, nil]
+        attr_reader :response_headers
+
         # rubocop:disable Lint/UnusedMethodArgument
 
         # @api public
@@ -45,9 +50,19 @@ def initialize(client:, req:, headers:, page_data:)
           @client = client
           @req = req
           @model = req.fetch(:model)
+          @response_headers = headers
           super()
         end
 
+        # @api private
+        #
+        # @param headers [Hash{String=>String}]
+        # @return [self]
+        def __set_response_headers(headers)
+          @response_headers = headers
+          self
+        end
+
         # rubocop:enable Lint/UnusedMethodArgument
       end
     end

lib/openai/internal/type/base_stream.rb

@@ -19,6 +19,11 @@ module BaseStream
         # @return [Hash{String=>String}]
         attr_reader :headers
 
+        # @api public
+        #
+        # @return [Hash{String=>String}]
+        def response_headers = @headers
+
         # @api public
         #
         # @return [void]

rbi/openai/internal/type/base_model.rbi

@@ -219,6 +219,10 @@ module OpenAI
         def [](key)
         end
 
+        sig { returns(T.nilable(T::Hash[String, String])) }
+        attr_reader :response_headers
+        end
+
         # Returns a Hash of the data underlying this object. O(1)
         #
         # Keys are Symbols and values are the raw values from the response. The return
@@ -278,6 +282,10 @@ module OpenAI
         def self.new(data = {})
         end
 
+        sig { params(headers: T::Hash[String, String]).returns(T.self_type) }
+        def __set_response_headers(headers)
+        end
+
         class << self
           # @api private
           sig { params(depth: Integer).returns(String) }

rbi/openai/internal/type/base_page.rbi

@@ -25,6 +25,10 @@ module OpenAI
         def to_enum
         end
 
+        sig { returns(T.nilable(T::Hash[String, String])) }
+        attr_reader :response_headers
+        end
+
         # @api private
         sig do
           params(
@@ -36,6 +40,10 @@ module OpenAI
         end
         def initialize(client:, req:, headers:, page_data:)
         end
+
+        sig { params(headers: T::Hash[String, String]).returns(T.self_type) }
+        def __set_response_headers(headers)
+        end
       end
     end
   end

rbi/openai/internal/type/base_stream.rbi

@@ -18,6 +18,10 @@ module OpenAI
         sig { returns(T::Hash[String, String]) }
         attr_reader :headers
 
+        sig { returns(T::Hash[String, String]) }
+        def response_headers
+        end
+
         sig { void }
         def close
         end

sig/openai/internal/type/base_model.rbs

@@ -77,6 +77,8 @@ module OpenAI
 
         def []: (Symbol key) -> top?
 
+        def response_headers: -> ::Hash[String, String]?
+
         def to_h: -> ::Hash[Symbol, top]
 
         alias to_hash to_h
@@ -91,6 +93,8 @@ module OpenAI
 
         def initialize: (?::Hash[Symbol, top] | instance data) -> void
 
+        def __set_response_headers: (::Hash[String, String] headers) -> self
+
         def self.inspect: (?depth: Integer) -> String
 
         def to_s: -> String