diff --git a/src/main/java/io/weaviate/client6/v1/api/collections/generate/DynamicProvider.java b/src/main/java/io/weaviate/client6/v1/api/collections/generate/GenerativeProvider.java similarity index 89% rename from src/main/java/io/weaviate/client6/v1/api/collections/generate/DynamicProvider.java rename to src/main/java/io/weaviate/client6/v1/api/collections/generate/GenerativeProvider.java index 231cd8558..f392578bd 100644 --- a/src/main/java/io/weaviate/client6/v1/api/collections/generate/DynamicProvider.java +++ b/src/main/java/io/weaviate/client6/v1/api/collections/generate/GenerativeProvider.java @@ -18,7 +18,7 @@ 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); /** @@ -26,7 +26,7 @@ public interface DynamicProvider { * * @param fn Lambda expression for optional parameters. */ - public static DynamicProvider anthropic( + public static GenerativeProvider anthropic( Function> fn) { return AnthropicGenerative.Provider.of(fn); } @@ -36,7 +36,7 @@ public static DynamicProvider anthropic( * * @param fn Lambda expression for optional parameters. */ - public static DynamicProvider anyscale( + public static GenerativeProvider anyscale( Function> fn) { return AnyscaleGenerative.Provider.of(fn); } @@ -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> fn) { @@ -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> fn) { @@ -74,7 +74,7 @@ public static DynamicProvider awsSagemaker( * * @param fn Lambda expression for optional parameters. */ - public static DynamicProvider cohere( + public static GenerativeProvider cohere( Function> fn) { return CohereGenerative.Provider.of(fn); } @@ -84,7 +84,7 @@ public static DynamicProvider cohere( * * @param fn Lambda expression for optional parameters. */ - public static DynamicProvider databricks( + public static GenerativeProvider databricks( Function> fn) { return DatabricksGenerative.Provider.of(fn); } @@ -94,7 +94,7 @@ public static DynamicProvider databricks( * * @param fn Lambda expression for optional parameters. */ - public static DynamicProvider friendliai( + public static GenerativeProvider friendliai( Function> fn) { return FriendliaiGenerative.Provider.of(fn); } @@ -104,7 +104,7 @@ public static DynamicProvider friendliai( * * @param fn Lambda expression for optional parameters. */ - public static DynamicProvider googleAiStudio( + public static GenerativeProvider googleAiStudio( Function> fn) { return GoogleGenerative.Provider.aiStudio(fn); } @@ -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> fn) { return GoogleGenerative.Provider.vertex(projectId, fn); @@ -126,7 +126,7 @@ public static DynamicProvider googleVertex( * * @param fn Lambda expression for optional parameters. */ - public static DynamicProvider mistral( + public static GenerativeProvider mistral( Function> fn) { return MistralGenerative.Provider.of(fn); } @@ -136,7 +136,7 @@ public static DynamicProvider mistral( * * @param fn Lambda expression for optional parameters. */ - public static DynamicProvider nvidia( + public static GenerativeProvider nvidia( Function> fn) { return NvidiaGenerative.Provider.of(fn); } @@ -146,7 +146,7 @@ public static DynamicProvider nvidia( * * @param fn Lambda expression for optional parameters. */ - public static DynamicProvider ollama( + public static GenerativeProvider ollama( Function> fn) { return OllamaGenerative.Provider.of(fn); } @@ -156,7 +156,7 @@ public static DynamicProvider ollama( * * @param fn Lambda expression for optional parameters. */ - public static DynamicProvider openai( + public static GenerativeProvider openai( Function> fn) { return OpenAiGenerative.Provider.of(fn); } @@ -166,7 +166,7 @@ public static DynamicProvider openai( * * @param fn Lambda expression for optional parameters. */ - public static DynamicProvider azure( + public static GenerativeProvider azure( Function> fn) { return AzureOpenAiGenerative.Provider.of(fn); } @@ -176,7 +176,7 @@ public static DynamicProvider azure( * * @param fn Lambda expression for optional parameters. */ - public static DynamicProvider xai( + public static GenerativeProvider xai( Function> fn) { return XaiGenerative.Provider.of(fn); } diff --git a/src/main/java/io/weaviate/client6/v1/api/collections/generate/GenerativeTask.java b/src/main/java/io/weaviate/client6/v1/api/collections/generate/GenerativeTask.java index 013697b66..84138aa05 100644 --- a/src/main/java/io/weaviate/client6/v1/api/collections/generate/GenerativeTask.java +++ b/src/main/java/io/weaviate/client6/v1/api/collections/generate/GenerativeTask.java @@ -58,7 +58,7 @@ void appendTo(WeaviateProtoGenerative.GenerativeSearch.Builder req) { } } - public record Single(String prompt, boolean debug, List providers) { + public record Single(String prompt, boolean debug, List providers) { public static Single of(String prompt) { return of(prompt, ObjectBuilder.identity()); } @@ -73,7 +73,7 @@ public Single(Builder builder) { public static class Builder implements ObjectBuilder { private final String prompt; - private final List providers = new ArrayList<>(); + private final List providers = new ArrayList<>(); private boolean debug = false; public Builder(String prompt) { @@ -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; @@ -114,7 +114,7 @@ public void appendTo(WeaviateProtoGenerative.GenerativeSearch.Builder req) { } } - public record Grouped(String prompt, boolean debug, List properties, List providers) { + public record Grouped(String prompt, boolean debug, List properties, List providers) { public static Grouped of(String prompt) { return of(prompt, ObjectBuilder.identity()); } @@ -129,7 +129,7 @@ public Grouped(Builder builder) { public static class Builder implements ObjectBuilder { private final String prompt; - private final List providers = new ArrayList<>(); + private final List providers = new ArrayList<>(); private final List properties = new ArrayList<>(); private boolean debug = false; @@ -146,7 +146,7 @@ public Builder properties(List 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; diff --git a/src/main/java/io/weaviate/client6/v1/api/collections/generative/AnthropicGenerative.java b/src/main/java/io/weaviate/client6/v1/api/collections/generative/AnthropicGenerative.java index bb836d49f..91ac0f68b 100644 --- a/src/main/java/io/weaviate/client6/v1/api/collections/generative/AnthropicGenerative.java +++ b/src/main/java/io/weaviate/client6/v1/api/collections/generative/AnthropicGenerative.java @@ -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; @@ -125,7 +125,7 @@ public static record Provider( Float topP, List stopSequences, List images, - List imageProperties) implements DynamicProvider { + List imageProperties) implements GenerativeProvider { public static Provider of( Function> fn) { diff --git a/src/main/java/io/weaviate/client6/v1/api/collections/generative/AnyscaleGenerative.java b/src/main/java/io/weaviate/client6/v1/api/collections/generative/AnyscaleGenerative.java index a2279e0a2..f24d7fc34 100644 --- a/src/main/java/io/weaviate/client6/v1/api/collections/generative/AnyscaleGenerative.java +++ b/src/main/java/io/weaviate/client6/v1/api/collections/generative/AnyscaleGenerative.java @@ -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; @@ -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> fn) { diff --git a/src/main/java/io/weaviate/client6/v1/api/collections/generative/AwsGenerative.java b/src/main/java/io/weaviate/client6/v1/api/collections/generative/AwsGenerative.java index e92a0d548..a5593bf26 100644 --- a/src/main/java/io/weaviate/client6/v1/api/collections/generative/AwsGenerative.java +++ b/src/main/java/io/weaviate/client6/v1/api/collections/generative/AwsGenerative.java @@ -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; @@ -123,7 +123,7 @@ public static record Provider( String targetModelVariant, Float temperature, List images, - List imageProperties) implements DynamicProvider { + List imageProperties) implements GenerativeProvider { public static Provider bedrock( String region, diff --git a/src/main/java/io/weaviate/client6/v1/api/collections/generative/AzureOpenAiGenerative.java b/src/main/java/io/weaviate/client6/v1/api/collections/generative/AzureOpenAiGenerative.java index 94d0a3c0a..78c47c75f 100644 --- a/src/main/java/io/weaviate/client6/v1/api/collections/generative/AzureOpenAiGenerative.java +++ b/src/main/java/io/weaviate/client6/v1/api/collections/generative/AzureOpenAiGenerative.java @@ -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; @@ -128,7 +128,7 @@ public static record Provider( String deploymentId, List stopSequences, List images, - List imageProperties) implements DynamicProvider { + List imageProperties) implements GenerativeProvider { public static Provider of( Function> fn) { diff --git a/src/main/java/io/weaviate/client6/v1/api/collections/generative/CohereGenerative.java b/src/main/java/io/weaviate/client6/v1/api/collections/generative/CohereGenerative.java index 9a3d8860e..cc803b20f 100644 --- a/src/main/java/io/weaviate/client6/v1/api/collections/generative/CohereGenerative.java +++ b/src/main/java/io/weaviate/client6/v1/api/collections/generative/CohereGenerative.java @@ -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; @@ -142,7 +142,7 @@ public static record Provider( Float topP, Float frequencyPenalty, Float presencePenalty, - List stopSequences) implements DynamicProvider { + List stopSequences) implements GenerativeProvider { public static Provider of( Function> fn) { diff --git a/src/main/java/io/weaviate/client6/v1/api/collections/generative/DatabricksGenerative.java b/src/main/java/io/weaviate/client6/v1/api/collections/generative/DatabricksGenerative.java index 0b69fd54b..2740a3b4b 100644 --- a/src/main/java/io/weaviate/client6/v1/api/collections/generative/DatabricksGenerative.java +++ b/src/main/java/io/weaviate/client6/v1/api/collections/generative/DatabricksGenerative.java @@ -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; @@ -106,7 +106,7 @@ public static record Provider( Float presencePenalty, Boolean logProbs, Integer topLogProbs, - List stopSequences) implements DynamicProvider { + List stopSequences) implements GenerativeProvider { public static Provider of( Function> fn) { diff --git a/src/main/java/io/weaviate/client6/v1/api/collections/generative/FriendliaiGenerative.java b/src/main/java/io/weaviate/client6/v1/api/collections/generative/FriendliaiGenerative.java index d154dc8b3..a42080249 100644 --- a/src/main/java/io/weaviate/client6/v1/api/collections/generative/FriendliaiGenerative.java +++ b/src/main/java/io/weaviate/client6/v1/api/collections/generative/FriendliaiGenerative.java @@ -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; @@ -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> fn) { diff --git a/src/main/java/io/weaviate/client6/v1/api/collections/generative/GoogleGenerative.java b/src/main/java/io/weaviate/client6/v1/api/collections/generative/GoogleGenerative.java index 45536cdc4..f41d359bd 100644 --- a/src/main/java/io/weaviate/client6/v1/api/collections/generative/GoogleGenerative.java +++ b/src/main/java/io/weaviate/client6/v1/api/collections/generative/GoogleGenerative.java @@ -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; @@ -164,7 +164,7 @@ public static record Provider( String region, List stopSequences, List images, - List imageProperties) implements DynamicProvider { + List imageProperties) implements GenerativeProvider { public static Provider vertex( String projectId, diff --git a/src/main/java/io/weaviate/client6/v1/api/collections/generative/MistralGenerative.java b/src/main/java/io/weaviate/client6/v1/api/collections/generative/MistralGenerative.java index 3f64cd06e..7366f146f 100644 --- a/src/main/java/io/weaviate/client6/v1/api/collections/generative/MistralGenerative.java +++ b/src/main/java/io/weaviate/client6/v1/api/collections/generative/MistralGenerative.java @@ -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; @@ -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> fn) { diff --git a/src/main/java/io/weaviate/client6/v1/api/collections/generative/NvidiaGenerative.java b/src/main/java/io/weaviate/client6/v1/api/collections/generative/NvidiaGenerative.java index 6bc156a16..81f414641 100644 --- a/src/main/java/io/weaviate/client6/v1/api/collections/generative/NvidiaGenerative.java +++ b/src/main/java/io/weaviate/client6/v1/api/collections/generative/NvidiaGenerative.java @@ -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; @@ -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> fn) { diff --git a/src/main/java/io/weaviate/client6/v1/api/collections/generative/OllamaGenerative.java b/src/main/java/io/weaviate/client6/v1/api/collections/generative/OllamaGenerative.java index 93b5fb3c7..e108eed01 100644 --- a/src/main/java/io/weaviate/client6/v1/api/collections/generative/OllamaGenerative.java +++ b/src/main/java/io/weaviate/client6/v1/api/collections/generative/OllamaGenerative.java @@ -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; @@ -71,7 +71,7 @@ public static record Provider( String model, Float temperature, List images, - List imageProperties) implements DynamicProvider { + List imageProperties) implements GenerativeProvider { public static Provider of( Function> fn) { diff --git a/src/main/java/io/weaviate/client6/v1/api/collections/generative/OpenAiGenerative.java b/src/main/java/io/weaviate/client6/v1/api/collections/generative/OpenAiGenerative.java index 0417aacda..5e8c40db8 100644 --- a/src/main/java/io/weaviate/client6/v1/api/collections/generative/OpenAiGenerative.java +++ b/src/main/java/io/weaviate/client6/v1/api/collections/generative/OpenAiGenerative.java @@ -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; @@ -124,7 +124,7 @@ public static record Provider( Float presencePenalty, List stopSequences, List images, - List imageProperties) implements DynamicProvider { + List imageProperties) implements GenerativeProvider { public static Provider of( Function> fn) { diff --git a/src/main/java/io/weaviate/client6/v1/api/collections/generative/XaiGenerative.java b/src/main/java/io/weaviate/client6/v1/api/collections/generative/XaiGenerative.java index d736c658c..687d82dbc 100644 --- a/src/main/java/io/weaviate/client6/v1/api/collections/generative/XaiGenerative.java +++ b/src/main/java/io/weaviate/client6/v1/api/collections/generative/XaiGenerative.java @@ -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; @@ -94,7 +94,7 @@ public static record Provider( Float temperature, Float topP, List images, - List imageProperties) implements DynamicProvider { + List imageProperties) implements GenerativeProvider { public static Provider of( Function> fn) {