fix configuration setup

megacamelus · Mar 21, 2024 · e173a71 · e173a71
1 parent 740228d
commit e173a71
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 15 deletions.
diff --git a/...ackend/src/main/java/org/apache/camel/assistant/web/resources/AssistantConfiguration.java b/...ackend/src/main/java/org/apache/camel/assistant/web/resources/AssistantConfiguration.java
@@ -2,23 +2,24 @@
 
 import io.smallrye.config.ConfigMapping;
 import io.smallrye.config.WithDefault;
-import io.smallrye.config.WithName;
 
-@ConfigMapping
+@ConfigMapping(prefix = "camel.assistant")
 public interface AssistantConfiguration {
 
     Qdrant qdrant();
 
     interface Qdrant {
-        @WithName("collection.name")
-        String collectionName();
+        Collection collection();
 
         @WithDefault("localhost")
-        @WithName("host")
         String host();
 
         @WithDefault("6334")
-        @WithName("grpc.port")
-        int grpcPort();
+        int port();
+
+        interface Collection {
+            @WithDefault("camel")
+            String name();
+        }
     }
 }
diff --git a/...rc/main/java/org/apache/camel/assistant/web/resources/AssistantEmbeddingStoreService.java b/...rc/main/java/org/apache/camel/assistant/web/resources/AssistantEmbeddingStoreService.java
@@ -17,7 +17,7 @@ public class AssistantEmbeddingStoreService {
     @Named
     QdrantEmbeddingStore store() {
             return QdrantEmbeddingStore.builder()
-                    .collectionName(configuration.qdrant().collectionName())
+                    .collectionName(configuration.qdrant().collection().name())
                     .client(client)
                     .build();
     }

diff --git a/...nt-backend/src/main/java/org/apache/camel/assistant/web/resources/AssistantProducers.java b/...nt-backend/src/main/java/org/apache/camel/assistant/web/resources/AssistantProducers.java
@@ -11,7 +11,7 @@ public class AssistantProducers {
     public QdrantClient qdrantClient(AssistantConfiguration configuration) {
         QdrantGrpcClient gc = QdrantGrpcClient.newBuilder(
                 configuration.qdrant().host(),
-                configuration.qdrant().grpcPort(),
+                configuration.qdrant().port(),
                 false)
             .build();
 

diff --git a/...nt-backend/src/main/java/org/apache/camel/assistant/web/resources/AssistantReadiness.java b/...nt-backend/src/main/java/org/apache/camel/assistant/web/resources/AssistantReadiness.java
@@ -23,12 +23,12 @@ public class AssistantReadiness implements HealthCheck {
     public HealthCheckResponse call() {
         HealthCheckResponseBuilder rb = HealthCheckResponse.named("Qdrant connection health check")
             .withData("qdrant.host", configuration.qdrant().host())
-            .withData("qdrant.port", configuration.qdrant().grpcPort())
-            .withData("qdrant.collection", configuration.qdrant().collectionName());
+            .withData("qdrant.port", configuration.qdrant().port())
+            .withData("qdrant.collection", configuration.qdrant().collection().name());
 
         try {
             Collections.CollectionInfo reply =
-                client.getCollectionInfoAsync(configuration.qdrant().collectionName(), Duration.ofSeconds(5)).get();
+                client.getCollectionInfoAsync(configuration.qdrant().collection().name(), Duration.ofSeconds(5)).get();
 
             rb.withData("collection.status", reply.getStatus().name());
 

diff --git a/assistant-backend/src/main/resources/application.properties b/assistant-backend/src/main/resources/application.properties
@@ -1,8 +1,8 @@
 quarkus.banner.enabled=false
 
-qdrant.collection.name=camel
-qdrant.host=${QDRANT_HOST:localhost}
-qdrant.grpc.port=${QDRANT_GRPC_PORT:6334}
+camel.assistant.qdrant.collection.name=camel
+camel.assistant.qdrant.host=${QDRANT_HOST:localhost}
+camel.assistant.qdrant.port=${QDRANT_GRPC_PORT:6334}
 
 # Override this for using with a different AI service
 quarkus.langchain4j.chat-model.provider=ollama