-
Notifications
You must be signed in to change notification settings - Fork 5.1k
CAMEL-23254: Add Milvus helper beans for YAML DSL usage #21994
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.
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
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
4adc937
Camel-Milvus: create rag helpers to be used as beans
smongiar ef4a4b0
Add missing configurable properties to Milvus helpers
gnodet 7d655c3
Restore original raw SDK tests alongside helper-based tests
gnodet bc21cbc
Camel-Milvus: collection must be loaded into memory before DML operat…
smongiar File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
195 changes: 195 additions & 0 deletions
195
...src/main/java/org/apache/camel/component/milvus/helpers/MilvusHelperCreateCollection.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,195 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.camel.component.milvus.helpers; | ||
|
|
||
| import io.milvus.grpc.DataType; | ||
| import io.milvus.param.collection.CreateCollectionParam; | ||
| import io.milvus.param.collection.FieldType; | ||
| import org.apache.camel.Exchange; | ||
| import org.apache.camel.Processor; | ||
| import org.apache.camel.component.milvus.MilvusAction; | ||
| import org.apache.camel.component.milvus.MilvusHeaders; | ||
|
|
||
| /** | ||
| * A Camel {@link Processor} that builds a Milvus {@link io.milvus.param.collection.CreateCollectionParam} from simple | ||
| * string properties and sets it as the exchange body together with the {@link MilvusAction#CREATE_COLLECTION} header. | ||
| */ | ||
| public class MilvusHelperCreateCollection implements Processor { | ||
|
|
||
| private String collectionName = "default_collection"; | ||
| private String collectionDescription = "Default collection"; | ||
| private String idFieldName = "id"; | ||
| private String dimension = "768"; | ||
| private String textFieldName = "content"; | ||
| private String textFieldDataType = "VarChar"; | ||
| private String vectorFieldName = "embedding"; | ||
| private String vectorDataType = "FloatVector"; | ||
| private String textFieldMaxLength = "2048"; | ||
| private String additionalTextFields; | ||
|
|
||
| @Override | ||
| public void process(Exchange exchange) throws Exception { | ||
| int vectorDim = Integer.parseInt(dimension); | ||
| int maxLength = Integer.parseInt(textFieldMaxLength); | ||
| DataType textDataType = DataType.valueOf(textFieldDataType); | ||
|
|
||
| FieldType idField = FieldType.newBuilder() | ||
| .withName(idFieldName) | ||
| .withDataType(DataType.Int64) | ||
| .withPrimaryKey(true) | ||
| .withAutoID(true) | ||
| .build(); | ||
|
|
||
| FieldType.Builder textFieldBuilder = FieldType.newBuilder() | ||
| .withName(textFieldName) | ||
| .withDataType(textDataType); | ||
| if (textDataType == DataType.VarChar) { | ||
| textFieldBuilder.withMaxLength(maxLength); | ||
| } | ||
| FieldType textField = textFieldBuilder.build(); | ||
|
|
||
| DataType vecDataType = DataType.valueOf(vectorDataType); | ||
|
|
||
| FieldType vectorField = FieldType.newBuilder() | ||
| .withName(vectorFieldName) | ||
| .withDataType(vecDataType) | ||
| .withDimension(vectorDim) | ||
| .build(); | ||
|
|
||
| CreateCollectionParam.Builder builder = CreateCollectionParam.newBuilder() | ||
| .withCollectionName(collectionName) | ||
| .withDescription(collectionDescription) | ||
| .addFieldType(idField) | ||
| .addFieldType(textField); | ||
|
|
||
| if (additionalTextFields != null && !additionalTextFields.isBlank()) { | ||
| for (String fieldName : additionalTextFields.split(",")) { | ||
| String trimmed = fieldName.trim(); | ||
| if (!trimmed.isEmpty()) { | ||
| FieldType extraField = FieldType.newBuilder() | ||
| .withName(trimmed) | ||
| .withDataType(DataType.VarChar) | ||
| .withMaxLength(maxLength) | ||
| .build(); | ||
| builder.addFieldType(extraField); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| builder.addFieldType(vectorField); | ||
|
|
||
| exchange.getIn().setBody(builder.build()); | ||
| exchange.getIn().setHeader(MilvusHeaders.ACTION, MilvusAction.CREATE_COLLECTION); | ||
| } | ||
|
|
||
| public String getCollectionName() { | ||
| return collectionName; | ||
| } | ||
|
|
||
| public void setCollectionName(String collectionName) { | ||
| this.collectionName = collectionName; | ||
| } | ||
|
|
||
| public String getCollectionDescription() { | ||
| return collectionDescription; | ||
| } | ||
|
|
||
| public void setCollectionDescription(String collectionDescription) { | ||
| this.collectionDescription = collectionDescription; | ||
| } | ||
|
|
||
| public String getIdFieldName() { | ||
| return idFieldName; | ||
| } | ||
|
|
||
| public void setIdFieldName(String idFieldName) { | ||
| this.idFieldName = idFieldName; | ||
| } | ||
|
|
||
| public String getDimension() { | ||
| return dimension; | ||
| } | ||
|
|
||
| /** | ||
| * @param dimension the vector dimension as a string (e.g., {@code 768}, {@code 1536}) | ||
| */ | ||
| public void setDimension(String dimension) { | ||
| this.dimension = dimension; | ||
| } | ||
|
|
||
| public String getTextFieldName() { | ||
| return textFieldName; | ||
| } | ||
|
|
||
| public void setTextFieldName(String textFieldName) { | ||
| this.textFieldName = textFieldName; | ||
| } | ||
|
|
||
| public String getTextFieldDataType() { | ||
| return textFieldDataType; | ||
| } | ||
|
|
||
| /** | ||
| * @param textFieldDataType the Milvus {@link io.milvus.grpc.DataType} enum name (e.g., {@code VarChar}, | ||
| * {@code Int8}) | ||
| */ | ||
| public void setTextFieldDataType(String textFieldDataType) { | ||
| this.textFieldDataType = textFieldDataType; | ||
| } | ||
|
|
||
| public String getVectorDataType() { | ||
| return vectorDataType; | ||
| } | ||
|
|
||
| /** | ||
| * @param vectorDataType the Milvus {@link io.milvus.grpc.DataType} enum name for the vector field (e.g., | ||
| * {@code FloatVector}, {@code BinaryVector}, {@code Float16Vector}) | ||
| */ | ||
| public void setVectorDataType(String vectorDataType) { | ||
| this.vectorDataType = vectorDataType; | ||
| } | ||
|
|
||
| public String getVectorFieldName() { | ||
| return vectorFieldName; | ||
| } | ||
|
|
||
| public void setVectorFieldName(String vectorFieldName) { | ||
| this.vectorFieldName = vectorFieldName; | ||
| } | ||
|
|
||
| public String getTextFieldMaxLength() { | ||
| return textFieldMaxLength; | ||
| } | ||
|
|
||
| /** | ||
| * @param textFieldMaxLength the maximum length for VarChar fields as a string (e.g., {@code 2048}) | ||
| */ | ||
| public void setTextFieldMaxLength(String textFieldMaxLength) { | ||
| this.textFieldMaxLength = textFieldMaxLength; | ||
| } | ||
|
|
||
| public String getAdditionalTextFields() { | ||
| return additionalTextFields; | ||
| } | ||
|
|
||
| /** | ||
| * @param additionalTextFields comma-separated list of extra VarChar field names (e.g., {@code title,author}) | ||
| */ | ||
| public void setAdditionalTextFields(String additionalTextFields) { | ||
| this.additionalTextFields = additionalTextFields; | ||
| } | ||
| } | ||
123 changes: 123 additions & 0 deletions
123
...lvus/src/main/java/org/apache/camel/component/milvus/helpers/MilvusHelperCreateIndex.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,123 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.camel.component.milvus.helpers; | ||
|
|
||
| import io.milvus.param.IndexType; | ||
| import io.milvus.param.MetricType; | ||
| import io.milvus.param.index.CreateIndexParam; | ||
| import org.apache.camel.Exchange; | ||
| import org.apache.camel.Processor; | ||
| import org.apache.camel.component.milvus.MilvusAction; | ||
| import org.apache.camel.component.milvus.MilvusHeaders; | ||
|
|
||
| /** | ||
| * A Camel {@link Processor} that builds a Milvus {@link io.milvus.param.index.CreateIndexParam} from simple string | ||
| * properties and sets it as the exchange body together with the {@link MilvusAction#CREATE_INDEX} header. | ||
| */ | ||
| public class MilvusHelperCreateIndex implements Processor { | ||
|
|
||
| private String collectionName = "default_collection"; | ||
| private String vectorFieldName = "embedding"; | ||
| private String indexName; | ||
| private String indexType = "IVF_FLAT"; | ||
| private String metricType = "COSINE"; | ||
| private String extraParam = "{\"nlist\": 128}"; | ||
|
|
||
| @Override | ||
| public void process(Exchange exchange) throws Exception { | ||
| IndexType idxType = IndexType.valueOf(indexType); | ||
| MetricType metric = MetricType.valueOf(metricType); | ||
|
|
||
| CreateIndexParam.Builder builder = CreateIndexParam.newBuilder() | ||
| .withCollectionName(collectionName) | ||
| .withFieldName(vectorFieldName) | ||
| .withIndexType(idxType) | ||
| .withMetricType(metric) | ||
| .withExtraParam(extraParam) | ||
| .withSyncMode(Boolean.TRUE); | ||
|
|
||
| if (indexName != null && !indexName.isEmpty()) { | ||
| builder.withIndexName(indexName); | ||
| } | ||
|
|
||
| CreateIndexParam param = builder.build(); | ||
|
|
||
| exchange.getIn().setBody(param); | ||
| exchange.getIn().setHeader(MilvusHeaders.ACTION, MilvusAction.CREATE_INDEX); | ||
| } | ||
|
|
||
| public String getCollectionName() { | ||
| return collectionName; | ||
| } | ||
|
|
||
| public void setCollectionName(String collectionName) { | ||
| this.collectionName = collectionName; | ||
| } | ||
|
|
||
| public String getVectorFieldName() { | ||
| return vectorFieldName; | ||
| } | ||
|
|
||
| public void setVectorFieldName(String vectorFieldName) { | ||
| this.vectorFieldName = vectorFieldName; | ||
| } | ||
|
|
||
| public String getIndexName() { | ||
| return indexName; | ||
| } | ||
|
|
||
| /** | ||
| * @param indexName the name to assign to the index (e.g., {@code myVectorIndex}) | ||
| */ | ||
| public void setIndexName(String indexName) { | ||
| this.indexName = indexName; | ||
| } | ||
|
|
||
| public String getIndexType() { | ||
| return indexType; | ||
| } | ||
|
|
||
| /** | ||
| * @param indexType the Milvus {@link io.milvus.param.IndexType} enum name (e.g., {@code IVF_FLAT}, {@code HNSW}) | ||
| */ | ||
| public void setIndexType(String indexType) { | ||
| this.indexType = indexType; | ||
| } | ||
|
|
||
| public String getMetricType() { | ||
| return metricType; | ||
| } | ||
|
|
||
| /** | ||
| * @param metricType the Milvus {@link io.milvus.param.MetricType} enum name (e.g., {@code COSINE}, {@code L2}, | ||
| * {@code IP}) | ||
| */ | ||
| public void setMetricType(String metricType) { | ||
| this.metricType = metricType; | ||
| } | ||
|
|
||
| public String getExtraParam() { | ||
| return extraParam; | ||
| } | ||
|
|
||
| /** | ||
| * @param extraParam JSON string with index-specific parameters (e.g., {@code {"nlist": 128}}) | ||
| */ | ||
| public void setExtraParam(String extraParam) { | ||
| this.extraParam = extraParam; | ||
| } | ||
| } |
69 changes: 69 additions & 0 deletions
69
...el-milvus/src/main/java/org/apache/camel/component/milvus/helpers/MilvusHelperDelete.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.camel.component.milvus.helpers; | ||
|
|
||
| import io.milvus.param.dml.DeleteParam; | ||
| import org.apache.camel.Exchange; | ||
| import org.apache.camel.Processor; | ||
| import org.apache.camel.component.milvus.MilvusAction; | ||
| import org.apache.camel.component.milvus.MilvusHeaders; | ||
|
|
||
| /** | ||
| * A Camel {@link Processor} that builds a Milvus {@link io.milvus.param.dml.DeleteParam} from simple string properties | ||
| * and sets it as the exchange body together with the {@link MilvusAction#DELETE} header. | ||
| */ | ||
| public class MilvusHelperDelete implements Processor { | ||
|
|
||
| private String collectionName = "default_collection"; | ||
| private String filter; | ||
|
|
||
| @Override | ||
| public void process(Exchange exchange) throws Exception { | ||
| if (filter == null || filter.isEmpty()) { | ||
| throw new IllegalArgumentException( | ||
| "A filter expression is required for delete operations (e.g., \"id in [1, 2, 3]\")"); | ||
| } | ||
|
|
||
| DeleteParam param = DeleteParam.newBuilder() | ||
| .withCollectionName(collectionName) | ||
| .withExpr(filter) | ||
| .build(); | ||
|
|
||
| exchange.getIn().setBody(param); | ||
| exchange.getIn().setHeader(MilvusHeaders.ACTION, MilvusAction.DELETE); | ||
| } | ||
|
|
||
| public String getCollectionName() { | ||
| return collectionName; | ||
| } | ||
|
|
||
| public void setCollectionName(String collectionName) { | ||
| this.collectionName = collectionName; | ||
| } | ||
|
|
||
| public String getFilter() { | ||
| return filter; | ||
| } | ||
|
|
||
| /** | ||
| * @param filter a Milvus boolean expression to select entities to delete (e.g., {@code id in [1, 2, 3]}, | ||
| * {@code age > 18}) | ||
| */ | ||
| public void setFilter(String filter) { | ||
| this.filter = filter; | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why are int/long types Strings?