refactor: provide separate builders for VertexAI / AiStudio generative modules

Author: bevzzz

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

@@ -186,8 +186,8 @@ public static Generative friendliai(Function<FriendliaiGenerative.Builder, Objec
   }
 
   /** Configure a default {@code generative-palm} module. */
-  public static Generative google(String projectId) {
-    return GoogleGenerative.of(projectId);
+  public static Generative googleVertex(String projectId) {
+    return GoogleGenerative.vertex(projectId);
   }
 
   /**
@@ -196,9 +196,24 @@ public static Generative google(String projectId) {
    * @param projectId Project ID.
    * @param fn        Lambda expression for optional parameters.
    */
-  public static Generative google(String projectId,
-      Function<GoogleGenerative.Builder, ObjectBuilder<GoogleGenerative>> fn) {
-    return GoogleGenerative.of(projectId, fn);
+  public static Generative googleVertex(String projectId,
+      Function<GoogleGenerative.VertexBuilder, ObjectBuilder<GoogleGenerative>> fn) {
+    return GoogleGenerative.vertex(projectId, fn);
+  }
+
+  /** Configure a default {@code generative-palm} module. */
+  public static Generative googleAiStudio() {
+    return GoogleGenerative.aiStudio();
+  }
+
+  /**
+   * Configure a {@code generative-palm} module.
+   *
+   * @param fn Lambda expression for optional parameters.
+   */
+  public static Generative googleAiStudio(
+      Function<GoogleGenerative.AiStudioBuilder, ObjectBuilder<GoogleGenerative>> fn) {
+    return GoogleGenerative.aiStudio(fn);
   }
 
   /** Configure a default {@code generative-mistral} module. */

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

@@ -104,9 +104,21 @@ public static DynamicProvider friendliai(
    *
    * @param fn Lambda expression for optional parameters.
    */
-  public static DynamicProvider google(
-      Function<GoogleGenerative.Provider.Builder, ObjectBuilder<GoogleGenerative.Provider>> fn) {
-    return GoogleGenerative.Provider.of(fn);
+  public static DynamicProvider googleAiStudio(
+      Function<GoogleGenerative.Provider.AiStudioBuilder, ObjectBuilder<GoogleGenerative.Provider>> fn) {
+    return GoogleGenerative.Provider.aiStudio(fn);
+  }
+
+  /**
+   * Configure {@code generative-palm} as a dynamic provider.
+   *
+   * @param projectId Google project ID.
+   * @param fn        Lambda expression for optional parameters.
+   */
+  public static DynamicProvider googleVertex(
+      String projectId,
+      Function<GoogleGenerative.Provider.VertexBuilder, ObjectBuilder<GoogleGenerative.Provider>> fn) {
+    return GoogleGenerative.Provider.vertex(projectId, fn);
   }
 
   /**

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

@@ -9,6 +9,7 @@
 
 import io.weaviate.client6.v1.api.collections.Generative;
 import io.weaviate.client6.v1.api.collections.generate.DynamicProvider;
+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;
 import io.weaviate.client6.v1.internal.grpc.protocol.WeaviateProtoGenerative;
@@ -32,12 +33,20 @@ public Object _self() {
     return this;
   }
 
-  public static GoogleGenerative of(String projectId) {
-    return of(projectId, ObjectBuilder.identity());
+  public static GoogleGenerative aiStudio() {
+    return aiStudio(ObjectBuilder.identity());
   }
 
-  public static GoogleGenerative of(String projectId, Function<Builder, ObjectBuilder<GoogleGenerative>> fn) {
-    return fn.apply(new Builder(projectId)).build();
+  public static GoogleGenerative aiStudio(Function<AiStudioBuilder, ObjectBuilder<GoogleGenerative>> fn) {
+    return fn.apply(new AiStudioBuilder()).build();
+  }
+
+  public static GoogleGenerative vertex(String projectId) {
+    return vertex(projectId, ObjectBuilder.identity());
+  }
+
+  public static GoogleGenerative vertex(String projectId, Function<VertexBuilder, ObjectBuilder<GoogleGenerative>> fn) {
+    return fn.apply(new VertexBuilder(projectId)).build();
   }
 
   public GoogleGenerative(Builder builder) {
@@ -51,22 +60,23 @@ public GoogleGenerative(Builder builder) {
         builder.temperature);
   }
 
-  public static class Builder implements ObjectBuilder<GoogleGenerative> {
+  public abstract static class Builder implements ObjectBuilder<GoogleGenerative> {
+    private String baseUrl;
     private final String projectId;
 
-    private String baseUrl;
     private String model;
     private Integer maxTokens;
     private Integer topK;
     private Float topP;
     private Float temperature;
 
-    public Builder(String projectId) {
+    public Builder(String baseUrl, String projectId) {
       this.projectId = projectId;
+      this.baseUrl = baseUrl;
     }
 
     /** Base URL of the generative provider. */
-    public Builder baseUrl(String baseUrl) {
+    protected Builder baseUrl(String baseUrl) {
       this.baseUrl = baseUrl;
       return this;
     }
@@ -110,6 +120,24 @@ public GoogleGenerative build() {
     }
   }
 
+  public static class AiStudioBuilder extends Builder {
+    public AiStudioBuilder() {
+      super(Text2VecGoogleVectorizer.AiStudioBuilder.BASE_URL, null);
+    }
+  }
+
+  public static class VertexBuilder extends Builder {
+    public VertexBuilder(String projectId) {
+      super(Text2VecGoogleVectorizer.VertexBuilder.DEFAULT_BASE_URL, projectId);
+    }
+
+    /** Base URL of the generative provider. */
+    public VertexBuilder baseUrl(String baseUrl) {
+      super.baseUrl(baseUrl);
+      return this;
+    }
+  }
+
   public static record Metadata(TokenMetadata tokens, Usage usage) implements ProviderMetadata {
 
     public static record TokenCount(Long totalBillableCharacters, Long totalTokens) {
@@ -138,9 +166,15 @@ public static record Provider(
       List<String> images,
       List<String> imageProperties) implements DynamicProvider {
 
-    public static Provider of(
-        Function<GoogleGenerative.Provider.Builder, ObjectBuilder<GoogleGenerative.Provider>> fn) {
-      return fn.apply(new Builder()).build();
+    public static Provider vertex(
+        String projectId,
+        Function<GoogleGenerative.Provider.VertexBuilder, ObjectBuilder<GoogleGenerative.Provider>> fn) {
+      return fn.apply(new VertexBuilder(projectId)).build();
+    }
+
+    public static Provider aiStudio(
+        Function<GoogleGenerative.Provider.AiStudioBuilder, ObjectBuilder<GoogleGenerative.Provider>> fn) {
+      return fn.apply(new AiStudioBuilder()).build();
     }
 
     @Override
@@ -205,24 +239,30 @@ public Provider(Builder builder) {
           builder.imageProperties);
     }
 
-    public static class Builder implements ObjectBuilder<GoogleGenerative.Provider> {
+    public abstract static class Builder implements ObjectBuilder<GoogleGenerative.Provider> {
+      private final String projectId;
       private String baseUrl;
+
       private Integer topK;
       private Float topP;
       private String model;
       private Integer maxTokens;
       private Float temperature;
       private Float frequencyPenalty;
       private Float presencePenalty;
-      private String projectId;
       private String endpointId;
       private String region;
       private final List<String> stopSequences = new ArrayList<>();
       private final List<String> images = new ArrayList<>();
       private final List<String> imageProperties = new ArrayList<>();
 
+      public Builder(String baseUrl, String projectId) {
+        this.projectId = projectId;
+        this.baseUrl = baseUrl;
+      }
+
       /** Base URL of the generative provider. */
-      public Builder baseUrl(String baseUrl) {
+      protected Builder baseUrl(String baseUrl) {
         this.baseUrl = baseUrl;
         return this;
       }
@@ -276,11 +316,6 @@ public Builder stopSequences(List<String> stopSequences) {
         return this;
       }
 
-      public Builder projectId(String projectId) {
-        this.projectId = projectId;
-        return this;
-      }
-
       public Builder endpointId(String endpointId) {
         this.endpointId = endpointId;
         return this;
@@ -323,5 +358,23 @@ public GoogleGenerative.Provider build() {
         return new GoogleGenerative.Provider(this);
       }
     }
+
+    public static class AiStudioBuilder extends Builder {
+      public AiStudioBuilder() {
+        super(Text2VecGoogleVectorizer.AiStudioBuilder.BASE_URL, null);
+      }
+    }
+
+    public static class VertexBuilder extends Builder {
+      public VertexBuilder(String projectId) {
+        super(Text2VecGoogleVectorizer.VertexBuilder.DEFAULT_BASE_URL, projectId);
+      }
+
+      /** Base URL of the generative provider. */
+      public VertexBuilder baseUrl(String baseUrl) {
+        super.baseUrl(baseUrl);
+        return this;
+      }
+    }
   }
 }

src/main/java/io/weaviate/client6/v1/api/collections/vectorizers/Text2VecGoogleVectorizer.java

@@ -203,14 +203,18 @@ public Text2VecGoogleVectorizer build() {
   }
 
   public static class AiStudioBuilder extends Builder {
+    public static final String BASE_URL = "generativelanguage.googleapis.com";
+
     public AiStudioBuilder() {
-      super("generativelanguage.googleapis.com", null);
+      super(BASE_URL, null);
     }
   }
 
   public static class VertexBuilder extends Builder {
+    public static final String DEFAULT_BASE_URL = "us-central1-aiplatform.googleapis.com";
+
     public VertexBuilder(String projectId) {
-      super("us-central1-aiplatform.googleapis.com", projectId);
+      super(DEFAULT_BASE_URL, projectId);
     }
 
     public VertexBuilder baseUrl(String baseUrl) {