Get specs passing

Author: alexrudall

lib/openai/client.rb

@@ -2,15 +2,23 @@ module OpenAI
   class Client
     include OpenAI::HTTP
 
-    attr_reader :access_token, :organization_id, :uri_base, :request_timeout, :extra_headers
+    CONFIG_KEYS = %i[
+      api_type
+      api_version
+      access_token
+      organization_id
+      uri_base
+      request_timeout
+      extra_headers
+    ].freeze
+    attr_reader *CONFIG_KEYS
 
-    def initialize(access_token: nil, organization_id: nil, uri_base: nil,
-                   request_timeout: nil, extra_headers: {})
-      @access_token = access_token || OpenAI.configuration.access_token
-      @organization_id = organization_id || OpenAI.configuration.organization_id
-      @request_timeout = request_timeout || OpenAI.configuration.request_timeout
-      @uri_base = uri_base || OpenAI.configuration.uri_base
-      @extra_headers = extra_headers
+    def initialize(config = {})
+      CONFIG_KEYS.each do |key|
+        # Set instance variables like api_type & access_token. Fall back to global config
+        # if not present.
+        instance_variable_set("@#{key}", config[key] || OpenAI.configuration.send(key))
+      end
     end
 
     def chat(parameters: {})
@@ -56,5 +64,9 @@ def transcribe(parameters: {})
     def translate(parameters: {})
       multipart_post(path: "/audio/translations", parameters: parameters)
     end
+
+    def azure?
+      @api_type == :azure
+    end
   end
 end

lib/openai/http.rb

@@ -70,34 +70,34 @@ def conn(multipart: false)
     end
 
     def uri(path:)
-      if OpenAI.configuration.api_type == :azure
+      if azure?
         base = File.join(@uri_base, path)
-        "#{base}?api-version=#{OpenAI.configuration.api_version}"
+        "#{base}?api-version=#{@api_version}"
       else
-        File.join(@uri_base, OpenAI.configuration.api_version, path)
+        File.join(@uri_base, @api_version, path)
       end
     end
 
     def headers
-      if OpenAI.configuration.api_type == :azure
+      if azure?
         azure_headers
       else
         openai_headers
-      end.merge(OpenAI.configuration.extra_headers || {})
+      end.merge(@extra_headers || {})
     end
 
     def openai_headers
       {
         "Content-Type" => "application/json",
         "Authorization" => "Bearer #{@access_token}",
         "OpenAI-Organization" => @organization_id
-      }.merge(@extra_headers)
+      }
     end
 
     def azure_headers
       {
         "Content-Type" => "application/json",
-        "api-key" => OpenAI.configuration.access_token
+        "api-key" => @access_token
       }
     end