Merge pull request #1135 from jmartisk/main-issue-1129

Fix registration of embedding model for Easy RAG
quarkiverse · Dec 3, 2024 · 2e8615a · 2e8615a
2 parents bb5c722 + ddda5fa
commit 2e8615a
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/core/deployment/src/main/java/io/quarkiverse/langchain4j/deployment/BeansProcessor.java b/core/deployment/src/main/java/io/quarkiverse/langchain4j/deployment/BeansProcessor.java
@@ -261,11 +261,14 @@ public void handleProviders(BeanDiscoveryFinishedBuildItem beanDiscoveryFinished
             // in case multiple embedding model providers are available,
             // the user has to specify `quarkus.langchain4j.embedding-model.provider` to choose one
             Optional<String> userSelectedProvider = buildConfig.defaultConfig().embeddingModel().provider();
-            String provider = selectEmbeddingModelProvider(inProcessEmbeddingBuildItems, embeddingCandidateItems,
-                    beanDiscoveryFinished.beanStream().withBeanType(EmbeddingModel.class),
-                    userSelectedProvider, embeddingModelBeanType, embeddingModelConfigNamespace);
-            selectedEmbeddingProducer
-                    .produce(new SelectedEmbeddingModelCandidateBuildItem(provider, NamedConfigUtil.DEFAULT_NAME));
+            if (userSelectedProvider.isEmpty()) {
+                String provider = selectEmbeddingModelProvider(inProcessEmbeddingBuildItems, embeddingCandidateItems,
+                        beanDiscoveryFinished.beanStream().withBeanType(EmbeddingModel.class),
+                        userSelectedProvider, embeddingModelBeanType, embeddingModelConfigNamespace);
+                selectedEmbeddingProducer
+                        .produce(new SelectedEmbeddingModelCandidateBuildItem(provider, NamedConfigUtil.DEFAULT_NAME));
+            }
+            // else: if the user actually selected a provider, the model will be registered automatically below anyway
         }
 
         for (String modelName : requestedModerationModels) {