resolve review comments

MacPaw · May 30, 2023 · 4cf235c · 4cf235c
1 parent a768269
commit 4cf235c
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 9 deletions.
diff --git a/Sources/OpenAI/OpenAI.swift b/Sources/OpenAI/OpenAI.swift
@@ -24,12 +24,12 @@ final public class OpenAI: OpenAIProtocol {
         public let host: String
 
         /// Optional base path if you set up OpenAI API proxy on a custom path on your own host. Default is ""
-        public let basePath: String?
+        public let basePath: String
 
         /// Default request timeout
         public let timeoutInterval: TimeInterval
 
-        public init(token: String, organizationIdentifier: String? = nil, host: String = "api.openai.com", basePath: String? = nil, timeoutInterval: TimeInterval = 60.0) {
+        public init(token: String, organizationIdentifier: String? = nil, host: String = "api.openai.com", basePath: String = "", timeoutInterval: TimeInterval = 60.0) {
             self.token = token
             self.organizationIdentifier = organizationIdentifier
             self.host = host
@@ -172,11 +172,9 @@ extension OpenAI {
 extension OpenAI {
 
     func buildURL(path: String) -> URL {
-        var components = URLComponents()
-        components.scheme = "https"
-        components.host = configuration.host
-        components.path = (configuration.basePath ?? "") + path
-        return components.url!
+        return URL(string: "https://\(configuration.host)")!
+            .appendingPathComponent(configuration.basePath.trimmingCharacters(in: .init(charactersIn: "/")))
+            .appendingPathComponent(path.trimmingCharacters(in: .init(charactersIn: "/")))
     }
 }
 

diff --git a/Tests/OpenAITests/OpenAITests.swift b/Tests/OpenAITests/OpenAITests.swift
@@ -283,10 +283,39 @@ class OpenAITests: XCTestCase {
     }
 
     func testCustomURLBuilt() {
-        let configuration = OpenAI.Configuration(token: "foo", organizationIdentifier: "bar", host: "my.host.com", timeoutInterval: 14)
-        let openAI = OpenAI(configuration: configuration, session: self.urlSession)
+        var configuration = OpenAI.Configuration(token: "foo", organizationIdentifier: "bar", host: "my.host.com", timeoutInterval: 14)
+        var openAI = OpenAI(configuration: configuration, session: self.urlSession)
         let completionsURL = openAI.buildURL(path: .completions)
         XCTAssertEqual(completionsURL, URL(string: "https://my.host.com/v1/completions"))
+
+        configuration = OpenAI.Configuration(
+            token: "foo",
+            organizationIdentifier: "bar",
+            host: "bizbaz.com",
+            timeoutInterval: 14
+        )
+        openAI = OpenAI(configuration: configuration, session: URLSessionMock())
+        XCTAssertEqual(openAI.buildURL(path: "foo"), URL(string: "https://bizbaz.com/foo"))
+
+        configuration = OpenAI.Configuration(
+            token: "foo",
+            organizationIdentifier: "bar",
+            host: "bizbaz.com",
+            basePath: "/openai",
+            timeoutInterval: 14
+        )
+        openAI = OpenAI(configuration: configuration, session: URLSessionMock())
+        XCTAssertEqual(openAI.buildURL(path: "foo"), URL(string:"https://bizbaz.com/openai/foo"))
+
+        configuration = OpenAI.Configuration(
+            token: "foo",
+            organizationIdentifier: "bar",
+            host: "bizbaz.com",
+            basePath: "/openai/",
+            timeoutInterval: 14
+        )
+        openAI = OpenAI(configuration: configuration, session: URLSessionMock())
+        XCTAssertEqual(openAI.buildURL(path: "/foo"), URL(string: "https://bizbaz.com/openai/foo"))
     }
 }