Skip to content

Commit 6fe6bdd

Browse files
authored
Merge pull request #382 from weaviate/rob/muvera
Add muvera config
2 parents e1b39e6 + a17cbbd commit 6fe6bdd

7 files changed

Lines changed: 1507 additions & 1843 deletions

File tree

src/main/java/io/weaviate/client/v1/misc/model/MultiVectorConfig.java

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package io.weaviate.client.v1.misc.model;
22

3+
import com.google.gson.annotations.SerializedName;
34
import lombok.AccessLevel;
45
import lombok.Builder;
56
import lombok.EqualsAndHashCode;
@@ -17,8 +18,35 @@ public class MultiVectorConfig {
1718
private boolean enabled = true;
1819
@Builder.Default
1920
private Aggregation aggregation = Aggregation.MAX_SIM;
21+
@SerializedName("muvera")
22+
private MuveraConfig muvera;
2023

2124
public enum Aggregation {
2225
MAX_SIM;
2326
}
27+
28+
29+
public MuveraConfig getMuveraEncoding() {
30+
return this.muvera;
31+
}
32+
33+
// Hide the default getter
34+
private MuveraConfig getMuvera() {
35+
return this.muvera;
36+
}
37+
38+
public static class MultiVectorConfigBuilder {
39+
private MuveraConfig muvera;
40+
41+
public MultiVectorConfigBuilder encoding(MuveraConfig muvera) {
42+
this.muvera = muvera;
43+
return this;
44+
}
45+
46+
// Hide default builder setter
47+
private MultiVectorConfigBuilder muvera(MuveraConfig _muvera) {
48+
return this;
49+
}
50+
51+
}
2452
}
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package io.weaviate.client.v1.misc.model;
2+
3+
import lombok.AccessLevel;
4+
import lombok.Builder;
5+
import lombok.EqualsAndHashCode;
6+
import lombok.Getter;
7+
import lombok.ToString;
8+
import lombok.experimental.FieldDefaults;
9+
10+
11+
@Getter
12+
@Builder
13+
@ToString
14+
@EqualsAndHashCode
15+
@FieldDefaults(level = AccessLevel.PRIVATE)
16+
public class MuveraConfig {
17+
Boolean enabled;
18+
Integer ksim;
19+
Integer dprojections;
20+
Integer repetitions;
21+
}

src/test/java/io/weaviate/integration/client/WeaviateVersion.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@
33
public class WeaviateVersion {
44

55
// docker image version
6-
public static final String WEAVIATE_IMAGE = "1.30.0";
6+
public static final String WEAVIATE_IMAGE = "1.31.0-rc.0-5ff7495";
77

88
// to be set according to weaviate docker image
9-
public static final String EXPECTED_WEAVIATE_VERSION = "1.30.0";
9+
public static final String EXPECTED_WEAVIATE_VERSION = "1.31.0-rc.0";
1010
// to be set according to weaviate docker image
11-
public static final String EXPECTED_WEAVIATE_GIT_HASH = "b7b7715";
11+
public static final String EXPECTED_WEAVIATE_GIT_HASH = "5ff7495";
1212

13-
private WeaviateVersion() {
14-
}
13+
private WeaviateVersion() {}
1514
}

0 commit comments

Comments
 (0)