code cleanup

Author: albertopeam

Sources/OpenAISwift/OpenAISwift.swift

@@ -34,7 +34,7 @@ extension InternalError: Decodable {}
 
 public class OpenAISwift {
     private let urlSession: URLSession
-    fileprivate(set) var token: String
+    private let token: String
 
     public init(urlSession: URLSession = .shared, authToken: String) {
         self.urlSession = urlSession
@@ -69,7 +69,7 @@ extension OpenAISwift {
 
     private func makeRequest<BodyType: Encodable>(endpoint: Endpoint, body: BodyType, completionHandler: @escaping (Result<OpenAI, OpenAIError>) -> Void) {
         guard let request = prepareRequest(endpoint, body: body) else {
-            completionHandler(.failure(.decodingError(error: RequestError())))
+            completionHandler(.failure(.genericError(error: RequestError())))
             return
         }
         let task = urlSession.dataTask(with: request) { (data, response, error) in
@@ -91,19 +91,6 @@ extension OpenAISwift {
         task.resume()
     }
 
-    private func makeRequest(request: URLRequest, completionHandler: @escaping (Result<Data, Error>) -> Void) {
-        let session = URLSession.shared
-        let task = session.dataTask(with: request) { (data, response, error) in
-            if let error = error {
-                completionHandler(.failure(error))
-            } else if let data = data {
-                completionHandler(.success(data))
-            }
-        }
-        
-        task.resume()
-    }
-    
     private func prepareRequest<BodyType: Encodable>(_ endpoint: Endpoint, body: BodyType) -> URLRequest? {
         guard let baseUrl = URL(string: endpoint.baseURL()) else {
             return nil

Tests/OpenAISwiftTests/OpenAISwiftTests.swift

@@ -55,6 +55,27 @@ final class OpenAISwiftTests: XCTestCase {
         }
     }
 
+    func testDecodingError() async throws {
+        do {
+            let responseData = try XCTUnwrap("{}".data(using: .utf8))
+            let expectedUrl = try XCTUnwrap(URL(string: "https://api.openai.com/v1/completions"))
+            let expectedToken = try XCTUnwrap(validAuthToken)
+            MockURLProtocol.handlers.add(match: { $0.url == expectedUrl },
+                                         inspect: {
+                XCTAssertEqual($0.allHTTPHeaderFields?["Content-Type"], "application/json")
+                XCTAssertEqual($0.allHTTPHeaderFields?["Authorization"], "Bearer \(expectedToken)")
+            },
+                                         result: .success(.init(statusCode: 500, data: responseData)))
+            let sut = OpenAISwift(urlSession: mockUrlSession, authToken: validAuthToken)
+            
+            _ = try await sut.sendCompletion(with: "Write a haiku")
+            
+            XCTFail("sendCompletion must fail")
+        } catch OpenAIError.decodingError {
+            XCTAssertTrue(true)
+        }
+    }
+    
     func testSuccess() async throws {
         let successData = try XCTUnwrap("""
         {