updated loader

Author: swiftuiux

Sources/openai-async-image-swiftui/enum/AsyncImageErrors.swift

@@ -7,7 +7,6 @@
 
 import Foundation
 
-/// Enumeration representing the various errors that can occur in `OpenAIAsyncImage`
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
 enum AsyncImageErrors: Error, Equatable {
 
@@ -20,4 +19,22 @@ enum AsyncImageErrors: Error, Equatable {
     /// Error indicating that the response returned no images
     case returnedNoImages
 
+    /// Status is not valid
+    case httpStatus(String)
+}
+
+@available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
+extension AsyncImageErrors: LocalizedError {
+    public var errorDescription: String? {
+        switch self {
+        case .imageInit:
+            return NSLocalizedString("Unable to create image from the provided data.", comment: "")
+        case .clientIsNotDefined:
+            return NSLocalizedString("Client not found. The URL might be invalid.", comment: "")
+        case .returnedNoImages:
+            return NSLocalizedString("The response did not contain any images.", comment: "")
+        case .httpStatus(let data):
+            return NSLocalizedString("HTTP status error: \(data).", comment: "")
+        }
+    }
 }

Sources/openai-async-image-swiftui/viewModel/OpenAIDefaultLoader.swift

@@ -17,21 +17,20 @@ import AppKit.NSImage
 #endif
 
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
-public final class OpenAIDefaultLoader : IOpenAILoader{
+public final class OpenAIDefaultLoader: IOpenAILoader {
 
     /// HTTP async client to handle requests
-    private let client : Http.Proxy<JsonReader, JsonWriter>?
+    private let client: Http.Proxy<JsonReader, JsonWriter>?
 
     /// Endpoint parameters required for making requests
-    private let endpoint : IOpenAIImageEndpoint
+    private let endpoint: IOpenAIImageEndpoint
 
     /// Initializes the loader with endpoint parameters
     /// - Parameter endpoint: Set of parameters for making requests
-    public init(endpoint : IOpenAIImageEndpoint) {
-        
+    public init(endpoint: IOpenAIImageEndpoint) {
         self.endpoint = endpoint
 
-        guard let url = URL(string: endpoint.urlString) else{
+        guard let url = URL(string: endpoint.urlString) else {
             client = nil
             return
         }
@@ -45,33 +44,52 @@ public final class OpenAIDefaultLoader : IOpenAILoader{
     ///   - size: The size of the generated image
     /// - Returns: OpenAI Image
     public func load(
-        _ prompt : String,
-        with size : OpenAIImageSize
-    ) async throws -> Image{
-        
-        // Prepare the request body with the prompt and size
-        let body = Input(prompt: prompt, size: size, response_format: .b64, n: 1)
-        
-        // Set the request headers, including authorization
-        let headers = ["Content-Type": "application/json","Authorization": "Bearer \(endpoint.apiKey)"]
-        let path = endpoint.path
+        _ prompt: String,
+        with size: OpenAIImageSize
+    ) async throws -> Image {
 
-        guard let client = client else{
+        guard let client = client else {
             throw AsyncImageErrors.clientIsNotDefined
         }
 
-        // Send the request and get the response
-        let result: Http.Response<Output> = try await client.post(path: path, body: body, headers: headers)
+        do {
+            let (path, body, headers) = prepareRequest(prompt: prompt, size: size)
+            let result: Http.Response<Output> = try await client.post(path: path, body: body, headers: headers)
+            return try imageBase64(from: result.value)
+            
+        } catch {
+           try handleRequestError(error)
+        }
+    }
+    
+    /// Prepares the request with the necessary parameters
+    /// - Parameters:
+    ///   - prompt: The text prompt describing the desired image
+    ///   - size: The size of the generated image
+    /// - Returns: A tuple containing the path, body, and headers for the request
+    private func prepareRequest(prompt: String, size: OpenAIImageSize) -> (String, Input, [String: String]) {
+        let body = Input(prompt: prompt, size: size, response_format: .b64, n: 1)
+        let headers = ["Content-Type": "application/json", "Authorization": "Bearer \(endpoint.apiKey)"]
+        let path = endpoint.path
+        return (path, body, headers)
+    }
+    
+    /// Handles errors that occur during the request
+    /// - Parameter error: The error that occurred
+    private func handleRequestError(_ error: Error) throws -> Never {
+        if case let Http.Errors.status(_, _, data) = error, let responseData = data {
+            let data = String(data: responseData, encoding: .utf8) ?? "Unable to decode data"
+            throw AsyncImageErrors.httpStatus(data)
+        }
 
-        // Convert the response to an image
-        return try imageBase64(from: result.value)
+        throw error
     }
 
     /// Decodes base64 encoded string to Data
     /// - Parameter output: The output received from the endpoint
     /// - Returns: Decoded Data
-    private func decodeBase64(from output: Output) throws -> Data?{
-        guard let base64 = output.firstImage else  {
+    private func decodeBase64(from output: Output) throws -> Data? {
+        guard let base64 = output.firstImage else {
             throw AsyncImageErrors.returnedNoImages
         }
 
@@ -83,10 +101,9 @@ public final class OpenAIDefaultLoader : IOpenAILoader{
     /// - Parameter output: OpenAI response type
     /// - Returns: UIImage
     private func imageBase64(from output: Output) throws -> Image {
-        
         let data = try decodeBase64(from: output)
 
-        if let data, let image = UIImage(data: data){
+        if let data, let image = UIImage(data: data) {
             return Image(uiImage: image)
         }
 
@@ -99,10 +116,9 @@ public final class OpenAIDefaultLoader : IOpenAILoader{
     /// - Parameter output: OpenAI response type
     /// - Returns: NSImage
     private func imageBase64(from output: Output) throws -> Image {
-        
         let data = try decodeBase64(from: output)
 
-        if let data, let image = NSImage(data: data){
+        if let data, let image = NSImage(data: data) {
             return Image(nsImage: image)
         }