Use Faraday's built in JSON parsing

Author: alexrudall

lib/openai/http.rb

@@ -3,41 +3,32 @@
 module OpenAI
   module HTTP
     def get(path:)
-      to_json(conn.get(uri(path: path)) do |req|
+      conn.get(uri(path: path)) do |req|
         req.headers = headers
-      end&.body)
+      end&.body
     end
 
     def json_post(path:, parameters:)
-      to_json(conn.post(uri(path: path)) do |req|
+      conn.post(uri(path: path)) do |req|
         configure_json_post_request(req, parameters)
-      end&.body)
+      end&.body
     end
 
     def multipart_post(path:, parameters: nil)
-      to_json(conn(multipart: true).post(uri(path: path)) do |req|
+      conn(multipart: true).post(uri(path: path)) do |req|
         req.headers = headers.merge({ "Content-Type" => "multipart/form-data" })
         req.body = multipart_parameters(parameters)
-      end&.body)
+      end&.body
     end
 
     def delete(path:)
-      to_json(conn.delete(uri(path: path)) do |req|
+      conn.delete(uri(path: path)) do |req|
         req.headers = headers
-      end&.body)
+      end&.body
     end
 
     private
 
-    def to_json(string)
-      return unless string
-
-      JSON.parse(string)
-    rescue JSON::ParserError
-      # Convert a multiline string of JSON objects to a JSON array.
-      JSON.parse(string.gsub("}\n{", "},{").prepend("[").concat("]"))
-    end
-
     # Given a proc, returns an outer proc that can be used to iterate over a JSON stream of chunks.
     # For each chunk, the inner user_proc is called giving it the JSON object. The JSON object could
     # be a data object or an error object as described in the OpenAI API documentation.
@@ -64,6 +55,7 @@ def conn(multipart: false)
         f.options[:timeout] = @request_timeout
         f.request(:multipart) if multipart
         f.response :raise_error
+        f.response :json
       end
     end
 

spec/openai/client/finetunes_spec.rb

@@ -53,7 +53,12 @@
 
       it "succeeds" do
         VCR.use_cassette(cassette) do
-          expect(response.dig("error", "code")).to eq("fine_tune_not_found")
+          response
+        rescue Faraday::ResourceNotFound => e
+          expect(e.response).to include(status: 404)
+          expect(e.response.dig(:body, "error", "code")).to eq("fine_tune_not_found")
+        else
+          raise "Expected to raise Faraday::ResourceNotFound"
         end
       end
     end
@@ -64,7 +69,12 @@
 
       it "succeeds" do
         VCR.use_cassette(cassette) do
-          expect(response.dig("error", "code")).to eq("fine_tune_not_found")
+          response
+        rescue Faraday::ResourceNotFound => e
+          expect(e.response).to include(status: 404)
+          expect(e.response.dig(:body, "error", "code")).to eq("fine_tune_not_found")
+        else
+          raise "Expected to raise Faraday::ResourceNotFound"
         end
       end
     end
@@ -75,7 +85,12 @@
 
       it "succeeds" do
         VCR.use_cassette(cassette) do
-          expect(response.dig("error", "code")).to eq("fine_tune_not_found")
+          response
+        rescue Faraday::ResourceNotFound => e
+          expect(e.response).to include(status: 404)
+          expect(e.response.dig(:body, "error", "code")).to eq("fine_tune_not_found")
+        else
+          raise "Expected to raise Faraday::ResourceNotFound"
         end
       end
     end

spec/openai/client/http_spec.rb

@@ -189,15 +189,6 @@
     end
   end
 
-  describe ".to_json" do
-    context "with a jsonl string" do
-      let(:body) { "{\"prompt\":\":)\"}\n{\"prompt\":\":(\"}\n" }
-      let(:parsed) { OpenAI::Client.new.send(:to_json, body) }
-
-      it { expect(parsed).to eq([{ "prompt" => ":)" }, { "prompt" => ":(" }]) }
-    end
-  end
-
   describe ".uri" do
     let(:path) { "/chat" }
     let(:uri) { OpenAI::Client.new.send(:uri, path: path) }