Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@
import io.weaviate.client6.v1.internal.ObjectBuilder;
import io.weaviate.client6.v1.internal.grpc.protocol.WeaviateProtoGenerative;

public interface DynamicProvider {
public interface GenerativeProvider {
void appendTo(WeaviateProtoGenerative.GenerativeProvider.Builder req);

/**
* Configure {@code generative-anthropic} as a dynamic provider.
*
* @param fn Lambda expression for optional parameters.
*/
public static DynamicProvider anthropic(
public static GenerativeProvider anthropic(
Function<AnthropicGenerative.Provider.Builder, ObjectBuilder<AnthropicGenerative.Provider>> fn) {
return AnthropicGenerative.Provider.of(fn);
}
Expand All @@ -36,7 +36,7 @@ public static DynamicProvider anthropic(
*
* @param fn Lambda expression for optional parameters.
*/
public static DynamicProvider anyscale(
public static GenerativeProvider anyscale(
Function<AnyscaleGenerative.Provider.Builder, ObjectBuilder<AnyscaleGenerative.Provider>> fn) {
return AnyscaleGenerative.Provider.of(fn);
}
Expand All @@ -48,7 +48,7 @@ public static DynamicProvider anyscale(
* @param model Inference model.
* @param fn Lambda expression for optional parameters.
*/
public static DynamicProvider awsBedrock(
public static GenerativeProvider awsBedrock(
String region,
String model,
Function<AwsGenerative.Provider.BedrockBuilder, ObjectBuilder<AwsGenerative.Provider>> fn) {
Expand All @@ -62,7 +62,7 @@ public static DynamicProvider awsBedrock(
* @param endpoint Base inference URL.
* @param fn Lambda expression for optional parameters.
*/
public static DynamicProvider awsSagemaker(
public static GenerativeProvider awsSagemaker(
String region,
String endpoint,
Function<AwsGenerative.Provider.SagemakerBuilder, ObjectBuilder<AwsGenerative.Provider>> fn) {
Expand All @@ -74,7 +74,7 @@ public static DynamicProvider awsSagemaker(
*
* @param fn Lambda expression for optional parameters.
*/
public static DynamicProvider cohere(
public static GenerativeProvider cohere(
Function<CohereGenerative.Provider.Builder, ObjectBuilder<CohereGenerative.Provider>> fn) {
return CohereGenerative.Provider.of(fn);
}
Expand All @@ -84,7 +84,7 @@ public static DynamicProvider cohere(
*
* @param fn Lambda expression for optional parameters.
*/
public static DynamicProvider databricks(
public static GenerativeProvider databricks(
Function<DatabricksGenerative.Provider.Builder, ObjectBuilder<DatabricksGenerative.Provider>> fn) {
return DatabricksGenerative.Provider.of(fn);
}
Expand All @@ -94,7 +94,7 @@ public static DynamicProvider databricks(
*
* @param fn Lambda expression for optional parameters.
*/
public static DynamicProvider friendliai(
public static GenerativeProvider friendliai(
Function<FriendliaiGenerative.Provider.Builder, ObjectBuilder<FriendliaiGenerative.Provider>> fn) {
return FriendliaiGenerative.Provider.of(fn);
}
Expand All @@ -104,7 +104,7 @@ public static DynamicProvider friendliai(
*
* @param fn Lambda expression for optional parameters.
*/
public static DynamicProvider googleAiStudio(
public static GenerativeProvider googleAiStudio(
Function<GoogleGenerative.Provider.AiStudioBuilder, ObjectBuilder<GoogleGenerative.Provider>> fn) {
return GoogleGenerative.Provider.aiStudio(fn);
}
Expand All @@ -115,7 +115,7 @@ public static DynamicProvider googleAiStudio(
* @param projectId Google project ID.
* @param fn Lambda expression for optional parameters.
*/
public static DynamicProvider googleVertex(
public static GenerativeProvider googleVertex(
String projectId,
Function<GoogleGenerative.Provider.VertexBuilder, ObjectBuilder<GoogleGenerative.Provider>> fn) {
return GoogleGenerative.Provider.vertex(projectId, fn);
Expand All @@ -126,7 +126,7 @@ public static DynamicProvider googleVertex(
*
* @param fn Lambda expression for optional parameters.
*/
public static DynamicProvider mistral(
public static GenerativeProvider mistral(
Function<MistralGenerative.Provider.Builder, ObjectBuilder<MistralGenerative.Provider>> fn) {
return MistralGenerative.Provider.of(fn);
}
Expand All @@ -136,7 +136,7 @@ public static DynamicProvider mistral(
*
* @param fn Lambda expression for optional parameters.
*/
public static DynamicProvider nvidia(
public static GenerativeProvider nvidia(
Function<NvidiaGenerative.Provider.Builder, ObjectBuilder<NvidiaGenerative.Provider>> fn) {
return NvidiaGenerative.Provider.of(fn);
}
Expand All @@ -146,7 +146,7 @@ public static DynamicProvider nvidia(
*
* @param fn Lambda expression for optional parameters.
*/
public static DynamicProvider ollama(
public static GenerativeProvider ollama(
Function<OllamaGenerative.Provider.Builder, ObjectBuilder<OllamaGenerative.Provider>> fn) {
return OllamaGenerative.Provider.of(fn);
}
Expand All @@ -156,7 +156,7 @@ public static DynamicProvider ollama(
*
* @param fn Lambda expression for optional parameters.
*/
public static DynamicProvider openai(
public static GenerativeProvider openai(
Function<OpenAiGenerative.Provider.Builder, ObjectBuilder<OpenAiGenerative.Provider>> fn) {
return OpenAiGenerative.Provider.of(fn);
}
Expand All @@ -166,7 +166,7 @@ public static DynamicProvider openai(
*
* @param fn Lambda expression for optional parameters.
*/
public static DynamicProvider azure(
public static GenerativeProvider azure(
Function<AzureOpenAiGenerative.Provider.Builder, ObjectBuilder<AzureOpenAiGenerative.Provider>> fn) {
return AzureOpenAiGenerative.Provider.of(fn);
}
Expand All @@ -176,7 +176,7 @@ public static DynamicProvider azure(
*
* @param fn Lambda expression for optional parameters.
*/
public static DynamicProvider xai(
public static GenerativeProvider xai(
Function<XaiGenerative.Provider.Builder, ObjectBuilder<XaiGenerative.Provider>> fn) {
return XaiGenerative.Provider.of(fn);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ void appendTo(WeaviateProtoGenerative.GenerativeSearch.Builder req) {
}
}

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

public static class Builder implements ObjectBuilder<Single> {
private final String prompt;
private final List<DynamicProvider> providers = new ArrayList<>();
private final List<GenerativeProvider> providers = new ArrayList<>();
private boolean debug = false;

public Builder(String prompt) {
Expand All @@ -85,7 +85,7 @@ public Builder debug(boolean enable) {
return this;
}

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

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

public static class Builder implements ObjectBuilder<Grouped> {
private final String prompt;
private final List<DynamicProvider> providers = new ArrayList<>();
private final List<GenerativeProvider> providers = new ArrayList<>();
private final List<String> properties = new ArrayList<>();
private boolean debug = false;

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

public Builder dynamicProvider(DynamicProvider provider) {
public Builder generativeProvider(GenerativeProvider provider) {
providers.clear(); // Protobuf allows `repeated` but the server expects there to be 1.
providers.add(provider);
return this;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import com.google.gson.annotations.SerializedName;

import io.weaviate.client6.v1.api.collections.Generative;
import io.weaviate.client6.v1.api.collections.generate.DynamicProvider;
import io.weaviate.client6.v1.api.collections.generate.GenerativeProvider;
import io.weaviate.client6.v1.internal.ObjectBuilder;
import io.weaviate.client6.v1.internal.grpc.protocol.WeaviateProtoBase;
import io.weaviate.client6.v1.internal.grpc.protocol.WeaviateProtoGenerative;
Expand Down Expand Up @@ -125,7 +125,7 @@ public static record Provider(
Float topP,
List<String> stopSequences,
List<String> images,
List<String> imageProperties) implements DynamicProvider {
List<String> imageProperties) implements GenerativeProvider {

public static Provider of(
Function<AnthropicGenerative.Provider.Builder, ObjectBuilder<AnthropicGenerative.Provider>> fn) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import com.google.gson.annotations.SerializedName;

import io.weaviate.client6.v1.api.collections.Generative;
import io.weaviate.client6.v1.api.collections.generate.DynamicProvider;
import io.weaviate.client6.v1.api.collections.generate.GenerativeProvider;
import io.weaviate.client6.v1.internal.ObjectBuilder;
import io.weaviate.client6.v1.internal.grpc.protocol.WeaviateProtoGenerative;

Expand Down Expand Up @@ -75,7 +75,7 @@ public static record Metadata() implements ProviderMetadata {
public static record Provider(
String baseUrl,
String model,
Float temperature) implements DynamicProvider {
Float temperature) implements GenerativeProvider {

public static Provider of(
Function<AnyscaleGenerative.Provider.Builder, ObjectBuilder<AnyscaleGenerative.Provider>> fn) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import com.google.gson.annotations.SerializedName;

import io.weaviate.client6.v1.api.collections.Generative;
import io.weaviate.client6.v1.api.collections.generate.DynamicProvider;
import io.weaviate.client6.v1.api.collections.generate.GenerativeProvider;
import io.weaviate.client6.v1.api.collections.vectorizers.Text2VecAwsVectorizer.Service;
import io.weaviate.client6.v1.internal.ObjectBuilder;
import io.weaviate.client6.v1.internal.grpc.protocol.WeaviateProtoBase;
Expand Down Expand Up @@ -123,7 +123,7 @@ public static record Provider(
String targetModelVariant,
Float temperature,
List<String> images,
List<String> imageProperties) implements DynamicProvider {
List<String> imageProperties) implements GenerativeProvider {

public static Provider bedrock(
String region,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import com.google.gson.annotations.SerializedName;

import io.weaviate.client6.v1.api.collections.Generative;
import io.weaviate.client6.v1.api.collections.generate.DynamicProvider;
import io.weaviate.client6.v1.api.collections.generate.GenerativeProvider;
import io.weaviate.client6.v1.internal.ObjectBuilder;
import io.weaviate.client6.v1.internal.grpc.protocol.WeaviateProtoBase;
import io.weaviate.client6.v1.internal.grpc.protocol.WeaviateProtoGenerative;
Expand Down Expand Up @@ -128,7 +128,7 @@ public static record Provider(
String deploymentId,
List<String> stopSequences,
List<String> images,
List<String> imageProperties) implements DynamicProvider {
List<String> imageProperties) implements GenerativeProvider {

public static Provider of(
Function<AzureOpenAiGenerative.Provider.Builder, ObjectBuilder<AzureOpenAiGenerative.Provider>> fn) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import com.google.gson.annotations.SerializedName;

import io.weaviate.client6.v1.api.collections.Generative;
import io.weaviate.client6.v1.api.collections.generate.DynamicProvider;
import io.weaviate.client6.v1.api.collections.generate.GenerativeProvider;
import io.weaviate.client6.v1.internal.ObjectBuilder;
import io.weaviate.client6.v1.internal.grpc.protocol.WeaviateProtoBase;
import io.weaviate.client6.v1.internal.grpc.protocol.WeaviateProtoGenerative;
Expand Down Expand Up @@ -142,7 +142,7 @@ public static record Provider(
Float topP,
Float frequencyPenalty,
Float presencePenalty,
List<String> stopSequences) implements DynamicProvider {
List<String> stopSequences) implements GenerativeProvider {

public static Provider of(
Function<CohereGenerative.Provider.Builder, ObjectBuilder<CohereGenerative.Provider>> fn) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import com.google.gson.annotations.SerializedName;

import io.weaviate.client6.v1.api.collections.Generative;
import io.weaviate.client6.v1.api.collections.generate.DynamicProvider;
import io.weaviate.client6.v1.api.collections.generate.GenerativeProvider;
import io.weaviate.client6.v1.internal.ObjectBuilder;
import io.weaviate.client6.v1.internal.grpc.protocol.WeaviateProtoBase;
import io.weaviate.client6.v1.internal.grpc.protocol.WeaviateProtoGenerative;
Expand Down Expand Up @@ -106,7 +106,7 @@ public static record Provider(
Float presencePenalty,
Boolean logProbs,
Integer topLogProbs,
List<String> stopSequences) implements DynamicProvider {
List<String> stopSequences) implements GenerativeProvider {

public static Provider of(
Function<DatabricksGenerative.Provider.Builder, ObjectBuilder<DatabricksGenerative.Provider>> fn) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import com.google.gson.annotations.SerializedName;

import io.weaviate.client6.v1.api.collections.Generative;
import io.weaviate.client6.v1.api.collections.generate.DynamicProvider;
import io.weaviate.client6.v1.api.collections.generate.GenerativeProvider;
import io.weaviate.client6.v1.internal.ObjectBuilder;
import io.weaviate.client6.v1.internal.grpc.protocol.WeaviateProtoGenerative;

Expand Down Expand Up @@ -89,7 +89,7 @@ public static record Provider(
String model,
Float temperature,
Integer n,
Float topP) implements DynamicProvider {
Float topP) implements GenerativeProvider {

public static Provider of(
Function<FriendliaiGenerative.Provider.Builder, ObjectBuilder<FriendliaiGenerative.Provider>> fn) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import com.google.gson.annotations.SerializedName;

import io.weaviate.client6.v1.api.collections.Generative;
import io.weaviate.client6.v1.api.collections.generate.DynamicProvider;
import io.weaviate.client6.v1.api.collections.generate.GenerativeProvider;
import io.weaviate.client6.v1.api.collections.vectorizers.Text2VecGoogleVectorizer;
import io.weaviate.client6.v1.internal.ObjectBuilder;
import io.weaviate.client6.v1.internal.grpc.protocol.WeaviateProtoBase;
Expand Down Expand Up @@ -164,7 +164,7 @@ public static record Provider(
String region,
List<String> stopSequences,
List<String> images,
List<String> imageProperties) implements DynamicProvider {
List<String> imageProperties) implements GenerativeProvider {

public static Provider vertex(
String projectId,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import com.google.gson.annotations.SerializedName;

import io.weaviate.client6.v1.api.collections.Generative;
import io.weaviate.client6.v1.api.collections.generate.DynamicProvider;
import io.weaviate.client6.v1.api.collections.generate.GenerativeProvider;
import io.weaviate.client6.v1.internal.ObjectBuilder;
import io.weaviate.client6.v1.internal.grpc.protocol.WeaviateProtoGenerative;

Expand Down Expand Up @@ -88,7 +88,7 @@ public static record Provider(
Integer maxTokens,
String model,
Float temperature,
Float topP) implements DynamicProvider {
Float topP) implements GenerativeProvider {

public static Provider of(
Function<MistralGenerative.Provider.Builder, ObjectBuilder<MistralGenerative.Provider>> fn) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import com.google.gson.annotations.SerializedName;

import io.weaviate.client6.v1.api.collections.Generative;
import io.weaviate.client6.v1.api.collections.generate.DynamicProvider;
import io.weaviate.client6.v1.api.collections.generate.GenerativeProvider;
import io.weaviate.client6.v1.internal.ObjectBuilder;
import io.weaviate.client6.v1.internal.grpc.protocol.WeaviateProtoGenerative;

Expand Down Expand Up @@ -88,7 +88,7 @@ public static record Provider(
Integer maxTokens,
String model,
Float temperature,
Float topP) implements DynamicProvider {
Float topP) implements GenerativeProvider {

public static Provider of(
Function<NvidiaGenerative.Provider.Builder, ObjectBuilder<NvidiaGenerative.Provider>> fn) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import com.google.gson.annotations.SerializedName;

import io.weaviate.client6.v1.api.collections.Generative;
import io.weaviate.client6.v1.api.collections.generate.DynamicProvider;
import io.weaviate.client6.v1.api.collections.generate.GenerativeProvider;
import io.weaviate.client6.v1.internal.ObjectBuilder;
import io.weaviate.client6.v1.internal.grpc.protocol.WeaviateProtoBase;
import io.weaviate.client6.v1.internal.grpc.protocol.WeaviateProtoGenerative;
Expand Down Expand Up @@ -71,7 +71,7 @@ public static record Provider(
String model,
Float temperature,
List<String> images,
List<String> imageProperties) implements DynamicProvider {
List<String> imageProperties) implements GenerativeProvider {

public static Provider of(
Function<OllamaGenerative.Provider.Builder, ObjectBuilder<OllamaGenerative.Provider>> fn) {
Expand Down
Loading