Skip to content

Commit 245af59

Browse files
committed
Upgrade to Spring Boot 3.4.3 and Spring AI 1.0.0-M6. Adjust MultiChatResponse structure. Fix breaking API call in MultiChatService.
1 parent e6d998d commit 245af59

File tree

3 files changed

+14
-11
lines changed

3 files changed

+14
-11
lines changed

build.gradle

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
plugins {
22
id 'java'
3+
<<<<<<< Updated upstream
34
id 'org.cyclonedx.bom' version '2.1.0'
5+
=======
6+
id 'org.cyclonedx.bom' version '2.2.0'
7+
>>>>>>> Stashed changes
48
id 'com.gorylenko.gradle-git-properties' version '2.4.2'
5-
id 'org.springframework.boot' version '3.4.2'
9+
id 'org.springframework.boot' version '3.4.3'
610
id 'io.spring.dependency-management' version '1.1.7'
711
id 'org.springdoc.openapi-gradle-plugin' version '1.9.0'
812
}
@@ -24,17 +28,17 @@ repositories {
2428
}
2529

2630
ext {
27-
set('springAiVersion', "1.0.0-M5")
31+
set('springAiVersion', "1.0.0-M6")
2832
}
2933

3034
dependencies {
3135
implementation('org.springframework.boot:spring-boot-starter-actuator')
3236
implementation('org.springframework.boot:spring-boot-starter-validation')
3337
implementation 'org.springframework.boot:spring-boot-starter-web'
3438
implementation 'org.springframework.ai:spring-ai-openai-spring-boot-starter'
35-
implementation 'io.github.springboot-addons:spring-boot-starter-httpclient5-actuator:1.1.0'
36-
implementation 'io.github.springboot-addons:spring-boot-starter-httpclient5-resilience4j:1.1.0'
37-
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.4'
39+
implementation 'io.github.springboot-addons:spring-boot-starter-httpclient5-actuator:1.1.1'
40+
implementation 'io.github.springboot-addons:spring-boot-starter-httpclient5-resilience4j:1.1.1'
41+
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.5'
3842
testImplementation 'org.springframework.boot:spring-boot-starter-test'
3943
testImplementation 'org.assertj:assertj-core:3.27.3'
4044
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'

src/main/java/me/pacphi/domain/chat/MultiChatResponse.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,8 @@ public record MultiChatResponse(
99
String content,
1010
boolean success,
1111
String errorMessage,
12-
Long promptTokens,
13-
Long generationTokens,
14-
Long totalTokens,
12+
Integer promptTokens,
13+
Integer totalTokens,
1514
String responseTime
1615
) {
1716
private static String getFormattedResponseTime(long responseTimeMillis) {
@@ -33,10 +32,10 @@ private static String getFormattedResponseTime(long responseTimeMillis) {
3332
}
3433

3534
public static MultiChatResponse success(String model, String response, Usage usage, long responseTime) {
36-
return new MultiChatResponse(model, response, true, null, usage.getPromptTokens(), usage.getGenerationTokens(), usage.getTotalTokens(), getFormattedResponseTime(responseTime));
35+
return new MultiChatResponse(model, response, true, null, usage.getPromptTokens(), usage.getTotalTokens(), getFormattedResponseTime(responseTime));
3736
}
3837

3938
public static MultiChatResponse failure(String model, String error) {
40-
return new MultiChatResponse(model, null, false, error, null, null, null, null);
39+
return new MultiChatResponse(model, null, false, error, null, null, null);
4140
}
4241
}

src/main/java/me/pacphi/service/chat/MultiChatService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public List<MultiChatResponse> respond(String inquiry) {
6060
usage = chatResponse.getMetadata().getUsage();
6161
}
6262
if (chatResponse.getResult() != null) {
63-
response = chatResponse.getResult().getOutput().getContent();
63+
response = chatResponse.getResult().getOutput().getText();
6464
}
6565
}
6666
if (usage == null) {

0 commit comments

Comments
 (0)