bug: fixing model dictonary

Package.swift

@@ -1,5 +1,4 @@
 // swift-tools-version: 5.9
-
 import PackageDescription
 
 let package = Package(

Sources/aiXplainKit/Errors/Model+Error.swift

@@ -50,6 +50,9 @@ enum ModelError: Error, Equatable {
 
     /// Error reportet when using a file/URL as input and something went wrong
     case failToGenerateAFilePayload(error: String)
+
+    /// An unsupported value type was encountered while transforming the dictonary into a model input
+    case typeNotRecognizedWhileCreatingACombinedInput
 
     var localizedDescription: String {
         switch self {
@@ -72,6 +75,8 @@ enum ModelError: Error, Equatable {
             return "No URL was provided for the Model Run service. Please set a URL using `AiXplainKit.keyManager`."
         case .failToGenerateAFilePayload(error: let error):
             return "Something went wrong while generating a payload for the model from a file: \(error)"
+        case .typeNotRecognizedWhileCreatingACombinedInput:
+            return "An unsupported value type was encountered during dictonary model input generation. Please ensure that all values in the dictonary are either URLs or strings."
         }
     }
 }

Sources/aiXplainKit/Modules/Model/Input/ModelInput+Dictonary.swift

@@ -23,11 +23,29 @@
 
 import Foundation
 
-extension Dictionary: ModelInput where Key == String, Value == Any {
+extension Dictionary: ModelInput where Key == String, Value == ModelInput {
     public func generateInputPayloadForModel() async throws -> Data {
-        guard let jsonData = try? JSONSerialization.data(withJSONObject: self, options: []) else {
-            return Data()
+        var parsedSequence: [String:String] = [:]
+        let fileUploadManager = FileUploadManager()
+
+        for (_, keyValuePair) in self.enumerated() {
+            let (key, value) = keyValuePair
+
+            switch value {
+            case let url as URL:
+                let remoteURL = try await fileUploadManager.uploadDataIfNeedIt(from: url)
+                parsedSequence.updateValue(remoteURL.absoluteString, forKey: key)
+            case let string as String:
+                parsedSequence.updateValue(string, forKey: key)
+            default:
+                throw PipelineError.typeNotRecognizedWhileCreatingACombinedInput
+            }
         }
+
+        guard let jsonData = try? JSONSerialization.data(withJSONObject: parsedSequence, options: []) else {
+            throw PipelineError.inputEncodingError
+        }
+
         return jsonData
     }
 }

Sources/aiXplainKit/Modules/Model/Model.swift

@@ -48,7 +48,7 @@ do {
 public final class Model: DecodableAsset, CustomStringConvertible {
 
     /// Unique identifier for the model.
-    public let id: String
+    public var id: String
 
     /// Name of the model.
     public let name: String
@@ -95,20 +95,24 @@ public final class Model: DecodableAsset, CustomStringConvertible {
     public init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
 
-        id = try container.decode(String.self, forKey: .id)
+        id = try container.decodeIfPresent(String.self, forKey: .id) ?? ""
         name = try container.decode(String.self, forKey: .name)
         modelDescription = try container.decodeIfPresent(String.self, forKey: .description) ?? "An ML Model"
-        supplier = try container.decode(Supplier.self, forKey: .supplier)
 
-        version = try container.nestedContainer(keyedBy: CodingKeys.self, forKey: .version).decodeIfPresent(String.self, forKey: .id) ?? "-"
+        // Check if the "supplier" key is present and not an empty object
+        if var supplierContainer = try? container.nestedUnkeyedContainer(forKey: .supplier) {
+            supplier = try supplierContainer.decode(Supplier.self)
+        } else {
+            // Provide a default value for the supplier if it's missing or an empty object
+            supplier = Supplier(id: 0, name: "no", code: "")
+        }
 
+        version = try container.nestedContainer(keyedBy: CodingKeys.self, forKey: .version).decodeIfPresent(String.self, forKey: .id) ?? "-"
         pricing = try container.decode(Pricing.self, forKey: .pricing)
 
         privacy = nil
         license = nil
-
         logger = Logger(subsystem: "AiXplain", category: "Model(\(name)")
-
         networking = Networking()
     }
 

Sources/aiXplainKit/Provider/ModelProvider.swift

@@ -66,6 +66,9 @@ public final class ModelProvider {
         do {
             logger.debug("\(String(data: response.0, encoding: .utf8)!)")
             let fetchedModel = try JSONDecoder().decode(Model.self, from: response.0)
+            if fetchedModel.id.count <= 1 {
+                fetchedModel.id = modelID
+            }
 
             logger.info("\(fetchedModel.name) fetched")
             return fetchedModel