digital double logic

Author: paulparkinson

java-ai/src/main/java/oracleai/DigitalDoubles.java

@@ -50,12 +50,11 @@ public String uploadimageandvideo(
                 ", comments = " + comments + ", model = " + model +
                 "\ncomments with animstyle and prompt = " + commentsWithAnimStyleAndPrompt);
         if (!image.isEmpty()) {
-            OracleObjectStore.sendToObjectStorage(
-                    email + "_" + video.getOriginalFilename(), video.getInputStream());
             ORDSCalls.insertDigitalDoubleData(
                     image,null, firstName, lastName, email, company,jobRole, tshirtSize, commentsWithAnimStyleAndPrompt);
             if (!video.isEmpty()) {
-//                byte[] videoBytes = video.getBytes();
+                OracleObjectStore.sendToObjectStorage(
+                        email + "_" + video.getOriginalFilename(), video.getInputStream());
             }
             try {
                 org.apache.commons.io.FileUtils.forceMkdir(new File(DIRECTORY));

java-ai/src/main/java/oracleai/common/FileUploadExceptionAdvice.java

@@ -0,0 +1,16 @@
+package oracleai.common;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.multipart.MaxUploadSizeExceededException;
+
+@ControllerAdvice
+public class FileUploadExceptionAdvice {
+
+    @ExceptionHandler(MaxUploadSizeExceededException.class)
+    public ResponseEntity<String> handleMaxSizeException(MaxUploadSizeExceededException exc) {
+        return ResponseEntity.status(HttpStatus.EXPECTATION_FAILED).body("File too large!");
+    }
+}

java-ai/src/main/java/oracleai/services/AuthProvider.java

@@ -1,24 +1,22 @@
 package oracleai.services;
 
-import com.oracle.bmc.auth.AuthenticationDetailsProvider;
 import com.oracle.bmc.auth.ConfigFileAuthenticationDetailsProvider;
-import com.oracle.bmc.auth.AuthenticationDetailsProvider;
 import com.oracle.bmc.auth.BasicAuthenticationDetailsProvider;
-import com.oracle.bmc.auth.ConfigFileAuthenticationDetailsProvider;
-import com.oracle.bmc.auth.ResourcePrincipalAuthenticationDetailsProvider;
 import com.oracle.bmc.auth.InstancePrincipalsAuthenticationDetailsProvider;
+import oracleai.AIApplication;
+
 import java.io.IOException;
 
 public class AuthProvider {
 
     public static BasicAuthenticationDetailsProvider getAuthenticationDetailsProvider() throws IOException {
         if (isRunningInOKE()) return InstancePrincipalsAuthenticationDetailsProvider.builder().build();
         else return new ConfigFileAuthenticationDetailsProvider(
-                System.getenv("OCICONFIG_FILE"), System.getenv("OCICONFIG_PROFILE"));
+                AIApplication.OCICONFIG_FILE, AIApplication.OCICONFIG_PROFILE);
     }
 
     private static boolean isRunningInOKE() {
-        return true; //System.getenv("OCI_RESOURCE_PRINCIPAL_VERSION") != null;
+        return false; //System.getenv("OCI_RESOURCE_PRINCIPAL_VERSION") != null;
     }
 
 }

java-ai/src/main/java/oracleai/services/ORDSCalls.java

@@ -197,7 +197,7 @@ public static void insertDigitalDoubleData(MultipartFile image, MultipartFile vi
         request.p_participant_comments = comments;
 //        request.p_id_image_in = idimage;
         request.p_image_in = Base64.getEncoder().encodeToString(image.getBytes());;
-        request.p_video_in = Base64.getEncoder().encodeToString(video.getBytes());;
+        if (video!=null ) request.p_video_in = Base64.getEncoder().encodeToString(video.getBytes());;
         client.insertDigitalDoubleData(request);
         System.out.println("ORDSCalls.insertDigitalDoubleData insert complete");
     }

java-ai/src/main/java/oracleai/services/OracleObjectStore.java

@@ -18,7 +18,7 @@ public class OracleObjectStore {
 
 
     public static void sendToObjectStorage(String fileName, InputStream inputStreamForFile) throws IOException {
-        System.out.println("GenerateAPictureStoryUsingOnlySpeech.sendToObjectStorage fileToUpload:" + fileName);
+        System.out.println("sendToObjectStorage fileToUpload:" + fileName);
         BasicAuthenticationDetailsProvider provider = AuthProvider.getAuthenticationDetailsProvider();
         ObjectStorageClient client = ObjectStorageClient.builder().build(provider);
         PutObjectRequest putObjectRequest = PutObjectRequest.builder()

java-ai/src/main/resources/application.properties

@@ -26,3 +26,6 @@ spring:
 logging:
   level:
     org.springframework.web.cors: DEBUG
+server:
+  tomcat:
+    max-swallow-size: 200MB