Skip to content

Commit 7e6aaec

Browse files
committed
Handling JsonProcessingException
1 parent 616e4e3 commit 7e6aaec

File tree

4 files changed

+16
-14
lines changed

4 files changed

+16
-14
lines changed

orchestration/src/main/java/com/sap/ai/sdk/orchestration/spring/OrchestrationChatModel.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ public OrchestrationChatModel(@Nonnull final OrchestrationClient client) {
6464
@Override
6565
public ChatResponse call(@Nonnull final Prompt prompt) {
6666
if (prompt.getOptions() instanceof OrchestrationChatOptions options) {
67-
6867
val orchestrationPrompt = toOrchestrationPrompt(prompt);
6968
val response =
7069
new OrchestrationSpringChatResponse(

orchestration/src/main/java/com/sap/ai/sdk/orchestration/spring/OrchestrationSpringUtil.java

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
import com.sap.ai.sdk.prompt.registry.model.PromptTemplateSubstitutionRequest;
88
import com.sap.ai.sdk.prompt.registry.model.SingleChatTemplate;
99
import com.sap.ai.sdk.prompt.registry.model.Template;
10+
11+
import java.util.List;
1012
import java.util.Map;
1113
import javax.annotation.Nonnull;
1214
import lombok.val;
@@ -18,10 +20,6 @@
1820

1921
/** Utility class for orchestration-related operations in a Spring context. */
2022
public class OrchestrationSpringUtil {
21-
private static final OrchestrationModuleConfig config =
22-
new OrchestrationModuleConfig().withLlmConfig(GPT_4O_MINI);
23-
private static final OrchestrationChatOptions defaultOptions =
24-
new OrchestrationChatOptions(config);
2523

2624
private OrchestrationSpringUtil() {
2725
// Utility class, no instantiation allowed
@@ -35,13 +33,16 @@ private OrchestrationSpringUtil() {
3533
* @return a Prompt object containing the messages from the template
3634
*/
3735
@Nonnull
38-
public static Prompt getPromptTemplate(
39-
@Nonnull final String templateName, @Nonnull final Map<String, Object> inputParams) {
36+
public static List<Message> getPromptTemplate(
37+
@Nonnull final String templateName,
38+
@Nonnull final String Scenario,
39+
@Nonnull final String Version,
40+
@Nonnull final Map<String, Object> inputParams) {
4041
val templateMessages =
4142
new PromptClient()
4243
.parsePromptTemplateByNameVersion(
43-
"MyScenario",
44-
"1.0.0",
44+
Scenario,
45+
Version,
4546
templateName,
4647
"default",
4748
false,
@@ -65,6 +66,6 @@ public static Prompt getPromptTemplate(
6566
};
6667
})
6768
.toList();
68-
return new Prompt(messages, defaultOptions);
69+
return messages;
6970
}
7071
}

sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/services/SpringAiOrchestrationService.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import org.springframework.ai.chat.client.advisor.MessageChatMemoryAdvisor;
2727
import org.springframework.ai.chat.memory.InMemoryChatMemoryRepository;
2828
import org.springframework.ai.chat.memory.MessageWindowChatMemory;
29+
import org.springframework.ai.chat.messages.Message;
2930
import org.springframework.ai.chat.messages.SystemMessage;
3031
import org.springframework.ai.chat.messages.UserMessage;
3132
import org.springframework.ai.chat.model.ChatModel;
@@ -284,10 +285,11 @@ public ChatResponse getPromptTemplate() {
284285
val advisor = MessageChatMemoryAdvisor.builder(memory).build();
285286
val cl = ChatClient.builder(client).defaultAdvisors(advisor).build();
286287

287-
val prompt =
288+
List<Message> m =
288289
OrchestrationSpringUtil.getPromptTemplate(
289-
"prompt_template_name",
290-
Map.of("current_timestamp", System.currentTimeMillis(), "topic", "Time"));
290+
"prompt_template_name", "MyScenario", "1.0.0",
291+
Map.of("current_timestamp", String.valueOf(System.currentTimeMillis()), "topic", "Time"));
292+
val prompt = new Prompt(m, defaultOptions);
291293
return cl.prompt(prompt).call().chatResponse();
292294
}
293295
}

sample-code/spring-app/src/test/java/com/sap/ai/sdk/app/controllers/SpringAiOrchestrationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,6 @@ void getPromptTemplate() {
173173
assertThat(ChatResponse).isNotNull();
174174
assertThat(ChatResponse.getResult().getOutput().getText()).isNotEmpty();
175175
assertThat(ChatResponse.getResult().getOutput().getText())
176-
.contains("How can I assist you today?");
176+
.contains("blabla");
177177
}
178178
}

0 commit comments

Comments
 (0)