diff --git a/common/src/main/java/dev/langchain4j/model/embedding/EmbeddingModelConfig.java b/common/src/main/java/dev/langchain4j/model/embedding/EmbeddingModelConfig.java deleted file mode 100644 index 7577f926a..000000000 --- a/common/src/main/java/dev/langchain4j/model/embedding/EmbeddingModelConfig.java +++ /dev/null @@ -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(); - } -} \ No newline at end of file diff --git a/common/src/main/java/dev/langchain4j/store/embedding/InMemoryS2EmbeddingStore.java b/common/src/main/java/dev/langchain4j/store/embedding/InMemoryS2EmbeddingStore.java index 009536eab..dabd4061b 100644 --- a/common/src/main/java/dev/langchain4j/store/embedding/InMemoryS2EmbeddingStore.java +++ b/common/src/main/java/dev/langchain4j/store/embedding/InMemoryS2EmbeddingStore.java @@ -3,10 +3,12 @@ package dev.langchain4j.store.embedding; import com.tencent.supersonic.common.config.EmbeddingConfig; import com.tencent.supersonic.common.util.ContextUtils; import dev.langchain4j.data.embedding.Embedding; +import dev.langchain4j.model.embedding.BgeSmallZhEmbeddingModel; import dev.langchain4j.model.embedding.EmbeddingModel; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.MapUtils; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.NoSuchBeanDefinitionException; import java.io.IOException; import java.nio.file.Files; @@ -95,7 +97,13 @@ public class InMemoryS2EmbeddingStore implements S2EmbeddingStore { } 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 getEmbeddingStore(String collectionName) {