update to chat/genai

Author: paulparkinson

build.sh

@@ -1,21 +1,6 @@
 #!/bin/bash
 
-set -e
-
-IMAGE_NAME=podsofkon
-#IMAGE_VERSION=latest
-IMAGE_VERSION=sustainableaijava
-#DOCKER_REGISTRY=us-ashburn-1.ocir.io/oradbclouducm/gd74087885
-DOCKER_REGISTRY=us-ashburn-1.ocir.io/oradbclouducm/podsofkon
-
-export IMAGE=${DOCKER_REGISTRY}/${IMAGE_NAME}:${IMAGE_VERSION}
-export IMAGE_VERSION=$IMAGE_VERSION
+#The following is temporary until release is available in maven and only required to be called once...
+#mvn org.apache.maven.plugins:maven-install-plugin:2.5.2:install-file -Dfile=lib/oci-java-sdk-generativeai-3.25.1-preview1-20230906.204234-1.jar
 
 mvn clean package
-
-#docker buildx build --platform linux/amd64,linux/arm64 -t $IMAGE .
-podman build -t=$IMAGE .
-#docker buildx build --platform=linux/amd64 -t=$IMAGE .
-
-#docker push --platform linux/amd64  "$IMAGE"
-podman push "$IMAGE"

java-ai/build.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+set -e
+
+IMAGE_NAME=podsofkon
+#IMAGE_VERSION=latest
+IMAGE_VERSION=sustainableaijava
+#DOCKER_REGISTRY=us-ashburn-1.ocir.io/oradbclouducm/gd74087885
+DOCKER_REGISTRY=us-ashburn-1.ocir.io/oradbclouducm/podsofkon
+
+export IMAGE=${DOCKER_REGISTRY}/${IMAGE_NAME}:${IMAGE_VERSION}
+export IMAGE_VERSION=$IMAGE_VERSION
+
+mvn clean package
+
+#docker buildx build --platform linux/amd64,linux/arm64 -t $IMAGE .
+podman build -t=$IMAGE .
+#docker buildx build --platform=linux/amd64 -t=$IMAGE .
+
+#docker push --platform linux/amd64  "$IMAGE"
+podman push "$IMAGE"

java-ai/build0.sh

@@ -15,7 +15,7 @@
 	<description>Oracle AI Demos</description>
 
 	<properties>
-		<oci.sdk.version>3.44.2</oci.sdk.version>
+		<oci.sdk.version>3.52.1</oci.sdk.version>
 	</properties>
 
 	<dependencies>
@@ -40,7 +40,7 @@
 		<dependency>
 			<groupId>com.oracle.cloud.spring</groupId>
 			<artifactId>spring-cloud-oci-starter</artifactId>
-			<version>1.2.0</version>
+			<version>1.3.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.oracle.oci.sdk</groupId>

build_and_run.sh renamed to java-ai/build_and_run.sh

@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.oracle.bmc.aivision.model.ImageTextDetectionFeature;
+import com.oracle.bmc.generativeaiinference.model.OnDemandServingMode;
 import oracleai.services.ORDSCalls;
 import oracleai.services.OracleGenAI;
 import oracleai.services.OracleObjectStore;
@@ -43,8 +44,13 @@ public String analyzedoc(@RequestParam("file") MultipartFile multipartFile,
         }
         System.out.println(concatenatedText);
         System.out.println("analyzedoc fullText = " + concatenatedText);
+        OnDemandServingMode chatServingMode = OnDemandServingMode.builder()
+                .modelId("cohere.command-r-16k")
+                .build();
         String explanationOfResults =
-                OracleGenAI.chat("explain these test results in simple terms, in less than 100 words, " +
+                OracleGenAI.builder().compartment(AIApplication.COMPARTMENT_ID)
+                        .servingMode(chatServingMode)
+                        .build().chat("explain these test results in simple terms, in less than 100 words, " +
                         "and tell me what should I do to get better results: \"" + concatenatedText + "\"");
         System.out.println("ExplainAndAdviseOnHealthTestResults.analyzedoc explanationOfResults:" + explanationOfResults);
         model.addAttribute("results", "SUMMARY WITH ADVICE: " + explanationOfResults +