test: add JSON tests for Generative.CustomTypeAdapterFactory

Author: bevzzz

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

@@ -6,11 +6,11 @@
 import java.util.function.Function;
 
 import com.google.gson.Gson;
+import com.google.gson.JsonParser;
 import com.google.gson.TypeAdapter;
 import com.google.gson.TypeAdapterFactory;
 import com.google.gson.reflect.TypeToken;
 import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
 
 import io.weaviate.client6.v1.api.collections.generative.AnthropicGenerative;
@@ -161,7 +161,7 @@ public static Generative frienliai() {
    *
    * @param fn Lambda expression for optional parameters.
    */
-  public static Generative frienliai(Function<FriendliaiGenerative.Builder, ObjectBuilder<FriendliaiGenerative>> fn) {
+  public static Generative friendliai(Function<FriendliaiGenerative.Builder, ObjectBuilder<FriendliaiGenerative>> fn) {
     return FriendliaiGenerative.of(fn);
   }
 
@@ -508,35 +508,39 @@ public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> type) {
         init(gson);
       }
 
-      final TypeAdapter<Generative> writeAdapter = (TypeAdapter<Generative>) gson.getDelegateAdapter(this,
+      final TypeAdapter<T> writeAdapter = (TypeAdapter<T>) gson.getDelegateAdapter(this,
           TypeToken.get(rawType));
       return (TypeAdapter<T>) new TypeAdapter<Generative>() {
 
         @Override
         public void write(JsonWriter out, Generative value) throws IOException {
           out.beginObject();
           out.name(value._kind().jsonValue());
-          writeAdapter.write(out, value._self());
+          writeAdapter.write(out, (T) value._self());
           out.endObject();
         }
 
         @Override
         public Generative read(JsonReader in) throws IOException {
-          in.beginObject();
-          var moduleName = in.nextName();
-          try {
-            var kind = Generative.Kind.valueOfJson(moduleName);
-            var adapter = readAdapters.get(kind);
-            assert adapter != null : "no generative adapter for kind " + kind;
-            return adapter.read(in);
-          } catch (IllegalArgumentException e) {
-            return null;
-          } finally {
-            if (in.peek() == JsonToken.BEGIN_OBJECT) {
-              in.beginObject();
+          var jsonObject = JsonParser.parseReader(in).getAsJsonObject();
+          var provider = jsonObject.keySet().iterator().next();
+
+          var generative = jsonObject.get(provider).getAsJsonObject();
+          Generative.Kind kind;
+          if (provider.equals(Generative.Kind.OPENAI.jsonValue())) {
+            kind = generative.has("deploymentId") && generative.has("resourceName")
+                ? Generative.Kind.AZURE_OPENAI
+                : Generative.Kind.OPENAI;
+          } else {
+            try {
+              kind = Generative.Kind.valueOfJson(provider);
+            } catch (IllegalArgumentException e) {
+              return null;
             }
-            in.endObject();
           }
+          var adapter = readAdapters.get(kind);
+          assert adapter != null : "no generative adapter for kind " + kind;
+          return adapter.fromJsonTree(generative);
         }
       }.nullSafe();
     }

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

@@ -9,7 +9,6 @@
 
 import io.weaviate.client6.v1.api.collections.Generative;
 import io.weaviate.client6.v1.internal.ObjectBuilder;
-import io.weaviate.client6.v1.internal.TaggedUnion;
 
 public record AnthropicGenerative(
     @SerializedName("model") String model,

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

@@ -10,7 +10,7 @@
 public record AwsGenerative(
     @SerializedName("region") String region,
     @SerializedName("service") String service,
-    @SerializedName("endpoint") String baseURL,
+    @SerializedName("endpoint") String baseUrl,
     @SerializedName("model") String model) implements Generative {
 
   @Override

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

@@ -12,7 +12,7 @@
 
 public record CohereGenerative(
     @SerializedName("baseURL") String baseUrl,
-    @SerializedName("kProperty") Integer k,
+    @SerializedName("kProperty") Integer topK,
     @SerializedName("model") String model,
     @SerializedName("maxTokensProperty") Integer maxTokens,
     @SerializedName("temperatureProperty") Float temperature,
@@ -40,7 +40,7 @@ public static CohereGenerative of(Function<Builder, ObjectBuilder<CohereGenerati
   public CohereGenerative(Builder builder) {
     this(
         builder.baseUrl,
-        builder.k,
+        builder.topK,
         builder.model,
         builder.maxTokens,
         builder.temperature,
@@ -50,7 +50,7 @@ public CohereGenerative(Builder builder) {
 
   public static class Builder implements ObjectBuilder<CohereGenerative> {
     private String baseUrl;
-    private Integer k;
+    private Integer topK;
     private String model;
     private Integer maxTokens;
     private Float temperature;
@@ -63,8 +63,8 @@ public Builder baseUrl(String baseUrl) {
       return this;
     }
 
-    public Builder k(int k) {
-      this.k = k;
+    public Builder topK(int topK) {
+      this.topK = topK;
       return this;
     }
 

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

@@ -34,23 +34,23 @@ public static DatabricksGenerative of(String baseURL, Function<Builder, ObjectBu
 
   public DatabricksGenerative(Builder builder) {
     this(
-        builder.baseURL,
+        builder.baseUrl,
         builder.maxTokens,
         builder.topK,
         builder.topP,
         builder.temperature);
   }
 
   public static class Builder implements ObjectBuilder<DatabricksGenerative> {
-    private final String baseURL;
+    private final String baseUrl;
 
     private Integer maxTokens;
     private Integer topK;
     private Float topP;
     private Float temperature;
 
-    public Builder(String baseURL) {
-      this.baseURL = baseURL;
+    public Builder(String baseUrl) {
+      this.baseUrl = baseUrl;
     }
 
     /** Limit the number of tokens to generate in the response. */

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

@@ -1,7 +1,6 @@
 package io.weaviate.client6.v1.api.collections.generative;
 
 import io.weaviate.client6.v1.api.collections.Generative;
-import io.weaviate.client6.v1.api.collections.generate.ProviderMetadata;
 
 public record DummyGenerative() implements Generative {
   @Override

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

@@ -8,7 +8,7 @@
 import io.weaviate.client6.v1.internal.ObjectBuilder;
 
 public record OllamaGenerative(
-    @SerializedName("apiEndpoint") String apiEndpoint,
+    @SerializedName("apiEndpoint") String baseUrl,
     @SerializedName("model") String model) implements Generative {
 
   @Override
@@ -31,17 +31,17 @@ public static OllamaGenerative of(Function<Builder, ObjectBuilder<OllamaGenerati
 
   public OllamaGenerative(Builder builder) {
     this(
-        builder.apiEndpoint,
+        builder.baseUrl,
         builder.model);
   }
 
   public static class Builder implements ObjectBuilder<OllamaGenerative> {
-    private String apiEndpoint;
+    private String baseUrl;
     private String model;
 
-    /** Destination endpoint of the generative provider. */
-    public Builder apiEndpoint(String apiEndpoint) {
-      this.apiEndpoint = apiEndpoint;
+    /** Base URL of the generative model. */
+    public Builder baseUrl(String baseUrl) {
+      this.baseUrl = baseUrl;
       return this;
     }