[CM-1580]: Implemented utility to convert Curve into standard Asset. Implemented related test case.

Author: yaricom

comet-java-client/src/main/java/ml/comet/experiment/impl/utils/AssetUtils.java

@@ -7,18 +7,22 @@
 import ml.comet.experiment.impl.asset.AssetImpl;
 import ml.comet.experiment.impl.asset.AssetType;
 import ml.comet.experiment.impl.asset.RemoteAssetImpl;
+import ml.comet.experiment.impl.rest.CurveData;
+import ml.comet.experiment.model.Curve;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Stream;
 
+import static ml.comet.experiment.impl.asset.AssetType.CURVE;
 import static ml.comet.experiment.impl.asset.AssetType.POINTS_3D;
 import static ml.comet.experiment.impl.asset.AssetType.UNKNOWN;
 
@@ -128,6 +132,20 @@ public static AssetImpl createAssetFromData(byte[] data, @NonNull String logical
         return updateAsset(asset, overwrite, metadata, type);
     }
 
+    /**
+     * Creates {@code Asset} from provided {@code Curve} instance.
+     *
+     * @param curve     the {@code Curve} instance with data points.
+     * @param overwrite if {@code true} mark as override
+     * @return the instance of the {@link AssetImpl} with file-like data.
+     */
+    public static AssetImpl createAssetFromCurve(@NonNull Curve curve, boolean overwrite) {
+        CurveData data = CurveData.from(curve);
+        String json = JsonUtils.toJson(data);
+        return createAssetFromData(json.getBytes(StandardCharsets.UTF_8), curve.getName(), overwrite,
+                Optional.empty(), Optional.of(CURVE.type()));
+    }
+
     /**
      * Updates provided {@link AssetImpl} with values from optionals or with defaults.
      *

comet-java-client/src/test/java/ml/comet/experiment/impl/utils/AssetUtilsTest.java

@@ -5,6 +5,8 @@
 import ml.comet.experiment.impl.TestUtils;
 import ml.comet.experiment.impl.asset.AssetImpl;
 import ml.comet.experiment.impl.asset.AssetType;
+import ml.comet.experiment.model.Curve;
+import ml.comet.experiment.model.DataPoint;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.file.PathUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -34,13 +36,16 @@
 import static java.util.Optional.empty;
 import static java.util.Optional.ofNullable;
 import static ml.comet.experiment.impl.asset.AssetType.ASSET;
+import static ml.comet.experiment.impl.asset.AssetType.CURVE;
 import static ml.comet.experiment.impl.asset.AssetType.NOTEBOOK;
 import static ml.comet.experiment.impl.asset.AssetType.SOURCE_CODE;
 import static ml.comet.experiment.impl.utils.AssetUtils.REMOTE_FILE_NAME_DEFAULT;
+import static ml.comet.experiment.impl.utils.AssetUtils.createAssetFromCurve;
 import static ml.comet.experiment.impl.utils.AssetUtils.createAssetFromData;
 import static ml.comet.experiment.impl.utils.AssetUtils.createAssetFromFile;
 import static ml.comet.experiment.impl.utils.AssetUtils.createRemoteAsset;
 import static ml.comet.experiment.impl.utils.AssetUtils.updateAsset;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -215,6 +220,26 @@ public void testCreateAssetFromData() {
         assertEquals(expected, asset.getType());
     }
 
+    @Test
+    public void testCreateAssetFromCurve() {
+        String json = "{\"name\":\"someCurve\",\"x\":[0.0,1.0,2.0,3.0,4.0,5.0,6.0,7.0,8.0,9.0],\"y\":[0.0,10.0,20.0,30.0,40.0,50.0,60.0,70.0,80.0,90.0]}";
+        byte []data = json.getBytes(StandardCharsets.UTF_8);
+        int count = 10;
+        DataPoint[] dataPoints = new DataPoint[count];
+        for (int i = 0; i < count; i++) {
+            dataPoints[i] = DataPoint.of(i, i * 10);
+        }
+        String fileName = "someCurve";
+        Curve curve = new Curve(dataPoints, fileName);
+
+        AssetImpl asset = createAssetFromCurve(curve, true);
+        assertNotNull(asset);
+        assertArrayEquals(data, asset.getFileLikeData().orElse(null));
+        assertEquals(fileName, asset.getLogicalPath());
+        assertEquals(CURVE.type(), asset.getType());
+        assertTrue(asset.getOverwrite());
+    }
+
     @Test
     public void testUpdateAsset() {
         boolean overwrite = true;