Skip to content

Commit 1bc41b0

Browse files
committed
Formatting
1 parent e80c80a commit 1bc41b0

File tree

4 files changed

+17
-15
lines changed

4 files changed

+17
-15
lines changed

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

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
import com.fasterxml.jackson.annotation.JsonSubTypes;
44
import com.fasterxml.jackson.annotation.JsonTypeInfo;
5-
import lombok.AccessLevel;
6-
import lombok.NoArgsConstructor;
75
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
86
import com.sap.ai.sdk.orchestration.model.LLMChoiceSynchronous;
9-
import com.sap.ai.sdk.orchestration.model.LLMModuleResultSynchronous;
107
import com.sap.ai.sdk.orchestration.model.LLMModuleResultStreaming;
8+
import com.sap.ai.sdk.orchestration.model.LLMModuleResultSynchronous;
9+
import lombok.AccessLevel;
10+
import lombok.NoArgsConstructor;
1111

1212
@NoArgsConstructor(access = AccessLevel.PRIVATE)
1313
final class JacksonMixins {
@@ -30,11 +30,10 @@ interface ModuleResultsOutputUnmaskingInnerMixIn {}
3030
use = JsonTypeInfo.Id.NAME,
3131
include = JsonTypeInfo.As.PROPERTY,
3232
property = "type",
33-
defaultImpl = LLMModuleResultSynchronous.class
34-
)
33+
defaultImpl = LLMModuleResultSynchronous.class)
3534
@JsonSubTypes({
36-
@JsonSubTypes.Type(value = LLMModuleResultSynchronous.class, name = "synch"),
37-
@JsonSubTypes.Type(value = LLMModuleResultStreaming.class, name = "streaming")
35+
@JsonSubTypes.Type(value = LLMModuleResultSynchronous.class, name = "synch"),
36+
@JsonSubTypes.Type(value = LLMModuleResultStreaming.class, name = "streaming")
3837
})
3938
public interface DefaultToSynchronousMixin {}
4039

@@ -43,11 +42,10 @@ public interface DefaultToSynchronousMixin {}
4342
use = JsonTypeInfo.Id.NAME,
4443
include = JsonTypeInfo.As.PROPERTY,
4544
property = "type",
46-
defaultImpl = LLMModuleResultStreaming.class
47-
)
45+
defaultImpl = LLMModuleResultStreaming.class)
4846
@JsonSubTypes({
49-
@JsonSubTypes.Type(value = LLMModuleResultSynchronous.class, name = "synch"),
50-
@JsonSubTypes.Type(value = LLMModuleResultStreaming.class, name = "streaming")
47+
@JsonSubTypes.Type(value = LLMModuleResultSynchronous.class, name = "synch"),
48+
@JsonSubTypes.Type(value = LLMModuleResultStreaming.class, name = "streaming")
5149
})
5250
public interface DefaultToStreamingMixin {}
5351

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ public String getDeltaContent() {
2525
// A delta only contains one choice with a variable index
2626
&& choices.get(0).getIndex() == 0) {
2727

28-
final var message = (Map<String, Object>) ((ChatDelta) choices.get(0).toMap().get("delta")).toMap();
28+
final var message =
29+
(Map<String, Object>) ((ChatDelta) choices.get(0).toMap().get("delta")).toMap();
2930
// Avoid the second delta: "choices":[{"delta":{"content":"","role":"assistant"}}]
3031
if (message != null && message.get("content") != null) {
3132
return message.get("content").toString();

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,8 @@ public OrchestrationChatResponse executeRequestFromJsonModuleConfig(
213213
CompletionPostResponseSynchronous executeRequest(@Nonnull final String request) {
214214
val postRequest = new HttpPost("/completion");
215215
postRequest.setEntity(new StringEntity(request, ContentType.APPLICATION_JSON));
216-
JACKSON.addMixIn(ErrorResponseModuleResultsAllOfLlm.class, JacksonMixins.DefaultToSynchronousMixin.class);
216+
JACKSON.addMixIn(
217+
ErrorResponseModuleResultsAllOfLlm.class, JacksonMixins.DefaultToSynchronousMixin.class);
217218

218219
try {
219220
val destination = destinationSupplier.get();
@@ -277,7 +278,8 @@ private <D extends StreamedDelta> Stream<D> streamRequest(
277278
val destination = destinationSupplier.get();
278279
log.debug("Using destination {} to connect to orchestration service", destination);
279280
val client = ApacheHttpClient5Accessor.getHttpClient(destination);
280-
JACKSON.addMixIn(ErrorResponseModuleResultsAllOfLlm.class, JacksonMixins.DefaultToStreamingMixin.class);
281+
JACKSON.addMixIn(
282+
ErrorResponseModuleResultsAllOfLlm.class, JacksonMixins.DefaultToStreamingMixin.class);
281283
return new ClientStreamingHandler<>(
282284
deltaType, OrchestrationError.class, OrchestrationClientException::new)
283285
.objectMapper(JACKSON)

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -704,7 +704,8 @@ void streamChatCompletionDeltas() throws IOException {
704704
assertThat(choices0.getFinishReason()).isEmpty();
705705
assertThat(choices0.toMap().get("delta")).isNotNull();
706706
// this should be getDelta(), only when the result is of type LLMModuleResultStreaming
707-
final var message0 = (Map<String, Object>) ((ChatDelta) choices0.toMap().get("delta")).toMap();
707+
final var message0 =
708+
(Map<String, Object>) ((ChatDelta) choices0.toMap().get("delta")).toMap();
708709
assertThat(message0.get("role")).isEqualTo("");
709710
assertThat(message0.get("content")).isEqualTo("");
710711
final var templating = deltaList.get(0).getModuleResults().getTemplating();

0 commit comments

Comments
 (0)