Skip to content

Commit 2cda676

Browse files
bot-sdk-jsbot-sdk-js
committed
Formatting
1 parent 05f75ea commit 2cda676

File tree

7 files changed

+39
-47
lines changed

7 files changed

+39
-47
lines changed

‎foundation-models/openai/pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -154,12 +154,12 @@
154154
<artifactId>javaparser-core</artifactId>
155155
<scope>test</scope>
156156
</dependency>
157-
<dependency>
158-
<groupId>org.springframework.ai</groupId>
159-
<artifactId>spring-ai-client-chat</artifactId>
160-
<scope>test</scope>
161-
</dependency>
162-
</dependencies>
157+
<dependency>
158+
<groupId>org.springframework.ai</groupId>
159+
<artifactId>spring-ai-client-chat</artifactId>
160+
<scope>test</scope>
161+
</dependency>
162+
</dependencies>
163163

164164
<profiles>
165165
<profile>

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

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

3+
import static org.springframework.ai.model.tool.ToolCallingChatOptions.isInternalToolExecutionEnabled;
4+
35
import com.fasterxml.jackson.core.JsonProcessingException;
46
import com.fasterxml.jackson.core.type.TypeReference;
57
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -14,6 +16,11 @@
1416
import com.sap.ai.sdk.foundationmodels.openai.generated.model.ChatCompletionTool;
1517
import com.sap.ai.sdk.foundationmodels.openai.generated.model.FunctionObject;
1618
import io.vavr.control.Option;
19+
import java.util.ArrayList;
20+
import java.util.List;
21+
import java.util.Map;
22+
import java.util.function.Function;
23+
import javax.annotation.Nonnull;
1724
import lombok.RequiredArgsConstructor;
1825
import lombok.val;
1926
import org.springframework.ai.chat.messages.AssistantMessage;
@@ -28,14 +35,6 @@
2835
import org.springframework.ai.model.tool.DefaultToolCallingManager;
2936
import reactor.core.publisher.Flux;
3037

31-
import javax.annotation.Nonnull;
32-
import java.util.ArrayList;
33-
import java.util.List;
34-
import java.util.Map;
35-
import java.util.function.Function;
36-
37-
import static org.springframework.ai.model.tool.ToolCallingChatOptions.isInternalToolExecutionEnabled;
38-
3938
/**
4039
* OpenAI Chat Model implementation that interacts with the OpenAI API to generate chat completions.
4140
*/

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

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

3+
import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
4+
import static com.github.tomakehurst.wiremock.client.WireMock.anyUrl;
5+
import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
6+
import static com.github.tomakehurst.wiremock.client.WireMock.equalToJson;
7+
import static com.github.tomakehurst.wiremock.client.WireMock.post;
8+
import static com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor;
9+
import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
10+
import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
11+
import static com.github.tomakehurst.wiremock.client.WireMock.verify;
12+
import static com.github.tomakehurst.wiremock.stubbing.Scenario.STARTED;
13+
import static org.assertj.core.api.Assertions.assertThat;
14+
import static org.assertj.core.api.Assertions.assertThatThrownBy;
15+
import static org.mockito.ArgumentMatchers.any;
16+
import static org.mockito.Mockito.doReturn;
17+
import static org.mockito.Mockito.mock;
18+
import static org.mockito.Mockito.spy;
19+
import static org.mockito.Mockito.times;
20+
321
import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
422
import com.github.tomakehurst.wiremock.junit5.WireMockTest;
523
import com.sap.ai.sdk.foundationmodels.openai.OpenAiClient;
624
import com.sap.cloud.sdk.cloudplatform.connectivity.ApacheHttpClient5Accessor;
725
import com.sap.cloud.sdk.cloudplatform.connectivity.ApacheHttpClient5Cache;
826
import com.sap.cloud.sdk.cloudplatform.connectivity.DefaultHttpDestination;
27+
import java.io.IOException;
28+
import java.io.InputStream;
29+
import java.util.List;
30+
import java.util.Objects;
31+
import java.util.function.Function;
932
import lombok.val;
1033
import org.apache.hc.client5.http.classic.HttpClient;
1134
import org.apache.hc.core5.http.ContentType;
@@ -26,30 +49,6 @@
2649
import org.springframework.ai.support.ToolCallbacks;
2750
import reactor.core.publisher.Flux;
2851

29-
import java.io.IOException;
30-
import java.io.InputStream;
31-
import java.util.List;
32-
import java.util.Objects;
33-
import java.util.function.Function;
34-
35-
import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
36-
import static com.github.tomakehurst.wiremock.client.WireMock.anyUrl;
37-
import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
38-
import static com.github.tomakehurst.wiremock.client.WireMock.equalToJson;
39-
import static com.github.tomakehurst.wiremock.client.WireMock.post;
40-
import static com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor;
41-
import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
42-
import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
43-
import static com.github.tomakehurst.wiremock.client.WireMock.verify;
44-
import static com.github.tomakehurst.wiremock.stubbing.Scenario.STARTED;
45-
import static org.assertj.core.api.Assertions.assertThat;
46-
import static org.assertj.core.api.Assertions.assertThatThrownBy;
47-
import static org.mockito.ArgumentMatchers.any;
48-
import static org.mockito.Mockito.doReturn;
49-
import static org.mockito.Mockito.mock;
50-
import static org.mockito.Mockito.spy;
51-
import static org.mockito.Mockito.times;
52-
5352
@WireMockTest
5453
public class OpenAiChatModelTest {
5554

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
package com.sap.ai.sdk.foundationmodels.openai.spring;
22

3+
import javax.annotation.Nonnull;
34
import org.springframework.ai.tool.annotation.Tool;
45
import org.springframework.ai.tool.annotation.ToolParam;
56

6-
import javax.annotation.Nonnull;
7-
8-
public class WeatherMethod
9-
{
7+
public class WeatherMethod {
108

119
/** Unit of temperature */
1210
public enum Unit {

‎sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/controllers/SpringAiOpenAiController.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
package com.sap.ai.sdk.app.controllers;
22

33
import com.sap.ai.sdk.app.services.SpringAiOpenAiService;
4-
54
import javax.annotation.Nonnull;
65
import javax.annotation.Nullable;
7-
86
import lombok.val;
97
import org.springframework.ai.chat.messages.AssistantMessage;
108
import org.springframework.beans.factory.annotation.Autowired;

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,7 @@ public ChatResponse completion() {
7676
*/
7777
@Nonnull
7878
public Flux<ChatResponse> streamChatCompletion() {
79-
val prompt =
80-
new Prompt("Can you give me the first 100 numbers of the Fibonacci sequence?");
79+
val prompt = new Prompt("Can you give me the first 100 numbers of the Fibonacci sequence?");
8180
return chatClient.stream(prompt);
8281
}
8382

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import com.sap.ai.sdk.foundationmodels.openai.OpenAiModel;
77
import java.util.List;
88
import java.util.concurrent.atomic.AtomicInteger;
9-
109
import org.junit.jupiter.api.Test;
1110
import org.springframework.ai.chat.messages.AssistantMessage;
1211
import org.springframework.ai.chat.model.ChatResponse;

0 commit comments

Comments
 (0)