tolldemo: queue-reader starting position (#885)

* convert to spring boot 2.7.x application
* add call out to vision ai service

---------

Signed-off-by: Mark Nelson <mark.x.nelson@oracle.com>

Author: markxnelson

tolldemo/journal-app/src/main/java/com/example/journalapp/model/Journal.java

@@ -36,5 +36,7 @@ public class Journal {
     private String tollDate;
     @Column(name = "TOLL_COST")
     private Integer tollCost;
+    @Column(name = "DETECTED_VEHICLE_TYPE")
+    private String detectedVehicleType;
 
 }

tolldemo/journal-app/src/main/resources/schema.sql

@@ -7,5 +7,6 @@ create table if not exists journal (
     license_plate varchar2(10),
     vehicle_type varchar2(10),
     toll_date varchar2(25),
-    toll_cost number
+    toll_cost number,
+    detected_vehicle_type varchar2(10)
 );

tolldemo/queue-reader/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.2.5</version>
+        <version>2.7.18</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.example</groupId>
@@ -14,15 +14,19 @@
     <name>queue-reader</name>
     <description>queue-reader</description>
     <properties>
-        <java.version>21</java.version>
-        <spring-cloud.version>2023.0.1</spring-cloud.version>
-        <oracle-springboot-starter.version>23.4.0</oracle-springboot-starter.version>
+        <java.version>11</java.version>
+        <spring-cloud.version>2021.0.8</spring-cloud.version>
+        <oracle-springboot-starter.version>2.7.12</oracle-springboot-starter.version>
     </properties>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>
@@ -42,6 +46,20 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- oci sdk -->
+        <dependency>
+            <groupId>com.oracle.oci.sdk</groupId>
+            <artifactId>oci-java-sdk-common-httpclient-jersey</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.oracle.oci.sdk</groupId>
+            <artifactId>oci-java-sdk-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.oracle.oci.sdk</groupId>
+            <artifactId>oci-java-sdk-aivision</artifactId>
+        </dependency>
     </dependencies>
     <dependencyManagement>
         <dependencies>
@@ -52,6 +70,13 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>com.oracle.oci.sdk</groupId>
+                <artifactId>oci-java-sdk-bom</artifactId>
+                <version>3.41.0</version>
+                <type>pom</type>
+                <scope>import</scope>
+              </dependency>
         </dependencies>
     </dependencyManagement>
 

tolldemo/queue-reader/src/main/java/com/example/queuereader/client/AIVisionClient.java

@@ -0,0 +1,65 @@
+package com.example.queuereader.client;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.springframework.stereotype.Component;
+
+import com.oracle.bmc.ConfigFileReader;
+import com.oracle.bmc.aivision.AIServiceVisionClient;
+import com.oracle.bmc.aivision.model.AnalyzeImageDetails;
+import com.oracle.bmc.aivision.model.ImageClassificationFeature;
+import com.oracle.bmc.aivision.model.Label;
+import com.oracle.bmc.aivision.model.ObjectStorageImageDetails;
+import com.oracle.bmc.aivision.requests.AnalyzeImageRequest;
+import com.oracle.bmc.aivision.responses.AnalyzeImageResponse;
+import com.oracle.bmc.auth.AuthenticationDetailsProvider;
+import com.oracle.bmc.auth.ConfigFileAuthenticationDetailsProvider;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Component
+public class AIVisionClient {
+
+    public String analyzeImage(String imageUrl) {
+        ConfigFileReader.ConfigFile configFile = null;
+        try {
+            configFile = ConfigFileReader.parseDefault();
+        } catch (IOException ioe) {
+            return null;
+        }
+        AuthenticationDetailsProvider provider = new ConfigFileAuthenticationDetailsProvider(configFile);
+        AIServiceVisionClient client = AIServiceVisionClient.builder().build(provider);
+
+        String objectName = "cars-images/htsngg9tpc-2/" + imageUrl;
+        log.info("object name: " + objectName);
+
+        AnalyzeImageDetails analyzeImageDetails = AnalyzeImageDetails.builder()
+            .compartmentId("ocid1.compartment.oc1..aaaaaaaaulnuhmwvxfhcj46mtomr64ublwg6unsocdsmj5yvkujach6zewla")
+            .features(new ArrayList<>(Arrays.asList(ImageClassificationFeature.builder()
+                .modelId("ocid1.aivisionmodel.oc1.iad.amaaaaaaq33dybyan4fwde3syguv3dpp3alpryjs4z7phur4gfhhdr7l3c3q").build())))
+            .image(ObjectStorageImageDetails.builder()
+                .bucketName("tolldemo")
+                .namespaceName("maacloud")
+                .objectName(objectName).build())
+            .build();
+
+        AnalyzeImageRequest analyzeImageRequest = AnalyzeImageRequest.builder()
+            .analyzeImageDetails(analyzeImageDetails)
+            .opcRequestId("buggaluggs").build();
+
+        log.info("request: " + analyzeImageRequest);
+        AnalyzeImageResponse response = client.analyzeImage(analyzeImageRequest);
+
+        List<Label> labels = response.getAnalyzeImageResult().getLabels();
+        if (labels.isEmpty()) {
+            return null;
+        }
+        return labels.get(0).getName() + "," + labels.get(0).getConfidence();
+
+    }
+
+}

tolldemo/queue-reader/src/main/java/com/example/queuereader/controller/TollImageValidationController.java

@@ -0,0 +1,36 @@
+package com.example.queuereader.controller;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.example.queuereader.service.AIVisionService;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@RestController
+@RequestMapping("/image")
+public class TollImageValidationController {
+    
+    private AIVisionService service;
+
+    TollImageValidationController(AIVisionService service) {
+        this.service = service;
+    }
+
+    @PostMapping("/analyze")
+    public ResponseEntity<String> analyzeImage(@RequestBody String imageUrl) {
+        log.info("imageUrl = " + imageUrl);        
+        String response = service.analyzeImage(imageUrl);
+        if (response == null) {
+            return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
+        }
+        return new ResponseEntity<>(response, HttpStatus.OK);
+    }
+    
+
+}

tolldemo/queue-reader/src/main/java/com/example/queuereader/controller/TollReaderReceiver.java

@@ -3,10 +3,13 @@
 
 package com.example.queuereader.controller;
 
+import com.example.queuereader.service.AIVisionService;
 import com.example.queuereader.service.JournalService;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.jms.annotation.JmsListener;
 import org.springframework.stereotype.Component;
@@ -18,9 +21,11 @@ public class TollReaderReceiver {
     ObjectMapper objectMapper = new ObjectMapper();
 
     private JournalService journalService;
+    private AIVisionService aiVisionService;
 
-    public TollReaderReceiver(JournalService journalService) {
+    public TollReaderReceiver(JournalService journalService, AIVisionService aiVisionService) {
         this.journalService = journalService;
+        this.aiVisionService = aiVisionService;
     }
 
     @JmsListener(destination = "TollGate")
@@ -29,7 +34,14 @@ public void receiveTollData(String tollData) {
         try {
             JsonNode tollDataJson = objectMapper.readTree(tollData);
             log.info(String.valueOf(tollDataJson));
-            journalService.journal(tollDataJson);
+            // call ai vision model to detect vehicle type
+            String aiResult = aiVisionService.analyzeImage(tollDataJson.get("image").asText());
+            log.info("result from ai (type,confidence): " + aiResult);
+            String detectedVehicleType = aiResult.split(",")[0];
+            // add the detected vehicle type
+            JsonNode updatedTollDataJson = (JsonNode) ((ObjectNode)tollDataJson).put("detectedVehicleType", detectedVehicleType);
+
+            journalService.journal(updatedTollDataJson);
         } catch (JsonProcessingException e) {
             e.printStackTrace();
         }

tolldemo/queue-reader/src/main/java/com/example/queuereader/model/TollData.java

@@ -15,4 +15,5 @@ public class TollData {
     private String licensePlate;
     private String carType;
     private String timeStamp;
+    private String detectedCarType;
 }

tolldemo/queue-reader/src/main/java/com/example/queuereader/service/AIVisionService.java

@@ -0,0 +1,20 @@
+package com.example.queuereader.service;
+
+import org.springframework.stereotype.Service;
+
+import com.example.queuereader.client.AIVisionClient;
+
+@Service
+public class AIVisionService {
+    
+    private AIVisionClient client; 
+
+    AIVisionService(AIVisionClient client) {
+        this.client = client;
+    }
+
+    public String analyzeImage(String imageUrl) {
+        return client.analyzeImage(imageUrl);
+    }
+
+}

tolldemo/queue-reader/src/main/resources/application-local.yaml

@@ -1,13 +1,10 @@
 # mvn clean spring-boot:run -Dspring-boot.run.profiles=local
 spring:
   application:
-    name: queue-reader
-  threads:
-    virtual:
-      enabled: true
+    name: queue-reader 
 
   datasource:
-    url: jdbc:oracle:thin:@//localhost:1521/orclpdb1
+    url: jdbc:oracle:thin:@//172.17.0.2:1521/freepdb1
     username: tolldemo
     password: Welcome12345
     driver-class-name: oracle.jdbc.OracleDriver
@@ -20,3 +17,9 @@ spring:
       max-pool-size: 30
 server:
   port: 9090
+
+oracle:
+  aq:
+    url: jdbc:oracle:thin:@//172.17.0.2:1521/freepdb1
+    username: tolldemo
+    password: Welcome12345

tolldemo/queue-reader/src/test/java/com/example/queuereader/TestAIVisionClient.java

@@ -0,0 +1,20 @@
+package com.example.queuereader;
+
+import org.junit.jupiter.api.Test;
+
+import com.example.queuereader.client.AIVisionClient;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class TestAIVisionClient {
+
+    @Test
+    public void testImageAnalyze() {
+        AIVisionClient client = new AIVisionClient();
+
+        String response = client.analyzeImage("suv/PHOTO_96.jpg");
+        log.info(response.toString());
+    }
+
+}