feat: send properly base64 encoded for new r models

ntua-unit-of-control-and-informatics · Nov 21, 2024 · 7ca404a · 7ca404a
1 parent 263cc4e
commit 7ca404a
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/src/main/kotlin/org/jaqpot/api/mapper/ModelMapper.kt b/src/main/kotlin/org/jaqpot/api/mapper/ModelMapper.kt
@@ -131,15 +131,11 @@ private fun Model.encodeRawPreprocessor(rawPreprocessor: ByteArray?): String? {
 }
 
 fun Model.encodeRawModel(rawModel: ByteArray): String {
-    return if (isRModel()) {
+    return if (isRModel() && isLegacyModel()) {
         // https://upci-ntua.atlassian.net/browse/JAQPOT-199
         // R models require special deserialization and base64 messes up the model
         rawModel.decodeToString()
-    }
-//    else if (isLegacyModel()) {
-//        String(rawModel)
-//    }
-    else {
+    } else {
         Base64.getEncoder().encodeToString(rawModel)
     }
 }