Skip to content

Commit 4bc431b

Browse files
committed
Format; Remove redundant files; Fix test
1 parent 433d84a commit 4bc431b

File tree

11 files changed

+118
-849
lines changed

11 files changed

+118
-849
lines changed

foundation-models/openai/src/main/java/com/sap/ai/sdk/foundationmodels/openai/JacksonMixins.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,16 @@ interface CreateChatCompletionStreamResponseMixIn {}
1616
@JsonTypeInfo(use = JsonTypeInfo.Id.NONE)
1717
interface CreateChatCompletionResponseMixIn {}
1818

19-
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "object", defaultImpl = CreateChatCompletionResponse.class, visible = true)
19+
@JsonTypeInfo(
20+
use = JsonTypeInfo.Id.NAME,
21+
property = "object",
22+
defaultImpl = CreateChatCompletionResponse.class,
23+
visible = true)
2024
@JsonSubTypes({
21-
@JsonSubTypes.Type(value = CreateChatCompletionResponse.class, name="chat.completion"),
22-
@JsonSubTypes.Type(value = CreateChatCompletionStreamResponse.class, name = "chat.completion.chunk"),
25+
@JsonSubTypes.Type(value = CreateChatCompletionResponse.class, name = "chat.completion"),
26+
@JsonSubTypes.Type(
27+
value = CreateChatCompletionStreamResponse.class,
28+
name = "chat.completion.chunk"),
2329
})
2430
public interface ChatCompletionCreate200ResponseMixIn {}
2531
}

foundation-models/openai/src/main/java/com/sap/ai/sdk/foundationmodels/openai/OpenAiChatCompletionDelta.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
package com.sap.ai.sdk.foundationmodels.openai;
22

33
import com.fasterxml.jackson.annotation.JsonCreator;
4-
import com.fasterxml.jackson.annotation.JsonIgnore;
5-
import com.fasterxml.jackson.annotation.JsonValue;
4+
import com.google.common.annotations.Beta;
65
import com.sap.ai.sdk.core.common.StreamedDelta;
76
import com.sap.ai.sdk.foundationmodels.openai.model2.ChatCompletionsCreate200Response;
87
import com.sap.ai.sdk.foundationmodels.openai.model2.CreateChatCompletionResponse;
98
import com.sap.ai.sdk.foundationmodels.openai.model2.CreateChatCompletionStreamResponse;
10-
import com.sap.ai.sdk.foundationmodels.openai.model2.CreateChatCompletionStreamResponseChoicesInner;
11-
import lombok.AccessLevel;
12-
import lombok.RequiredArgsConstructor;
13-
import lombok.Value;
14-
15-
import java.util.List;
169
import java.util.Objects;
1710
import javax.annotation.Nonnull;
1811
import javax.annotation.Nullable;
12+
import lombok.RequiredArgsConstructor;
13+
import lombok.Value;
1914

20-
15+
/**
16+
* OpenAI chat completion output delta for streaming.
17+
*
18+
* @since 1.3.0
19+
*/
20+
@Beta
2121
@Value
2222
@RequiredArgsConstructor(onConstructor_ = @JsonCreator)
2323
public class OpenAiChatCompletionDelta implements StreamedDelta {
@@ -26,7 +26,7 @@ public class OpenAiChatCompletionDelta implements StreamedDelta {
2626
@Nonnull
2727
@Override
2828
public String getDeltaContent() {
29-
if( getOriginalResponse() instanceof CreateChatCompletionStreamResponse response) {
29+
if (getOriginalResponse() instanceof CreateChatCompletionStreamResponse response) {
3030
final var choices = response.getChoices();
3131
if (!choices.isEmpty() && choices.get(0).getIndex() == 0) {
3232
final var message = choices.get(0).getDelta();
@@ -35,7 +35,7 @@ public String getDeltaContent() {
3535
}
3636
}
3737
}
38-
if( getOriginalResponse() instanceof CreateChatCompletionResponse response) {
38+
if (getOriginalResponse() instanceof CreateChatCompletionResponse response) {
3939
final var choices = response.getChoices();
4040
if (!choices.isEmpty() && choices.get(0).getIndex() == 0) {
4141
final var delta = choices.get(0).getCustomField("delta"); // .getMessage() does not work
@@ -50,14 +50,14 @@ public String getDeltaContent() {
5050
@Nullable
5151
@Override
5252
public String getFinishReason() {
53-
if( getOriginalResponse() instanceof CreateChatCompletionStreamResponse response) {
53+
if (getOriginalResponse() instanceof CreateChatCompletionStreamResponse response) {
5454
final var choices = response.getChoices();
5555
if (!choices.isEmpty()) {
5656
final var finishReason = choices.get(0).getFinishReason();
5757
return finishReason != null ? finishReason.getValue() : null;
5858
}
5959
}
60-
if( getOriginalResponse() instanceof CreateChatCompletionResponse response) {
60+
if (getOriginalResponse() instanceof CreateChatCompletionResponse response) {
6161
final var choices = response.getChoices();
6262
if (!choices.isEmpty()) {
6363
final var finishReason = choices.get(0).getFinishReason();

foundation-models/openai/src/main/java/com/sap/ai/sdk/foundationmodels/openai/OpenAiClient.java

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -322,11 +322,17 @@ private <D extends StreamedDelta> Stream<D> streamRequest(
322322
try {
323323
final var client = ApacheHttpClient5Accessor.getHttpClient(destination);
324324
return new ClientStreamingHandler<>(deltaType, OpenAiError.class, OpenAiClientException::new)
325-
.objectMapper(JACKSON
326-
.addMixIn(CreateChatCompletionResponse.class, JacksonMixins.CreateChatCompletionResponseMixIn.class)
327-
.addMixIn(CreateChatCompletionStreamResponse.class, JacksonMixins.CreateChatCompletionStreamResponseMixIn.class)
328-
.addMixIn(ChatCompletionsCreate200Response.class, JacksonMixins.ChatCompletionCreate200ResponseMixIn.class)
329-
)
325+
.objectMapper(
326+
JACKSON
327+
.addMixIn(
328+
CreateChatCompletionResponse.class,
329+
JacksonMixins.CreateChatCompletionResponseMixIn.class)
330+
.addMixIn(
331+
CreateChatCompletionStreamResponse.class,
332+
JacksonMixins.CreateChatCompletionStreamResponseMixIn.class)
333+
.addMixIn(
334+
ChatCompletionsCreate200Response.class,
335+
JacksonMixins.ChatCompletionCreate200ResponseMixIn.class))
330336
.handleStreamingResponse(client.executeOpen(null, request, null));
331337
} catch (final IOException e) {
332338
throw new OpenAiClientException("Request to OpenAI model failed", e);

foundation-models/openai/src/main/java/com/sap/ai/sdk/foundationmodels/openai/model2/AudioResponseFormat.java

Lines changed: 0 additions & 73 deletions
This file was deleted.

foundation-models/openai/src/main/java/com/sap/ai/sdk/foundationmodels/openai/model2/ChatCompletionChoiceCommon.java

Lines changed: 0 additions & 191 deletions
This file was deleted.

0 commit comments

Comments
 (0)