status code handling

Author: swiftuiux

Package.swift

@@ -13,7 +13,7 @@ let package = Package(
             targets: ["replicate-kit-swift"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/The-Igor/async-http-client.git", from: "1.4.2")
+        .package(url: "https://github.com/The-Igor/async-http-client.git", from: "1.4.3")
     ],
     targets: [
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.

Sources/replicate-kit-swift/ReplicateAPI.swift

@@ -76,11 +76,7 @@ public struct ReplicateAPI{
 
         let path = "collections/\(collection_slug)"
 
-        do{
-            return try await client.get(path: path, validate: rule).value
-        }catch{
-            throw ResponseError.check(error)
-        }
+        return try await client.get(path: path, validate: rule).value
     }
 
     /// Get a model
@@ -91,11 +87,7 @@ public struct ReplicateAPI{
 
         let path = "models/\(owner)/\(name)"
 
-        do{
-            return try await client.get(path: path, validate: rule).value
-        }catch{
-            throw ResponseError.check(error)
-        }
+        return try await client.get(path: path, validate: rule).value
 
     }
 
@@ -146,14 +138,7 @@ public struct ReplicateAPI{
         by id : String
     ) async throws -> Prediction<Output>{
 
-        do{
-            return try await client.get(
-                path: "predictions/\(id)",
-                validate: rule
-            ).value
-        }catch{
-            throw ResponseError.check(error)
-        }
+        try await client.get(path: "predictions/\(id)", validate: rule).value
     }
 
     // MARK: - Private
@@ -202,15 +187,11 @@ public struct ReplicateAPI{
         with body : HttpBody<Input>
     ) async throws -> Prediction<Output>{
 
-        do{
-            return try await client.post(
-                path: "predictions",
-                body : body,
-                validate: rule
-            ).value
-        }catch{
-            throw ResponseError.check(error)
-        }
+        try await client.post(
+            path: "predictions",
+            body : body,
+            validate: rule
+        ).value
     }
 }
 
@@ -250,4 +231,4 @@ fileprivate func sessionCfg (_ token : String) -> URLSessionConfiguration{
 }
 
 /// Between the range responses from the server is valid
-fileprivate let rule = [Http.Validate.status(.range(200..<299))]
+fileprivate let rule = [Http.Validate.status(.check(errorFn))]

Sources/replicate-kit-swift/error/Errors.swift

@@ -27,8 +27,5 @@ extension ReplicateAPI{
 
         /// Could not decode error format response
         case couldNotDecodeErrorContainer
-        
-        /// Could not decode error description
-        case read(ResponseError)
     }    
 }

Sources/replicate-kit-swift/error/ResponseError.swift

@@ -46,30 +46,30 @@ public struct ResponseError: Hashable, CustomStringConvertible, LocalizedError,
     }
 
 
-    /// Processing cases server cannot or will not process the request due to something that is perceived to be a client error
-    /// 401 Unauthorized
-    /// 402 Payment Required
-    /// - Parameter error: Error
-    /// - Returns: Error with a decription why server cannot or will not process the request  or Error
-    static func check(_ error : Error) -> Error{
-        
-        guard case let Http.Errors.status(status, _, data) = error else{
-            return error
-        }
-        
-        guard let status, (400...499).contains(status) else{
-            return error
-        }
-        
-        guard let data = data else{
-            return error
-        }
-        
-        if let error = try? JSONDecoder().decode(ResponseError.self, from: data){
-            return ReplicateAPI.Errors.read(error)
-        }
-        
+
+}
+
+/// Processing cases server cannot or will not process the request due to something that is perceived to be a client error
+/// 401 Unauthorized
+/// 402 Payment Required
+/// - Parameter error: Error
+/// - Returns: Error with a decription why server cannot or will not process the request if it managed to parse data response, standard status error or nil if requst was succesful
+internal func errorFn(status: Int,  _ response : URLResponse, data: Data?) -> Error?{
+    
+    if (200...299).contains(status) { return nil }
+    
+    guard (400...499).contains(status) else{
+        return Http.Errors.status(status, response, data)
+    }
+    
+    guard let data = data else{
+        return Http.Errors.status(status, response, data)
+    }
+    
+    if let error = try? JSONDecoder().decode(ResponseError.self, from: data){
         return error
-        
     }
+    
+    return Http.Errors.status(status, response, data)
+    
 }