chore: broadly detect json family of content-type headers

Author: stainless-app[bot]

lib/openai/internal/util.rb

@@ -471,6 +471,11 @@ def writable_enum(&blk)
         end
       end
 
+      # @type [Regexp]
+      JSON_CONTENT = %r{^application/(?:vnd(?:\.[^.]+)*\+)?json(?!l)}
+      # @type [Regexp]
+      JSONL_CONTENT = %r{^application/(?:x-)?jsonl}
+
       class << self
         # @api private
         #
@@ -563,9 +568,9 @@ def encode_content(headers, body)
           body = body.inner if body.is_a?(OpenAI::Internal::Util::SerializationAdapter)
 
           case [content_type, body]
-          in [%r{^application/(?:vnd\.api\+)?json}, Hash | Array | -> { primitive?(_1) }]
+          in [OpenAI::Internal::Util::JSON_CONTENT, Hash | Array | -> { primitive?(_1) }]
             [headers, JSON.fast_generate(body)]
-          in [%r{^application/(?:x-)?jsonl}, Enumerable] unless body.is_a?(StringIO) || body.is_a?(IO)
+          in [OpenAI::Internal::Util::JSONL_CONTENT, Enumerable] unless body.is_a?(StringIO) || body.is_a?(IO)
             [headers, body.lazy.map { JSON.fast_generate(_1) }]
           in [%r{^multipart/form-data}, Hash | Pathname | StringIO | IO]
             boundary, strio = encode_multipart_streaming(body)
@@ -611,15 +616,15 @@ def force_charset!(content_type, text:)
         # @return [Object]
         def decode_content(headers, stream:, suppress_error: false)
           case (content_type = headers["content-type"])
-          in %r{^application/(?:vnd\.api\+)?json}
+          in OpenAI::Internal::Util::JSON_CONTENT
             json = stream.to_a.join
             begin
               JSON.parse(json, symbolize_names: true)
             rescue JSON::ParserError => e
               raise e unless suppress_error
               json
             end
-          in %r{^application/(?:x-)?jsonl}
+          in OpenAI::Internal::Util::JSONL_CONTENT
             lines = decode_lines(stream)
             chain_fused(lines) do |y|
               lines.each { y << JSON.parse(_1, symbolize_names: true) }

rbi/lib/openai/internal/util.rbi

@@ -192,6 +192,9 @@ module OpenAI
         def writable_enum(&blk); end
       end
 
+      JSON_CONTENT = T.let(%r{^application/(?:vnd(?:\.[^.]+)*\+)?json(?!l)}, Regexp)
+      JSONL_CONTENT = T.let(%r{^application/(?:x-)?jsonl}, Regexp)
+
       class << self
         # @api private
         sig do

sig/openai/internal/util.rbs

@@ -103,6 +103,9 @@ module OpenAI
         (Enumerator::Yielder y) -> void
       } -> Enumerable[String]
 
+      JSON_CONTENT: Regexp
+      JSONL_CONTENT: Regexp
+
       def self?.write_multipart_chunk: (
         Enumerator::Yielder y,
         boundary: String,

test/openai/internal/util_test.rb

@@ -157,6 +157,22 @@ def test_joining_queries
   end
 end
 
+class OpenAI::Test::RegexMatchTest < Minitest::Test
+  def test_json_content
+    cases = {
+      "application/json" => true,
+      "application/jsonl" => false,
+      "application/vnd.github.v3+json" => true,
+      "application/vnd.api+json" => true
+    }
+    cases.each do |header, _verdict|
+      assert_pattern do
+        OpenAI::Internal::Util::JSON_CONTENT.match?(header) => verdict
+      end
+    end
+  end
+end
+
 class OpenAI::Test::UtilFormDataEncodingTest < Minitest::Test
   class FakeCGI < CGI
     def initialize(headers, io)