Merge branch 'main' into feat/boost

Author: bevzzz

pom.xml

@@ -54,7 +54,7 @@
     <maven.compiler.release>17</maven.compiler.release>
     <lombok.version>1.18.42</lombok.version>
     <gson.version>2.13.2</gson.version>
-    <httpclient.version>5.6</httpclient.version>
+    <httpclient.version>5.6.1</httpclient.version>
     <lang3.version>3.20.0</lang3.version>
     <junit.version>4.13.2</junit.version>
     <testcontainers.version>2.0.3</testcontainers.version>

src/it/java/io/weaviate/integration/BackupITest.java

@@ -245,7 +245,7 @@ public void test_lifecycle_async() throws ExecutionException, InterruptedExcepti
   @Test(expected = IllegalStateException.class)
   public void test_waitForCompletion_unknown() throws IOException, TimeoutException {
     var backup = new Backup("#1", "/tmp/bak/#1", "filesystem", List.of("Things"), BackupStatus.STARTED,
-        null, null, null, null, null);
+        null, null, null, null, null, null);
     backup.waitForCompletion(client);
   }
 

src/it/java/io/weaviate/integration/CollectionsITest.java

@@ -1,6 +1,7 @@
 package io.weaviate.integration;
 
 import java.io.IOException;
+import java.util.ArrayList;
 
 import org.assertj.core.api.Assertions;
 import org.assertj.core.api.InstanceOfAssertFactories;
@@ -510,4 +511,39 @@ public void test_asyncReplicationConfig() throws IOException {
         .returns(13, AsyncReplicationConfig::propagationConcurrency)
         .returns(14, AsyncReplicationConfig::propagationBatchSize);
   }
+
+  @Test
+  public void test_properties() {
+    Assertions.assertThatCode(() -> {
+      var properties = new ArrayList<Property>() {
+        {
+          add(Property.textArray("prop_textArray"));
+          add(Property.integer("prop_integer"));
+          add(Property.integerArray("prop_integerArray"));
+          add(Property.number("prop_number"));
+          add(Property.numberArray("prop_numberArray"));
+          add(Property.bool("prop_bool"));
+          add(Property.boolArray("prop_boolArray"));
+          add(Property.blob("prop_blob"));
+          add(Property.date("prop_date"));
+          add(Property.dateArray("prop_dateArray"));
+          add(Property.uuid("prop_uuid"));
+          add(Property.uuidArray("prop_uuidArray"));
+          add(Property.object("prop_object",
+              p -> p.nestedProperties(Property.text("foo"))));
+          add(Property.objectArray("prop_objectArray",
+              p -> p.nestedProperties(Property.text("foo"))));
+          add(Property.phoneNumber("prop_phoneNumber"));
+          add(Property.geoCoordinates("prop_geoCoordinates"));
+        }
+      };
+
+      requireAtLeast(Weaviate.Version.V137, () -> {
+        properties.add(Property.blobHash("prop_blobHash"));
+      });
+
+      client.collections.create(
+          ns("Things"), col -> col.properties(properties));
+    }).doesNotThrowAnyException();
+  }
 }

src/it/java/io/weaviate/integration/SearchITest.java

@@ -38,6 +38,7 @@
 import io.weaviate.client6.v1.api.collections.generate.TaskOutput;
 import io.weaviate.client6.v1.api.collections.generative.DummyGenerative;
 import io.weaviate.client6.v1.api.collections.query.Boost;
+import io.weaviate.client6.v1.api.collections.query.Diversity;
 import io.weaviate.client6.v1.api.collections.query.FetchObjectById;
 import io.weaviate.client6.v1.api.collections.query.Filter;
 import io.weaviate.client6.v1.api.collections.query.GroupBy;
@@ -952,4 +953,17 @@ public void testBoost(String __, Object boost) throws Exception {
     Assertions.assertThat(got).hasSameSizeAs(baseline);
     Assertions.assertThat(got).doesNotContainSequence(baseline);
   }
+  
+  @Test
+  public void testDiversity() throws Exception {
+    Version.V137.orSkip();
+
+    var things = client.collections.use(COLLECTION);
+    var resp = things.query.nearVector(searchVector,
+        opt -> opt.diversity(Diversity.mmr(div -> div.limit(3))));
+
+    Assertions.assertThat(resp)
+        .extracting(QueryResponse::objects, InstanceOfAssertFactories.LIST)
+        .hasSize(3);
+  }
 }

src/main/java/io/weaviate/client6/v1/api/backup/Backup.java

@@ -35,6 +35,8 @@ public record Backup(
     @SerializedName("completedAt") OffsetDateTime completedAt,
     /** Backup size in GiB. */
     @SerializedName("size") Float sizeGiB,
+    /** Prefix for the incremental backup IDs. */
+    @SerializedName("incremental_base_backup_id") String prefixIncremental,
     /**
      * This value indicates if a backup is being created or restored from.
      * For operations like LIST this value is null.
@@ -55,6 +57,7 @@ Backup withOperation(Operation operation) {
         startedAt,
         completedAt,
         sizeGiB,
+        prefixIncremental,
         operation);
   }
 

src/main/java/io/weaviate/client6/v1/api/backup/CreateBackupRequest.java

@@ -26,6 +26,7 @@ public static record BackupCreate(
       @SerializedName("id") String id,
       @SerializedName("include") List<String> includeCollections,
       @SerializedName("exclude") List<String> excludeCollections,
+      @SerializedName("incremental_base_backup_id") String prefixIncremental,
       @SerializedName("config") Config config) {
 
     private static record Config(
@@ -48,6 +49,7 @@ public BackupCreate(Builder builder) {
           builder.backupId,
           builder.includeCollections,
           builder.excludeCollections,
+          builder.prefixIncremental,
           new Config(
               builder.cpuPercentage,
               builder.compressionLevel,
@@ -58,6 +60,7 @@ public BackupCreate(Builder builder) {
     public static class Builder implements ObjectBuilder<BackupCreate> {
       private final String backupId;
 
+      private String prefixIncremental;
       private Integer cpuPercentage;
       private CompressionLevel compressionLevel;
       private String bucket;
@@ -69,6 +72,12 @@ public Builder(String backupId) {
         this.backupId = backupId;
       }
 
+      /** Prefix for incremental backup IDs. */
+      public Builder prefixIncremental(String prefixIncremental) {
+        this.prefixIncremental = prefixIncremental;
+        return this;
+      }
+
       /** Collection that should be included in the backup. */
       public Builder includeCollections(String... includeCollections) {
         return includeCollections(Arrays.asList(includeCollections));

src/main/java/io/weaviate/client6/v1/api/collections/DataType.java

@@ -14,6 +14,7 @@ public interface DataType {
   public static final String BOOL = "boolean";
   public static final String BOOL_ARRAY = "boolean[]";
   public static final String BLOB = "blob";
+  public static final String BLOB_HASH = "blobHash";
   public static final String DATE = "date";
   public static final String DATE_ARRAY = "date[]";
   public static final String UUID = "uuid";

src/main/java/io/weaviate/client6/v1/api/collections/Generative.java

@@ -19,6 +19,7 @@
 import io.weaviate.client6.v1.api.collections.generative.AzureOpenAiGenerative;
 import io.weaviate.client6.v1.api.collections.generative.CohereGenerative;
 import io.weaviate.client6.v1.api.collections.generative.DatabricksGenerative;
+import io.weaviate.client6.v1.api.collections.generative.DeepseekGenerative;
 import io.weaviate.client6.v1.api.collections.generative.DummyGenerative;
 import io.weaviate.client6.v1.api.collections.generative.FriendliaiGenerative;
 import io.weaviate.client6.v1.api.collections.generative.GoogleGenerative;
@@ -38,6 +39,7 @@ public enum Kind implements JsonEnum<Kind> {
     ANTHROPIC("generative-anthropic"),
     COHERE("generative-cohere"),
     DATABRICKS("generative-databricks"),
+    DEEPSEEK("generative-deepseek"),
     FRIENDLIAI("generative-friendliai"),
     GOOGLE("generative-google"),
     MISTRAL("generative-mistral"),
@@ -171,6 +173,22 @@ public static Generative databricks(String endpoint,
     return DatabricksGenerative.of(endpoint, fn);
   }
 
+  /**
+   * Configure a default {@code generative-deepseek} module.
+   */
+  public static Generative deepseek() {
+    return DeepseekGenerative.of();
+  }
+
+  /**
+   * Configure a {@code generative-deepseek} module.
+   *
+   * @param fn Lambda expression for optional parameters.
+   */
+  public static Generative deepseek(Function<DeepseekGenerative.Builder, ObjectBuilder<DeepseekGenerative>> fn) {
+    return DeepseekGenerative.of(fn);
+  }
+
   /** Configure a default {@code generative-frienliai} module. */
   public static Generative frienliai() {
     return FriendliaiGenerative.of();
@@ -384,6 +402,21 @@ default DatabricksGenerative asDatabricks() {
     return _as(Generative.Kind.DATABRICKS);
   }
 
+  /** Is this a {@code generative-deepseek} provider? */
+  default boolean isDeepseek() {
+    return _is(Generative.Kind.DEEPSEEK);
+  }
+
+  /**
+   * Get as {@link DeepseekGenerative} instance.
+   *
+   * @throws IllegalStateException if the current kind is not
+   *                               {@code generative-deepseek}.
+   */
+  default DeepseekGenerative asDeepseek() {
+    return _as(Generative.Kind.DEEPSEEK);
+  }
+
   /** Is this a {@code generative-friendliai} provider? */
   default boolean isFriendliai() {
     return _is(Generative.Kind.FRIENDLIAI);
@@ -520,6 +553,7 @@ private final void init(Gson gson) {
       addAdapter(gson, Generative.Kind.AWS, AwsGenerative.class);
       addAdapter(gson, Generative.Kind.COHERE, CohereGenerative.class);
       addAdapter(gson, Generative.Kind.DATABRICKS, DatabricksGenerative.class);
+      addAdapter(gson, Generative.Kind.DEEPSEEK, DeepseekGenerative.class);
       addAdapter(gson, Generative.Kind.GOOGLE, GoogleGenerative.class);
       addAdapter(gson, Generative.Kind.FRIENDLIAI, FriendliaiGenerative.class);
       addAdapter(gson, Generative.Kind.MISTRAL, MistralGenerative.class);

src/main/java/io/weaviate/client6/v1/api/collections/Property.java

@@ -118,6 +118,25 @@ public static Property blob(String name, Function<Builder, ObjectBuilder<Propert
     return newProperty(name, DataType.BLOB, fn);
   }
 
+  /**
+   * Create a {@code blobHash} property.
+   *
+   * @param name Property name.
+   */
+  public static Property blobHash(String name) {
+    return blobHash(name, ObjectBuilder.identity());
+  }
+
+  /**
+   * Create a {@code blobHash} property with additional configuration.
+   *
+   * @param name Property name.
+   * @param fn   Lambda expression for optional parameters.
+   */
+  public static Property blobHash(String name, Function<Builder, ObjectBuilder<Property>> fn) {
+    return newProperty(name, DataType.BLOB_HASH, fn);
+  }
+
   /**
    * Create a {@code bool} property.
    *

src/main/java/io/weaviate/client6/v1/api/collections/Replication.java

@@ -98,6 +98,7 @@ public Builder hashTreeHeight(int hashTreeHeight) {
        *
        * @deprecated This paramter should be controled server-side.
        */
+      @Deprecated
       public Builder maxWorkers(int maxWorkers) {
         this.maxWorkers = maxWorkers;
         return this;
@@ -126,6 +127,7 @@ public Builder frequencyMillisWhilePropagating(int frequencyMillisWhilePropagati
        *
        * @deprecated This parameter should be controled server-side.
        */
+      @Deprecated
       public Builder aliveNodesCheckingFrequencyMillis(int aliveNodesCheckingFrequencyMillis) {
         this.aliveNodesCheckingFrequencyMillis = aliveNodesCheckingFrequencyMillis;
         return this;