Update generative module references from "generative-palm" to "generative-google" and enhance JSON tests with additional parameters

Author: databyjp

src/main/java/io/weaviate/client6/v1/api/collections/Generative.java

@@ -39,7 +39,7 @@ public enum Kind implements JsonEnum<Kind> {
     COHERE("generative-cohere"),
     DATABRICKS("generative-databricks"),
     FRIENDLIAI("generative-friendliai"),
-    GOOGLE("generative-palm"),
+    GOOGLE("generative-google"),
     MISTRAL("generative-mistral"),
     NVIDIA("generative-nvidia"),
     OLLAMA("generative-ollama"),
@@ -185,13 +185,13 @@ public static Generative friendliai(Function<FriendliaiGenerative.Builder, Objec
     return FriendliaiGenerative.of(fn);
   }
 
-  /** Configure a default {@code generative-palm} module. */
+  /** Configure a default {@code generative-google} module. */
   public static Generative googleVertex(String projectId) {
     return GoogleGenerative.vertex(projectId);
   }
 
   /**
-   * Configure a {@code generative-palm} module.
+   * Configure a {@code generative-google} module.
    *
    * @param projectId Project ID.
    * @param fn        Lambda expression for optional parameters.
@@ -201,13 +201,13 @@ public static Generative googleVertex(String projectId,
     return GoogleGenerative.vertex(projectId, fn);
   }
 
-  /** Configure a default {@code generative-palm} module. */
+  /** Configure a default {@code generative-google} module. */
   public static Generative googleAiStudio() {
     return GoogleGenerative.aiStudio();
   }
 
   /**
-   * Configure a {@code generative-palm} module.
+   * Configure a {@code generative-google} module.
    *
    * @param fn Lambda expression for optional parameters.
    */
@@ -399,7 +399,7 @@ default FriendliaiGenerative asFriendliai() {
     return _as(Generative.Kind.FRIENDLIAI);
   }
 
-  /** Is this a {@code generative-palm} provider? */
+  /** Is this a {@code generative-google} provider? */
   default boolean isGoogle() {
     return _is(Generative.Kind.GOOGLE);
   }
@@ -408,7 +408,7 @@ default boolean isGoogle() {
    * Get as {@link GoogleGenerative} instance.
    *
    * @throws IllegalStateException if the current kind is not
-   *                               {@code generative-palm}.
+   *                               {@code generative-google}.
    */
   default GoogleGenerative asGoogle() {
     return _as(Generative.Kind.GOOGLE);

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

@@ -100,7 +100,7 @@ public static GenerativeProvider friendliai(
   }
 
   /**
-   * Configure {@code generative-palm} as a dynamic provider.
+   * Configure {@code generative-google} as a dynamic provider.
    *
    * @param fn Lambda expression for optional parameters.
    */
@@ -110,7 +110,7 @@ public static GenerativeProvider googleAiStudio(
   }
 
   /**
-   * Configure {@code generative-palm} as a dynamic provider.
+   * Configure {@code generative-google} as a dynamic provider.
    *
    * @param projectId Google project ID.
    * @param fn        Lambda expression for optional parameters.

src/test/java/io/weaviate/client6/v1/internal/json/JSONTest.java

@@ -941,6 +941,7 @@ public static Object[][] testCases() {
         {
             Generative.class,
             Generative.anthropic(cfg -> cfg
+                .baseUrl("https://example.com")
                 .topK(1)
                 .maxTokens(2)
                 .temperature(3f)
@@ -949,6 +950,7 @@ public static Object[][] testCases() {
             """
                 {
                   "generative-anthropic": {
+                    "baseURL": "https://example.com",
                     "topK": 1,
                     "maxTokens": 2,
                     "temperature": 3.0,
@@ -964,13 +966,23 @@ public static Object[][] testCases() {
                 "aws-region",
                 "example-model",
                 cfg -> cfg
-                    .model("example-model")),
+                    .model("example-model"),
+                    .temperature(0.7f)
+                    .maxTokenCount(100)
+                    .topK(50)
+                    .topP(0.9f)
+                    .stopSequences("STOP", "END")),
             """
                 {
                   "generative-aws": {
                     "model": "example-model",
                     "region": "aws-region",
-                    "service": "bedrock"
+                    "service": "bedrock",
+                    "temperature": 0.7,
+                    "maxTokenCount": 100,
+                    "topK": 50,
+                    "topP": 0.9,
+                    "stopSequences": ["STOP", "END"]
                   }
                 }
                   """,
@@ -981,13 +993,21 @@ public static Object[][] testCases() {
                 "aws-region",
                 "https://example.com",
                 cfg -> cfg
-                    .endpoint("https://example.com")),
+                    .endpoint("https://example.com")
+                    .targetModel("custom-model")
+                    .targetVariant("variant-1")
+                    .maxTokensToSample(200)
+                    .stopSequences("STOP")),
             """
                 {
                   "generative-aws": {
                     "endpoint": "https://example.com",
                     "region": "aws-region",
-                    "service": "sagemaker"
+                    "service": "sagemaker",
+                    "targetModel": "custom-model",
+                    "targetVariant": "variant-1",
+                    "maxTokensToSample": 200,
+                    "stopSequences": ["STOP"]
                   }
                 }
                   """,
@@ -1077,13 +1097,15 @@ public static Object[][] testCases() {
                 .baseUrl("https://example.com")
                 .maxTokens(2)
                 .temperature(3f)
+                .topP(0.95f)
                 .model("example-model")),
             """
                 {
                   "generative-nvidia": {
                     "baseURL": "https://example.com",
                     "maxTokens": 2,
                     "temperature": 3.0,
+                    "topP": 0.95,
                     "model": "example-model"
                   }
                 }
@@ -1099,17 +1121,23 @@ public static Object[][] testCases() {
                     .temperature(3f)
                     .topK(4)
                     .topP(5f)
-                    .modelId("example-model")),
+                    .modelId("example-model")
+                    .endpointId("endpoint-123")
+                    .region("us-central1")
+                    .model("gemini-pro")),
             """
                 {
-                  "generative-palm": {
+                  "generative-google": {
                     "apiEndpoint": "https://example.com",
                     "maxOutputTokens": 2,
                     "temperature": 3.0,
                     "topK": 4,
                     "topP": 5,
                     "projectId": "google-project",
-                    "modelId": "example-model"
+                    "modelId": "example-model",
+                    "endpointId": "endpoint-123",
+                    "region": "us-central1",
+                    "model": "gemini-pro"
                   }
                 }
                   """,
@@ -1134,13 +1162,15 @@ public static Object[][] testCases() {
                 .baseUrl("https://example.com")
                 .maxTokens(2)
                 .temperature(3f)
+                .topP(0.9f)
                 .model("example-model")),
             """
                 {
                   "generative-xai": {
                     "baseURL": "https://example.com",
                     "maxTokens": 2,
                     "temperature": 3.0,
+                    "topP": 0.9,
                     "model": "example-model"
                   }
                 }