feat: introduce query target to near-media queries

bevzzz · bevzzz · commit b7320a90f014 · 2025-10-16T13:50:00.000+02:00
diff --git a/src/main/java/io/weaviate/client6/v1/api/collections/query/AbstractQueryClient.java b/src/main/java/io/weaviate/client6/v1/api/collections/query/AbstractQueryClient.java
diff --git a/src/main/java/io/weaviate/client6/v1/api/collections/query/NearAudio.java b/src/main/java/io/weaviate/client6/v1/api/collections/query/NearAudio.java
@@ -3,20 +3,30 @@
 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 NearAudio(String audio, Float distance, Float certainty, BaseQueryOptions common)
+public record NearAudio(Target searchTarget, Float distance, Float certainty, BaseQueryOptions common)
     implements QueryOperator, AggregateObjectFilter {
 
   public static NearAudio of(String audio) {
-    return of(audio, ObjectBuilder.identity());
+    return of(Target.blob(audio));
   }
 
   public static NearAudio of(String audio, Function<Builder, ObjectBuilder<NearAudio>> fn) {
-    return fn.apply(new Builder(audio)).build();
+    return of(Target.blob(audio), fn);
+  }
+
+  public static NearAudio of(Target searchTarget) {
+    return of(searchTarget, ObjectBuilder.identity());
+  }
+
+  public static NearAudio of(Target searchTarget, Function<Builder, ObjectBuilder<NearAudio>> fn) {
+    return fn.apply(new Builder(searchTarget)).build();
   }
 
   public NearAudio(Builder builder) {
@@ -28,7 +38,7 @@ public NearAudio(Builder builder) {
   }
 
   public static class Builder extends NearMediaBuilder<Builder, NearAudio> {
-    public Builder(String audio) {
+    public Builder(Target audio) {
       super(audio);
     }
 
@@ -54,7 +64,16 @@ public void appendTo(WeaviateProtoAggregate.AggregateRequest.Builder req) {
 
   private WeaviateProtoBaseSearch.NearAudioSearch.Builder protoBuilder() {
     var nearAudio = WeaviateProtoBaseSearch.NearAudioSearch.newBuilder();
-    nearAudio.setAudio(audio);
+    if (searchTarget instanceof TextTarget text) {
+      nearAudio.setAudio(text.query().get(0));
+    } else if (searchTarget instanceof CombinedTextTarget combined) {
+      nearAudio.setAudio(combined.query().get(0));
+    }
+
+    var targets = WeaviateProtoBaseSearch.Targets.newBuilder();
+    if (searchTarget.appendTargets(targets)) {
+      nearAudio.setTargets(targets);
+    }
 
     if (certainty != null) {
       nearAudio.setCertainty(certainty);
diff --git a/src/main/java/io/weaviate/client6/v1/api/collections/query/NearDepth.java b/src/main/java/io/weaviate/client6/v1/api/collections/query/NearDepth.java
@@ -3,20 +3,30 @@
 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 NearDepth(String depth, Float distance, Float certainty, BaseQueryOptions common)
+public record NearDepth(Target searchTarget, Float distance, Float certainty, BaseQueryOptions common)
     implements QueryOperator, AggregateObjectFilter {
 
   public static NearDepth of(String depth) {
-    return of(depth, ObjectBuilder.identity());
+    return of(Target.blob(depth));
   }
 
   public static NearDepth of(String depth, Function<Builder, ObjectBuilder<NearDepth>> fn) {
-    return fn.apply(new Builder(depth)).build();
+    return of(Target.blob(depth), fn);
+  }
+
+  public static NearDepth of(Target searchTarget) {
+    return of(searchTarget, ObjectBuilder.identity());
+  }
+
+  public static NearDepth of(Target searchTarget, Function<Builder, ObjectBuilder<NearDepth>> fn) {
+    return fn.apply(new Builder(searchTarget)).build();
   }
 
   public NearDepth(Builder builder) {
@@ -28,8 +38,8 @@ public NearDepth(Builder builder) {
   }
 
   public static class Builder extends NearMediaBuilder<Builder, NearDepth> {
-    public Builder(String depth) {
-      super(depth);
+    public Builder(Target searchTarget) {
+      super(searchTarget);
     }
 
     @Override
@@ -54,7 +64,16 @@ public void appendTo(WeaviateProtoAggregate.AggregateRequest.Builder req) {
 
   private WeaviateProtoBaseSearch.NearDepthSearch.Builder protoBuilder() {
     var nearDepth = WeaviateProtoBaseSearch.NearDepthSearch.newBuilder();
-    nearDepth.setDepth(depth);
+    if (searchTarget instanceof TextTarget depth) {
+      nearDepth.setDepth(depth.query().get(0));
+    } else if (searchTarget instanceof CombinedTextTarget combined) {
+      nearDepth.setDepth(combined.query().get(0));
+    }
+
+    var targets = WeaviateProtoBaseSearch.Targets.newBuilder();
+    if (searchTarget.appendTargets(targets)) {
+      nearDepth.setTargets(targets);
+    }
 
     if (certainty != null) {
       nearDepth.setCertainty(certainty);
diff --git a/src/main/java/io/weaviate/client6/v1/api/collections/query/NearImage.java b/src/main/java/io/weaviate/client6/v1/api/collections/query/NearImage.java
@@ -3,20 +3,30 @@
 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 NearImage(String image, Float distance, Float certainty, BaseQueryOptions common)
+public record NearImage(Target searchTarget, Float distance, Float certainty, BaseQueryOptions common)
     implements QueryOperator, AggregateObjectFilter {
 
   public static NearImage of(String image) {
-    return of(image, ObjectBuilder.identity());
+    return of(Target.blob(image));
   }
 
   public static NearImage of(String image, Function<Builder, ObjectBuilder<NearImage>> fn) {
-    return fn.apply(new Builder(image)).build();
+    return of(Target.blob(image), fn);
+  }
+
+  public static NearImage of(Target searchTarget) {
+    return of(searchTarget, ObjectBuilder.identity());
+  }
+
+  public static NearImage of(Target searchTarget, Function<Builder, ObjectBuilder<NearImage>> fn) {
+    return fn.apply(new Builder(searchTarget)).build();
   }
 
   public NearImage(Builder builder) {
@@ -28,8 +38,8 @@ public NearImage(Builder builder) {
   }
 
   public static class Builder extends NearMediaBuilder<Builder, NearImage> {
-    public Builder(String image) {
-      super(image);
+    public Builder(Target searchTarget) {
+      super(searchTarget);
     }
 
     @Override
@@ -54,7 +64,16 @@ public void appendTo(WeaviateProtoAggregate.AggregateRequest.Builder req) {
 
   private WeaviateProtoBaseSearch.NearImageSearch.Builder protoBuilder() {
     var nearImage = WeaviateProtoBaseSearch.NearImageSearch.newBuilder();
-    nearImage.setImage(image);
+    if (searchTarget instanceof TextTarget image) {
+      nearImage.setImage(image.query().get(0));
+    } else if (searchTarget instanceof CombinedTextTarget combined) {
+      nearImage.setImage(combined.query().get(0));
+    }
+
+    var targets = WeaviateProtoBaseSearch.Targets.newBuilder();
+    if (searchTarget.appendTargets(targets)) {
+      nearImage.setTargets(targets);
+    }
 
     if (certainty != null) {
       nearImage.setCertainty(certainty);
diff --git a/src/main/java/io/weaviate/client6/v1/api/collections/query/NearImu.java b/src/main/java/io/weaviate/client6/v1/api/collections/query/NearImu.java
@@ -3,20 +3,30 @@
 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 NearImu(String imu, Float distance, Float certainty, BaseQueryOptions common)
+public record NearImu(Target searchTarget, Float distance, Float certainty, BaseQueryOptions common)
     implements QueryOperator, AggregateObjectFilter {
 
   public static NearImu of(String imu) {
-    return of(imu, ObjectBuilder.identity());
+    return of(Target.blob(imu));
   }
 
   public static NearImu of(String imu, Function<Builder, ObjectBuilder<NearImu>> fn) {
-    return fn.apply(new Builder(imu)).build();
+    return of(Target.blob(imu), fn);
+  }
+
+  public static NearImu of(Target searchTarget) {
+    return of(searchTarget, ObjectBuilder.identity());
+  }
+
+  public static NearImu of(Target searchTarget, Function<Builder, ObjectBuilder<NearImu>> fn) {
+    return fn.apply(new Builder(searchTarget)).build();
   }
 
   public NearImu(Builder builder) {
@@ -28,8 +38,8 @@ public NearImu(Builder builder) {
   }
 
   public static class Builder extends NearMediaBuilder<Builder, NearImu> {
-    public Builder(String imu) {
-      super(imu);
+    public Builder(Target searchTarget) {
+      super(searchTarget);
     }
 
     @Override
@@ -54,7 +64,16 @@ public void appendTo(WeaviateProtoAggregate.AggregateRequest.Builder req) {
 
   private WeaviateProtoBaseSearch.NearIMUSearch.Builder protoBuilder() {
     var nearImu = WeaviateProtoBaseSearch.NearIMUSearch.newBuilder();
-    nearImu.setImu(imu);
+    if (searchTarget instanceof TextTarget imu) {
+      nearImu.setImu(imu.query().get(0));
+    } else if (searchTarget instanceof CombinedTextTarget combined) {
+      nearImu.setImu(combined.query().get(0));
+    }
+
+    var targets = WeaviateProtoBaseSearch.Targets.newBuilder();
+    if (searchTarget.appendTargets(targets)) {
+      nearImu.setTargets(targets);
+    }
 
     if (certainty != null) {
       nearImu.setCertainty(certainty);
diff --git a/src/main/java/io/weaviate/client6/v1/api/collections/query/NearMediaBuilder.java b/src/main/java/io/weaviate/client6/v1/api/collections/query/NearMediaBuilder.java
@@ -3,9 +3,9 @@
 abstract class NearMediaBuilder<SelfT extends NearMediaBuilder<SelfT, MediaT>, MediaT extends Object>
     extends BaseVectorSearchBuilder<SelfT, MediaT> {
   // Required query parameters.
-  final String media;
+  final Target media;
 
-  public NearMediaBuilder(String media) {
+  public NearMediaBuilder(Target media) {
     this.media = media;
   }
 }
diff --git a/src/main/java/io/weaviate/client6/v1/api/collections/query/NearThermal.java b/src/main/java/io/weaviate/client6/v1/api/collections/query/NearThermal.java
@@ -3,20 +3,30 @@
 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 NearThermal(String thermal, Float distance, Float certainty, BaseQueryOptions common)
+public record NearThermal(Target searchTarget, Float distance, Float certainty, BaseQueryOptions common)
     implements QueryOperator, AggregateObjectFilter {
 
   public static NearThermal of(String thermal) {
-    return of(thermal, ObjectBuilder.identity());
+    return of(Target.blob(thermal));
   }
 
   public static NearThermal of(String thermal, Function<Builder, ObjectBuilder<NearThermal>> fn) {
-    return fn.apply(new Builder(thermal)).build();
+    return of(Target.blob(thermal), fn);
+  }
+
+  public static NearThermal of(Target searchTarget) {
+    return of(searchTarget, ObjectBuilder.identity());
+  }
+
+  public static NearThermal of(Target searchTarget, Function<Builder, ObjectBuilder<NearThermal>> fn) {
+    return fn.apply(new Builder(searchTarget)).build();
   }
 
   public NearThermal(Builder builder) {
@@ -28,8 +38,8 @@ public NearThermal(Builder builder) {
   }
 
   public static class Builder extends NearMediaBuilder<Builder, NearThermal> {
-    public Builder(String thermal) {
-      super(thermal);
+    public Builder(Target searchTarget) {
+      super(searchTarget);
     }
 
     @Override
@@ -54,7 +64,16 @@ public void appendTo(WeaviateProtoAggregate.AggregateRequest.Builder req) {
 
   private WeaviateProtoBaseSearch.NearThermalSearch.Builder protoBuilder() {
     var nearThermal = WeaviateProtoBaseSearch.NearThermalSearch.newBuilder();
-    nearThermal.setThermal(thermal);
+    if (searchTarget instanceof TextTarget thermal) {
+      nearThermal.setThermal(thermal.query().get(0));
+    } else if (searchTarget instanceof CombinedTextTarget combined) {
+      nearThermal.setThermal(combined.query().get(0));
+    }
+
+    var targets = WeaviateProtoBaseSearch.Targets.newBuilder();
+    if (searchTarget.appendTargets(targets)) {
+      nearThermal.setTargets(targets);
+    }
 
     if (certainty != null) {
       nearThermal.setCertainty(certainty);
diff --git a/src/main/java/io/weaviate/client6/v1/api/collections/query/NearVideo.java b/src/main/java/io/weaviate/client6/v1/api/collections/query/NearVideo.java
@@ -3,20 +3,30 @@
 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 NearVideo(String video, Float distance, Float certainty, BaseQueryOptions common)
+public record NearVideo(Target searchTarget, Float distance, Float certainty, BaseQueryOptions common)
     implements QueryOperator, AggregateObjectFilter {
 
   public static NearVideo of(String video) {
-    return of(video, ObjectBuilder.identity());
+    return of(Target.blob(video));
   }
 
   public static NearVideo of(String video, Function<Builder, ObjectBuilder<NearVideo>> fn) {
-    return fn.apply(new Builder(video)).build();
+    return of(Target.blob(video), fn);
+  }
+
+  public static NearVideo of(Target searchTarget) {
+    return of(searchTarget, ObjectBuilder.identity());
+  }
+
+  public static NearVideo of(Target searchTarget, Function<Builder, ObjectBuilder<NearVideo>> fn) {
+    return fn.apply(new Builder(searchTarget)).build();
   }
 
   public NearVideo(Builder builder) {
@@ -28,8 +38,8 @@ public NearVideo(Builder builder) {
   }
 
   public static class Builder extends NearMediaBuilder<Builder, NearVideo> {
-    public Builder(String video) {
-      super(video);
+    public Builder(Target searchTarget) {
+      super(searchTarget);
     }
 
     @Override
@@ -54,7 +64,16 @@ public void appendTo(WeaviateProtoAggregate.AggregateRequest.Builder req) {
 
   private WeaviateProtoBaseSearch.NearVideoSearch.Builder protoBuilder() {
     var nearVideo = WeaviateProtoBaseSearch.NearVideoSearch.newBuilder();
-    nearVideo.setVideo(video);
+    if (searchTarget instanceof TextTarget video) {
+      nearVideo.setVideo(video.query().get(0));
+    } else if (searchTarget instanceof CombinedTextTarget combined) {
+      nearVideo.setVideo(combined.query().get(0));
+    }
+
+    var targets = WeaviateProtoBaseSearch.Targets.newBuilder();
+    if (searchTarget.appendTargets(targets)) {
+      nearVideo.setTargets(targets);
+    }
 
     if (certainty != null) {
       nearVideo.setCertainty(certainty);
diff --git a/src/main/java/io/weaviate/client6/v1/api/collections/query/Target.java b/src/main/java/io/weaviate/client6/v1/api/collections/query/Target.java

Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,9 @@`
`3`	`3`	`abstract class NearMediaBuilder<SelfT extends NearMediaBuilder<SelfT, MediaT>, MediaT extends Object>`
`4`	`4`	`extends BaseVectorSearchBuilder<SelfT, MediaT> {`
`5`	`5`	`// Required query parameters.`
`6`		`- final String media;`
	`6`	`+ final Target media;`
`7`	`7`
`8`		`- public NearMediaBuilder(String media) {`
	`8`	`+ public NearMediaBuilder(Target media) {`
`9`	`9`	`this.media = media;`
`10`	`10`	`}`
`11`	`11`	`}`