Remove a force unwrap and formating (#59)

google-gemini · Dec 13, 2023 · ea39d69 · ea39d69
1 parent 6c19387
commit ea39d69
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/Sources/GoogleAI/Chat.swift b/Sources/GoogleAI/Chat.swift
@@ -39,8 +39,7 @@ public class Chat {
   /// - Parameter content: The new content to send as a single chat message.
   /// - Returns: The model's response if no error occurred.
   /// - Throws: A ``GenerateContentError`` if an error occurred.
-  public func sendMessage(_ content: [ModelContent]) async throws
-    -> GenerateContentResponse {
+  public func sendMessage(_ content: [ModelContent]) async throws -> GenerateContentResponse {
     // Ensure that the new content has the role set.
     let newContent: [ModelContent] = content.map(populateContentRole(_:))
 

diff --git a/Tests/GoogleAITests/GenerativeModelTests.swift b/Tests/GoogleAITests/GenerativeModelTests.swift
@@ -683,18 +683,18 @@ final class GenerativeModelTests: XCTestCase {
 
   private func httpRequestHandler(forResource name: String,
                                   withExtension ext: String,
-                                  statusCode: Int = 200) throws -> ((URLRequest) -> (
+                                  statusCode: Int = 200) throws -> ((URLRequest) throws -> (
     URLResponse,
     AsyncLineSequence<URL.AsyncBytes>?
   )) {
     let fileURL = try XCTUnwrap(Bundle.module.url(forResource: name, withExtension: ext))
     return { request in
-      let response = HTTPURLResponse(
+      let response = try XCTUnwrap(HTTPURLResponse(
         url: request.url!,
         statusCode: statusCode,
         httpVersion: nil,
         headerFields: nil
-      )!
+      ))
       return (response, fileURL.lines)
     }
   }

diff --git a/Tests/GoogleAITests/MockURLProtocol.swift b/Tests/GoogleAITests/MockURLProtocol.swift
@@ -17,7 +17,10 @@ import XCTest
 
 @available(iOS 15.0, tvOS 15.0, *)
 class MockURLProtocol: URLProtocol {
-  static var requestHandler: ((URLRequest) -> (URLResponse, AsyncLineSequence<URL.AsyncBytes>?))?
+  static var requestHandler: ((URLRequest) throws -> (
+    URLResponse,
+    AsyncLineSequence<URL.AsyncBytes>?
+  ))?
 
   override class func canInit(with request: URLRequest) -> Bool { return true }
 
@@ -32,7 +35,7 @@ class MockURLProtocol: URLProtocol {
     }
 
     Task {
-      let (response, stream) = requestHandler(self.request)
+      let (response, stream) = try requestHandler(self.request)
       client.urlProtocol(self, didReceive: response, cacheStoragePolicy: .notAllowed)
       if let stream = stream {
         do {