feat: add where-filter to aggregations

Author: bevzzz

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

@@ -5,11 +5,14 @@
 import java.util.List;
 import java.util.function.Function;
 
+import io.weaviate.client6.v1.api.collections.query.Filter;
 import io.weaviate.client6.v1.internal.ObjectBuilder;
 import io.weaviate.client6.v1.internal.grpc.protocol.WeaviateProtoAggregate;
+import io.weaviate.client6.v1.internal.grpc.protocol.WeaviateProtoBase;
 
 public record Aggregation(
     AggregateObjectFilter filter,
+    Filter whereFilter,
     Integer objectLimit,
     boolean includeTotalCount,
     List<PropertyAggregation> returnMetrics) {
@@ -29,6 +32,7 @@ public static Aggregation of(AggregateObjectFilter objectFilter, Function<Builde
   public Aggregation(Builder builder) {
     this(
         builder.objectFilter,
+        builder.whereFilter,
         builder.objectLimit,
         builder.includeTotalCount,
         builder.metrics);
@@ -41,6 +45,7 @@ public Builder(AggregateObjectFilter objectFilter) {
       this.objectFilter = objectFilter;
     }
 
+    private Filter whereFilter;
     private List<PropertyAggregation> metrics = new ArrayList<>();
     private Integer objectLimit;
     private boolean includeTotalCount = false;
@@ -55,6 +60,24 @@ public final Builder includeTotalCount(boolean include) {
       return this;
     }
 
+    /**
+     * Filter result set using traditional filtering operators: {@code eq},
+     * {@code gte}, {@code like}, etc.
+     * Subsequent calls to {@link #filter} aggregate with an AND operator.
+     */
+    public final Builder filters(Filter filter) {
+      this.whereFilter = this.whereFilter == null
+          ? filter
+          : Filter.and(this.whereFilter, filter);
+      return this;
+    }
+
+    /** Combine several conditions using with an AND operator. */
+    public final Builder filters(Filter... filters) {
+      Arrays.stream(filters).map(this::filters);
+      return this;
+    }
+
     @SafeVarargs
     public final Builder metrics(PropertyAggregation... metrics) {
       this.metrics = Arrays.asList(metrics);
@@ -80,6 +103,12 @@ public void appendTo(WeaviateProtoAggregate.AggregateRequest.Builder req) {
       req.setObjectLimit(objectLimit);
     }
 
+    if (whereFilter != null) {
+      var protoFilters = WeaviateProtoBase.Filters.newBuilder();
+      whereFilter.appendTo(protoFilters);
+      req.setFilters(protoFilters);
+    }
+
     for (final var metric : returnMetrics) {
       var aggregation = WeaviateProtoAggregate.AggregateRequest.Aggregation.newBuilder();
       metric.appendTo(aggregation);

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

@@ -131,7 +131,9 @@ protected SelfT generate(Function<GenerativeSearch.Builder, ObjectBuilder<Genera
      * Subsequent calls to {@link #filter} aggregate with an AND operator.
      */
     public final SelfT filters(Filter filter) {
-      this.filter = this.filter == null ? filter : Filter.and(this.filter, filter);
+      this.filter = this.filter == null
+          ? filter
+          : Filter.and(this.filter, filter);
       return (SelfT) this;
     }