Skip to content

Commit b4af659

Browse files
bevzzzbevzzz
authored
Merge pull request #507 from weaviate/rename-dynamic
v6: Rename dynamic to generative
2 parents c08a3ef + dfc378c commit b4af659

15 files changed

Lines changed: 48 additions & 48 deletions

src/main/java/io/weaviate/client6/v1/api/collections/generate/DynamicProvider.java renamed to src/main/java/io/weaviate/client6/v1/api/collections/generate/GenerativeProvider.java

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818
import io.weaviate.client6.v1.internal.ObjectBuilder;
1919
import io.weaviate.client6.v1.internal.grpc.protocol.WeaviateProtoGenerative;
2020

21-
public interface DynamicProvider {
21+
public interface GenerativeProvider {
2222
void appendTo(WeaviateProtoGenerative.GenerativeProvider.Builder req);
2323

2424
/**
2525
* Configure {@code generative-anthropic} as a dynamic provider.
2626
*
2727
* @param fn Lambda expression for optional parameters.
2828
*/
29-
public static DynamicProvider anthropic(
29+
public static GenerativeProvider anthropic(
3030
Function<AnthropicGenerative.Provider.Builder, ObjectBuilder<AnthropicGenerative.Provider>> fn) {
3131
return AnthropicGenerative.Provider.of(fn);
3232
}
@@ -36,7 +36,7 @@ public static DynamicProvider anthropic(
3636
*
3737
* @param fn Lambda expression for optional parameters.
3838
*/
39-
public static DynamicProvider anyscale(
39+
public static GenerativeProvider anyscale(
4040
Function<AnyscaleGenerative.Provider.Builder, ObjectBuilder<AnyscaleGenerative.Provider>> fn) {
4141
return AnyscaleGenerative.Provider.of(fn);
4242
}
@@ -48,7 +48,7 @@ public static DynamicProvider anyscale(
4848
* @param model Inference model.
4949
* @param fn Lambda expression for optional parameters.
5050
*/
51-
public static DynamicProvider awsBedrock(
51+
public static GenerativeProvider awsBedrock(
5252
String region,
5353
String model,
5454
Function<AwsGenerative.Provider.BedrockBuilder, ObjectBuilder<AwsGenerative.Provider>> fn) {
@@ -62,7 +62,7 @@ public static DynamicProvider awsBedrock(
6262
* @param endpoint Base inference URL.
6363
* @param fn Lambda expression for optional parameters.
6464
*/
65-
public static DynamicProvider awsSagemaker(
65+
public static GenerativeProvider awsSagemaker(
6666
String region,
6767
String endpoint,
6868
Function<AwsGenerative.Provider.SagemakerBuilder, ObjectBuilder<AwsGenerative.Provider>> fn) {
@@ -74,7 +74,7 @@ public static DynamicProvider awsSagemaker(
7474
*
7575
* @param fn Lambda expression for optional parameters.
7676
*/
77-
public static DynamicProvider cohere(
77+
public static GenerativeProvider cohere(
7878
Function<CohereGenerative.Provider.Builder, ObjectBuilder<CohereGenerative.Provider>> fn) {
7979
return CohereGenerative.Provider.of(fn);
8080
}
@@ -84,7 +84,7 @@ public static DynamicProvider cohere(
8484
*
8585
* @param fn Lambda expression for optional parameters.
8686
*/
87-
public static DynamicProvider databricks(
87+
public static GenerativeProvider databricks(
8888
Function<DatabricksGenerative.Provider.Builder, ObjectBuilder<DatabricksGenerative.Provider>> fn) {
8989
return DatabricksGenerative.Provider.of(fn);
9090
}
@@ -94,7 +94,7 @@ public static DynamicProvider databricks(
9494
*
9595
* @param fn Lambda expression for optional parameters.
9696
*/
97-
public static DynamicProvider friendliai(
97+
public static GenerativeProvider friendliai(
9898
Function<FriendliaiGenerative.Provider.Builder, ObjectBuilder<FriendliaiGenerative.Provider>> fn) {
9999
return FriendliaiGenerative.Provider.of(fn);
100100
}
@@ -104,7 +104,7 @@ public static DynamicProvider friendliai(
104104
*
105105
* @param fn Lambda expression for optional parameters.
106106
*/
107-
public static DynamicProvider googleAiStudio(
107+
public static GenerativeProvider googleAiStudio(
108108
Function<GoogleGenerative.Provider.AiStudioBuilder, ObjectBuilder<GoogleGenerative.Provider>> fn) {
109109
return GoogleGenerative.Provider.aiStudio(fn);
110110
}
@@ -115,7 +115,7 @@ public static DynamicProvider googleAiStudio(
115115
* @param projectId Google project ID.
116116
* @param fn Lambda expression for optional parameters.
117117
*/
118-
public static DynamicProvider googleVertex(
118+
public static GenerativeProvider googleVertex(
119119
String projectId,
120120
Function<GoogleGenerative.Provider.VertexBuilder, ObjectBuilder<GoogleGenerative.Provider>> fn) {
121121
return GoogleGenerative.Provider.vertex(projectId, fn);
@@ -126,7 +126,7 @@ public static DynamicProvider googleVertex(
126126
*
127127
* @param fn Lambda expression for optional parameters.
128128
*/
129-
public static DynamicProvider mistral(
129+
public static GenerativeProvider mistral(
130130
Function<MistralGenerative.Provider.Builder, ObjectBuilder<MistralGenerative.Provider>> fn) {
131131
return MistralGenerative.Provider.of(fn);
132132
}
@@ -136,7 +136,7 @@ public static DynamicProvider mistral(
136136
*
137137
* @param fn Lambda expression for optional parameters.
138138
*/
139-
public static DynamicProvider nvidia(
139+
public static GenerativeProvider nvidia(
140140
Function<NvidiaGenerative.Provider.Builder, ObjectBuilder<NvidiaGenerative.Provider>> fn) {
141141
return NvidiaGenerative.Provider.of(fn);
142142
}
@@ -146,7 +146,7 @@ public static DynamicProvider nvidia(
146146
*
147147
* @param fn Lambda expression for optional parameters.
148148
*/
149-
public static DynamicProvider ollama(
149+
public static GenerativeProvider ollama(
150150
Function<OllamaGenerative.Provider.Builder, ObjectBuilder<OllamaGenerative.Provider>> fn) {
151151
return OllamaGenerative.Provider.of(fn);
152152
}
@@ -156,7 +156,7 @@ public static DynamicProvider ollama(
156156
*
157157
* @param fn Lambda expression for optional parameters.
158158
*/
159-
public static DynamicProvider openai(
159+
public static GenerativeProvider openai(
160160
Function<OpenAiGenerative.Provider.Builder, ObjectBuilder<OpenAiGenerative.Provider>> fn) {
161161
return OpenAiGenerative.Provider.of(fn);
162162
}
@@ -166,7 +166,7 @@ public static DynamicProvider openai(
166166
*
167167
* @param fn Lambda expression for optional parameters.
168168
*/
169-
public static DynamicProvider azure(
169+
public static GenerativeProvider azure(
170170
Function<AzureOpenAiGenerative.Provider.Builder, ObjectBuilder<AzureOpenAiGenerative.Provider>> fn) {
171171
return AzureOpenAiGenerative.Provider.of(fn);
172172
}
@@ -176,7 +176,7 @@ public static DynamicProvider azure(
176176
*
177177
* @param fn Lambda expression for optional parameters.
178178
*/
179-
public static DynamicProvider xai(
179+
public static GenerativeProvider xai(
180180
Function<XaiGenerative.Provider.Builder, ObjectBuilder<XaiGenerative.Provider>> fn) {
181181
return XaiGenerative.Provider.of(fn);
182182
}

‎src/main/java/io/weaviate/client6/v1/api/collections/generate/GenerativeTask.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ void appendTo(WeaviateProtoGenerative.GenerativeSearch.Builder req) {
5858
}
5959
}
6060

61-
public record Single(String prompt, boolean debug, List<DynamicProvider> providers) {
61+
public record Single(String prompt, boolean debug, List<GenerativeProvider> providers) {
6262
public static Single of(String prompt) {
6363
return of(prompt, ObjectBuilder.identity());
6464
}
@@ -73,7 +73,7 @@ public Single(Builder builder) {
7373

7474
public static class Builder implements ObjectBuilder<Single> {
7575
private final String prompt;
76-
private final List<DynamicProvider> providers = new ArrayList<>();
76+
private final List<GenerativeProvider> providers = new ArrayList<>();
7777
private boolean debug = false;
7878

7979
public Builder(String prompt) {
@@ -85,7 +85,7 @@ public Builder debug(boolean enable) {
8585
return this;
8686
}
8787

88-
public Builder dynamicProvider(DynamicProvider provider) {
88+
public Builder generativeProvider(GenerativeProvider provider) {
8989
providers.clear(); // Protobuf allows `repeated` but the server expects there to be 1.
9090
providers.add(provider);
9191
return this;
@@ -114,7 +114,7 @@ public void appendTo(WeaviateProtoGenerative.GenerativeSearch.Builder req) {
114114
}
115115
}
116116

117-
public record Grouped(String prompt, boolean debug, List<String> properties, List<DynamicProvider> providers) {
117+
public record Grouped(String prompt, boolean debug, List<String> properties, List<GenerativeProvider> providers) {
118118
public static Grouped of(String prompt) {
119119
return of(prompt, ObjectBuilder.identity());
120120
}
@@ -129,7 +129,7 @@ public Grouped(Builder builder) {
129129

130130
public static class Builder implements ObjectBuilder<Grouped> {
131131
private final String prompt;
132-
private final List<DynamicProvider> providers = new ArrayList<>();
132+
private final List<GenerativeProvider> providers = new ArrayList<>();
133133
private final List<String> properties = new ArrayList<>();
134134
private boolean debug = false;
135135

@@ -146,7 +146,7 @@ public Builder properties(List<String> properties) {
146146
return this;
147147
}
148148

149-
public Builder dynamicProvider(DynamicProvider provider) {
149+
public Builder generativeProvider(GenerativeProvider provider) {
150150
providers.clear(); // Protobuf allows `repeated` but the server expects there to be 1.
151151
providers.add(provider);
152152
return this;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import com.google.gson.annotations.SerializedName;
99

1010
import io.weaviate.client6.v1.api.collections.Generative;
11-
import io.weaviate.client6.v1.api.collections.generate.DynamicProvider;
11+
import io.weaviate.client6.v1.api.collections.generate.GenerativeProvider;
1212
import io.weaviate.client6.v1.internal.ObjectBuilder;
1313
import io.weaviate.client6.v1.internal.grpc.protocol.WeaviateProtoBase;
1414
import io.weaviate.client6.v1.internal.grpc.protocol.WeaviateProtoGenerative;
@@ -125,7 +125,7 @@ public static record Provider(
125125
Float topP,
126126
List<String> stopSequences,
127127
List<String> images,
128-
List<String> imageProperties) implements DynamicProvider {
128+
List<String> imageProperties) implements GenerativeProvider {
129129

130130
public static Provider of(
131131
Function<AnthropicGenerative.Provider.Builder, ObjectBuilder<AnthropicGenerative.Provider>> fn) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import com.google.gson.annotations.SerializedName;
66

77
import io.weaviate.client6.v1.api.collections.Generative;
8-
import io.weaviate.client6.v1.api.collections.generate.DynamicProvider;
8+
import io.weaviate.client6.v1.api.collections.generate.GenerativeProvider;
99
import io.weaviate.client6.v1.internal.ObjectBuilder;
1010
import io.weaviate.client6.v1.internal.grpc.protocol.WeaviateProtoGenerative;
1111

@@ -75,7 +75,7 @@ public static record Metadata() implements ProviderMetadata {
7575
public static record Provider(
7676
String baseUrl,
7777
String model,
78-
Float temperature) implements DynamicProvider {
78+
Float temperature) implements GenerativeProvider {
7979

8080
public static Provider of(
8181
Function<AnyscaleGenerative.Provider.Builder, ObjectBuilder<AnyscaleGenerative.Provider>> fn) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import com.google.gson.annotations.SerializedName;
99

1010
import io.weaviate.client6.v1.api.collections.Generative;
11-
import io.weaviate.client6.v1.api.collections.generate.DynamicProvider;
11+
import io.weaviate.client6.v1.api.collections.generate.GenerativeProvider;
1212
import io.weaviate.client6.v1.api.collections.vectorizers.Text2VecAwsVectorizer.Service;
1313
import io.weaviate.client6.v1.internal.ObjectBuilder;
1414
import io.weaviate.client6.v1.internal.grpc.protocol.WeaviateProtoBase;
@@ -123,7 +123,7 @@ public static record Provider(
123123
String targetModelVariant,
124124
Float temperature,
125125
List<String> images,
126-
List<String> imageProperties) implements DynamicProvider {
126+
List<String> imageProperties) implements GenerativeProvider {
127127

128128
public static Provider bedrock(
129129
String region,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import com.google.gson.annotations.SerializedName;
99

1010
import io.weaviate.client6.v1.api.collections.Generative;
11-
import io.weaviate.client6.v1.api.collections.generate.DynamicProvider;
11+
import io.weaviate.client6.v1.api.collections.generate.GenerativeProvider;
1212
import io.weaviate.client6.v1.internal.ObjectBuilder;
1313
import io.weaviate.client6.v1.internal.grpc.protocol.WeaviateProtoBase;
1414
import io.weaviate.client6.v1.internal.grpc.protocol.WeaviateProtoGenerative;
@@ -128,7 +128,7 @@ public static record Provider(
128128
String deploymentId,
129129
List<String> stopSequences,
130130
List<String> images,
131-
List<String> imageProperties) implements DynamicProvider {
131+
List<String> imageProperties) implements GenerativeProvider {
132132

133133
public static Provider of(
134134
Function<AzureOpenAiGenerative.Provider.Builder, ObjectBuilder<AzureOpenAiGenerative.Provider>> fn) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import com.google.gson.annotations.SerializedName;
99

1010
import io.weaviate.client6.v1.api.collections.Generative;
11-
import io.weaviate.client6.v1.api.collections.generate.DynamicProvider;
11+
import io.weaviate.client6.v1.api.collections.generate.GenerativeProvider;
1212
import io.weaviate.client6.v1.internal.ObjectBuilder;
1313
import io.weaviate.client6.v1.internal.grpc.protocol.WeaviateProtoBase;
1414
import io.weaviate.client6.v1.internal.grpc.protocol.WeaviateProtoGenerative;
@@ -142,7 +142,7 @@ public static record Provider(
142142
Float topP,
143143
Float frequencyPenalty,
144144
Float presencePenalty,
145-
List<String> stopSequences) implements DynamicProvider {
145+
List<String> stopSequences) implements GenerativeProvider {
146146

147147
public static Provider of(
148148
Function<CohereGenerative.Provider.Builder, ObjectBuilder<CohereGenerative.Provider>> fn) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import com.google.gson.annotations.SerializedName;
99

1010
import io.weaviate.client6.v1.api.collections.Generative;
11-
import io.weaviate.client6.v1.api.collections.generate.DynamicProvider;
11+
import io.weaviate.client6.v1.api.collections.generate.GenerativeProvider;
1212
import io.weaviate.client6.v1.internal.ObjectBuilder;
1313
import io.weaviate.client6.v1.internal.grpc.protocol.WeaviateProtoBase;
1414
import io.weaviate.client6.v1.internal.grpc.protocol.WeaviateProtoGenerative;
@@ -106,7 +106,7 @@ public static record Provider(
106106
Float presencePenalty,
107107
Boolean logProbs,
108108
Integer topLogProbs,
109-
List<String> stopSequences) implements DynamicProvider {
109+
List<String> stopSequences) implements GenerativeProvider {
110110

111111
public static Provider of(
112112
Function<DatabricksGenerative.Provider.Builder, ObjectBuilder<DatabricksGenerative.Provider>> fn) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import com.google.gson.annotations.SerializedName;
66

77
import io.weaviate.client6.v1.api.collections.Generative;
8-
import io.weaviate.client6.v1.api.collections.generate.DynamicProvider;
8+
import io.weaviate.client6.v1.api.collections.generate.GenerativeProvider;
99
import io.weaviate.client6.v1.internal.ObjectBuilder;
1010
import io.weaviate.client6.v1.internal.grpc.protocol.WeaviateProtoGenerative;
1111

@@ -89,7 +89,7 @@ public static record Provider(
8989
String model,
9090
Float temperature,
9191
Integer n,
92-
Float topP) implements DynamicProvider {
92+
Float topP) implements GenerativeProvider {
9393

9494
public static Provider of(
9595
Function<FriendliaiGenerative.Provider.Builder, ObjectBuilder<FriendliaiGenerative.Provider>> fn) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import com.google.gson.annotations.SerializedName;
99

1010
import io.weaviate.client6.v1.api.collections.Generative;
11-
import io.weaviate.client6.v1.api.collections.generate.DynamicProvider;
11+
import io.weaviate.client6.v1.api.collections.generate.GenerativeProvider;
1212
import io.weaviate.client6.v1.api.collections.vectorizers.Text2VecGoogleVectorizer;
1313
import io.weaviate.client6.v1.internal.ObjectBuilder;
1414
import io.weaviate.client6.v1.internal.grpc.protocol.WeaviateProtoBase;
@@ -164,7 +164,7 @@ public static record Provider(
164164
String region,
165165
List<String> stopSequences,
166166
List<String> images,
167-
List<String> imageProperties) implements DynamicProvider {
167+
List<String> imageProperties) implements GenerativeProvider {
168168

169169
public static Provider vertex(
170170
String projectId,

0 commit comments

Comments
 (0)