Skip to content

Commit 483db01

Browse files
bot-sdk-jsbot-sdk-js
committed
Formatting
1 parent 8554091 commit 483db01

File tree

4 files changed

+62
-33
lines changed

4 files changed

+62
-33
lines changed

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

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,15 @@
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;
64
import com.sap.ai.sdk.core.common.StreamedDelta;
75
import com.sap.ai.sdk.foundationmodels.openai.model2.ChatCompletionsCreate200Response;
86
import com.sap.ai.sdk.foundationmodels.openai.model2.CreateChatCompletionResponse;
97
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;
168
import java.util.Objects;
179
import javax.annotation.Nonnull;
1810
import javax.annotation.Nullable;
19-
11+
import lombok.RequiredArgsConstructor;
12+
import lombok.Value;
2013

2114
@Value
2215
@RequiredArgsConstructor(onConstructor_ = @JsonCreator)
@@ -26,7 +19,7 @@ public class OpenAiChatCompletionDelta implements StreamedDelta {
2619
@Nonnull
2720
@Override
2821
public String getDeltaContent() {
29-
if( getOriginalResponse() instanceof CreateChatCompletionStreamResponse response) {
22+
if (getOriginalResponse() instanceof CreateChatCompletionStreamResponse response) {
3023
final var choices = response.getChoices();
3124
if (!choices.isEmpty() && choices.get(0).getIndex() == 0) {
3225
final var message = choices.get(0).getDelta();
@@ -35,7 +28,7 @@ public String getDeltaContent() {
3528
}
3629
}
3730
}
38-
if( getOriginalResponse() instanceof CreateChatCompletionResponse response) {
31+
if (getOriginalResponse() instanceof CreateChatCompletionResponse response) {
3932
final var choices = response.getChoices();
4033
if (!choices.isEmpty() && choices.get(0).getIndex() == 0) {
4134
final var delta = choices.get(0).getCustomField("delta"); // .getMessage() does not work
@@ -50,14 +43,14 @@ public String getDeltaContent() {
5043
@Nullable
5144
@Override
5245
public String getFinishReason() {
53-
if( getOriginalResponse() instanceof CreateChatCompletionStreamResponse response) {
46+
if (getOriginalResponse() instanceof CreateChatCompletionStreamResponse response) {
5447
final var choices = response.getChoices();
5548
if (!choices.isEmpty()) {
5649
final var finishReason = choices.get(0).getFinishReason();
5750
return finishReason != null ? finishReason.getValue() : null;
5851
}
5952
}
60-
if( getOriginalResponse() instanceof CreateChatCompletionResponse response) {
53+
if (getOriginalResponse() instanceof CreateChatCompletionResponse response) {
6154
final var choices = response.getChoices();
6255
if (!choices.isEmpty()) {
6356
final var finishReason = choices.get(0).getFinishReason();

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,9 @@ public class CreateChatCompletionResponse implements ChatCompletionsCreate200Res
5959
public enum ObjectEnum {
6060
/** The CHAT_COMPLETION option of this CreateChatCompletionResponse */
6161
CHAT_COMPLETION("chat.completion"),
62-
/**
63-
* The UNKNOWN_DEFAULT_OPEN_API option of this CreateChatCompletionResponse
64-
*/
65-
UNKNOWN_DEFAULT_OPEN_API("unknown_default_open_api");;
62+
/** The UNKNOWN_DEFAULT_OPEN_API option of this CreateChatCompletionResponse */
63+
UNKNOWN_DEFAULT_OPEN_API("unknown_default_open_api");
64+
;
6665

6766
private String value;
6867

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
public interface EmbeddingsCreateRequestInput {
2828
/** Helper class to create a String that implements {@link EmbeddingsCreateRequestInput}. */
2929
class InnerString implements EmbeddingsCreateRequestInput {
30-
@com.fasterxml.jackson.annotation.JsonValue
31-
String value;
30+
@com.fasterxml.jackson.annotation.JsonValue String value;
31+
3232
InnerString(String value) {
3333
this.value = value;
3434
}

‎foundation-models/openai/src/test/java/com/sap/ai/sdk/foundationmodels/openai/OpenAiClientTest.java‎

Lines changed: 51 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ void chatCompletion(@Nonnull final Callable<CreateChatCompletionResponse> reques
280280
assertThat(contentFilterResults.getSelfHarm().isFiltered()).isFalse();
281281
assertThat(contentFilterResults.getProfanity()).isNull();
282282
assertThat(contentFilterResults.getError()).isNull();
283-
//assertThat(contentFilterResults.getJailbreak()).isNull();
283+
// assertThat(contentFilterResults.getJailbreak()).isNull();
284284

285285
verify(
286286
postRequestedFor(urlPathEqualTo("/chat/completions"))
@@ -386,7 +386,12 @@ void embedding() {
386386
assertThat(embeddingData.getEmbedding())
387387
.isNotNull()
388388
.isNotEmpty()
389-
.containsExactly(new BigDecimal("0.0"),new BigDecimal("3.4028235E+38"),new BigDecimal("1.4E-45"),new BigDecimal("1.23"),new BigDecimal("-4.56"));
389+
.containsExactly(
390+
new BigDecimal("0.0"),
391+
new BigDecimal("3.4028235E+38"),
392+
new BigDecimal("1.4E-45"),
393+
new BigDecimal("1.23"),
394+
new BigDecimal("-4.56"));
390395

391396
verify(
392397
postRequestedFor(urlPathEqualTo("/embeddings"))
@@ -484,11 +489,26 @@ void streamChatCompletionDeltas() throws IOException {
484489
assertThat(deltaList.get(3).getDeltaContent()).isEqualTo("!");
485490
assertThat(deltaList.get(4).getDeltaContent()).isEqualTo("");
486491

487-
assertThat(((CreateChatCompletionResponse)deltaList.get(0).getOriginalResponse()).getSystemFingerprint()).isNull();
488-
assertThat(((CreateChatCompletionStreamResponse)deltaList.get(1).getOriginalResponse()).getSystemFingerprint()).isEqualTo("fp_e49e4201a9");
489-
assertThat(((CreateChatCompletionStreamResponse)deltaList.get(2).getOriginalResponse()).getSystemFingerprint()).isEqualTo("fp_e49e4201a9");
490-
assertThat(((CreateChatCompletionStreamResponse)deltaList.get(3).getOriginalResponse()).getSystemFingerprint()).isEqualTo("fp_e49e4201a9");
491-
assertThat(((CreateChatCompletionStreamResponse)deltaList.get(4).getOriginalResponse()).getSystemFingerprint()).isEqualTo("fp_e49e4201a9");
492+
assertThat(
493+
((CreateChatCompletionResponse) deltaList.get(0).getOriginalResponse())
494+
.getSystemFingerprint())
495+
.isNull();
496+
assertThat(
497+
((CreateChatCompletionStreamResponse) deltaList.get(1).getOriginalResponse())
498+
.getSystemFingerprint())
499+
.isEqualTo("fp_e49e4201a9");
500+
assertThat(
501+
((CreateChatCompletionStreamResponse) deltaList.get(2).getOriginalResponse())
502+
.getSystemFingerprint())
503+
.isEqualTo("fp_e49e4201a9");
504+
assertThat(
505+
((CreateChatCompletionStreamResponse) deltaList.get(3).getOriginalResponse())
506+
.getSystemFingerprint())
507+
.isEqualTo("fp_e49e4201a9");
508+
assertThat(
509+
((CreateChatCompletionStreamResponse) deltaList.get(4).getOriginalResponse())
510+
.getSystemFingerprint())
511+
.isEqualTo("fp_e49e4201a9");
492512

493513
/*
494514
assertThat(deltaList.get(0).getUsage()).isNull();
@@ -501,11 +521,26 @@ void streamChatCompletionDeltas() throws IOException {
501521
assertThat(usage.getPromptTokens()).isEqualTo(21);
502522
assertThat(usage.getTotalTokens()).isEqualTo(628);
503523
*/
504-
assertThat(((CreateChatCompletionResponse)deltaList.get(0).getOriginalResponse()).getChoices()).isEmpty();
505-
assertThat(((CreateChatCompletionStreamResponse)deltaList.get(1).getOriginalResponse()).getChoices()).hasSize(1);
506-
assertThat(((CreateChatCompletionStreamResponse)deltaList.get(2).getOriginalResponse()).getChoices()).hasSize(1);
507-
assertThat(((CreateChatCompletionStreamResponse)deltaList.get(3).getOriginalResponse()).getChoices()).hasSize(1);
508-
assertThat(((CreateChatCompletionStreamResponse)deltaList.get(4).getOriginalResponse()).getChoices()).hasSize(1);
524+
assertThat(
525+
((CreateChatCompletionResponse) deltaList.get(0).getOriginalResponse())
526+
.getChoices())
527+
.isEmpty();
528+
assertThat(
529+
((CreateChatCompletionStreamResponse) deltaList.get(1).getOriginalResponse())
530+
.getChoices())
531+
.hasSize(1);
532+
assertThat(
533+
((CreateChatCompletionStreamResponse) deltaList.get(2).getOriginalResponse())
534+
.getChoices())
535+
.hasSize(1);
536+
assertThat(
537+
((CreateChatCompletionStreamResponse) deltaList.get(3).getOriginalResponse())
538+
.getChoices())
539+
.hasSize(1);
540+
assertThat(
541+
((CreateChatCompletionStreamResponse) deltaList.get(4).getOriginalResponse())
542+
.getChoices())
543+
.hasSize(1);
509544

510545
final var delta0 = (CreateChatCompletionResponse) deltaList.get(0).getOriginalResponse();
511546
assertThat(delta0.getId()).isEqualTo("");
@@ -522,7 +557,8 @@ void streamChatCompletionDeltas() throws IOException {
522557
// assertThat(promptFilter0).isNotNull();
523558
// assertFilter(promptFilter0);
524559

525-
final var delta2 = (CreateChatCompletionStreamResponse) deltaList.get(2).getOriginalResponse();
560+
final var delta2 =
561+
(CreateChatCompletionStreamResponse) deltaList.get(2).getOriginalResponse();
526562
assertThat(delta2.getId()).isEqualTo("chatcmpl-A16EvnkgEm6AdxY0NoOmGPjsJucQ1");
527563
assertThat(delta2.getCreated()).isEqualTo(1724825677);
528564
assertThat(delta2.getModel()).isEqualTo("gpt-35-turbo");
@@ -543,7 +579,8 @@ void streamChatCompletionDeltas() throws IOException {
543579
final var delta3 = deltaList.get(3);
544580
assertThat(delta3.getDeltaContent()).isEqualTo("!");
545581

546-
final var delta4 = (CreateChatCompletionStreamResponse) deltaList.get(4).getOriginalResponse();
582+
final var delta4 =
583+
(CreateChatCompletionStreamResponse) deltaList.get(4).getOriginalResponse();
547584
final var delta4Choice = delta4.getChoices().get(0);
548585
assertThat(delta4Choice.getFinishReason()).isEqualTo("stop");
549586
assertThat(delta4Choice.getDelta().getContent()).isNotNull();

0 commit comments

Comments
 (0)