Merge pull request #460 from alexrudall/handle-version-in-base-uri

Handle API version in base URI

Author: alexrudall

lib/openai/http.rb

@@ -88,6 +88,8 @@ def uri(path:)
       if azure?
         base = File.join(@uri_base, path)
         "#{base}?api-version=#{@api_version}"
+      elsif @uri_base.include?(@api_version)
+        File.join(@uri_base, path)
       else
         File.join(@uri_base, @api_version, path)
       end

spec/openai/client/http_spec.rb

@@ -204,6 +204,18 @@
 
     it { expect(uri).to eq("https://api.openai.com/v1/chat") }
 
+    context "uri_base with version included" do
+      before do
+        OpenAI.configuration.uri_base = "https://api.openai.com/v1/"
+      end
+
+      after do
+        OpenAI.configuration.uri_base = "https://api.openai.com/"
+      end
+
+      it { expect(uri).to eq("https://api.openai.com/v1/chat") }
+    end
+
     context "uri_base without trailing slash" do
       before do
         OpenAI.configuration.uri_base = "https://api.openai.com"