Skip to content

Commit 2e8615a

Browse files
authored
Merge pull request #1135 from jmartisk/main-issue-1129
Fix registration of embedding model for Easy RAG
2 parents bb5c722 + ddda5fa commit 2e8615a

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

core/deployment/src/main/java/io/quarkiverse/langchain4j/deployment/BeansProcessor.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -261,11 +261,14 @@ public void handleProviders(BeanDiscoveryFinishedBuildItem beanDiscoveryFinished
261261
// in case multiple embedding model providers are available,
262262
// the user has to specify `quarkus.langchain4j.embedding-model.provider` to choose one
263263
Optional<String> userSelectedProvider = buildConfig.defaultConfig().embeddingModel().provider();
264-
String provider = selectEmbeddingModelProvider(inProcessEmbeddingBuildItems, embeddingCandidateItems,
265-
beanDiscoveryFinished.beanStream().withBeanType(EmbeddingModel.class),
266-
userSelectedProvider, embeddingModelBeanType, embeddingModelConfigNamespace);
267-
selectedEmbeddingProducer
268-
.produce(new SelectedEmbeddingModelCandidateBuildItem(provider, NamedConfigUtil.DEFAULT_NAME));
264+
if (userSelectedProvider.isEmpty()) {
265+
String provider = selectEmbeddingModelProvider(inProcessEmbeddingBuildItems, embeddingCandidateItems,
266+
beanDiscoveryFinished.beanStream().withBeanType(EmbeddingModel.class),
267+
userSelectedProvider, embeddingModelBeanType, embeddingModelConfigNamespace);
268+
selectedEmbeddingProducer
269+
.produce(new SelectedEmbeddingModelCandidateBuildItem(provider, NamedConfigUtil.DEFAULT_NAME));
270+
}
271+
// else: if the user actually selected a provider, the model will be registered automatically below anyway
269272
}
270273

271274
for (String modelName : requestedModerationModels) {

0 commit comments

Comments
 (0)