Skip to content

Commit 5cc3077

Browse files
committed
fix: embeddings
1 parent 59c878f commit 5cc3077

File tree

3 files changed

+5
-14
lines changed

3 files changed

+5
-14
lines changed

backend/src/main/java/ch/xxx/aidoclibchat/adapter/config/ApplicationConfig.java

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,7 @@
2727
@Configuration
2828
@EnableAsync
2929
public class ApplicationConfig {
30-
31-
// @Primary
32-
// @Profile("ollama")
33-
// @Bean
34-
// public EmbeddingClient embeddingClient() {
35-
// return new TransformersEmbeddingClient();
36-
// }
37-
30+
3831
@Bean
3932
public RestClient createRestClient() {
4033
return RestClient.builder().build();

backend/src/main/java/ch/xxx/aidoclibchat/adapter/repository/DocumentVSRepositoryBean.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import org.springframework.ai.vectorstore.filter.Filter.Value;
2929
import org.springframework.ai.vectorstore.filter.FilterExpressionConverter;
3030
import org.springframework.ai.vectorstore.pgvector.PgVectorStore;
31+
import org.springframework.beans.factory.annotation.Qualifier;
3132
import org.springframework.jdbc.core.JdbcTemplate;
3233
import org.springframework.jdbc.core.RowMapper;
3334
import org.springframework.stereotype.Repository;
@@ -48,7 +49,7 @@ public class DocumentVSRepositoryBean implements DocumentVsRepository {
4849
private final ObjectMapper objectMapper;
4950
private final FilterExpressionConverter filterExpressionConverter;
5051

51-
public DocumentVSRepositoryBean(JdbcTemplate jdbcTemplate, EmbeddingModel embeddingClient,
52+
public DocumentVSRepositoryBean(JdbcTemplate jdbcTemplate, @Qualifier("embeddingModel") EmbeddingModel embeddingClient,
5253
ObjectMapper objectMapper) {
5354
this.jdbcTemplate = jdbcTemplate;
5455
this.objectMapper = objectMapper;

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
spring.ai.ollama.base-url=${OLLAMA-BASE-URL:http://localhost:11434}
2-
spring.ai.ollama.embedding.enabled=false
3-
spring.ai.embedding.transformer.enabled=true
42
document-token-limit=9000
53
embedding-token-limit=500
64
spring.liquibase.change-log=classpath:/dbchangelog/db.changelog-master-ollama.xml
@@ -12,7 +10,7 @@ spring.liquibase.change-log=classpath:/dbchangelog/db.changelog-master-ollama.xm
1210
# document processing
1311
# config free production use
1412
# best model for documents currently
15-
spring.ai.ollama.chat.options.model=qwen2.5:32b
13+
#spring.ai.ollama.chat.options.model=qwen2.5:32b
1614
#spring.ai.ollama.chat.options.model=deepseek-r1:14b
1715
#spring.ai.ollama.chat.options.model=llama3.1:8b
1816
spring.ai.ollama.chat.options.num-ctx=12288
@@ -22,7 +20,6 @@ spring.ai.embedding.transformer.tokenizer.uri=https://huggingface.co/mixedbread-
2220
# function calling
2321
# best model for function calls currently
2422
#spring.ai.ollama.chat.options.model=qwen2.5:14b
25-
#spring.ai.ollama.chat.options.model=qwen2.5:14b
2623
#spring.ai.ollama.chat.options.num-ctx=40960
2724

2825
#spring.ai.ollama.chat.model=llama3.1:8b
@@ -31,7 +28,7 @@ spring.ai.embedding.transformer.tokenizer.uri=https://huggingface.co/mixedbread-
3128

3229
# image processing
3330
# best model for vision currently
34-
#spring.ai.ollama.chat.options.model=llama3.2-vision:11b
31+
spring.ai.ollama.chat.options.model=llama3.2-vision:11b
3532
#spring.ai.ollama.chat.options.num-thread=8
3633
#spring.ai.ollama.chat.options.keep_alive=1s
3734

0 commit comments

Comments
 (0)