Skip to content

Camel-Milvus: Improve headers #13535

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
oscerd merged 3 commits into from
Mar 19, 2024
Merged

Camel-Milvus: Improve headers #13535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
06ab0c8
Camel-Milvus Test Infra: Align langchain embeddings component to new …
oscerd Mar 19, 2024
6aad4d5
Camel-Milvus: Improve headers
oscerd Mar 19, 2024
6bd33ab
Camel-Milvus: Improve headers
oscerd Mar 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions ...log/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/milvus.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" },
Expand Down
6 changes: 2 additions & 4 deletions ...ache/camel/component/langchain/embeddings/LangchainEmbeddingsComponentMilvusTargetIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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());

Expand Down
2 changes: 1 addition & 1 deletion ...dings/LangchainEmbeddingsComponentIT.java → ...ainEmbeddingsComponentQdrantTargetIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
8 changes: 2 additions & 6 deletions ...mel-milvus/src/generated/resources/META-INF/org/apache/camel/component/milvus/milvus.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" },
Expand Down
14 changes: 0 additions & 14 deletions components/camel-milvus/src/main/java/org/apache/camel/component/milvus/Milvus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
}
}
1 change: 1 addition & 0 deletions components/camel-milvus/src/main/java/org/apache/camel/component/milvus/MilvusProducer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
}
54 changes: 0 additions & 54 deletions ...rc/generated/java/org/apache/camel/builder/endpoint/dsl/MilvusEndpointBuilderFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
Expand All @@ -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,
Expand Down