Skip to content

Commit 6b05f78

Browse files
committed
Minor fixes
1 parent 7a9fde3 commit 6b05f78

4 files changed

Lines changed: 90 additions & 4 deletions

File tree

src/main/java/io/weaviate/client6/v1/api/collections/generative/AzureOpenAiGenerative.java

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,14 @@
1414
import io.weaviate.client6.v1.internal.grpc.protocol.WeaviateProtoGenerative;
1515

1616
public record AzureOpenAiGenerative(
17+
@SerializedName("apiVersion") String apiVersion,
1718
@SerializedName("baseURL") String baseUrl,
1819
@SerializedName("frequencyPenalty") Float frequencyPenalty,
1920
@SerializedName("presencePenalty") Float presencePenalty,
2021
@SerializedName("maxTokens") Integer maxTokens,
2122
@SerializedName("temperature") Float temperature,
2223
@SerializedName("topP") Float topP,
24+
@SerializedName("model") String model,
2325

2426
@SerializedName("resourceName") String resourceName,
2527
@SerializedName("deploymentId") String deploymentId) implements Generative {
@@ -45,12 +47,14 @@ public static AzureOpenAiGenerative of(String resourceName, String deploymentId,
4547

4648
public AzureOpenAiGenerative(Builder builder) {
4749
this(
50+
builder.apiVersion,
4851
builder.baseUrl,
4952
builder.frequencyPenalty,
5053
builder.presencePenalty,
5154
builder.maxTokens,
5255
builder.temperature,
5356
builder.topP,
57+
builder.model,
5458
builder.resourceName,
5559
builder.deploymentId);
5660
}
@@ -59,24 +63,38 @@ public static class Builder implements ObjectBuilder<AzureOpenAiGenerative> {
5963
private final String resourceName;
6064
private final String deploymentId;
6165

66+
private String apiVersion;
6267
private String baseUrl;
6368
private Float frequencyPenalty;
6469
private Float presencePenalty;
6570
private Integer maxTokens;
6671
private Float temperature;
6772
private Float topP;
73+
private String model;
6874

6975
public Builder(String resourceName, String deploymentId) {
7076
this.resourceName = resourceName;
7177
this.deploymentId = deploymentId;
7278
}
7379

80+
/** API version for the generative provider. */
81+
public Builder apiVersion(String apiVersion) {
82+
this.apiVersion = apiVersion;
83+
return this;
84+
}
85+
7486
/** Base URL of the generative provider. */
7587
public Builder baseUrl(String baseUrl) {
7688
this.baseUrl = baseUrl;
7789
return this;
7890
}
7991

92+
/** Select generative model. */
93+
public Builder model(String model) {
94+
this.model = model;
95+
return this;
96+
}
97+
8098
/** Limit the number of tokens to generate in the response. */
8199
public Builder maxTokens(int maxTokens) {
82100
this.maxTokens = maxTokens;

src/main/java/io/weaviate/client6/v1/api/collections/generative/OpenAiGenerative.java

Lines changed: 49 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,16 @@
1414
import io.weaviate.client6.v1.internal.grpc.protocol.WeaviateProtoGenerative;
1515

1616
public record OpenAiGenerative(
17+
@SerializedName("apiVersion") String apiVersion,
1718
@SerializedName("baseURL") String baseUrl,
1819
@SerializedName("frequencyPenalty") Float frequencyPenalty,
1920
@SerializedName("presencePenalty") Float presencePenalty,
2021
@SerializedName("maxTokens") Integer maxTokens,
2122
@SerializedName("temperature") Float temperature,
2223
@SerializedName("topP") Float topP,
23-
24-
@SerializedName("model") String model) implements Generative {
24+
@SerializedName("model") String model,
25+
@SerializedName("reasoningEffort") ReasoningEffort reasoningEffort,
26+
@SerializedName("verbosity") Verbosity verbosity) implements Generative {
2527

2628
@Override
2729
public Kind _kind() {
@@ -43,23 +45,35 @@ public static OpenAiGenerative of(Function<Builder, ObjectBuilder<OpenAiGenerati
4345

4446
public OpenAiGenerative(Builder builder) {
4547
this(
48+
builder.apiVersion,
4649
builder.baseUrl,
4750
builder.frequencyPenalty,
4851
builder.presencePenalty,
4952
builder.maxTokens,
5053
builder.temperature,
5154
builder.topP,
52-
builder.model);
55+
builder.model,
56+
builder.reasoningEffort,
57+
builder.verbosity);
5358
}
5459

5560
public static class Builder implements ObjectBuilder<OpenAiGenerative> {
61+
private String apiVersion;
5662
private String baseUrl;
5763
private Float frequencyPenalty;
5864
private Float presencePenalty;
5965
private Integer maxTokens;
6066
private Float temperature;
6167
private Float topP;
6268
private String model;
69+
private ReasoningEffort reasoningEffort;
70+
private Verbosity verbosity;
71+
72+
/** API version for the generative provider. */
73+
public Builder apiVersion(String apiVersion) {
74+
this.apiVersion = apiVersion;
75+
return this;
76+
}
6377

6478
/** Base URL of the generative provider. */
6579
public Builder baseUrl(String baseUrl) {
@@ -73,6 +87,18 @@ public Builder model(String model) {
7387
return this;
7488
}
7589

90+
/** Set the reasoning effort level. */
91+
public Builder reasoningEffort(ReasoningEffort reasoningEffort) {
92+
this.reasoningEffort = reasoningEffort;
93+
return this;
94+
}
95+
96+
/** Set the verbosity level. */
97+
public Builder verbosity(Verbosity verbosity) {
98+
this.verbosity = verbosity;
99+
return this;
100+
}
101+
76102
/** Limit the number of tokens to generate in the response. */
77103
public Builder maxTokens(int maxTokens) {
78104
this.maxTokens = maxTokens;
@@ -110,6 +136,26 @@ public OpenAiGenerative build() {
110136
}
111137
}
112138

139+
public enum ReasoningEffort {
140+
@SerializedName("minimal")
141+
MINIMAL,
142+
@SerializedName("low")
143+
LOW,
144+
@SerializedName("medium")
145+
MEDIUM,
146+
@SerializedName("high")
147+
HIGH;
148+
}
149+
150+
public enum Verbosity {
151+
@SerializedName("low")
152+
LOW,
153+
@SerializedName("medium")
154+
MEDIUM,
155+
@SerializedName("high")
156+
HIGH;
157+
}
158+
113159
public static record Metadata(ProviderMetadata.Usage usage) implements ProviderMetadata {
114160
}
115161

src/main/java/io/weaviate/client6/v1/api/collections/rerankers/CohereReranker.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public record CohereReranker(
1111
@SerializedName("model") String model) implements Reranker {
1212

1313
public static final String RERANK_ENGLISH_V2 = "rerank-english-v2.0";
14-
public static final String RERANK_MULTILINGUAL_V2 = "rerank-mulilingual-v2.0";
14+
public static final String RERANK_MULTILINGUAL_V2 = "rerank-multilingual-v2.0";
1515

1616
@Override
1717
public Kind _kind() {

src/main/java/io/weaviate/client6/v1/api/collections/vectorizers/Text2VecAzureOpenAiVectorizer.java

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414

1515
public record Text2VecAzureOpenAiVectorizer(
1616
@SerializedName("baseURL") String baseUrl,
17+
@SerializedName("dimensions") Integer dimensions,
18+
@SerializedName("model") String model,
1719
@SerializedName("deploymentId") String deploymentId,
1820
@SerializedName("resourceName") String resourceName,
1921

@@ -54,6 +56,8 @@ public static Text2VecAzureOpenAiVectorizer of(
5456
*/
5557
public Text2VecAzureOpenAiVectorizer(
5658
String baseUrl,
59+
Integer dimensions,
60+
String model,
5761
String deploymentId,
5862
String resourceName,
5963

@@ -62,6 +66,8 @@ public Text2VecAzureOpenAiVectorizer(
6266
VectorIndex vectorIndex,
6367
Quantization quantization) {
6468
this.baseUrl = baseUrl;
69+
this.dimensions = dimensions;
70+
this.model = model;
6571
this.deploymentId = deploymentId;
6672
this.resourceName = resourceName;
6773

@@ -74,6 +80,8 @@ public Text2VecAzureOpenAiVectorizer(
7480
public Text2VecAzureOpenAiVectorizer(Builder builder) {
7581
this(
7682
builder.baseUrl,
83+
builder.dimensions,
84+
builder.model,
7785
builder.deploymentId,
7886
builder.resourceName,
7987

@@ -90,6 +98,8 @@ public static class Builder implements ObjectBuilder<Text2VecAzureOpenAiVectoriz
9098
private VectorIndex vectorIndex = VectorIndex.DEFAULT_VECTOR_INDEX;
9199

92100
private String baseUrl;
101+
private Integer dimensions;
102+
private String model;
93103
private String deploymentId;
94104
private String resourceName;
95105

@@ -98,6 +108,18 @@ public Builder baseUrl(String baseUrl) {
98108
return this;
99109
}
100110

111+
/** Set the number of dimensions for the vector embeddings. */
112+
public Builder dimensions(int dimensions) {
113+
this.dimensions = dimensions;
114+
return this;
115+
}
116+
117+
/** Select the embedding model. */
118+
public Builder model(String model) {
119+
this.model = model;
120+
return this;
121+
}
122+
101123
public Builder deploymentId(String deploymentId) {
102124
this.deploymentId = deploymentId;
103125
return this;

0 commit comments

Comments
 (0)