SK-2071: fix file object in response

Author: saileshwar-skyflow

src/main/java/com/skyflow/VaultClient.java

@@ -493,10 +493,10 @@ protected DeidentifyAudioRequest getDeidentifyAudioRequest(DeidentifyFileRequest
                 .allowRegex(allowRegex)
                 .restrictRegex(restrictRegex)
                 .entityTypes(mappedEntityTypes)
-                .bleepFrequency(request.getBleep().getFrequency())
-                .bleepGain(request.getBleep().getGain())
-                .bleepStartPadding(request.getBleep().getStartPadding())
-                .bleepStopPadding(request.getBleep().getStopPadding())
+                .bleepFrequency(request.getBleep() != null ? request.getBleep().getFrequency() : null)
+                .bleepGain(request.getBleep() != null ? request.getBleep().getGain() : null)
+                .bleepStartPadding(request.getBleep() != null ? request.getBleep().getStartPadding() : null)
+                .bleepStopPadding(request.getBleep() != null ? request.getBleep().getStopPadding() : null)
                 .outputProcessedAudio(request.getOutputProcessedAudio())
                 .outputTranscription(outputTranscriptionType)
                 .tokenType(tokenType)

src/main/java/com/skyflow/utils/Constants.java

@@ -26,5 +26,6 @@ public final class Constants {
     public static final String SDK_METRICS_HEADER_KEY = "sky-metadata";
     public static final String REQUEST_ID_HEADER_KEY = "x-request-id";
     public static final String PROCESSED_FILE_NAME_PREFIX = "processed-";
-    public static final String ERROR_FROM_CLIENT_HEADER_KEY = "error-from-client";
+    public static final String ERROR_FROM_CLIENT_HEADER_KEY = "eror-from-client";
+    public static final String DEIDENTIFIED_FILE_PREFIX = "deidentified";;
 }

src/main/java/com/skyflow/vault/controller/DetectController.java

@@ -231,24 +231,26 @@ private static synchronized DeidentifyFileResponse parseDeidentifyFileResponse(D
         }
 
         File processedFileObject = null;
+        FileInfo fileInfo = null;
         Optional<String> processedFileBase64 = firstOutput != null ? firstOutput.getProcessedFile() : Optional.empty();
         Optional<String> processedFileExtension = firstOutput != null ? firstOutput.getProcessedFileExtension() : Optional.empty();
 
         if (processedFileBase64.isPresent() && processedFileExtension.isPresent()) {
             try {
                 byte[] decodedBytes = Base64.getDecoder().decode(processedFileBase64.get());
                 String suffix = "." + processedFileExtension.get();
-                processedFileObject = File.createTempFile("deidentified", suffix);
-                processedFileObject.deleteOnExit();
-
+                String fileName = Constants.DEIDENTIFIED_FILE_PREFIX + suffix;
+                processedFileObject = new File(System.getProperty("java.io.tmpdir"), fileName);
                 Files.write(processedFileObject.toPath(), decodedBytes);
+                 fileInfo = new FileInfo(processedFileObject);
+                processedFileObject.deleteOnExit();
             } catch (IOException ioe) {
                 throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.FailedToEncodeFile.getMessage());
             }
         }
 
         return new DeidentifyFileResponse(
-                processedFileObject,
+                fileInfo,
                 firstOutput.getProcessedFile().orElse(null),
                 firstOutput.getProcessedFileType().get().toString(),
                 firstOutput.getProcessedFileExtension().get(),

src/main/java/com/skyflow/vault/detect/DeidentifyFileResponse.java

@@ -7,7 +7,7 @@
 import java.util.List;
 
 public class DeidentifyFileResponse {
-    private final File file;
+    private final FileInfo file;
     private final String fileBase64;
     private final String type;
     private final String extension;
@@ -23,7 +23,7 @@ public class DeidentifyFileResponse {
     private final List<String> errors;
 
 
-    public DeidentifyFileResponse(File file, String fileBase64, String type, String extension,
+    public DeidentifyFileResponse(FileInfo file, String fileBase64, String type, String extension,
                                   Integer wordCount, Integer charCount, Double sizeInKb,
                                   Double durationInSeconds, Integer pageCount, Integer slideCount,
                                   List<FileEntityInfo> entities, String runId, String status, List<String> errors) {
@@ -47,7 +47,7 @@ public DeidentifyFileResponse(String runId, String status) {
         this(null, null, null, null, null, null, null, null, null, null, null, runId, status, null);
     }
 
-    public File getFile() {
+    public FileInfo getFile() {
         return file;
     }
 

src/main/java/com/skyflow/vault/detect/FileInfo.java

@@ -0,0 +1,33 @@
+package com.skyflow.vault.detect;
+
+import java.io.File;
+
+public class FileInfo {
+    private String name;
+    private long size;
+    private String type;
+    private long lastModified;
+
+    public FileInfo(File file) {
+        this.name = file.getName();
+        this.size = file.length();
+        this.type = "";
+        this.lastModified = file.lastModified();
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public long getSize() {
+        return size;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public long getLastModified() {
+        return lastModified;
+    }
+}

src/test/java/com/skyflow/vault/detect/DeidentifyFileResponseTest.java

@@ -27,9 +27,10 @@ public void testAllGettersAndToString() {
         String runId = "run-123";
         String status = "SUCCESS";
         java.util.List<String> errors = Arrays.asList("error1", "error2");
+        FileInfo fileInfo = new FileInfo(fileObject);
 
         DeidentifyFileResponse response = new DeidentifyFileResponse(
-                fileObject, file, type, extension, wordCount, charCount, sizeInKb,
+                fileInfo, file, type, extension, wordCount, charCount, sizeInKb,
                 durationInSeconds, pageCount, slideCount, entities, runId, status, errors
         );
 

src/test/java/com/skyflow/vault/detect/FileInfoTest.java

@@ -0,0 +1,41 @@
+package com.skyflow.vault.detect;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+
+public class FileInfoTest {
+
+    @Test
+    public void testFileInfoFields() throws IOException {
+        // Create a temp file
+        File tempFile = File.createTempFile("testfileinfo", ".txt");
+        tempFile.deleteOnExit();
+
+        // Write some content to ensure size > 0
+        FileWriter writer = new FileWriter(tempFile);
+        writer.write("Hello Skyflow!");
+        writer.close();
+
+        FileInfo fileInfo = new FileInfo(tempFile);
+
+        Assert.assertEquals(tempFile.getName(), fileInfo.getName());
+        Assert.assertEquals(tempFile.length(), fileInfo.getSize());
+        Assert.assertEquals("", fileInfo.getType());
+        Assert.assertEquals(tempFile.lastModified(), fileInfo.getLastModified());
+    }
+
+    @Test
+    public void testFileInfoWithNonExistentFile() {
+        File fakeFile = new File("nonexistentfile.txt");
+        FileInfo fileInfo = new FileInfo(fakeFile);
+
+        Assert.assertEquals("nonexistentfile.txt", fileInfo.getName());
+        Assert.assertEquals(0, fileInfo.getSize());
+        Assert.assertEquals("", fileInfo.getType());
+        Assert.assertEquals(0, fileInfo.getLastModified());
+    }
+}