move into javaai dir, add k8s and dockerfile and basicauth

Author: paulparkinson

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

@@ -29,15 +29,15 @@ public String uploadImage(@RequestParam("image") MultipartFile image, Model mode
         return "images";
     }
 
-    @GetMapping("/uploadimageandvideo0")
-    public String uploadimageandvideo(@RequestParam("image") MultipartFile image, Model model) {
-//        ORDSCalls.uploadImage(image);
-//        System.out.println("Image upload complete for: " + image.getOriginalFilename());
-        System.out.println("convertImage(): " + ORDSCalls.convertImage());
-        ImageStore[] imageStores = ORDSCalls.getImageStoreData();
-        model.addAttribute("images", imageStores);
-        return "images";
-    }
+//    @GetMapping("/uploadimageandvideo0")
+//    public String uploadimageandvideo(@RequestParam("image") MultipartFile image, Model model) {
+////        ORDSCalls.uploadImage(image);
+////        System.out.println("Image upload complete for: " + image.getOriginalFilename());
+//        System.out.println("convertImage(): " + ORDSCalls.convertImage());
+//        ImageStore[] imageStores = ORDSCalls.getImageStoreData();
+//        model.addAttribute("images", imageStores);
+//        return "images";
+//    }
 
 
     private static final String DIRECTORY = "/tmp/images/";
@@ -52,8 +52,10 @@ public ResponseEntity<String> uploadImage(@RequestParam("image") MultipartFile f
             org.apache.commons.io.FileUtils.forceMkdir(new File(DIRECTORY));
             Path path = Paths.get(DIRECTORY + file.getOriginalFilename());
             file.transferTo(path);
-
-            return ResponseEntity.ok("File uploaded and available at: " + "/images/" + file.getOriginalFilename());
+            return ResponseEntity.ok(
+                    ORDSCalls.convertImage("http://129.80.168.144/transferimage/images/" + file.getOriginalFilename())
+            );
+//            return ResponseEntity.ok("File uploaded and available at: " + "/images/" + file.getOriginalFilename());
         } catch (Exception e) {
             return ResponseEntity.internalServerError().body("Could not upload the file: " + e.getMessage());
         }

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

@@ -124,14 +124,15 @@ public static ImageStore[] make3Drequest() {
     }
 
 
-    public static String convertImage() {
+    public static String convertImage(String imageLocation) {
         String apiUrl = "https://api.meshy.ai/v1/image-to-3d";
         RestTemplate restTemplate = new RestTemplate();
         HttpHeaders headers = new HttpHeaders();
         headers.setContentType(MediaType.APPLICATION_JSON);
         headers.set("Authorization", "Bearer " + AIApplication.THREEDEY);
         String requestJson =
-                "{\"image_url\": \"https://upload.wikimedia.org/wikipedia/commons/e/e1/Face_%E2%80%93_Alexander.jpg\", " +
+//                "{\"image_url\": \"https://upload.wikimedia.org/wikipedia/commons/e/e1/Face_%E2%80%93_Alexander.jpg\", " +
+                "{\"image_url\": \""+imageLocation+"\", " +
                         "\"enable_pbr\": true, \"surface_mode\": \"hard\"}";
         HttpEntity<String> entity = new HttpEntity<>(requestJson, headers);
         ResponseEntity<String> response = restTemplate.postForEntity(apiUrl, entity, String.class);