Skip to content

Commit 8244f64

Browse files
committed
Add and test getAllMessages
1 parent 3f5f043 commit 8244f64

File tree

3 files changed

+24
-11
lines changed

3 files changed

+24
-11
lines changed

orchestration/src/main/java/com/sap/ai/sdk/orchestration/OrchestrationChatResponse.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@
22

33
import static lombok.AccessLevel.PACKAGE;
44

5+
import com.sap.ai.sdk.orchestration.client.model.ChatMessage;
56
import com.sap.ai.sdk.orchestration.client.model.CompletionPostResponse;
67
import com.sap.ai.sdk.orchestration.client.model.LLMModuleResultSynchronous;
78
import com.sap.ai.sdk.orchestration.client.model.TokenUsage;
9+
import java.util.List;
810
import javax.annotation.Nonnull;
11+
import javax.annotation.Nullable;
912
import lombok.RequiredArgsConstructor;
1013
import lombok.Value;
1114

@@ -49,4 +52,14 @@ public String getContent() throws OrchestrationClientException {
4952
public TokenUsage getTokenUsage() {
5053
return ((LLMModuleResultSynchronous) originalResponse.getOrchestrationResult()).getUsage();
5154
}
55+
56+
/**
57+
* Get all messages.
58+
*
59+
* @return A list of all messages.
60+
*/
61+
@Nullable
62+
public List<ChatMessage> getAllMessages() {
63+
return originalResponse.getModuleResults().getTemplating();
64+
}
5265
}

orchestration/src/test/java/com/sap/ai/sdk/orchestration/OrchestrationUnitTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,9 @@ void testTemplating() throws IOException {
142142

143143
final var response = result.getOriginalResponse();
144144
assertThat(response.getRequestId()).isEqualTo("26ea36b5-c196-4806-a9a6-a686f0c6ad91");
145-
assertThat(response.getModuleResults().getTemplating().get(0).getContent())
145+
assertThat(result.getAllMessages().get(0).getContent())
146146
.isEqualTo("Reply with 'Orchestration Service is working!' in German");
147-
assertThat(response.getModuleResults().getTemplating().get(0).getRole()).isEqualTo("user");
147+
assertThat(result.getAllMessages().get(0).getRole()).isEqualTo("user");
148148
var llm = (LLMModuleResultSynchronous) response.getModuleResults().getLlm();
149149
assertThat(llm.getId()).isEqualTo("chatcmpl-9lzPV4kLrXjFckOp2yY454wksWBoj");
150150
assertThat(llm.getObject()).isEqualTo("chat.completion");

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ void testCompletion() {
3232

3333
@Test
3434
void testTemplate() {
35-
final var response = controller.template();
36-
final var result = response.getOriginalResponse();
35+
final var result = controller.template();
36+
final var response = result.getOriginalResponse();
3737

38-
assertThat(result.getRequestId()).isNotEmpty();
39-
assertThat(result.getModuleResults().getTemplating().get(0).getContent())
38+
assertThat(response.getRequestId()).isNotEmpty();
39+
assertThat(result.getAllMessages().get(0).getContent())
4040
.isEqualTo("Reply with 'Orchestration Service is working!' in German");
41-
assertThat(result.getModuleResults().getTemplating().get(0).getRole()).isEqualTo("user");
42-
var llm = (LLMModuleResultSynchronous) result.getModuleResults().getLlm();
41+
assertThat(result.getAllMessages().get(0).getRole()).isEqualTo("user");
42+
var llm = (LLMModuleResultSynchronous) response.getModuleResults().getLlm();
4343
assertThat(llm.getId()).isNotEmpty();
4444
assertThat(llm.getObject()).isEqualTo("chat.completion");
4545
assertThat(llm.getCreated()).isGreaterThan(1);
@@ -49,12 +49,12 @@ void testTemplate() {
4949
assertThat(choices.get(0).getMessage().getContent()).isNotEmpty();
5050
assertThat(choices.get(0).getMessage().getRole()).isEqualTo("assistant");
5151
assertThat(choices.get(0).getFinishReason()).isEqualTo("stop");
52-
var usage = response.getTokenUsage();
52+
var usage = result.getTokenUsage();
5353
assertThat(usage.getCompletionTokens()).isGreaterThan(1);
5454
assertThat(usage.getPromptTokens()).isGreaterThan(1);
5555
assertThat(usage.getTotalTokens()).isGreaterThan(1);
5656

57-
var orchestrationResult = ((LLMModuleResultSynchronous) result.getOrchestrationResult());
57+
var orchestrationResult = ((LLMModuleResultSynchronous) response.getOrchestrationResult());
5858
assertThat(orchestrationResult.getObject()).isEqualTo("chat.completion");
5959
assertThat(orchestrationResult.getCreated()).isGreaterThan(1);
6060
assertThat(orchestrationResult.getModel())
@@ -64,7 +64,7 @@ void testTemplate() {
6464
assertThat(choices.get(0).getMessage().getContent()).isNotEmpty();
6565
assertThat(choices.get(0).getMessage().getRole()).isEqualTo("assistant");
6666
assertThat(choices.get(0).getFinishReason()).isEqualTo("stop");
67-
usage = response.getTokenUsage();
67+
usage = result.getTokenUsage();
6868
assertThat(usage.getCompletionTokens()).isGreaterThan(1);
6969
assertThat(usage.getPromptTokens()).isGreaterThan(1);
7070
assertThat(usage.getTotalTokens()).isGreaterThan(1);

0 commit comments

Comments
 (0)