chore(internal): improve response envelope unwrap functionality

Author: stainless-app[bot]

lib/openai/internal/transport/base_client.rb

@@ -214,7 +214,7 @@ def initialize(
         #
         #   @option req [Object, nil] :body
         #
-        #   @option req [Symbol, nil] :unwrap
+        #   @option req [Symbol, Integer, Array<Symbol, Integer>, Proc, nil] :unwrap
         #
         #   @option req [Class<OpenAI::Internal::Type::BasePage>, nil] :page
         #
@@ -415,7 +415,7 @@ def initialize(
         #
         # @param body [Object, nil]
         #
-        # @param unwrap [Symbol, nil]
+        # @param unwrap [Symbol, Integer, Array<Symbol, Integer>, Proc, nil]
         #
         # @param page [Class<OpenAI::Internal::Type::BasePage>, nil]
         #

lib/openai/internal/util.rb

@@ -175,30 +175,31 @@ def deep_merge(*values, sentinel: nil, concat: false)
         # @api private
         #
         # @param data [Hash{Symbol=>Object}, Array<Object>, Object]
-        # @param pick [Symbol, Integer, Array<Symbol, Integer>, nil]
-        # @param sentinel [Object, nil]
+        # @param pick [Symbol, Integer, Array<Symbol, Integer>, Proc, nil]
         # @param blk [Proc, nil]
         #
         # @return [Object, nil]
-        def dig(data, pick, sentinel = nil, &blk)
-          case [data, pick, blk]
-          in [_, nil, nil]
+        def dig(data, pick, &blk)
+          case [data, pick]
+          in [_, nil]
             data
-          in [Hash, Symbol, _] | [Array, Integer, _]
-            blk.nil? ? data.fetch(pick, sentinel) : data.fetch(pick, &blk)
-          in [Hash | Array, Array, _]
+          in [Hash, Symbol] | [Array, Integer]
+            data.fetch(pick) { blk&.call }
+          in [Hash | Array, Array]
             pick.reduce(data) do |acc, key|
               case acc
               in Hash if acc.key?(key)
                 acc.fetch(key)
               in Array if key.is_a?(Integer) && key < acc.length
                 acc[key]
               else
-                return blk.nil? ? sentinel : blk.call
+                return blk&.call
               end
             end
-          in _
-            blk.nil? ? sentinel : blk.call
+          in [_, Proc]
+            pick.call(data)
+          else
+            blk&.call
           end
         end
       end

rbi/lib/openai/internal/transport/base_client.rbi

@@ -24,7 +24,14 @@ module OpenAI
                         )]
               ),
               body: T.nilable(T.anything),
-              unwrap: T.nilable(Symbol),
+              unwrap: T.nilable(
+                T.any(
+                  Symbol,
+                  Integer,
+                  T::Array[T.any(Symbol, Integer)],
+                  T.proc.params(arg0: T.anything).returns(T.anything)
+                )
+              ),
               page: T.nilable(T::Class[OpenAI::Internal::Type::BasePage[OpenAI::Internal::Type::BaseModel]]),
               stream: T.nilable(
                 T::Class[OpenAI::Internal::Type::BaseStream[T.anything,
@@ -173,7 +180,14 @@ module OpenAI
                       )]
             ),
             body: T.nilable(T.anything),
-            unwrap: T.nilable(Symbol),
+            unwrap: T.nilable(
+              T.any(
+                Symbol,
+                Integer,
+                T::Array[T.any(Symbol, Integer)],
+                T.proc.params(arg0: T.anything).returns(T.anything)
+              )
+            ),
             page: T.nilable(T::Class[OpenAI::Internal::Type::BasePage[OpenAI::Internal::Type::BaseModel]]),
             stream: T.nilable(
               T::Class[OpenAI::Internal::Type::BaseStream[T.anything,

rbi/lib/openai/internal/util.rbi

@@ -68,13 +68,19 @@ module OpenAI
         sig do
           params(
             data: T.any(OpenAI::Internal::AnyHash, T::Array[T.anything], T.anything),
-            pick: T.nilable(T.any(Symbol, Integer, T::Array[T.any(Symbol, Integer)])),
-            sentinel: T.nilable(T.anything),
+            pick: T.nilable(
+              T.any(
+                Symbol,
+                Integer,
+                T::Array[T.any(Symbol, Integer)],
+                T.proc.params(arg0: T.anything).returns(T.anything)
+              )
+            ),
             blk: T.nilable(T.proc.returns(T.anything))
           )
             .returns(T.nilable(T.anything))
         end
-        def dig(data, pick, sentinel = nil, &blk); end
+        def dig(data, pick, &blk); end
       end
 
       class << self

sig/openai/internal/transport/base_client.rbs

@@ -11,7 +11,10 @@ module OpenAI
             | Integer
             | ::Array[(String | Integer)?])?]?,
             body: top?,
-            unwrap: Symbol?,
+            unwrap: (Symbol
+            | Integer
+            | ::Array[(Symbol | Integer)]
+            | (^(top arg0) -> top))?,
             page: Class?,
             stream: Class?,
             model: OpenAI::Internal::Type::Converter::input?,
@@ -96,7 +99,10 @@ module OpenAI
           | Integer
           | ::Array[(String | Integer)?])?]?,
           ?body: top?,
-          ?unwrap: Symbol?,
+          ?unwrap: (Symbol
+          | Integer
+          | ::Array[(Symbol | Integer)]
+          | (^(top arg0) -> top))?,
           ?page: Class?,
           ?stream: Class?,
           ?model: OpenAI::Internal::Type::Converter::input?,

sig/openai/internal/util.rbs

@@ -29,8 +29,10 @@ module OpenAI
 
       def self?.dig: (
         ::Hash[Symbol, top] | ::Array[top] | top data,
-        (Symbol | Integer | ::Array[(Symbol | Integer)])? pick,
-        ?top? sentinel
+        (Symbol
+        | Integer
+        | ::Array[(Symbol | Integer)]
+        | (^(top arg0) -> top))? pick
       ) {
         -> top?
       } -> top?

test/openai/internal/util_test.rb

@@ -87,8 +87,9 @@ def test_dig
       OpenAI::Internal::Util.dig([], 1.0) => nil
 
       OpenAI::Internal::Util.dig(Object, 1) => nil
-      OpenAI::Internal::Util.dig([], 1.0, 2) => 2
       OpenAI::Internal::Util.dig([], 1.0) { 2 } => 2
+      OpenAI::Internal::Util.dig([], ->(_) { 2 }) => 2
+      OpenAI::Internal::Util.dig([1], -> { _1 in [1] }) => true
     end
   end
 end
@@ -165,9 +166,9 @@ def test_json_content
       "application/vnd.github.v3+json" => true,
       "application/vnd.api+json" => true
     }
-    cases.each do |header, _verdict|
+    cases.each do |header, verdict|
       assert_pattern do
-        OpenAI::Internal::Util::JSON_CONTENT.match?(header) => verdict
+        OpenAI::Internal::Util::JSON_CONTENT.match?(header) => ^verdict
       end
     end
   end