Skip to content

Commit 9b5671d

Browse files
authored
fixed EmbedAll() function in OCI Gen AI sample (#228)
fixed EmbedAll() in oci gen ai samples
1 parent 1eb9227 commit 9b5671d

File tree

3 files changed

+13
-6
lines changed

3 files changed

+13
-6
lines changed

spring-cloud-oci/spring-cloud-oci-samples/spring-cloud-oci-adb-sample/src/main/resources/application.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
33

44
spring.cloud.oci.region.static = us-phoenix-1
5-
#spring.cloud.oci.config.type = RESOURCE_PRINCIPAL
5+
spring.cloud.oci.config.type = file

spring-cloud-oci/spring-cloud-oci-samples/spring-cloud-oci-gen-ai-sample/src/main/java/com/oracle/cloud/spring/sample/genai/springcloudocigenaisample/EmbeddingModelController.java

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

66
package com.oracle.cloud.spring.sample.genai.springcloudocigenaisample;
77

8+
import java.util.Collections;
9+
import java.util.HashMap;
810
import java.util.List;
911
import java.util.Map;
1012

@@ -44,11 +46,15 @@ ResponseEntity<?> embed(@Parameter(required = true, example = "embedding input")
4446
@PostMapping(value = "embedAll")
4547
ResponseEntity<?> embed(@Parameter(required = true, example = "embedding text") @RequestBody List<String> inputs) {
4648
List<EmbedTextResponse> embedded = embeddingModel.embedAll(inputs);
47-
List<Map<String, Object>> response = embedded.stream().map(r -> Map.of(
48-
"inputs", r.getEmbedTextResult().getInputs(),
49-
"opcRequestId", r.getOpcRequestId(),
50-
"embeddings", embeddingModel.fromResponse(r)
51-
)).toList();
49+
List<Map<String, Object>> response = embedded.stream()
50+
.map(r -> {
51+
Map<String, Object> map = new HashMap<>();
52+
map.put("inputs", r.getEmbedTextResult() != null ? r.getEmbedTextResult().getInputs() : Collections.emptyList());
53+
map.put("opcRequestId", r.getOpcRequestId() != null ? r.getOpcRequestId() : "N/A");
54+
map.put("embeddings", embeddingModel.fromResponse(r));
55+
return map;
56+
})
57+
.toList();
5258
return ResponseEntity.ok().body(response);
5359
}
5460
}

spring-cloud-oci/spring-cloud-oci-samples/spring-cloud-oci-gen-ai-sample/src/main/resources/application.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ spring.cloud.oci.genai.chat.compartment=${OCI_COMPARTMENT_ID}
1212

1313
spring.cloud.oci.genai.chat.onDemandModelId=${OCI_CHAT_MODEL_ID}
1414
spring.cloud.oci.genai.embedding.onDemandModelId=${OCI_EMBEDDING_MODEL_ID}
15+

0 commit comments

Comments
 (0)