Refactored packages to google.genai

Signed-off-by: ddobrin <[email protected]>

Author: ddobrin

models/spring-ai-google-genai/src/main/java/org/springframework/ai/vertexai/gemini/VertexAiGeminiChatModel.java renamed to models/spring-ai-google-genai/src/main/java/org/springframework/ai/google/genai/GoogleGenAiChatModel.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ai.vertexai.gemini;
+package org.springframework.ai.google.genai;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -25,7 +25,6 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
-import com.fasterxml.jackson.databind.JsonNode;
 import com.google.genai.Client;
 import com.google.genai.ResponseStream;
 import com.google.genai.types.Candidate;
@@ -46,6 +45,7 @@
 import io.micrometer.observation.contextpropagation.ObservationThreadLocalAccessor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.ai.google.genai.schema.GoogleGenAiToolCallingManager;
 import reactor.core.publisher.Flux;
 import reactor.core.scheduler.Schedulers;
 
@@ -82,9 +82,8 @@
 import org.springframework.ai.retry.RetryUtils;
 import org.springframework.ai.support.UsageCalculator;
 import org.springframework.ai.tool.definition.ToolDefinition;
-import org.springframework.ai.vertexai.gemini.common.VertexAiGeminiConstants;
-import org.springframework.ai.vertexai.gemini.common.VertexAiGeminiSafetySetting;
-import org.springframework.ai.vertexai.gemini.schema.VertexToolCallingManager;
+import org.springframework.ai.google.genai.common.GoogleGenAiConstants;
+import org.springframework.ai.google.genai.common.GoogleGenAiSafetySetting;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.lang.NonNull;
 import org.springframework.retry.support.RetryTemplate;
@@ -93,8 +92,8 @@
 import org.springframework.util.StringUtils;
 
 /**
- * Vertex AI Gemini Chat Model implementation that provides access to Google's Gemini
- * language models.
+ * Google GenAI Chat Model implementation that provides access to Google's Gemini language
+ * models.
  *
  * <p>
  * Key features include:
@@ -103,7 +102,7 @@
  * Gemini 1.5/2.0 Flash variants</li>
  * <li>Tool/Function calling capabilities through {@link ToolCallingManager}</li>
  * <li>Streaming support via {@link #stream(Prompt)} method</li>
- * <li>Configurable safety settings through {@link VertexAiGeminiSafetySetting}</li>
+ * <li>Configurable safety settings through {@link GoogleGenAiSafetySetting}</li>
  * <li>Support for system messages and multi-modal content (text and images)</li>
  * <li>Built-in retry mechanism and observability through Micrometer</li>
  * <li>Google Search Retrieval integration</li>
@@ -112,13 +111,13 @@
  * <p>
  * The model can be configured with various options including temperature, top-k, top-p
  * sampling, maximum output tokens, and candidate count through
- * {@link VertexAiGeminiChatOptions}.
+ * {@link GoogleGenAiChatOptions}.
  *
  * <p>
  * Use the {@link Builder} to create instances with custom configurations:
  *
  * <pre>{@code
- * VertexAiGeminiChatModel model = VertexAiGeminiChatModel.builder()
+ * GoogleGenAiChatModel model = GoogleGenAiChatModel.builder()
  * 		.genAiClient(genAiClient)
  * 		.defaultOptions(options)
  * 		.toolCallingManager(toolManager)
@@ -135,11 +134,11 @@
  * @author Alexandros Pappas
  * @author Ilayaperumal Gopinathan
  * @since 0.8.1
- * @see VertexAiGeminiChatOptions
+ * @see GoogleGenAiChatOptions
  * @see ToolCallingManager
  * @see ChatModel
  */
-public class VertexAiGeminiChatModel implements ChatModel, DisposableBean {
+public class GoogleGenAiChatModel implements ChatModel, DisposableBean {
 
 	private static final ChatModelObservationConvention DEFAULT_OBSERVATION_CONVENTION = new DefaultChatModelObservationConvention();
 
@@ -149,7 +148,7 @@ public class VertexAiGeminiChatModel implements ChatModel, DisposableBean {
 
 	private final Client genAiClient;
 
-	private final VertexAiGeminiChatOptions defaultOptions;
+	private final GoogleGenAiChatOptions defaultOptions;
 
 	/**
 	 * The retry template used to retry the API calls.
@@ -180,40 +179,40 @@ public class VertexAiGeminiChatModel implements ChatModel, DisposableBean {
 	private ChatModelObservationConvention observationConvention = DEFAULT_OBSERVATION_CONVENTION;
 
 	/**
-	 * Creates a new instance of VertexAiGeminiChatModel.
+	 * Creates a new instance of GoogleGenAiChatModel.
 	 * @param genAiClient the GenAI Client instance to use
 	 * @param defaultOptions the default options to use
 	 * @param toolCallingManager the tool calling manager to use. It is wrapped in a
-	 * {@link VertexToolCallingManager} to ensure compatibility with Vertex AI's OpenAPI
-	 * schema format.
+	 * {@link GoogleGenAiToolCallingManager} to ensure compatibility with Vertex AI's
+	 * OpenAPI schema format.
 	 * @param retryTemplate the retry template to use
 	 * @param observationRegistry the observation registry to use
 	 */
-	public VertexAiGeminiChatModel(Client genAiClient, VertexAiGeminiChatOptions defaultOptions,
+	public GoogleGenAiChatModel(Client genAiClient, GoogleGenAiChatOptions defaultOptions,
 			ToolCallingManager toolCallingManager, RetryTemplate retryTemplate,
 			ObservationRegistry observationRegistry) {
 		this(genAiClient, defaultOptions, toolCallingManager, retryTemplate, observationRegistry,
 				new DefaultToolExecutionEligibilityPredicate());
 	}
 
 	/**
-	 * Creates a new instance of VertexAiGeminiChatModel.
+	 * Creates a new instance of GoogleGenAiChatModel.
 	 * @param genAiClient the GenAI Client instance to use
 	 * @param defaultOptions the default options to use
 	 * @param toolCallingManager the tool calling manager to use. It is wrapped in a
-	 * {@link VertexToolCallingManager} to ensure compatibility with Vertex AI's OpenAPI
-	 * schema format.
+	 * {@link GoogleGenAiToolCallingManager} to ensure compatibility with Vertex AI's
+	 * OpenAPI schema format.
 	 * @param retryTemplate the retry template to use
 	 * @param observationRegistry the observation registry to use
 	 * @param toolExecutionEligibilityPredicate the tool execution eligibility predicate
 	 */
-	public VertexAiGeminiChatModel(Client genAiClient, VertexAiGeminiChatOptions defaultOptions,
+	public GoogleGenAiChatModel(Client genAiClient, GoogleGenAiChatOptions defaultOptions,
 			ToolCallingManager toolCallingManager, RetryTemplate retryTemplate, ObservationRegistry observationRegistry,
 			ToolExecutionEligibilityPredicate toolExecutionEligibilityPredicate) {
 
 		Assert.notNull(genAiClient, "GenAI Client must not be null");
-		Assert.notNull(defaultOptions, "VertexAiGeminiChatOptions must not be null");
-		Assert.notNull(defaultOptions.getModel(), "VertexAiGeminiChatOptions.modelName must not be null");
+		Assert.notNull(defaultOptions, "GoogleGenAiChatOptions must not be null");
+		Assert.notNull(defaultOptions.getModel(), "GoogleGenAiChatOptions.modelName must not be null");
 		Assert.notNull(retryTemplate, "RetryTemplate must not be null");
 		Assert.notNull(toolCallingManager, "ToolCallingManager must not be null");
 		Assert.notNull(toolExecutionEligibilityPredicate, "ToolExecutionEligibilityPredicate must not be null");
@@ -225,14 +224,14 @@ public VertexAiGeminiChatModel(Client genAiClient, VertexAiGeminiChatOptions def
 		this.observationRegistry = observationRegistry;
 		this.toolExecutionEligibilityPredicate = toolExecutionEligibilityPredicate;
 
-		// Wrap the provided tool calling manager in a VertexToolCallingManager to
+		// Wrap the provided tool calling manager in a GoogleGenAiToolCallingManager to
 		// ensure
 		// compatibility with Vertex AI's OpenAPI schema format.
-		if (toolCallingManager instanceof VertexToolCallingManager) {
+		if (toolCallingManager instanceof GoogleGenAiToolCallingManager) {
 			this.toolCallingManager = toolCallingManager;
 		}
 		else {
-			this.toolCallingManager = new VertexToolCallingManager(toolCallingManager);
+			this.toolCallingManager = new GoogleGenAiToolCallingManager(toolCallingManager);
 		}
 	}
 
@@ -393,7 +392,7 @@ private ChatResponse internalCall(Prompt prompt, ChatResponse previousChatRespon
 
 		ChatModelObservationContext observationContext = ChatModelObservationContext.builder()
 			.prompt(prompt)
-			.provider(VertexAiGeminiConstants.PROVIDER_NAME)
+			.provider(GoogleGenAiConstants.PROVIDER_NAME)
 			.build();
 
 		ChatResponse response = ChatModelObservationDocumentation.CHAT_MODEL_OPERATION
@@ -444,21 +443,21 @@ private ChatResponse internalCall(Prompt prompt, ChatResponse previousChatRespon
 
 	Prompt buildRequestPrompt(Prompt prompt) {
 		// Process runtime options
-		VertexAiGeminiChatOptions runtimeOptions = null;
+		GoogleGenAiChatOptions runtimeOptions = null;
 		if (prompt.getOptions() != null) {
 			if (prompt.getOptions() instanceof ToolCallingChatOptions toolCallingChatOptions) {
 				runtimeOptions = ModelOptionsUtils.copyToTarget(toolCallingChatOptions, ToolCallingChatOptions.class,
-						VertexAiGeminiChatOptions.class);
+						GoogleGenAiChatOptions.class);
 			}
 			else {
 				runtimeOptions = ModelOptionsUtils.copyToTarget(prompt.getOptions(), ChatOptions.class,
-						VertexAiGeminiChatOptions.class);
+						GoogleGenAiChatOptions.class);
 			}
 		}
 
 		// Define request options by merging runtime options and default options
-		VertexAiGeminiChatOptions requestOptions = ModelOptionsUtils.merge(runtimeOptions, this.defaultOptions,
-				VertexAiGeminiChatOptions.class);
+		GoogleGenAiChatOptions requestOptions = ModelOptionsUtils.merge(runtimeOptions, this.defaultOptions,
+				GoogleGenAiChatOptions.class);
 
 		// Merge @JsonIgnore-annotated options explicitly since they are ignored by
 		// Jackson, used by ModelOptionsUtils.
@@ -504,7 +503,7 @@ public Flux<ChatResponse> internalStream(Prompt prompt, ChatResponse previousCha
 
 			ChatModelObservationContext observationContext = ChatModelObservationContext.builder()
 				.prompt(prompt)
-				.provider(VertexAiGeminiConstants.PROVIDER_NAME)
+				.provider(GoogleGenAiConstants.PROVIDER_NAME)
 				.build();
 
 			Observation observation = ChatModelObservationDocumentation.CHAT_MODEL_OPERATION.observation(
@@ -636,7 +635,7 @@ private DefaultUsage getDefaultUsage(com.google.genai.types.GenerateContentRespo
 
 	GeminiRequest createGeminiRequest(Prompt prompt) {
 
-		VertexAiGeminiChatOptions requestOptions = (VertexAiGeminiChatOptions) prompt.getOptions();
+		GoogleGenAiChatOptions requestOptions = (GoogleGenAiChatOptions) prompt.getOptions();
 
 		// Build GenerateContentConfig
 		GenerateContentConfig.Builder configBuilder = GenerateContentConfig.builder();
@@ -692,7 +691,7 @@ GeminiRequest createGeminiRequest(Prompt prompt) {
 			tools.add(Tool.builder().functionDeclarations(functionDeclarations).build());
 		}
 
-		if (prompt.getOptions() instanceof VertexAiGeminiChatOptions options && options.getGoogleSearchRetrieval()) {
+		if (prompt.getOptions() instanceof GoogleGenAiChatOptions options && options.getGoogleSearchRetrieval()) {
 			var googleSearch = GoogleSearch.builder().build();
 			final var googleSearchRetrievalTool = Tool.builder().googleSearch(googleSearch).build();
 			tools.add(googleSearchRetrievalTool);
@@ -721,7 +720,7 @@ GeminiRequest createGeminiRequest(Prompt prompt) {
 
 	// Helper methods for mapping safety settings enums
 	private static com.google.genai.types.HarmCategory mapToGenAiHarmCategory(
-			VertexAiGeminiSafetySetting.HarmCategory category) {
+			GoogleGenAiSafetySetting.HarmCategory category) {
 		switch (category) {
 			case HARM_CATEGORY_UNSPECIFIED:
 				return new com.google.genai.types.HarmCategory(
@@ -744,7 +743,7 @@ private static com.google.genai.types.HarmCategory mapToGenAiHarmCategory(
 	}
 
 	private static com.google.genai.types.HarmBlockThreshold mapToGenAiHarmBlockThreshold(
-			VertexAiGeminiSafetySetting.HarmBlockThreshold threshold) {
+			GoogleGenAiSafetySetting.HarmBlockThreshold threshold) {
 		switch (threshold) {
 			case HARM_BLOCK_THRESHOLD_UNSPECIFIED:
 				return new com.google.genai.types.HarmBlockThreshold(
@@ -781,7 +780,7 @@ private List<Content> toGeminiContent(List<Message> instructions) {
 		return contents;
 	}
 
-	private List<SafetySetting> toGeminiSafetySettings(List<VertexAiGeminiSafetySetting> safetySettings) {
+	private List<SafetySetting> toGeminiSafetySettings(List<GoogleGenAiSafetySetting> safetySettings) {
 		return safetySettings.stream()
 			.map(safetySetting -> SafetySetting.builder()
 				.category(mapToGenAiHarmCategory(safetySetting.getCategory()))
@@ -808,7 +807,7 @@ GenerateContentResponse getContentResponse(GeminiRequest request) {
 
 	@Override
 	public ChatOptions getDefaultOptions() {
-		return VertexAiGeminiChatOptions.fromOptions(this.defaultOptions);
+		return GoogleGenAiChatOptions.fromOptions(this.defaultOptions);
 	}
 
 	@Override
@@ -833,10 +832,10 @@ public static final class Builder {
 
 		private Client genAiClient;
 
-		private VertexAiGeminiChatOptions defaultOptions = VertexAiGeminiChatOptions.builder()
+		private GoogleGenAiChatOptions defaultOptions = GoogleGenAiChatOptions.builder()
 			.temperature(0.7)
 			.topP(1.0)
-			.model(VertexAiGeminiChatModel.ChatModel.GEMINI_2_0_FLASH)
+			.model(GoogleGenAiChatModel.ChatModel.GEMINI_2_0_FLASH)
 			.build();
 
 		private ToolCallingManager toolCallingManager;
@@ -855,7 +854,7 @@ public Builder genAiClient(Client genAiClient) {
 			return this;
 		}
 
-		public Builder defaultOptions(VertexAiGeminiChatOptions defaultOptions) {
+		public Builder defaultOptions(GoogleGenAiChatOptions defaultOptions) {
 			this.defaultOptions = defaultOptions;
 			return this;
 		}
@@ -881,12 +880,12 @@ public Builder observationRegistry(ObservationRegistry observationRegistry) {
 			return this;
 		}
 
-		public VertexAiGeminiChatModel build() {
+		public GoogleGenAiChatModel build() {
 			if (this.toolCallingManager != null) {
-				return new VertexAiGeminiChatModel(this.genAiClient, this.defaultOptions, this.toolCallingManager,
+				return new GoogleGenAiChatModel(this.genAiClient, this.defaultOptions, this.toolCallingManager,
 						this.retryTemplate, this.observationRegistry, this.toolExecutionEligibilityPredicate);
 			}
-			return new VertexAiGeminiChatModel(this.genAiClient, this.defaultOptions, DEFAULT_TOOL_CALLING_MANAGER,
+			return new GoogleGenAiChatModel(this.genAiClient, this.defaultOptions, DEFAULT_TOOL_CALLING_MANAGER,
 					this.retryTemplate, this.observationRegistry, this.toolExecutionEligibilityPredicate);
 		}