refactor: use Target-Vector API for nearVector requests

Author: bevzzz

src/main/java/io/weaviate/client6/v1/api/collections/aggregate/AbstractAggregateClient.java

@@ -15,6 +15,7 @@
 import io.weaviate.client6.v1.api.collections.query.NearThermal;
 import io.weaviate.client6.v1.api.collections.query.NearVector;
 import io.weaviate.client6.v1.api.collections.query.NearVideo;
+import io.weaviate.client6.v1.api.collections.query.Target;
 import io.weaviate.client6.v1.internal.ObjectBuilder;
 import io.weaviate.client6.v1.internal.grpc.GrpcTransport;
 import io.weaviate.client6.v1.internal.orm.CollectionDescriptor;
@@ -197,7 +198,7 @@ public GroupedResponseT hybrid(Hybrid filter, Function<Aggregation.Builder, Obje
    * @see AggregateResponse
    */
   public ResponseT nearVector(float[] vector, Function<Aggregation.Builder, ObjectBuilder<Aggregation>> fn) {
-    return nearVector(NearVector.of(vector), fn);
+    return nearVector(NearVector.of(Target.vector(vector)), fn);
   }
 
   /**
@@ -214,7 +215,7 @@ public ResponseT nearVector(float[] vector, Function<Aggregation.Builder, Object
    */
   public ResponseT nearVector(float[] vector, Function<NearVector.Builder, ObjectBuilder<NearVector>> nv,
       Function<Aggregation.Builder, ObjectBuilder<Aggregation>> fn) {
-    return nearVector(NearVector.of(vector, nv), fn);
+    return nearVector(NearVector.of(Target.vector(vector), nv), fn);
   }
 
   /**
@@ -248,7 +249,7 @@ public ResponseT nearVector(NearVector filter, Function<Aggregation.Builder, Obj
    */
   public GroupedResponseT nearVector(float[] vector, Function<Aggregation.Builder, ObjectBuilder<Aggregation>> fn,
       GroupBy groupBy) {
-    return nearVector(NearVector.of(vector), fn, groupBy);
+    return nearVector(NearVector.of(Target.vector(vector)), fn, groupBy);
   }
 
   /**
@@ -268,7 +269,7 @@ public GroupedResponseT nearVector(float[] vector, Function<Aggregation.Builder,
    */
   public GroupedResponseT nearVector(float[] vector, Function<NearVector.Builder, ObjectBuilder<NearVector>> nv,
       Function<Aggregation.Builder, ObjectBuilder<Aggregation>> fn, GroupBy groupBy) {
-    return nearVector(NearVector.of(vector, nv), fn, groupBy);
+    return nearVector(NearVector.of(Target.vector(vector), nv), fn, groupBy);
   }
 
   /**

src/main/java/io/weaviate/client6/v1/api/collections/data/InsertManyRequest.java

@@ -10,7 +10,6 @@
 import io.weaviate.client6.v1.api.collections.CollectionHandleDefaults;
 import io.weaviate.client6.v1.api.collections.ObjectMetadata;
 import io.weaviate.client6.v1.api.collections.WeaviateObject;
-import io.weaviate.client6.v1.internal.Debug;
 import io.weaviate.client6.v1.internal.MapUtil;
 import io.weaviate.client6.v1.internal.grpc.ByteStringUtil;
 import io.weaviate.client6.v1.internal.grpc.Rpc;
@@ -162,8 +161,6 @@ public static <T> void buildObject(WeaviateProtoBatch.BatchObject.Builder object
         .setNonRefProperties(nonRef)
         .addAllSingleTargetRefProps(singleRef)
         .addAllMultiTargetRefProps(multiRef));
-
-    Debug.printProto(object);
   }
 
   @SuppressWarnings("unchecked")

src/main/java/io/weaviate/client6/v1/api/collections/query/AbstractQueryClient.java

@@ -317,7 +317,7 @@ public GroupedResponseT hybrid(Hybrid query, GroupBy groupBy) {
    *                              error status code.
    */
   public ResponseT nearVector(float[] vector) {
-    return nearVector(NearVector.of(vector));
+    return nearVector(Target.vector(vector));
   }
 
   /**
@@ -329,7 +329,31 @@ public ResponseT nearVector(float[] vector) {
    *                              error status code.
    */
   public ResponseT nearVector(float[] vector, Function<NearVector.Builder, ObjectBuilder<NearVector>> fn) {
-    return nearVector(NearVector.of(vector, fn));
+    return nearVector(Target.vector(vector), fn);
+  }
+
+  /**
+   * Query collection objects using near vector search.
+   *
+   * @param searchTarget Target query vectors.
+   * @throws WeaviateApiException in case the server returned with an
+   *                              error status code.
+   */
+  public ResponseT nearVector(NearVectorTarget searchTarget) {
+    return performRequest(NearVector.of(searchTarget));
+  }
+
+  /**
+   * Query collection objects using near vector search.
+   *
+   * @param searchTarget Target query vectors.
+   * @param fn           Lambda expression for optional parameters.
+   * @throws WeaviateApiException in case the server returned with an
+   *                              error status code.
+   */
+  public ResponseT nearVector(NearVectorTarget searchTarget,
+      Function<NearVector.Builder, ObjectBuilder<NearVector>> fn) {
+    return performRequest(NearVector.of(searchTarget, fn));
   }
 
   /**
@@ -356,7 +380,7 @@ public ResponseT nearVector(NearVector query) {
    * @see QueryResponseGrouped
    */
   public GroupedResponseT nearVector(float[] vector, GroupBy groupBy) {
-    return nearVector(NearVector.of(vector), groupBy);
+    return nearVector(Target.vector(vector), groupBy);
   }
 
   /**
@@ -374,7 +398,42 @@ public GroupedResponseT nearVector(float[] vector, GroupBy groupBy) {
    */
   public GroupedResponseT nearVector(float[] vector, Function<NearVector.Builder, ObjectBuilder<NearVector>> fn,
       GroupBy groupBy) {
-    return nearVector(NearVector.of(vector, fn), groupBy);
+    return nearVector(Target.vector(vector), fn, groupBy);
+  }
+
+  /**
+   * Query collection objects using near vector search.
+   *
+   * @param searchTarget Target query vectors.
+   * @param groupBy      Group-by clause.
+   * @return Grouped query result.
+   * @throws WeaviateApiException in case the server returned with an
+   *                              error status code.
+   *
+   * @see GroupBy
+   * @see QueryResponseGrouped
+   */
+  public GroupedResponseT nearVector(NearVectorTarget searchTarget,
+      GroupBy groupBy) {
+    return performRequest(NearVector.of(searchTarget), groupBy);
+  }
+
+  /**
+   * Query collection objects using near vector search.
+   *
+   * @param searchTarget Target query vectors.
+   * @param fn           Lambda expression for optional parameters.
+   * @return Grouped query result.
+   * @throws WeaviateApiException in case the server returned with an
+   *                              error status code.
+   *
+   * @see GroupBy
+   * @see QueryResponseGrouped
+   */
+  public GroupedResponseT nearVector(NearVectorTarget searchTarget,
+      Function<NearVector.Builder, ObjectBuilder<NearVector>> fn,
+      GroupBy groupBy) {
+    return performRequest(NearVector.of(searchTarget, fn), groupBy);
   }
 
   /**

src/main/java/io/weaviate/client6/v1/api/collections/query/NearVector.java

@@ -4,33 +4,31 @@
 
 import io.weaviate.client6.v1.api.collections.aggregate.AggregateObjectFilter;
 import io.weaviate.client6.v1.internal.ObjectBuilder;
-import io.weaviate.client6.v1.internal.grpc.ByteStringUtil;
 import io.weaviate.client6.v1.internal.grpc.protocol.WeaviateProtoAggregate;
-import io.weaviate.client6.v1.internal.grpc.protocol.WeaviateProtoBase;
 import io.weaviate.client6.v1.internal.grpc.protocol.WeaviateProtoBaseSearch;
 import io.weaviate.client6.v1.internal.grpc.protocol.WeaviateProtoSearchGet;
 
-public record NearVector(float[] vector, Float distance, Float certainty, BaseQueryOptions common)
+public record NearVector(NearVectorTarget searchTarget, Float distance, Float certainty, BaseQueryOptions common)
     implements QueryOperator, AggregateObjectFilter {
 
-  public static final NearVector of(float[] vector) {
-    return of(vector, ObjectBuilder.identity());
+  public static final NearVector of(NearVectorTarget searchTarget) {
+    return of(searchTarget, ObjectBuilder.identity());
   }
 
-  public static final NearVector of(float[] vector, Function<Builder, ObjectBuilder<NearVector>> fn) {
-    return fn.apply(new Builder(vector)).build();
+  public static final NearVector of(NearVectorTarget searchTarget, Function<Builder, ObjectBuilder<NearVector>> fn) {
+    return fn.apply(new Builder(searchTarget)).build();
   }
 
   public NearVector(Builder builder) {
-    this(builder.vector, builder.distance, builder.certainty, builder.baseOptions());
+    this(builder.searchTarget, builder.distance, builder.certainty, builder.baseOptions());
   }
 
   public static class Builder extends BaseVectorSearchBuilder<Builder, NearVector> {
     // Required query parameters.
-    private final float[] vector;
+    private final NearVectorTarget searchTarget;
 
-    public Builder(float[] vector) {
-      this.vector = vector;
+    public Builder(NearVectorTarget searchTarget) {
+      this.searchTarget = searchTarget;
     }
 
     @Override
@@ -56,9 +54,12 @@ public void appendTo(WeaviateProtoAggregate.AggregateRequest.Builder req) {
   // This is made package-private for Hybrid to see. Should we refactor?
   WeaviateProtoBaseSearch.NearVector.Builder protoBuilder() {
     var nearVector = WeaviateProtoBaseSearch.NearVector.newBuilder();
-    nearVector.addVectors(WeaviateProtoBase.Vectors.newBuilder()
-        .setType(WeaviateProtoBase.Vectors.VectorType.VECTOR_TYPE_SINGLE_FP32)
-        .setVectorBytes(ByteStringUtil.encodeVectorSingle(vector)));
+
+    searchTarget.appendVectors(nearVector);
+    var targets = WeaviateProtoBaseSearch.Targets.newBuilder();
+    if (searchTarget.appendTargets(targets)) {
+      nearVector.setTargets(targets);
+    }
 
     if (certainty != null) {
       nearVector.setCertainty(certainty);