From 06ab0c8379d4c945fed730b3a123cf4c06c39936 Mon Sep 17 00:00:00 2001 From: Andrea Cosentino Date: Tue, 19 Mar 2024 11:24:59 +0100 Subject: [PATCH 1/3] Camel-Milvus Test Infra: Align langchain embeddings component to new usage Signed-off-by: Andrea Cosentino --- .../LangchainEmbeddingsComponentMilvusTargetIT.java | 6 ++---- ...java => LangchainEmbeddingsComponentQdrantTargetIT.java} | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) rename components/camel-ai/camel-langchain-embeddings/src/test/java/org/apache/camel/component/langchain/embeddings/{LangchainEmbeddingsComponentIT.java => LangchainEmbeddingsComponentQdrantTargetIT.java} (98%) diff --git a/components/camel-ai/camel-langchain-embeddings/src/test/java/org/apache/camel/component/langchain/embeddings/LangchainEmbeddingsComponentMilvusTargetIT.java b/components/camel-ai/camel-langchain-embeddings/src/test/java/org/apache/camel/component/langchain/embeddings/LangchainEmbeddingsComponentMilvusTargetIT.java index 728914d789eff..3ad16173bbed4 100644 --- a/components/camel-ai/camel-langchain-embeddings/src/test/java/org/apache/camel/component/langchain/embeddings/LangchainEmbeddingsComponentMilvusTargetIT.java +++ b/components/camel-ai/camel-langchain-embeddings/src/test/java/org/apache/camel/component/langchain/embeddings/LangchainEmbeddingsComponentMilvusTargetIT.java @@ -16,7 +16,6 @@ */ package org.apache.camel.component.langchain.embeddings; -import java.net.URL; import java.util.ArrayList; import java.util.List; import java.util.Random; @@ -65,9 +64,8 @@ protected CamelContext createCamelContext() throws Exception { CamelContext context = super.createCamelContext(); var milvus = context.getComponent(Milvus.SCHEME, MilvusComponent.class); - URL url = new URL(MILVUS.getMilvusEndpointUrl()); - milvus.getConfiguration().setHost(url.getHost()); - milvus.getConfiguration().setPort(url.getPort()); + milvus.getConfiguration().setHost(MILVUS.getMilvusHost()); + milvus.getConfiguration().setPort(MILVUS.getMilvusPort()); context.getRegistry().bind("embedding-model", new AllMiniLmL6V2EmbeddingModel()); diff --git a/components/camel-ai/camel-langchain-embeddings/src/test/java/org/apache/camel/component/langchain/embeddings/LangchainEmbeddingsComponentIT.java b/components/camel-ai/camel-langchain-embeddings/src/test/java/org/apache/camel/component/langchain/embeddings/LangchainEmbeddingsComponentQdrantTargetIT.java similarity index 98% rename from components/camel-ai/camel-langchain-embeddings/src/test/java/org/apache/camel/component/langchain/embeddings/LangchainEmbeddingsComponentIT.java rename to components/camel-ai/camel-langchain-embeddings/src/test/java/org/apache/camel/component/langchain/embeddings/LangchainEmbeddingsComponentQdrantTargetIT.java index 75e3180cbe98b..03bc364083657 100644 --- a/components/camel-ai/camel-langchain-embeddings/src/test/java/org/apache/camel/component/langchain/embeddings/LangchainEmbeddingsComponentIT.java +++ b/components/camel-ai/camel-langchain-embeddings/src/test/java/org/apache/camel/component/langchain/embeddings/LangchainEmbeddingsComponentQdrantTargetIT.java @@ -43,7 +43,7 @@ @TestInstance(TestInstance.Lifecycle.PER_CLASS) @TestMethodOrder(MethodOrderer.OrderAnnotation.class) -public class LangchainEmbeddingsComponentIT extends CamelTestSupport { +public class LangchainEmbeddingsComponentQdrantTargetIT extends CamelTestSupport { public static final long POINT_ID = 8; public static final String QDRANT_URI = "qdrant:embeddings"; From 6aad4d54b736976320612abf82a9988a1915a0cf Mon Sep 17 00:00:00 2001 From: Andrea Cosentino Date: Tue, 19 Mar 2024 12:37:04 +0100 Subject: [PATCH 2/3] Camel-Milvus: Improve headers Signed-off-by: Andrea Cosentino --- .../org/apache/camel/component/milvus/Milvus.java | 14 -------------- .../camel/component/milvus/MilvusProducer.java | 1 + .../component/milvus/it/MilvusComponentIT.java | 2 ++ 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/components/camel-milvus/src/main/java/org/apache/camel/component/milvus/Milvus.java b/components/camel-milvus/src/main/java/org/apache/camel/component/milvus/Milvus.java index dbf45547b056a..ebc928616730d 100644 --- a/components/camel-milvus/src/main/java/org/apache/camel/component/milvus/Milvus.java +++ b/components/camel-milvus/src/main/java/org/apache/camel/component/milvus/Milvus.java @@ -29,24 +29,10 @@ public static class Headers { enums = "CREATE_COLLECTION,CREATE_INDEX,UPSERT,INSERT,SEARCH,DELETE") public static final String ACTION = "CamelMilvusAction"; - @Metadata(description = "Operation ID.", javaType = "long") - public static final String OPERATION_ID = "CamelMilvusOperationID"; - @Metadata(description = "Operation Status.", javaType = "String") public static final String OPERATION_STATUS = "CamelMilvusOperationStatus"; @Metadata(description = "Operation Status Value.", javaType = "int") public static final String OPERATION_STATUS_VALUE = "CamelMilvusOperationStatusValue"; - - @Metadata(description = "Include Payload.", javaType = "boolean", defaultValue = "true") - public static final String INCLUDE_PAYLOAD = "CamelMilvusWithPayload"; - public static final boolean DEFAULT_INCLUDE_PAYLOAD = true; - - @Metadata(description = "Include Vectors.", javaType = "boolean", defaultValue = "false") - public static final String INCLUDE_VECTORS = "CamelMilvusWithVectors"; - public static final boolean DEFAULT_INCLUDE_VECTORS = false; - - @Metadata(description = "The number of elements.", javaType = "int") - public static final String SIZE = "CamelMilvusSize"; } } diff --git a/components/camel-milvus/src/main/java/org/apache/camel/component/milvus/MilvusProducer.java b/components/camel-milvus/src/main/java/org/apache/camel/component/milvus/MilvusProducer.java index c6f23fcc68712..cf58965ca762a 100644 --- a/components/camel-milvus/src/main/java/org/apache/camel/component/milvus/MilvusProducer.java +++ b/components/camel-milvus/src/main/java/org/apache/camel/component/milvus/MilvusProducer.java @@ -186,6 +186,7 @@ private void handleResponseStatus(R r) { private void populateResponse(R r, Exchange exchange) { Message out = exchange.getMessage(); out.setHeader(Milvus.Headers.OPERATION_STATUS, r.getStatus()); + out.setHeader(Milvus.Headers.OPERATION_STATUS_VALUE, r.getStatus().intValue()); out.setBody(r.getData()); } } diff --git a/components/camel-milvus/src/test/java/org/apache/camel/component/milvus/it/MilvusComponentIT.java b/components/camel-milvus/src/test/java/org/apache/camel/component/milvus/it/MilvusComponentIT.java index 6220150f19cc1..5d6a5270f88c8 100644 --- a/components/camel-milvus/src/test/java/org/apache/camel/component/milvus/it/MilvusComponentIT.java +++ b/components/camel-milvus/src/test/java/org/apache/camel/component/milvus/it/MilvusComponentIT.java @@ -202,6 +202,7 @@ public void search() { assertThat(result).isNotNull(); assertThat(result.getException()).isNull(); assertThat(result.getMessage().getBody(SearchResponse.class).rowRecords.size() == 2); + System.err.println(result.getMessage().getHeaders()); } @Test @@ -240,6 +241,7 @@ public void delete() { assertThat(result).isNotNull(); assertThat(result.getException()).isNull(); assertThat(result.getMessage().getBody(SearchResponse.class).rowRecords.size() == 0); + System.err.println(result.getMessage().getHeaders()); } private List> generateFloatVectors(int count) { From 6bd33ab1cfac8625485732cf0a5245304b8d6794 Mon Sep 17 00:00:00 2001 From: Andrea Cosentino Date: Tue, 19 Mar 2024 13:43:29 +0100 Subject: [PATCH 3/3] Camel-Milvus: Improve headers Signed-off-by: Andrea Cosentino --- .../camel/catalog/components/milvus.json | 8 +-- .../apache/camel/component/milvus/milvus.json | 8 +-- .../milvus/it/MilvusComponentIT.java | 2 - .../dsl/MilvusEndpointBuilderFactory.java | 54 ------------------- 4 files changed, 4 insertions(+), 68 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/milvus.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/milvus.json index 21e7d75e8e70e..4e470ce0c9cc9 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/milvus.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/milvus.json @@ -33,12 +33,8 @@ }, "headers": { "CamelMilvusAction": { "index": 0, "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "String", "enum": [ "CREATE_COLLECTION", "CREATE_INDEX", "UPSERT", "INSERT", "SEARCH", "DELETE" ], "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The action to be performed.", "constantName": "org.apache.camel.component.milvus.Milvus$Headers#ACTION" }, - "CamelMilvusOperationID": { "index": 1, "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "long", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Operation ID.", "constantName": "org.apache.camel.component.milvus.Milvus$Headers#OPERATION_ID" }, - "CamelMilvusOperationStatus": { "index": 2, "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Operation Status.", "constantName": "org.apache.camel.component.milvus.Milvus$Headers#OPERATION_STATUS" }, - "CamelMilvusOperationStatusValue": { "index": 3, "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "int", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Operation Status Value.", "constantName": "org.apache.camel.component.milvus.Milvus$Headers#OPERATION_STATUS_VALUE" }, - "CamelMilvusWithPayload": { "index": 4, "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": "true", "description": "Include Payload.", "constantName": "org.apache.camel.component.milvus.Milvus$Headers#INCLUDE_PAYLOAD" }, - "CamelMilvusWithVectors": { "index": 5, "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": "false", "description": "Include Vectors.", "constantName": "org.apache.camel.component.milvus.Milvus$Headers#INCLUDE_VECTORS" }, - "CamelMilvusSize": { "index": 6, "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "int", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The number of elements.", "constantName": "org.apache.camel.component.milvus.Milvus$Headers#SIZE" } + "CamelMilvusOperationStatus": { "index": 1, "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Operation Status.", "constantName": "org.apache.camel.component.milvus.Milvus$Headers#OPERATION_STATUS" }, + "CamelMilvusOperationStatusValue": { "index": 2, "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "int", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Operation Status Value.", "constantName": "org.apache.camel.component.milvus.Milvus$Headers#OPERATION_STATUS_VALUE" } }, "properties": { "collection": { "index": 0, "kind": "path", "displayName": "Collection", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The collection Name" }, diff --git a/components/camel-milvus/src/generated/resources/META-INF/org/apache/camel/component/milvus/milvus.json b/components/camel-milvus/src/generated/resources/META-INF/org/apache/camel/component/milvus/milvus.json index 21e7d75e8e70e..4e470ce0c9cc9 100644 --- a/components/camel-milvus/src/generated/resources/META-INF/org/apache/camel/component/milvus/milvus.json +++ b/components/camel-milvus/src/generated/resources/META-INF/org/apache/camel/component/milvus/milvus.json @@ -33,12 +33,8 @@ }, "headers": { "CamelMilvusAction": { "index": 0, "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "String", "enum": [ "CREATE_COLLECTION", "CREATE_INDEX", "UPSERT", "INSERT", "SEARCH", "DELETE" ], "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The action to be performed.", "constantName": "org.apache.camel.component.milvus.Milvus$Headers#ACTION" }, - "CamelMilvusOperationID": { "index": 1, "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "long", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Operation ID.", "constantName": "org.apache.camel.component.milvus.Milvus$Headers#OPERATION_ID" }, - "CamelMilvusOperationStatus": { "index": 2, "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Operation Status.", "constantName": "org.apache.camel.component.milvus.Milvus$Headers#OPERATION_STATUS" }, - "CamelMilvusOperationStatusValue": { "index": 3, "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "int", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Operation Status Value.", "constantName": "org.apache.camel.component.milvus.Milvus$Headers#OPERATION_STATUS_VALUE" }, - "CamelMilvusWithPayload": { "index": 4, "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": "true", "description": "Include Payload.", "constantName": "org.apache.camel.component.milvus.Milvus$Headers#INCLUDE_PAYLOAD" }, - "CamelMilvusWithVectors": { "index": 5, "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": "false", "description": "Include Vectors.", "constantName": "org.apache.camel.component.milvus.Milvus$Headers#INCLUDE_VECTORS" }, - "CamelMilvusSize": { "index": 6, "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "int", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The number of elements.", "constantName": "org.apache.camel.component.milvus.Milvus$Headers#SIZE" } + "CamelMilvusOperationStatus": { "index": 1, "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Operation Status.", "constantName": "org.apache.camel.component.milvus.Milvus$Headers#OPERATION_STATUS" }, + "CamelMilvusOperationStatusValue": { "index": 2, "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "int", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Operation Status Value.", "constantName": "org.apache.camel.component.milvus.Milvus$Headers#OPERATION_STATUS_VALUE" } }, "properties": { "collection": { "index": 0, "kind": "path", "displayName": "Collection", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The collection Name" }, diff --git a/components/camel-milvus/src/test/java/org/apache/camel/component/milvus/it/MilvusComponentIT.java b/components/camel-milvus/src/test/java/org/apache/camel/component/milvus/it/MilvusComponentIT.java index 5d6a5270f88c8..6220150f19cc1 100644 --- a/components/camel-milvus/src/test/java/org/apache/camel/component/milvus/it/MilvusComponentIT.java +++ b/components/camel-milvus/src/test/java/org/apache/camel/component/milvus/it/MilvusComponentIT.java @@ -202,7 +202,6 @@ public void search() { assertThat(result).isNotNull(); assertThat(result.getException()).isNull(); assertThat(result.getMessage().getBody(SearchResponse.class).rowRecords.size() == 2); - System.err.println(result.getMessage().getHeaders()); } @Test @@ -241,7 +240,6 @@ public void delete() { assertThat(result).isNotNull(); assertThat(result.getException()).isNull(); assertThat(result.getMessage().getBody(SearchResponse.class).rowRecords.size() == 0); - System.err.println(result.getMessage().getHeaders()); } private List> generateFloatVectors(int count) { diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MilvusEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MilvusEndpointBuilderFactory.java index 8296e4289f969..b3bd1f451cbd1 100644 --- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MilvusEndpointBuilderFactory.java +++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MilvusEndpointBuilderFactory.java @@ -269,19 +269,6 @@ public String milvusAction() { return "CamelMilvusAction"; } - /** - * Operation ID. - * - * The option is a: {@code long} type. - * - * Group: producer - * - * @return the name of the header {@code MilvusOperationID}. - */ - public String milvusOperationID() { - return "CamelMilvusOperationID"; - } - /** * Operation Status. * @@ -307,47 +294,6 @@ public String milvusOperationStatus() { public String milvusOperationStatusValue() { return "CamelMilvusOperationStatusValue"; } - - /** - * Include Payload. - * - * The option is a: {@code boolean} type. - * - * Default: true - * Group: producer - * - * @return the name of the header {@code MilvusWithPayload}. - */ - public String milvusWithPayload() { - return "CamelMilvusWithPayload"; - } - - /** - * Include Vectors. - * - * The option is a: {@code boolean} type. - * - * Default: false - * Group: producer - * - * @return the name of the header {@code MilvusWithVectors}. - */ - public String milvusWithVectors() { - return "CamelMilvusWithVectors"; - } - - /** - * The number of elements. - * - * The option is a: {@code int} type. - * - * Group: producer - * - * @return the name of the header {@code MilvusSize}. - */ - public String milvusSize() { - return "CamelMilvusSize"; - } } static MilvusEndpointBuilder endpointBuilder( String componentName,