Skip to content

Commit 1d41fd1

Browse files
paulparkinsonpaulparkinson
committed
update to chat/genai and new digital doubles app
1 parent ae40585 commit 1d41fd1

File tree

9 files changed

+26
-42
lines changed

9 files changed

+26
-42
lines changed

‎java-ai/src/main/java/oracleai/AIApplication.java

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,27 +8,16 @@
88
@SpringBootApplication
99
public class AIApplication {
1010

11-
public static final String COMPARTMENT_ID="ocid1.compartment.oc1..aaaaaaaafnah3ogykjsg34qruhixhb2drls6zhsejzm7mubi2i5qj66slcoq";
12-
public static final String OBJECTSTORAGE_NAMESPACE="oradbclouducm";
13-
public static final String OBJECTSTORAGE_BUCKETNAME="doc";
14-
public static final String ORDS_OMLOPSENDPOINT_URL="https://rddainsuh6u1okc-ragdb.adb.us-ashburn-1.oraclecloudapps.com/ords/omlopsuser/";
15-
public static final String ORDS_ENDPOINT_URL="https://rddainsuh6u1okc-gd740878851.adb.us-ashburn-1.oraclecloudapps.com/ords/aiuser/";
16-
public static final String OCI_VISION_SERVICE_ENDPOINT="https://vision.aiservice.myregion.oci.oraclecloud.com";
17-
public static final String OCI_SPEECH_SERVICE_ENDPOINT="https://speech.aiservice.myregion.oci.oraclecloud.com";
18-
public static final String OCI_GENAI_SERVICE_ENDPOINT="https://inference.generativeai.us-chicago-1.oci.oraclecloud.com";
19-
public static final String OPENAI_KEY="sk-proj-708e3KQqGY9fGfoJ4edWT3BlbkFJMGcsVq7JBOWPg4mxn0Y8";
20-
public static final String THREEDEY = "msy_oCS1X5nuRxS06AjdlTJ0vCHg3OFyOhpaCMoa";
21-
public static String OCICONFIG_FILE = "~/.oci/config";
22-
public static final String OCICONFIG_PROFILE = "DEFAULT";
23-
// public static final String COMPARTMENT_ID = System.getenv("COMPARTMENT_ID");
24-
// public static final String OBJECTSTORAGE_NAMESPACE = System.getenv("OBJECTSTORAGE_NAMESPACE");
25-
// public static final String OBJECTSTORAGE_BUCKETNAME = System.getenv("OBJECTSTORAGE_BUCKETNAME");
26-
// public static final String ORDS_ENDPOINT_URL = System.getenv("ORDS_ENDPOINT_URL");
27-
// public static final String OCI_VISION_SERVICE_ENDPOINT = System.getenv("OCI_VISION_SERVICE_ENDPOINT");
28-
// public static final String OCI_SPEECH_SERVICE_ENDPOINT = System.getenv("OCI_SPEECH_SERVICE_ENDPOINT");
29-
// public static final String OCI_GENAI_SERVICE_ENDPOINT = System.getenv("OCI_GENAI_SERVICE_ENDPOINT");
30-
// public static final String OCICONFIG_FILE = System.getenv("OCICONFIG_FILE");
31-
// public static final String OCICONFIG_PROFILE = System.getenv("OCICONFIG_PROFILE");
11+
public static final String COMPARTMENT_ID = System.getenv("COMPARTMENT_ID");
12+
public static final String OBJECTSTORAGE_NAMESPACE = System.getenv("OBJECTSTORAGE_NAMESPACE");
13+
public static final String OBJECTSTORAGE_BUCKETNAME = System.getenv("OBJECTSTORAGE_BUCKETNAME");
14+
public static final String ORDS_ENDPOINT_URL = System.getenv("ORDS_ENDPOINT_URL");
15+
public static final String ORDS_OMLOPSENDPOINT_URL= System.getenv("ORDS_ENDPOINT_URL") + "/omlopsuser/";
16+
public static final String OCI_VISION_SERVICE_ENDPOINT = System.getenv("OCI_VISION_SERVICE_ENDPOINT");
17+
public static final String OCICONFIG_FILE = System.getenv("OCICONFIG_FILE");
18+
public static final String OCICONFIG_PROFILE = System.getenv("OCICONFIG_PROFILE");
19+
public static final String DIGITAL_DOUBLES_IMAGES_ENDPOINT = System.getenv("DIGITAL_DOUBLES_IMAGES_ENDPOINT");
20+
public static final String THREEDEY = "msy_mykey";
3221

3322
static {
3423
System.out.println("AIApplication.static initializer COMPARTMENT_ID:" + COMPARTMENT_ID);

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package oracleai;
22

3+
import oracleai.digitaldouble.ImageStore;
34
import oracleai.services.ORDSCalls;
45
import org.springframework.stereotype.Controller;
56
import org.springframework.ui.Model;

‎java-ai/src/main/java/oracleai/DigitalDoubleDownloadInfo.java renamed to ‎java-ai/src/main/java/oracleai/digitaldouble/DigitalDoubleDownloadInfo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package oracleai;
1+
package oracleai.digitaldouble;
22

33
public class DigitalDoubleDownloadInfo {
44

‎java-ai/src/main/java/oracleai/DigitalDoubleService.java renamed to ‎java-ai/src/main/java/oracleai/digitaldouble/DigitalDoubleService.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
package oracleai;
1+
package oracleai.digitaldouble;
22

3+
import oracleai.AIApplication;
34
import org.springframework.http.*;
45
import org.springframework.stereotype.Service;
56
import org.springframework.web.client.RestTemplate;

‎java-ai/src/main/java/oracleai/DigitalDoubles.java renamed to ‎java-ai/src/main/java/oracleai/digitaldouble/DigitalDoublesController.java

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
1-
package oracleai;
1+
package oracleai.digitaldouble;
22

33

44
import oracleai.services.ORDSCalls;
55
import oracleai.services.OracleObjectStore;
6-
import org.apache.tomcat.util.http.fileupload.FileUtils;
7-
import org.jetbrains.annotations.Nullable;
86
import org.springframework.beans.factory.annotation.Autowired;
9-
import org.springframework.http.HttpEntity;
10-
import org.springframework.http.HttpHeaders;
117
import org.springframework.http.ResponseEntity;
128
import org.springframework.stereotype.Controller;
139
import org.springframework.ui.Model;
@@ -16,22 +12,17 @@
1612

1713
import java.io.File;
1814
import java.io.IOException;
19-
import java.nio.file.Path;
20-
import java.nio.file.Paths;
21-
import java.util.HashMap;
22-
import java.util.Map;
2315

2416
import org.springframework.http.MediaType;
2517

2618
@Controller
2719
@RequestMapping("/digitaldoubles")
28-
public class DigitalDoubles {
20+
public class DigitalDoublesController {
2921

3022
private final ImageProcessor imageProcessor;
3123

32-
// Inject the ImageProcessor using constructor injection
3324
@Autowired
34-
public DigitalDoubles(ImageProcessor imageProcessor) {
25+
public DigitalDoublesController(ImageProcessor imageProcessor) {
3526
this.imageProcessor = imageProcessor;
3627
}
3728
private static final String DIRECTORY = "/tmp/images/";

‎java-ai/src/main/java/oracleai/ImageProcessor.java renamed to ‎java-ai/src/main/java/oracleai/digitaldouble/ImageProcessor.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
package oracleai;
1+
package oracleai.digitaldouble;
22

3+
import oracleai.AIApplication;
34
import oracleai.services.ORDSCalls;
45
import org.apache.commons.io.FileUtils;
56
import org.springframework.beans.factory.annotation.Autowired;
@@ -51,7 +52,7 @@ private void processQueue() {
5152
DigitalDoubleDownloadInfo digitalDoubleDownloadInfo;
5253
if (!task.getImageFileNameWithEmailPrefix().equals("")) {
5354
digitalDoubleDownloadInfo = ORDSCalls.convertImageAndQueueResults(
54-
"http://129.80.168.144/digitaldoubles/images/",
55+
AIApplication.DIGITAL_DOUBLES_IMAGES_ENDPOINT,
5556
task.getImageFileNameWithEmailPrefix());
5657
} else {
5758
digitalDoubleDownloadInfo = new DigitalDoubleDownloadInfo();

‎java-ai/src/main/java/oracleai/ImageStore.java renamed to ‎java-ai/src/main/java/oracleai/digitaldouble/ImageStore.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package oracleai;
1+
package oracleai.digitaldouble;
22
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
33
import com.fasterxml.jackson.annotation.JsonProperty;
44

‎java-ai/src/main/java/oracleai/ImageStoreWrapper.java renamed to ‎java-ai/src/main/java/oracleai/digitaldouble/ImageStoreWrapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package oracleai;
1+
package oracleai.digitaldouble;
22

33
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
44
import java.util.List;

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
import com.fasterxml.jackson.databind.JsonNode;
44
import com.fasterxml.jackson.databind.ObjectMapper;
55
import oracleai.*;
6-
import org.jetbrains.annotations.Nullable;
6+
import oracleai.digitaldouble.DigitalDoubleDownloadInfo;
7+
import oracleai.digitaldouble.ImageStore;
8+
import oracleai.digitaldouble.ImageStoreWrapper;
79
import org.springframework.http.*;
810
import org.springframework.stereotype.Service;
911
import org.springframework.web.client.RestTemplate;
@@ -68,7 +70,6 @@ public static String executeTextSearchOR(String ordsEndpoint, String sql, String
6870
return callTextSearch(ordsEndpoint, jsonPayload);
6971
}
7072

71-
@Nullable
7273
private static String callTextSearch(String ordsEndpoint, String jsonPayload) {
7374
HttpHeaders headers = new HttpHeaders();
7475
headers.setContentType(MediaType.APPLICATION_JSON);
@@ -206,7 +207,7 @@ public static void insertDigitalDoubleData(MultipartFile image, MultipartFile vi
206207
}
207208

208209

209-
public static @Nullable String getDigitalDoubleData(String email) throws Exception {
210+
public static String getDigitalDoubleData(String email) throws Exception {
210211
System.out.println("DigitalDoubles.downloaddigitaldouble lookup email:" + email);
211212
// String url = AIApplication.ORDS_OMLOPSENDPOINT_URL + "modelurls/geturls/" + email;
212213
String baseUrl = AIApplication.ORDS_OMLOPSENDPOINT_URL + "/digitaldouble/fbxurl/" ;

0 commit comments

Comments
 (0)