topdog/supersonic
1
0
Fork 0
mirror of https://github.com/tencentmusic/supersonic.git synced 2025-12-10 11:07:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(improvement)(common) When EmbeddingModel retrieval fails, use the default embedded model. (#1176)

Browse Source
This commit is contained in:
lexluo09
2024-06-20 21:57:32 +08:00
committed by GitHub
parent 3831f9fdf1
commit 5555dc8c45
2 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
common/src/main/java/dev/langchain4j/model/embedding/EmbeddingModelConfig.java
View File

@@ -1,15 +0,0 @@
package dev.langchain4j.model.embedding;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@Configuration
public class EmbeddingModelConfig {
@Bean
@ConditionalOnMissingBean
public EmbeddingModel embeddingModel() {
return new BgeSmallZhEmbeddingModel();
}
}

10
common/src/main/java/dev/langchain4j/store/embedding/InMemoryS2EmbeddingStore.java
View File

@@ -3,10 +3,12 @@ package dev.langchain4j.store.embedding;
import com.tencent.supersonic.common.config.EmbeddingConfig; import com.tencent.supersonic.common.config.EmbeddingConfig;
import com.tencent.supersonic.common.util.ContextUtils; import com.tencent.supersonic.common.util.ContextUtils;
import dev.langchain4j.data.embedding.Embedding; import dev.langchain4j.data.embedding.Embedding;
import dev.langchain4j.model.embedding.BgeSmallZhEmbeddingModel;
import dev.langchain4j.model.embedding.EmbeddingModel; import dev.langchain4j.model.embedding.EmbeddingModel;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.MapUtils; import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Files; import java.nio.file.Files;
@@ -95,7 +97,13 @@ public class InMemoryS2EmbeddingStore implements S2EmbeddingStore {
} }
private static EmbeddingModel getEmbeddingModel() { private static EmbeddingModel getEmbeddingModel() {
return ContextUtils.getBean(EmbeddingModel.class); EmbeddingModel embeddingModel;
try {
embeddingModel = ContextUtils.getBean(EmbeddingModel.class);
} catch (NoSuchBeanDefinitionException e) {
embeddingModel = new BgeSmallZhEmbeddingModel();
}
return embeddingModel;
} }
private InMemoryEmbeddingStore<EmbeddingQuery> getEmbeddingStore(String collectionName) { private InMemoryEmbeddingStore<EmbeddingQuery> getEmbeddingStore(String collectionName) {