Skip to content

Commit 6bef2d3

Browse files
committed
feat: update spring ai
1 parent 1f8d8e7 commit 6bef2d3

File tree

3 files changed

+12
-14
lines changed

3 files changed

+12
-14
lines changed

backend/build.gradle

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*/
1313
plugins {
1414
id 'java'
15-
id 'org.springframework.boot' version '3.4.0'
15+
id 'org.springframework.boot' version '3.5.0'
1616
id 'io.spring.dependency-management' version '1.1.7'
1717
}
1818

@@ -31,19 +31,20 @@ repositories {
3131
}
3232

3333
dependencies {
34+
implementation platform("org.springframework.ai:spring-ai-bom:1.0.0")
3435
implementation 'org.springframework.boot:spring-boot-starter-actuator'
3536
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
3637
implementation 'org.springframework.boot:spring-boot-starter-security'
3738
implementation 'org.springframework.boot:spring-boot-starter-web'
38-
implementation 'org.springframework.ai:spring-ai-tika-document-reader:1.0.0-SNAPSHOT'
39+
implementation 'org.springframework.ai:spring-ai-tika-document-reader'
3940
implementation 'org.liquibase:liquibase-core'
4041
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-csv'
4142
implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'
4243
implementation 'net.javacrumbs.shedlock:shedlock-spring:6.0.1'
43-
implementation 'net.javacrumbs.shedlock:shedlock-provider-jdbc-template:6.0.1'
44-
implementation 'org.springframework.ai:spring-ai-pgvector-store-spring-boot-starter:1.0.0-SNAPSHOT'
45-
implementation 'org.springframework.ai:spring-ai-transformers-spring-boot-starter:1.0.0-SNAPSHOT'
46-
implementation 'org.springframework.ai:spring-ai-ollama-spring-boot-starter:1.0.0-SNAPSHOT'
44+
implementation 'net.javacrumbs.shedlock:shedlock-provider-jdbc-template:6.0.1'
45+
implementation 'org.springframework.ai:spring-ai-starter-vector-store-pgvector'
46+
implementation 'org.springframework.ai:spring-ai-starter-model-transformers'
47+
implementation 'org.springframework.ai:spring-ai-starter-model-ollama'
4748
testImplementation 'org.springframework.boot:spring-boot-starter-test'
4849
testImplementation 'org.springframework.security:spring-security-test'
4950
testImplementation 'com.tngtech.archunit:archunit-junit5:1.4.0'

backend/src/main/java/ch/xxx/aidoclibchat/usecase/service/CodeGenerationService.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121

2222
import org.slf4j.Logger;
2323
import org.slf4j.LoggerFactory;
24+
import org.springframework.ai.chat.client.ChatClient.Builder;
2425
import org.springframework.ai.chat.prompt.PromptTemplate;
2526
import org.springframework.beans.factory.annotation.Value;
2627
import org.springframework.stereotype.Service;
27-
import org.springframework.ai.chat.client.ChatClient.Builder;
2828

2929
import ch.xxx.aidoclibchat.domain.model.dto.GithubClient;
3030
import ch.xxx.aidoclibchat.domain.model.dto.GithubSource;
@@ -111,9 +111,8 @@ public String generateTest(String url, Optional<String> testUrlOpt) {
111111
.orElse("");
112112
String classToTest = githubSource.lines().stream()
113113
.collect(Collectors.joining(System.getProperty("line.separator")));
114-
LOGGER.debug(new PromptTemplate(this.contextWindowSize >= 16 * 1024 ? this.ollamaPrompt1 : this.ollamaPrompt,
115-
Map.of("classToTest", classToTest, "contextClasses", contextClasses, "testExample", testExample))
116-
.createMessage().getText());
114+
LOGGER.debug(PromptTemplate.builder().template(this.contextWindowSize >= 16 * 1024 ? this.ollamaPrompt1 : this.ollamaPrompt)
115+
.variables(Map.of("classToTest", classToTest, "contextClasses", contextClasses, "testExample", testExample)).build().getTemplate());
117116
LOGGER.info("Generation started with context window: {}", this.contextWindowSize);
118117
var response = chatClient.prompt()
119118
.user(u -> u.text(this.contextWindowSize >= 16 * 1024 ? this.ollamaPrompt1 : this.ollamaPrompt)

backend/src/main/java/ch/xxx/aidoclibchat/usecase/service/ImageService.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,8 @@ private ResultData createAIResult(ImageQueryDto imageDto) {
118118
if (ImageType.JPEG.equals(imageDto.getImageType()) || ImageType.PNG.equals(imageDto.getImageType())) {
119119
imageDto = this.resizeImage(imageDto);
120120
}
121-
var prompt = new Prompt(
122-
new UserMessage(imageDto.getQuery(), List.of(new Media(MimeType.valueOf(imageDto.getImageType().getMediaType()),
123-
new ByteArrayResource(imageDto.getImageContent())))));
124-
121+
var prompt = new Prompt(UserMessage.builder().text(imageDto.getQuery())
122+
.media(Media.builder().data(new ByteArrayResource(imageDto.getImageContent())).mimeType(MimeType.valueOf(imageDto.getImageType().getMediaType())).build()).build());
125123
var response = this.chatClient.prompt(prompt).call().chatResponse();
126124
var resultData = new ResultData(response.getResult().getOutput().getText(), imageDto);
127125
return resultData;

0 commit comments

Comments
 (0)