refactor: pass nearText query as TextTarget

Author: bevzzz

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

@@ -427,7 +427,7 @@ public ResponseT nearText(String text, Function<Aggregation.Builder, ObjectBuild
    * @see AggregateResponse
    */
   public ResponseT nearText(List<String> concepts, Function<Aggregation.Builder, ObjectBuilder<Aggregation>> fn) {
-    return nearText(NearText.of(concepts), fn);
+    return nearText(NearText.of(Target.text(concepts)), fn);
   }
 
   /**
@@ -444,7 +444,7 @@ public ResponseT nearText(List<String> concepts, Function<Aggregation.Builder, O
    */
   public ResponseT nearText(String text, Function<NearText.Builder, ObjectBuilder<NearText>> nt,
       Function<Aggregation.Builder, ObjectBuilder<Aggregation>> fn) {
-    return nearText(NearText.of(text, nt), fn);
+    return nearText(NearText.of(Target.text(List.of(text)), nt), fn);
   }
 
   /**
@@ -461,7 +461,7 @@ public ResponseT nearText(String text, Function<NearText.Builder, ObjectBuilder<
    */
   public ResponseT nearText(List<String> concepts, Function<NearText.Builder, ObjectBuilder<NearText>> nt,
       Function<Aggregation.Builder, ObjectBuilder<Aggregation>> fn) {
-    return nearText(NearText.of(concepts, nt), fn);
+    return nearText(NearText.of(Target.text(concepts), nt), fn);
   }
 
   /**
@@ -513,7 +513,7 @@ public GroupedResponseT nearText(String text, Function<Aggregation.Builder, Obje
    */
   public GroupedResponseT nearText(List<String> concepts, Function<Aggregation.Builder, ObjectBuilder<Aggregation>> fn,
       GroupBy groupBy) {
-    return nearText(NearText.of(concepts), fn, groupBy);
+    return nearText(NearText.of(Target.text(concepts)), fn, groupBy);
   }
 
   /**
@@ -553,7 +553,7 @@ public GroupedResponseT nearText(String text, Function<NearText.Builder, ObjectB
    */
   public GroupedResponseT nearText(List<String> concepts, Function<NearText.Builder, ObjectBuilder<NearText>> nt,
       Function<Aggregation.Builder, ObjectBuilder<Aggregation>> fn, GroupBy groupBy) {
-    return nearText(NearText.of(concepts, nt), fn, groupBy);
+    return nearText(NearText.of(Target.text(concepts), nt), fn, groupBy);
   }
 
   /**

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

@@ -1,5 +1,6 @@
 package io.weaviate.client6.v1.api.collections.query;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Function;
@@ -548,7 +549,7 @@ public GroupedResponseT nearObject(NearObject query, GroupBy groupBy) {
    *                              error status code.
    */
   public ResponseT nearText(String... text) {
-    return nearText(NearText.of(text));
+    return nearText(Target.text(Arrays.asList(text)));
   }
 
   /**
@@ -560,7 +561,7 @@ public ResponseT nearText(String... text) {
    *                              error status code.
    */
   public ResponseT nearText(String text, Function<NearText.Builder, ObjectBuilder<NearText>> fn) {
-    return nearText(NearText.of(text, fn));
+    return nearText(Target.text(List.of(text)), fn);
   }
 
   /**
@@ -572,7 +573,30 @@ public ResponseT nearText(String text, Function<NearText.Builder, ObjectBuilder<
    *                              error status code.
    */
   public ResponseT nearText(List<String> text, Function<NearText.Builder, ObjectBuilder<NearText>> fn) {
-    return nearText(NearText.of(text, fn));
+    return nearText(Target.text(text), fn);
+  }
+
+  /**
+   * Query collection objects using near text search.
+   *
+   * @param searchTarget Target query concepts.
+   * @throws WeaviateApiException in case the server returned with an
+   *                              error status code.
+   */
+  public ResponseT nearText(Target searchTarget) {
+    return nearText(NearText.of(searchTarget));
+  }
+
+  /**
+   * Query collection objects using near text search.
+   *
+   * @param searchTarget Target query concepts.
+   * @param fn           Lambda expression for optional parameters.
+   * @throws WeaviateApiException in case the server returned with an
+   *                              error status code.
+   */
+  public ResponseT nearText(Target searchTarget, Function<NearText.Builder, ObjectBuilder<NearText>> fn) {
+    return nearText(NearText.of(searchTarget, fn));
   }
 
   /**
@@ -599,7 +623,7 @@ public ResponseT nearText(NearText query) {
    * @see QueryResponseGrouped
    */
   public GroupedResponseT nearText(String text, GroupBy groupBy) {
-    return nearText(NearText.of(text), groupBy);
+    return nearText(Target.text(List.of(text)), groupBy);
   }
 
   /**
@@ -615,7 +639,7 @@ public GroupedResponseT nearText(String text, GroupBy groupBy) {
    * @see QueryResponseGrouped
    */
   public GroupedResponseT nearText(List<String> text, GroupBy groupBy) {
-    return nearText(NearText.of(text), groupBy);
+    return nearText(Target.text(text), groupBy);
   }
 
   /**
@@ -631,9 +655,10 @@ public GroupedResponseT nearText(List<String> text, GroupBy groupBy) {
    * @see GroupBy
    * @see QueryResponseGrouped
    */
-  public GroupedResponseT nearText(String text, Function<NearText.Builder, ObjectBuilder<NearText>> fn,
+  public GroupedResponseT nearText(String text,
+      Function<NearText.Builder, ObjectBuilder<NearText>> fn,
       GroupBy groupBy) {
-    return nearText(NearText.of(text), groupBy);
+    return nearText(Target.text(List.of(text)), fn, groupBy);
   }
 
   /**
@@ -649,9 +674,45 @@ public GroupedResponseT nearText(String text, Function<NearText.Builder, ObjectB
    * @see GroupBy
    * @see QueryResponseGrouped
    */
-  public GroupedResponseT nearText(List<String> text, Function<NearText.Builder, ObjectBuilder<NearText>> fn,
+  public GroupedResponseT nearText(List<String> text,
+      Function<NearText.Builder, ObjectBuilder<NearText>> fn,
+      GroupBy groupBy) {
+    return nearText(Target.text(text), groupBy);
+  }
+
+  /**
+   * Query collection objects using near text search.
+   *
+   * @param searchTarget Target query concepts.
+   * @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 nearText(Target searchTarget, GroupBy groupBy) {
+    return nearText(NearText.of(searchTarget), groupBy);
+  }
+
+  /**
+   * Query collection objects using near text search.
+   *
+   * @param searchTarget Target query concepts.
+   * @param fn           Lambda expression for optional parameters.
+   * @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 nearText(Target searchTarget,
+      Function<NearText.Builder, ObjectBuilder<NearText>> fn,
       GroupBy groupBy) {
-    return nearText(NearText.of(text), groupBy);
+    return nearText(NearText.of(searchTarget, fn), groupBy);
   }
 
   /**

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

@@ -6,33 +6,36 @@
 import java.util.function.Function;
 
 import io.weaviate.client6.v1.api.collections.aggregate.AggregateObjectFilter;
+import io.weaviate.client6.v1.api.collections.query.Target.CombinedTextTarget;
+import io.weaviate.client6.v1.api.collections.query.Target.TextTarget;
 import io.weaviate.client6.v1.internal.ObjectBuilder;
 import io.weaviate.client6.v1.internal.grpc.protocol.WeaviateProtoAggregate;
 import io.weaviate.client6.v1.internal.grpc.protocol.WeaviateProtoBaseSearch;
 import io.weaviate.client6.v1.internal.grpc.protocol.WeaviateProtoSearchGet;
 
-public record NearText(List<String> concepts, Float distance, Float certainty, Move moveTo, Move moveAway,
+public record NearText(Target searchTarget, Float distance, Float certainty, Move moveTo,
+    Move moveAway,
     BaseQueryOptions common) implements QueryOperator, AggregateObjectFilter {
 
   public static NearText of(String... concepts) {
-    return of(Arrays.asList(concepts), ObjectBuilder.identity());
+    return of(Target.text(Arrays.asList(concepts)), ObjectBuilder.identity());
   }
 
-  public static NearText of(List<String> concepts) {
-    return of(concepts, ObjectBuilder.identity());
+  public static NearText of(Target searchTarget) {
+    return of(searchTarget, ObjectBuilder.identity());
   }
 
   public static NearText of(String text, Function<Builder, ObjectBuilder<NearText>> fn) {
-    return of(List.of(text), fn);
+    return of(Target.text(List.of(text)), fn);
   }
 
-  public static NearText of(List<String> concepts, Function<Builder, ObjectBuilder<NearText>> fn) {
-    return fn.apply(new Builder(concepts)).build();
+  public static NearText of(Target searchTarget, Function<Builder, ObjectBuilder<NearText>> fn) {
+    return fn.apply(new Builder(searchTarget)).build();
   }
 
   public NearText(Builder builder) {
     this(
-        builder.concepts,
+        builder.searchTarget,
         builder.distance,
         builder.certainty,
         builder.moveTo,
@@ -42,14 +45,14 @@ public NearText(Builder builder) {
 
   public static class Builder extends BaseVectorSearchBuilder<Builder, NearText> {
     // Required query parameters.
-    private final List<String> concepts;
+    private final Target searchTarget;
 
     // Optional query parameter.
     private Move moveTo;
     private Move moveAway;
 
-    public Builder(List<String> concepts) {
-      this.concepts = concepts;
+    public Builder(Target searchTarget) {
+      this.searchTarget = searchTarget;
     }
 
     public final Builder moveTo(float force, Function<Move.Builder, ObjectBuilder<Move>> fn) {
@@ -128,15 +131,24 @@ public void appendTo(WeaviateProtoAggregate.AggregateRequest.Builder req) {
   // Package-private for Hybrid to see.
   WeaviateProtoBaseSearch.NearTextSearch.Builder protoBuilder() {
     var nearText = WeaviateProtoBaseSearch.NearTextSearch.newBuilder();
-    nearText.addAllQuery(concepts);
+
+    if (searchTarget instanceof TextTarget text) {
+      nearText.addAllQuery(text.query());
+    } else if (searchTarget instanceof CombinedTextTarget combined) {
+      nearText.addAllQuery(combined.query());
+    }
+
+    var targets = WeaviateProtoBaseSearch.Targets.newBuilder();
+    if (searchTarget.appendTargets(targets)) {
+      nearText.setTargets(targets);
+    }
 
     if (certainty != null) {
       nearText.setCertainty(certainty);
     } else if (distance != null) {
       nearText.setDistance(distance);
     }
 
-    // TODO: add targets
     if (moveTo != null) {
       var to = WeaviateProtoBaseSearch.NearTextSearch.Move.newBuilder();
       moveTo.appendTo(to);

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

@@ -0,0 +1,7 @@
+package io.weaviate.client6.v1.api.collections.query;
+
+import io.weaviate.client6.v1.internal.grpc.protocol.WeaviateProtoBaseSearch;
+
+public interface NearVectorTarget extends Target {
+  void appendVectors(WeaviateProtoBaseSearch.NearVector.Builder req);
+}