Merge pull request #358 from atesgoral/handle-non-json-error

Handle case where error response body may not be JSON

Author: alexrudall

lib/openai/http.rb

@@ -51,7 +51,7 @@ def to_json_stream(user_proc:)
       proc do |chunk, _bytes, env|
         if env && env.status != 200
           raise_error = Faraday::Response::RaiseError.new
-          raise_error.on_complete(env.merge(body: JSON.parse(chunk)))
+          raise_error.on_complete(env.merge(body: try_parse_json(chunk)))
         end
 
         parser.feed(chunk) do |_type, data|
@@ -125,5 +125,11 @@ def configure_json_post_request(req, parameters)
       req.headers = headers
       req.body = req_parameters.to_json
     end
+
+    def try_parse_json(maybe_json)
+      JSON.parse(maybe_json)
+    rescue JSON::ParserError
+      maybe_json
+    end
   end
 end

spec/fixtures/cassettes/gpt-3_5-turbo_streamed_chat_with_error_response.yml

@@ -73,10 +73,10 @@ def call(chunk)
             end
           end
 
-          context "with an error response" do
-            let(:cassette) { "#{model} streamed chat with error response".downcase }
+          context "with an error response with a JSON body" do
+            let(:cassette) { "#{model} streamed chat with json error response".downcase }
 
-            it "raises an HTTP error" do
+            it "raises an HTTP error with the parsed body" do
               VCR.use_cassette(cassette, record: :none) do
                 response
               rescue Faraday::BadRequestError => e
@@ -94,6 +94,21 @@ def call(chunk)
               end
             end
           end
+
+          context "with an error response without a JSON body" do
+            let(:cassette) { "#{model} streamed chat with error response".downcase }
+
+            it "raises an HTTP error" do
+              VCR.use_cassette(cassette, record: :none) do
+                response
+              rescue Faraday::ServerError => e
+                expect(e.response).to include(status: 500)
+                expect(e.response[:body]).to eq("")
+              else
+                raise "Expected to raise Faraday::ServerError"
+              end
+            end
+          end
         end
       end