Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# The version of qdrant to use to download protos
qdrantProtosVersion=v1.15.0
qdrantProtosVersion=v1.16.0

# The version of qdrant docker image to run integration tests against
qdrantVersion=v1.15.0
qdrantVersion=v1.16.0

# The version of the client to generate
packageVersion=1.15.0
packageVersion=1.16.0
57 changes: 37 additions & 20 deletions src/main/java/io/qdrant/client/ConditionFactory.java
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
package io.qdrant.client;

import io.qdrant.client.grpc.Points.Condition;
import io.qdrant.client.grpc.Points.DatetimeRange;
import io.qdrant.client.grpc.Points.FieldCondition;
import io.qdrant.client.grpc.Points.Filter;
import io.qdrant.client.grpc.Points.GeoBoundingBox;
import io.qdrant.client.grpc.Points.GeoLineString;
import io.qdrant.client.grpc.Points.GeoPoint;
import io.qdrant.client.grpc.Points.GeoPolygon;
import io.qdrant.client.grpc.Points.GeoRadius;
import io.qdrant.client.grpc.Points.HasIdCondition;
import io.qdrant.client.grpc.Points.HasVectorCondition;
import io.qdrant.client.grpc.Points.IsEmptyCondition;
import io.qdrant.client.grpc.Points.IsNullCondition;
import io.qdrant.client.grpc.Points.Match;
import io.qdrant.client.grpc.Points.NestedCondition;
import io.qdrant.client.grpc.Points.PointId;
import io.qdrant.client.grpc.Points.Range;
import io.qdrant.client.grpc.Points.RepeatedIntegers;
import io.qdrant.client.grpc.Points.RepeatedStrings;
import io.qdrant.client.grpc.Points.ValuesCount;
import io.qdrant.client.grpc.Common.Condition;
import io.qdrant.client.grpc.Common.DatetimeRange;
import io.qdrant.client.grpc.Common.FieldCondition;
import io.qdrant.client.grpc.Common.Filter;
import io.qdrant.client.grpc.Common.GeoBoundingBox;
import io.qdrant.client.grpc.Common.GeoLineString;
import io.qdrant.client.grpc.Common.GeoPoint;
import io.qdrant.client.grpc.Common.GeoPolygon;
import io.qdrant.client.grpc.Common.GeoRadius;
import io.qdrant.client.grpc.Common.HasIdCondition;
import io.qdrant.client.grpc.Common.HasVectorCondition;
import io.qdrant.client.grpc.Common.IsEmptyCondition;
import io.qdrant.client.grpc.Common.IsNullCondition;
import io.qdrant.client.grpc.Common.Match;
import io.qdrant.client.grpc.Common.NestedCondition;
import io.qdrant.client.grpc.Common.PointId;
import io.qdrant.client.grpc.Common.Range;
import io.qdrant.client.grpc.Common.RepeatedIntegers;
import io.qdrant.client.grpc.Common.RepeatedStrings;
import io.qdrant.client.grpc.Common.ValuesCount;
import java.util.List;

/** Convenience methods for constructing {@link Condition} */
Expand Down Expand Up @@ -125,6 +125,23 @@ public static Condition matchPhrase(String field, String phrase) {
.build();
}

/**
* Match records where the given field matches any word in the text.
*
* @param field The name of the field
* @param textAny The text to match
* @return a new instance of {@link Condition}
*/
public static Condition matchTextAny(String field, String textAny) {
return Condition.newBuilder()
.setField(
FieldCondition.newBuilder()
.setKey(field)
.setMatch(Match.newBuilder().setTextAny(textAny).build())
.build())
.build();
}

/**
* Match records where the given field matches the given boolean value.
*
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/qdrant/client/ExpressionFactory.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package io.qdrant.client;

import io.qdrant.client.grpc.Points.Condition;
import io.qdrant.client.grpc.Common.Condition;
import io.qdrant.client.grpc.Points.DecayParamsExpression;
import io.qdrant.client.grpc.Points.DivExpression;
import io.qdrant.client.grpc.Points.Expression;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/qdrant/client/PointIdFactory.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package io.qdrant.client;

import io.qdrant.client.grpc.Points.PointId;
import io.qdrant.client.grpc.Common.PointId;
import java.util.UUID;

/** Convenience methods for constructing {@link PointId} */
Expand Down
88 changes: 86 additions & 2 deletions src/main/java/io/qdrant/client/QdrantClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
import io.qdrant.client.grpc.Collections.AliasDescription;
import io.qdrant.client.grpc.Collections.AliasOperations;
import io.qdrant.client.grpc.Collections.ChangeAliases;
import io.qdrant.client.grpc.Collections.CollectionClusterInfoRequest;
import io.qdrant.client.grpc.Collections.CollectionClusterInfoResponse;
import io.qdrant.client.grpc.Collections.CollectionDescription;
import io.qdrant.client.grpc.Collections.CollectionExistsRequest;
import io.qdrant.client.grpc.Collections.CollectionExistsResponse;
Expand All @@ -35,10 +37,14 @@
import io.qdrant.client.grpc.Collections.RenameAlias;
import io.qdrant.client.grpc.Collections.ShardKey;
import io.qdrant.client.grpc.Collections.UpdateCollection;
import io.qdrant.client.grpc.Collections.UpdateCollectionClusterSetupRequest;
import io.qdrant.client.grpc.Collections.UpdateCollectionClusterSetupResponse;
import io.qdrant.client.grpc.Collections.VectorParams;
import io.qdrant.client.grpc.Collections.VectorParamsMap;
import io.qdrant.client.grpc.Collections.VectorsConfig;
import io.qdrant.client.grpc.CollectionsGrpc;
import io.qdrant.client.grpc.Common.Filter;
import io.qdrant.client.grpc.Common.PointId;
import io.qdrant.client.grpc.JsonWithInt.Value;
import io.qdrant.client.grpc.Points;
import io.qdrant.client.grpc.Points.BatchResult;
Expand All @@ -55,11 +61,9 @@
import io.qdrant.client.grpc.Points.DiscoverPoints;
import io.qdrant.client.grpc.Points.DiscoverResponse;
import io.qdrant.client.grpc.Points.FieldType;
import io.qdrant.client.grpc.Points.Filter;
import io.qdrant.client.grpc.Points.GetPoints;
import io.qdrant.client.grpc.Points.GetResponse;
import io.qdrant.client.grpc.Points.PointGroup;
import io.qdrant.client.grpc.Points.PointId;
import io.qdrant.client.grpc.Points.PointStruct;
import io.qdrant.client.grpc.Points.PointVectors;
import io.qdrant.client.grpc.Points.PointsIdsList;
Expand Down Expand Up @@ -400,6 +404,35 @@ public ListenableFuture<CollectionInfo> getCollectionInfoAsync(
future, GetCollectionInfoResponse::getResult, MoreExecutors.directExecutor());
}

/**
* Gets detailed information about a collection's cluster setup.
*
* @param collectionName The name of the collection.
* @return a new instance of {@link ListenableFuture}
*/
public ListenableFuture<CollectionClusterInfoResponse> getCollectionClusterInfoAsync(
String collectionName) {
return getCollectionClusterInfoAsync(collectionName, null);
}

/**
* Gets detailed information about a collection's cluster setup.
*
* @param collectionName The name of the collection.
* @param timeout The timeout for the call.
* @return a new instance of {@link ListenableFuture}
*/
public ListenableFuture<CollectionClusterInfoResponse> getCollectionClusterInfoAsync(
String collectionName, @Nullable Duration timeout) {
logger.debug("Get collection cluster info for '{}'", collectionName);
CollectionClusterInfoRequest request =
CollectionClusterInfoRequest.newBuilder().setCollectionName(collectionName).build();
ListenableFuture<CollectionClusterInfoResponse> future =
getCollections(timeout).collectionClusterInfo(request);
addLogFailureCallback(future, "Get collection cluster info");
return future;
}

/**
* Deletes a collection and all its associated data.
*
Expand Down Expand Up @@ -511,6 +544,47 @@ public ListenableFuture<CollectionOperationResponse> updateCollectionAsync(
MoreExecutors.directExecutor());
}

/**
* Update cluster setup for a collection
*
* @param updateCollectionClusterSetup The update parameters.
* @return a new instance of {@link ListenableFuture}
*/
public ListenableFuture<UpdateCollectionClusterSetupResponse> updateCollectionClusterSetupAsync(
UpdateCollectionClusterSetupRequest updateCollectionClusterSetup) {
return updateCollectionClusterSetupAsync(updateCollectionClusterSetup, null);
}

/**
* Update cluster setup for a collection
*
* @param updateCollectionClusterSetup The update parameters.
* @param timeout The timeout for the call.
* @return a new instance of {@link ListenableFuture}
*/
public ListenableFuture<UpdateCollectionClusterSetupResponse> updateCollectionClusterSetupAsync(
UpdateCollectionClusterSetupRequest updateCollectionClusterSetup,
@Nullable Duration timeout) {
String collectionName = updateCollectionClusterSetup.getCollectionName();
Preconditions.checkArgument(!collectionName.isEmpty(), "Collection name must not be empty");
logger.debug("Update collection cluster setup'{}'", collectionName);

ListenableFuture<UpdateCollectionClusterSetupResponse> future =
getCollections(timeout).updateCollectionClusterSetup(updateCollectionClusterSetup);
addLogFailureCallback(future, "Update collection");
return Futures.transform(
future,
response -> {
if (!response.getResult()) {
logger.error("Cluster setup of collection '{}' could not be updated", collectionName);
throw new QdrantException(
"Cluster setup of collection '" + collectionName + "' could not be updated");
}
return response;
},
MoreExecutors.directExecutor());
}

/**
* Check if a collection exists
*
Expand Down Expand Up @@ -1212,6 +1286,16 @@ public ListenableFuture<UpdateResult> updateVectorsAsync(
return updateVectorsAsync(requestBuilder.build(), timeout);
}

/**
* Update named vectors for point.
*
* @param request The update point vectors request
* @return a new instance of {@link ListenableFuture}
*/
public ListenableFuture<UpdateResult> updateVectorsAsync(UpdatePointVectors request) {
return updateVectorsAsync(request, null);
}

/**
* Update named vectors for point.
*
Expand Down
13 changes: 12 additions & 1 deletion src/main/java/io/qdrant/client/QueryFactory.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import static io.qdrant.client.VectorInputFactory.multiVectorInput;
import static io.qdrant.client.VectorInputFactory.vectorInput;

import io.qdrant.client.grpc.Common.PointId;
import io.qdrant.client.grpc.Points.ContextInput;
import io.qdrant.client.grpc.Points.DiscoverInput;
import io.qdrant.client.grpc.Points.Document;
Expand All @@ -13,9 +14,9 @@
import io.qdrant.client.grpc.Points.Mmr;
import io.qdrant.client.grpc.Points.NearestInputWithMmr;
import io.qdrant.client.grpc.Points.OrderBy;
import io.qdrant.client.grpc.Points.PointId;
import io.qdrant.client.grpc.Points.Query;
import io.qdrant.client.grpc.Points.RecommendInput;
import io.qdrant.client.grpc.Points.Rrf;
import io.qdrant.client.grpc.Points.Sample;
import io.qdrant.client.grpc.Points.VectorInput;
import java.util.List;
Expand Down Expand Up @@ -65,6 +66,16 @@ public static Query fusion(Fusion fusion) {
return Query.newBuilder().setFusion(fusion).build();
}

/**
* Creates a {@link Query} for reciprocal rank fusion (RRF).
*
* @param rrf An instance of {@link Rrf}
* @return a new instance of {@link Query}
*/
public static Query rrf(Rrf rrf) {
return Query.newBuilder().setRrf(rrf).build();
}

/**
* Creates a {@link Query} to order points by a payload field.
*
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/qdrant/client/TargetVectorFactory.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package io.qdrant.client;

import io.qdrant.client.grpc.Points.PointId;
import io.qdrant.client.grpc.Common.PointId;
import io.qdrant.client.grpc.Points.TargetVector;
import io.qdrant.client.grpc.Points.Vector;
import io.qdrant.client.grpc.Points.VectorExample;
Expand Down
39 changes: 22 additions & 17 deletions src/main/java/io/qdrant/client/VectorFactory.java
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
package io.qdrant.client;

import com.google.common.primitives.Floats;
import io.qdrant.client.grpc.Points.DenseVector;
import io.qdrant.client.grpc.Points.Document;
import io.qdrant.client.grpc.Points.Image;
import io.qdrant.client.grpc.Points.InferenceObject;
import io.qdrant.client.grpc.Points.SparseIndices;
import io.qdrant.client.grpc.Points.MultiDenseVector;
import io.qdrant.client.grpc.Points.SparseVector;
import io.qdrant.client.grpc.Points.Vector;
import java.util.ArrayList;
import java.util.List;
Expand All @@ -21,7 +23,9 @@ private VectorFactory() {}
* @return A new instance of {@link Vector}
*/
public static Vector vector(List<Float> values) {
return Vector.newBuilder().addAllData(values).build();
return Vector.newBuilder()
.setDense(DenseVector.newBuilder().addAllData(values).build())
.build();
}

/**
Expand All @@ -31,7 +35,9 @@ public static Vector vector(List<Float> values) {
* @return A new instance of {@link Vector}
*/
public static Vector vector(float... values) {
return Vector.newBuilder().addAllData(Floats.asList(values)).build();
return Vector.newBuilder()
.setDense(DenseVector.newBuilder().addAllData(Floats.asList(values)).build())
.build();
}

/**
Expand All @@ -43,8 +49,7 @@ public static Vector vector(float... values) {
*/
public static Vector vector(List<Float> vector, List<Integer> indices) {
return Vector.newBuilder()
.addAllData(vector)
.setIndices(SparseIndices.newBuilder().addAllData(indices).build())
.setSparse(SparseVector.newBuilder().addAllValues(vector).addAllIndices(indices).build())
.build();
}

Expand Down Expand Up @@ -85,10 +90,13 @@ public static Vector vector(InferenceObject object) {
* @return A new instance of {@link Vector}
*/
public static Vector multiVector(List<List<Float>> vectors) {
int vectorSize = vectors.size();
List<Float> flatVector = vectors.stream().flatMap(List::stream).collect(Collectors.toList());

return Vector.newBuilder().addAllData(flatVector).setVectorsCount(vectorSize).build();
List<DenseVector> denseVectors =
vectors.stream()
.map(v -> DenseVector.newBuilder().addAllData(v).build())
.collect(Collectors.toList());
return Vector.newBuilder()
.setMultiDense(MultiDenseVector.newBuilder().addAllVectors(denseVectors).build())
.build();
}

/**
Expand All @@ -98,15 +106,12 @@ public static Vector multiVector(List<List<Float>> vectors) {
* @return A new instance of {@link Vector}
*/
public static Vector multiVector(float[][] vectors) {
int vectorSize = vectors.length;

List<Float> flatVector = new ArrayList<>();
List<DenseVector> denseVectors = new ArrayList<>();
for (float[] vector : vectors) {
for (float value : vector) {
flatVector.add(value);
}
denseVectors.add(DenseVector.newBuilder().addAllData(Floats.asList(vector)).build());
}

return Vector.newBuilder().addAllData(flatVector).setVectorsCount(vectorSize).build();
return Vector.newBuilder()
.setMultiDense(MultiDenseVector.newBuilder().addAllVectors(denseVectors).build())
.build();
}
}
2 changes: 1 addition & 1 deletion src/main/java/io/qdrant/client/VectorInputFactory.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
import static io.qdrant.client.PointIdFactory.id;

import com.google.common.primitives.Floats;
import io.qdrant.client.grpc.Common.PointId;
import io.qdrant.client.grpc.Points.DenseVector;
import io.qdrant.client.grpc.Points.Document;
import io.qdrant.client.grpc.Points.Image;
import io.qdrant.client.grpc.Points.InferenceObject;
import io.qdrant.client.grpc.Points.MultiDenseVector;
import io.qdrant.client.grpc.Points.PointId;
import io.qdrant.client.grpc.Points.SparseVector;
import io.qdrant.client.grpc.Points.VectorInput;
import java.util.ArrayList;
Expand Down
Loading
Loading