Skip to content

Commit c554516

Browse files
committed
feat: spring update
1 parent 3a6a2a1 commit c554516

File tree

3 files changed

+14
-11
lines changed

3 files changed

+14
-11
lines changed

backend/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
*/
1313
plugins {
1414
id 'java'
15-
id 'org.springframework.boot' version '3.3.0'
16-
id 'io.spring.dependency-management' version '1.1.4'
15+
id 'org.springframework.boot' version '3.4.0'
16+
id 'io.spring.dependency-management' version '1.1.6'
1717
}
1818

1919
group = 'ch.xxx'
@@ -37,13 +37,13 @@ dependencies {
3737
implementation 'org.liquibase:liquibase-core'
3838
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-csv'
3939
implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'
40-
implementation 'net.javacrumbs.shedlock:shedlock-spring:5.2.0'
41-
implementation 'net.javacrumbs.shedlock:shedlock-provider-jdbc-template:5.2.0'
40+
implementation 'net.javacrumbs.shedlock:shedlock-spring:6.0.1'
41+
implementation 'net.javacrumbs.shedlock:shedlock-provider-jdbc-template:6.0.1'
4242
implementation 'org.springframework.ai:spring-ai-pgvector-store-spring-boot-starter:1.0.0-SNAPSHOT'
4343
implementation 'org.springframework.ai:spring-ai-transformers-spring-boot-starter:1.0.0-SNAPSHOT'
4444
testImplementation 'org.springframework.boot:spring-boot-starter-test'
4545
testImplementation 'org.springframework.security:spring-security-test'
46-
testImplementation 'com.tngtech.archunit:archunit-junit5:1.1.0'
46+
testImplementation 'com.tngtech.archunit:archunit-junit5:1.3.0'
4747
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
4848

4949
// if(project.hasProperty('useOllama')) {

backend/src/main/resources/application-ollama.properties

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
spring.ai.ollama.base-url=${OLLAMA-BASE-URL:http://localhost:11434}
22
spring.ai.ollama.embedding.enabled=false
33
spring.ai.embedding.transformer.enabled=true
4-
document-token-limit=150
4+
document-token-limit=9000
55
embedding-token-limit=500
66
spring.liquibase.change-log=classpath:/dbchangelog/db.changelog-master-ollama.xml
77

@@ -11,7 +11,11 @@ spring.liquibase.change-log=classpath:/dbchangelog/db.changelog-master-ollama.xm
1111

1212
# document processing
1313
# falcon model config free production use
14-
#spring.ai.ollama.chat.model=falcon:40b
14+
#spring.ai.ollama.chat.model=qwen2.5:32b
15+
spring.ai.ollama.chat.model=llama3.1:8b
16+
spring.ai.ollama.chat.options.num-ctx=12288
17+
#spring.ai.embedding.transformer.onnx.modelUri=https://huggingface.co/mixedbread-ai/mxbai-embed-large-v1/tree/main/onnx/model_quantized.onnx
18+
#spring.ai.embedding.transformer.tokenizer.uri=https://huggingface.co/mixedbread-ai/mxbai-embed-large-v1/tree/main/tokenizer.json
1519
# beluga model config only for non production/commercial use
1620
#spring.ai.ollama.chat.model=stable-beluga:13b
1721

@@ -23,8 +27,6 @@ spring.liquibase.change-log=classpath:/dbchangelog/db.changelog-master-ollama.xm
2327
#spring.ai.ollama.chat.options.num-thread=8
2428
#spring.ai.ollama.chat.options.keep_alive=1s
2529

26-
#spring.ai.ollama.embedding.options.model=mxbai-embed-large:335m #test with Spring AI 1.0
27-
2830
# generate code
2931
#spring.ai.ollama.chat.model=granite-code:20b
3032
#spring.ai.ollama.chat.options.num-ctx=8192
@@ -35,8 +37,8 @@ spring.liquibase.change-log=classpath:/dbchangelog/db.changelog-master-ollama.xm
3537
#spring.ai.ollama.chat.model=deepseek-coder-v2:16b
3638
#spring.ai.ollama.chat.options.num-ctx=65536
3739

38-
spring.ai.ollama.chat.model=codestral:22b
39-
spring.ai.ollama.chat.options.num-ctx=32768
40+
#spring.ai.ollama.chat.model=codestral:22b
41+
#spring.ai.ollama.chat.options.num-ctx=32768
4042

4143
# generate book summaries
4244
spring.ai.ollama.chat.options.num-thread=8

runOllama.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@ docker exec -it ollama ollama run stable-beluga:13bc
1313
#docker exec -it ollama ollama run llama3.1:70b
1414
#docker exec -it ollama ollama run qwen2.5:32b
1515
#docker exec -it ollama ollama run codestral:22b
16+
#docker exec -it ollama ollama run llama3.1:8b
1617
#docker exec -it ollama bash

0 commit comments

Comments
 (0)