Skip to content

Commit e279ada

Browse files
dependabot[bot]Jonas-Isrrpanackal
authored
chore: [DevOps] bump the production-minor-patch group across 1 directory with 10 updates (#688)
* chore: [DevOps] bump the production-minor-patch group across 1 directory with 10 updates Bumps the production-minor-patch group with 10 updates in the / directory: | Package | From | To | | --- | --- | --- | | [org.springframework.ai:spring-ai-bom](https://github.com/spring-projects/spring-ai) | `1.0.3` | `1.1.2` | | [io.projectreactor:reactor-core](https://github.com/reactor/reactor-core) | `3.8.0` | `3.8.1` | | [io.micrometer:micrometer-core](https://github.com/micrometer-metrics/micrometer) | `1.16.0` | `1.16.1` | | [io.micrometer:micrometer-observation](https://github.com/micrometer-metrics/micrometer) | `1.16.0` | `1.16.1` | | [org.wiremock:wiremock](https://github.com/wiremock/wiremock) | `3.13.1` | `3.13.2` | | [org.mockito:mockito-core](https://github.com/mockito/mockito) | `5.20.0` | `5.21.0` | | [com.puppycrawl.tools:checkstyle](https://github.com/checkstyle/checkstyle) | `12.1.1` | `12.3.0` | | org.apache.tomcat.embed:tomcat-embed-core | `11.0.13` | `11.0.15` | | org.apache.tomcat.embed:tomcat-embed-websocket | `11.0.13` | `11.0.15` | | [com.sap.hcp.cf.logging:cf-java-logging-support-logback](https://github.com/SAP/cf-java-logging-support) | `4.0.0` | `4.0.1` | Updates `org.springframework.ai:spring-ai-bom` from 1.0.3 to 1.1.2 - [Release notes](https://github.com/spring-projects/spring-ai/releases) - [Commits](spring-projects/spring-ai@v1.0.3...v1.1.2) Updates `io.projectreactor:reactor-core` from 3.8.0 to 3.8.1 - [Release notes](https://github.com/reactor/reactor-core/releases) - [Commits](reactor/reactor-core@v3.8.0...v3.8.1) Updates `io.micrometer:micrometer-core` from 1.16.0 to 1.16.1 - [Release notes](https://github.com/micrometer-metrics/micrometer/releases) - [Commits](micrometer-metrics/micrometer@v1.16.0...v1.16.1) Updates `io.micrometer:micrometer-observation` from 1.16.0 to 1.16.1 - [Release notes](https://github.com/micrometer-metrics/micrometer/releases) - [Commits](micrometer-metrics/micrometer@v1.16.0...v1.16.1) Updates `io.micrometer:micrometer-observation` from 1.16.0 to 1.16.1 - [Release notes](https://github.com/micrometer-metrics/micrometer/releases) - [Commits](micrometer-metrics/micrometer@v1.16.0...v1.16.1) Updates `org.wiremock:wiremock` from 3.13.1 to 3.13.2 - [Release notes](https://github.com/wiremock/wiremock/releases) - [Commits](wiremock/wiremock@3.13.1...3.13.2) Updates `org.mockito:mockito-core` from 5.20.0 to 5.21.0 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](mockito/mockito@v5.20.0...v5.21.0) Updates `com.puppycrawl.tools:checkstyle` from 12.1.1 to 12.3.0 - [Release notes](https://github.com/checkstyle/checkstyle/releases) - [Commits](checkstyle/checkstyle@checkstyle-12.1.1...checkstyle-12.3.0) Updates `org.apache.tomcat.embed:tomcat-embed-core` from 11.0.13 to 11.0.15 Updates `org.apache.tomcat.embed:tomcat-embed-websocket` from 11.0.13 to 11.0.15 Updates `org.apache.tomcat.embed:tomcat-embed-websocket` from 11.0.13 to 11.0.15 Updates `com.sap.hcp.cf.logging:cf-java-logging-support-logback` from 4.0.0 to 4.0.1 - [Release notes](https://github.com/SAP/cf-java-logging-support/releases) - [Commits](SAP/cf-java-logging-support@4.0.0...4.0.1) --- updated-dependencies: - dependency-name: org.springframework.ai:spring-ai-bom dependency-version: 1.1.2 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: production-minor-patch - dependency-name: io.projectreactor:reactor-core dependency-version: 3.8.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: production-minor-patch - dependency-name: io.micrometer:micrometer-core dependency-version: 1.16.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: production-minor-patch - dependency-name: io.micrometer:micrometer-observation dependency-version: 1.16.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: production-minor-patch - dependency-name: io.micrometer:micrometer-observation dependency-version: 1.16.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: production-minor-patch - dependency-name: org.wiremock:wiremock dependency-version: 3.13.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: production-minor-patch - dependency-name: org.mockito:mockito-core dependency-version: 5.21.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: production-minor-patch - dependency-name: com.puppycrawl.tools:checkstyle dependency-version: 12.3.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: production-minor-patch - dependency-name: org.apache.tomcat.embed:tomcat-embed-core dependency-version: 11.0.15 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: production-minor-patch - dependency-name: org.apache.tomcat.embed:tomcat-embed-websocket dependency-version: 11.0.15 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: production-minor-patch - dependency-name: org.apache.tomcat.embed:tomcat-embed-websocket dependency-version: 11.0.15 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: production-minor-patch - dependency-name: com.sap.hcp.cf.logging:cf-java-logging-support-logback dependency-version: 4.0.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: production-minor-patch ... Signed-off-by: dependabot[bot] <[email protected]> * replace removed springframework.ai methods * spring-ai-autoconfigure-mcp-client does not have new version * reduce lines --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jonas Israel <[email protected]> Co-authored-by: Roshin Rajan Panackal <[email protected]>
1 parent 44d1229 commit e279ada

File tree

8 files changed

+27
-23
lines changed

8 files changed

+27
-23
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public Flux<ChatResponse> stream(@Nonnull final Prompt prompt) {
107107
});
108108
return flux.map(
109109
delta -> {
110-
val assistantMessage = new AssistantMessage(delta.getDeltaContent(), Map.of());
110+
val assistantMessage = new AssistantMessage(delta.getDeltaContent());
111111
val metadata =
112112
ChatGenerationMetadata.builder().finishReason(delta.getFinishReason()).build();
113113
return new ChatResponse(List.of(new Generation(assistantMessage, metadata)));
@@ -173,7 +173,8 @@ private static Generation toGeneration(
173173
}
174174
}
175175

176-
val assistantMessage = new AssistantMessage(message.getContent(), Map.of(), calls);
176+
val assistantMessage =
177+
AssistantMessage.builder().content(message.getContent()).toolCalls(calls).build();
177178
return new Generation(assistantMessage, metadata.build());
178179
}
179180

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import org.junit.jupiter.api.DisplayName;
2020
import org.junit.jupiter.api.Test;
2121
import org.springframework.ai.document.Document;
22-
import org.springframework.ai.embedding.EmbeddingOptionsBuilder;
22+
import org.springframework.ai.embedding.EmbeddingOptions;
2323
import org.springframework.ai.embedding.EmbeddingRequest;
2424

2525
class EmbeddingModelTest {
@@ -36,7 +36,7 @@ void setUp() {
3636
void testCallWithValidEmbeddingRequest() {
3737
val texts = List.of("Some text");
3838
val springAiRequest =
39-
new EmbeddingRequest(texts, EmbeddingOptionsBuilder.builder().withDimensions(128).build());
39+
new EmbeddingRequest(texts, EmbeddingOptions.builder().dimensions(128).build());
4040

4141
val expectedOpenAiResponse =
4242
new ObjectMapper()
@@ -67,7 +67,7 @@ void testCallWithValidEmbeddingRequest() {
6767
void testCallWithModelOptionSetThrows() {
6868
val springAiRequest =
6969
new EmbeddingRequest(
70-
List.of("Some text"), EmbeddingOptionsBuilder.builder().withModel("model").build());
70+
List.of("Some text"), EmbeddingOptions.builder().model("model").build());
7171

7272
val model = new OpenAiSpringEmbeddingModel(client);
7373

orchestration/src/main/java/com/sap/ai/sdk/orchestration/spring/OrchestrationSpringChatResponse.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import com.sap.ai.sdk.orchestration.model.LLMModuleResult;
66
import com.sap.ai.sdk.orchestration.model.TokenUsage;
77
import java.util.List;
8-
import java.util.Map;
98
import javax.annotation.Nonnull;
109
import lombok.EqualsAndHashCode;
1110
import lombok.Value;
@@ -59,7 +58,11 @@ static Generation toGeneration(@Nonnull final LLMChoice choice) {
5958
toolCall.getFunction().getArguments()))
6059
.toList();
6160

62-
val message = new AssistantMessage(choice.getMessage().getContent(), Map.of(), toolCalls);
61+
val message =
62+
AssistantMessage.builder()
63+
.content(choice.getMessage().getContent())
64+
.toolCalls(toolCalls)
65+
.build();
6366
return new Generation(message, metadata.build());
6467
}
6568

orchestration/src/test/java/com/sap/ai/sdk/orchestration/spring/OrchestrationEmbeddingModelTest.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import org.junit.jupiter.api.Test;
2525
import org.springframework.ai.document.MetadataMode;
2626
import org.springframework.ai.embedding.EmbeddingOptions;
27-
import org.springframework.ai.embedding.EmbeddingOptionsBuilder;
2827
import org.springframework.ai.embedding.EmbeddingRequest;
2928

3029
@WireMockTest
@@ -37,7 +36,7 @@ class OrchestrationEmbeddingModelTest {
3736

3837
@BeforeEach
3938
void setup(WireMockRuntimeInfo server) {
40-
options = EmbeddingOptionsBuilder.builder().withModel("text-embedding-3-small").build();
39+
options = EmbeddingOptions.builder().model("text-embedding-3-small").build();
4140

4241
final var destination = DefaultHttpDestination.builder(server.getHttpBaseUrl()).build();
4342
final var client = new OrchestrationClient(destination);
@@ -79,7 +78,7 @@ void testEmbeddingText() throws IOException {
7978
@Description("Tests that model must name must be set and request option precedes over default")
8079
void testEmbeddingWithMissingModelNameThrows() {
8180
final var request =
82-
new EmbeddingRequest(List.of("Hello World"), EmbeddingOptionsBuilder.builder().build());
81+
new EmbeddingRequest(List.of("Hello World"), EmbeddingOptions.builder().build());
8382

8483
assertThatThrownBy(() -> model.call(request))
8584
.isInstanceOf(NullPointerException.class)

pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,23 +57,23 @@
5757
<project.build.outputTimestamp>2025-04-03T13:23:00Z</project.build.outputTimestamp>
5858
<cloud-sdk.version>5.24.0</cloud-sdk.version>
5959
<junit-jupiter.version>6.0.1</junit-jupiter.version>
60-
<wiremock.version>3.13.1</wiremock.version>
60+
<wiremock.version>3.13.2</wiremock.version>
6161
<assertj-core.version>3.27.6</assertj-core.version>
6262
<slf4j.version>2.0.17</slf4j.version>
63-
<checkstyle.version>12.1.1</checkstyle.version>
63+
<checkstyle.version>12.3.0</checkstyle.version>
6464
<system-stubs.version>2.1.3</system-stubs.version>
6565
<surefire.version>3.5.4</surefire.version>
6666
<springframework.version>6.2.12</springframework.version>
67-
<spring-ai.version>1.0.3</spring-ai.version>
68-
<reactor-core.version>3.8.0</reactor-core.version>
67+
<spring-ai.version>1.1.2</spring-ai.version>
68+
<reactor-core.version>3.8.1</reactor-core.version>
6969
<dotenv-java.version>3.2.0</dotenv-java.version>
70-
<mockito.version>5.20.0</mockito.version>
70+
<mockito.version>5.21.0</mockito.version>
7171
<javaparser.version>3.27.1</javaparser.version>
7272
<jsonschema-generator.version>4.38.0</jsonschema-generator.version>
7373
<jackson.version>2.20.1</jackson.version>
7474
<logback.version>1.5.22</logback.version>
7575
<!-- conflicts resolution -->
76-
<micrometer.version>1.16.0</micrometer.version>
76+
<micrometer.version>1.16.1</micrometer.version>
7777
<json.version>20250517</json.version>
7878
<snakeyaml.version>2.5</snakeyaml.version>
7979
<!-- Formatting -->

sample-code/spring-app/pom.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
<project.rootdir>${project.basedir}/../../</project.rootdir>
3636
<spring-boot.version>3.5.7</spring-boot.version>
3737
<logback.version>1.5.22</logback.version>
38-
<cf-logging.version>4.0.0</cf-logging.version>
39-
<apache-tomcat-embed.version>11.0.13</apache-tomcat-embed.version>
38+
<cf-logging.version>4.0.1</cf-logging.version>
39+
<apache-tomcat-embed.version>11.0.15</apache-tomcat-embed.version>
4040
<!-- Skip end-to-end tests by default, can be overridden with -DskipTests=false -->
4141
<skipTests>true</skipTests>
4242
<!-- Allow logging frameworks because this module is not released -->
@@ -115,6 +115,7 @@
115115
<dependency>
116116
<groupId>org.springframework.ai</groupId>
117117
<artifactId>spring-ai-autoconfigure-mcp-client</artifactId>
118+
<version>1.0.3</version>
118119
<scope>runtime</scope>
119120
<exclusions>
120121
<exclusion>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import org.springframework.ai.chat.model.ChatResponse;
1717
import org.springframework.ai.chat.prompt.Prompt;
1818
import org.springframework.ai.document.Document;
19-
import org.springframework.ai.embedding.EmbeddingOptionsBuilder;
19+
import org.springframework.ai.embedding.EmbeddingOptions;
2020
import org.springframework.ai.embedding.EmbeddingRequest;
2121
import org.springframework.ai.embedding.EmbeddingResponse;
2222
import org.springframework.ai.model.tool.DefaultToolCallingChatOptions;
@@ -40,7 +40,7 @@ public class SpringAiOpenAiService {
4040
*/
4141
@Nonnull
4242
public EmbeddingResponse embedStrings() {
43-
final var options = EmbeddingOptionsBuilder.builder().withDimensions(128).build();
43+
final var options = EmbeddingOptions.builder().dimensions(128).build();
4444
final var springAiRequest =
4545
new EmbeddingRequest(List.of("The quick brown fox jumps over the lazy dog."), options);
4646

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import org.springframework.ai.chat.model.ChatResponse;
3232
import org.springframework.ai.chat.prompt.Prompt;
3333
import org.springframework.ai.chat.prompt.PromptTemplate;
34-
import org.springframework.ai.embedding.EmbeddingOptionsBuilder;
34+
import org.springframework.ai.embedding.EmbeddingOptions;
3535
import org.springframework.ai.support.ToolCallbacks;
3636
import org.springframework.ai.tool.ToolCallbackProvider;
3737
import org.springframework.beans.factory.annotation.Autowired;
@@ -276,8 +276,8 @@ public Translation responseFormat() {
276276
@Nonnull
277277
public float[] embed(@Nonnull final String inputText) {
278278
val embedOptions =
279-
EmbeddingOptionsBuilder.builder()
280-
.withModel(OrchestrationEmbeddingModel.TEXT_EMBEDDING_3_SMALL.name())
279+
EmbeddingOptions.builder()
280+
.model(OrchestrationEmbeddingModel.TEXT_EMBEDDING_3_SMALL.name())
281281
.build();
282282
return new OrchestrationSpringEmbeddingModel(embedOptions).embed(inputText);
283283
}

0 commit comments

Comments
 (0)