Remove underlyingError from GenerateContentError.invalidAPIKey (#92)

google-gemini · Jan 25, 2024 · 31f762d · 31f762d
1 parent d395e44
commit 31f762d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/Sources/GoogleAI/GenerateContentError.swift b/Sources/GoogleAI/GenerateContentError.swift
@@ -26,5 +26,5 @@ public enum GenerateContentError: Error {
   case responseStoppedEarly(reason: FinishReason, response: GenerateContentResponse)
 
   /// The provided API key is invalid.
-  case invalidAPIKey(underlying: Error)
+  case invalidAPIKey
 }
diff --git a/Sources/GoogleAI/GenerativeModel.swift b/Sources/GoogleAI/GenerativeModel.swift
@@ -109,7 +109,7 @@ public final class GenerativeModel {
       response = try await generativeAIService.loadRequest(request: generateContentRequest)
     } catch {
       if let error = error as? RPCError, error.isInvalidAPIKeyError() {
-        throw GenerateContentError.invalidAPIKey(underlying: error)
+        throw GenerateContentError.invalidAPIKey
       }
       throw GenerateContentError.internalError(underlying: error)
     }

diff --git a/Tests/GoogleAITests/GenerativeModelTests.swift b/Tests/GoogleAITests/GenerativeModelTests.swift
@@ -181,10 +181,8 @@ final class GenerativeModelTests: XCTestCase {
     do {
       _ = try await model.generateContent(testPrompt)
       XCTFail("Should throw GenerateContentError.internalError; no error thrown.")
-    } catch let GenerateContentError.invalidAPIKey(underlying: error as RPCError) {
-      XCTAssertEqual(error.status, .invalidArgument)
-      XCTAssertEqual(error.httpResponseCode, expectedStatusCode)
-      XCTAssertTrue(error.message.hasPrefix("API key not valid"))
+    } catch GenerateContentError.invalidAPIKey {
+      // Do nothing, catching a GenerateContentError.invalidAPIKey error is expected.
     } catch {
       XCTFail("Should throw GenerateContentError.invalidAPIKey; error thrown: \(error)")
     }