fix: append nested filters to nested gRPC stubs

Added protobuf.java-util dependency for logging protobuf objects as
JSON (debuggging).

Author: bevzzz

pom.xml

@@ -72,6 +72,7 @@
     <oauth2-oidc-sdk.version>11.20.1</oauth2-oidc-sdk.version>
     <mock-server.version>5.15.0</mock-server.version>
     <protobuf.java.version>4.29.1</protobuf.java.version>
+    <protobuf.java-util.version>4.29.1</protobuf.java-util.version>
     <grpc-netty-shaded.version>1.68.2</grpc-netty-shaded.version>
     <grpc-protobuf.version>1.68.2</grpc-protobuf.version>
     <grpc-stub.version>1.68.2</grpc-stub.version>
@@ -84,6 +85,11 @@
       <artifactId>protobuf-java</artifactId>
       <version>${protobuf.java.version}</version>
     </dependency>
+    <dependency>
+      <groupId>com.google.protobuf</groupId>
+      <artifactId>protobuf-java-util</artifactId>
+      <version>${protobuf.java-util.version}</version>
+    </dependency>
     <dependency>
         <groupId>io.grpc</groupId>
         <artifactId>grpc-netty-shaded</artifactId>

src/main/java/io/weaviate/client/v1/experimental/Batcher.java

@@ -2,11 +2,14 @@
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Consumer;
 
+import org.apache.commons.lang3.time.DateFormatUtils;
+
 import io.weaviate.client.Config;
 import io.weaviate.client.base.Result;
 import io.weaviate.client.base.http.HttpClient;
@@ -85,9 +88,15 @@ private Map<String, Object> toMap(T properties) {
       for (Field field : cls.getDeclaredFields()) {
         field.setAccessible(true);
         try {
-          fieldMap.put(field.getName(), field.get(properties));
+          Object value = field.get(properties);
+          // TODO: there will need to be a more delicate way of handling these things
+          // but this will suffice to demostrate the idea.
+          if (value instanceof Date) {
+            value = DateFormatUtils.format((Date) value, "yyyy-MM-dd'T'HH:mm:ssZZZZZ");
+          }
+          fieldMap.put(field.getName(), value);
         } catch (IllegalAccessException e) {
-          // Ignore
+          // Ignore for now
         }
       }
       return fieldMap;

src/main/java/io/weaviate/client/v1/experimental/SearchClient.java

@@ -1,5 +1,7 @@
 package io.weaviate.client.v1.experimental;
 
+import java.time.OffsetDateTime;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Consumer;
@@ -152,6 +154,9 @@ private static Object convertProtoValue(Value value) {
       return value.getIntValue();
     } else if (value.hasNumberValue()) {
       return value.getNumberValue();
+    } else if (value.hasDateValue()) {
+      OffsetDateTime offsetDateTime = OffsetDateTime.parse(value.getDateValue());
+      return Date.from(offsetDateTime.toInstant());
     } else {
       assert false : "branch not covered";
     }

src/main/java/io/weaviate/client/v1/experimental/Where.java

@@ -85,6 +85,10 @@ public static Where or(Map<String, Object> filters, Operator operator) {
   }
 
   public static List<Operand> fromMap(Map<String, Object> filters, Operator operator) {
+    if (operator.equals(Operator.AND) || operator.equals(Operator.OR)) {
+      // TODO: we will avoid this by not exposing AND/OR operators to the user.
+      throw new IllegalArgumentException("AND/OR operators are not comparison operators");
+    }
     return filters.entrySet().stream()
         .<Operand>map(entry -> new Where(
             operator,
@@ -508,9 +512,19 @@ public void append(Filters.Builder where) {
       case 1: // no need for operator
         operands.getFirst().append(where);
         return;
+      case 2: // Comparison operators: eq, gt, lt, like, etc.
+        operands.forEach(op -> op.append(where));
+        break;
+      default:
+        assert operator.equals(Operator.AND) || operator.equals(Operator.OR)
+            : "comparison operators must have max 2 operands";
+
+        operands.forEach(op -> {
+          Filters.Builder nested = Filters.newBuilder();
+          op.append(nested);
+          where.addFilters(nested);
+        });
     }
-
-    this.operands.forEach(op -> op.append(where));
     operator.append(where);
   }
 
@@ -609,7 +623,7 @@ private List<Long> toLongs() {
 
     @Override
     public void append(Filters.Builder where) {
-      where.setValueIntArray(WeaviateProtoBase.IntArray.newBuilder().addAllValues(toLongs()).build());
+      where.setValueIntArray(WeaviateProtoBase.IntArray.newBuilder().addAllValues(toLongs()));
     }
   }
 

src/main/java/io/weaviate/client/v1/filters/WhereFilter.java

@@ -1,15 +1,16 @@
 package io.weaviate.client.v1.filters;
 
+import java.util.Date;
+import java.util.function.Consumer;
+
+import org.apache.commons.lang3.ArrayUtils;
+
 import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.ToString;
 import lombok.experimental.FieldDefaults;
-import org.apache.commons.lang3.ArrayUtils;
-
-import java.util.Date;
-import java.util.function.Consumer;
 
 @Getter
 @ToString
@@ -31,11 +32,15 @@ public class WhereFilter {
   Double valueNumber;
   Double[] valueNumberArray;
   /**
-   * As of Weaviate v1.19 'valueString' is deprecated and replaced by 'valueText'.<br>
-   * See <a href="https://weaviate.io/developers/weaviate/config-refs/datatypes#introduction">data types</a>
+   * As of Weaviate v1.19 'valueString' is deprecated and replaced by
+   * 'valueText'.<br>
+   * See <a href=
+   * "https://weaviate.io/developers/weaviate/config-refs/datatypes#introduction">data
+   * types</a>
    */
   @Deprecated
   String valueString;
+  @Deprecated
   String[] valueStringArray;
   String valueText;
   String[] valueTextArray;
@@ -44,7 +49,6 @@ public static WhereFilterBuilder builder() {
     return new WhereFilterBuilder();
   }
 
-
   public static class WhereFilterBuilder {
     private WhereFilter[] operands;
     private String operator;
@@ -62,38 +66,49 @@ public WhereFilterBuilder operands(WhereFilter... operands) {
       this.operands = operands;
       return this;
     }
+
     public WhereFilterBuilder operator(String operator) {
       this.operator = operator;
       return this;
     }
+
     public WhereFilterBuilder path(String... path) {
       this.path = path;
       return this;
     }
+
     public WhereFilterBuilder valueBoolean(Boolean... valueBoolean) {
       valueBooleanArray = valueBoolean;
       return this;
     }
+
     public WhereFilterBuilder valueDate(Date... valueDate) {
       valueDateArray = valueDate;
       return this;
     }
+
     public WhereFilterBuilder valueInt(Integer... valueInt) {
       valueIntArray = valueInt;
       return this;
     }
+
     public WhereFilterBuilder valueNumber(Double... valueNumber) {
       valueNumberArray = valueNumber;
       return this;
     }
+
+    /** Deprecated: use {@link valueText} instead. */
+    @Deprecated
     public WhereFilterBuilder valueString(String... valueString) {
       valueStringArray = valueString;
       return this;
     }
+
     public WhereFilterBuilder valueText(String... valueText) {
       valueTextArray = valueText;
       return this;
     }
+
     public WhereFilterBuilder valueGeoRange(GeoRange valueGeoRange) {
       this.valueGeoRange = valueGeoRange;
       return this;
@@ -126,7 +141,6 @@ private <T> void assignSingleOrArray(T[] values, Consumer<T> single, Consumer<T[
     }
   }
 
-
   @Getter
   @Builder
   @ToString

src/main/java/io/weaviate/client/v1/graphql/query/builder/GetBuilder.java

@@ -293,7 +293,10 @@ private void addWhereFilters(Filters.Builder where, WhereFilter f) {
 
     if (ArrayUtils.isNotEmpty(operands)) { // Nested filters
       for (WhereFilter op : operands) {
-        addWhereFilters(where, op);
+        Filters.Builder nested = Filters.newBuilder();
+        addWhereFilters(nested, op);
+        where.addFilters(nested);
+        // addWhereFilters(where, op);
       }
     } else { // Individual where clauses (leaves)
       if (ArrayUtils.isNotEmpty(f.getPath())) {
@@ -310,19 +313,27 @@ private void addWhereFilters(Filters.Builder where, WhereFilter f) {
       } else if (f.getValueIntArray() != null) {
         IntArray.Builder arr = IntArray.newBuilder();
         Arrays.stream(f.getValueIntArray()).forEach(v -> arr.addValues(v));
-        where.setValueIntArray(arr.build());
+        where.setValueIntArray(arr);
       } else if (f.getValueNumber() != null) {
         where.setValueNumber(f.getValueNumber());
       } else if (f.getValueNumberArray() != null) {
         NumberArray.Builder arr = NumberArray.newBuilder();
         Arrays.stream(f.getValueNumberArray()).forEach(v -> arr.addValues(v));
-        where.setValueNumberArray(arr.build());
+        where.setValueNumberArray(arr);
       } else if (f.getValueText() != null) {
         where.setValueText(f.getValueText());
       } else if (f.getValueTextArray() != null) {
         TextArray.Builder arr = TextArray.newBuilder();
         Arrays.stream(f.getValueTextArray()).forEach(v -> arr.addValues(v));
-        where.setValueTextArray(arr.build());
+        where.setValueTextArray(arr);
+      } else if (f.getValueString() != null) {
+        where.setValueText(f.getValueString());
+      } else if (f.getValueStringArray() != null) {
+        TextArray.Builder arr = TextArray.newBuilder();
+        Arrays.stream(f.getValueStringArray()).forEach(v -> arr.addValues(v));
+        where.setValueTextArray(arr);
+      } else {
+        assert false : "unexpected WhereFilter value";
       }
     }
 
@@ -333,6 +344,11 @@ private void addWhereFilters(Filters.Builder where, WhereFilter f) {
       case Operator.Or:
         where.setOperator(WeaviateProtoBase.Filters.Operator.OPERATOR_OR);
         break;
+      case Operator.Equal:
+        where.setOperator(WeaviateProtoBase.Filters.Operator.OPERATOR_EQUAL);
+        break;
+      default:
+        assert false : "unexpected operator: " + f.getOperator();
     }
   }