updating to version 1.1.0-SNAPSHOT

Signed-off-by: Marzouki-Sami <[email protected]>

Author: Marzouki-Sami

models/spring-ai-vertex-ai-imagen/pom.xml

@@ -21,8 +21,8 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.ai</groupId>
-		<artifactId>spring-ai</artifactId>
-		<version>1.0.0-M5</version>
+		<artifactId>spring-ai-parent</artifactId>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
@@ -67,9 +67,10 @@
 		</dependency>
 
 		<!-- production dependencies -->
+
 		<dependency>
 			<groupId>org.springframework.ai</groupId>
-			<artifactId>spring-ai-core</artifactId>
+			<artifactId>spring-ai-model</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 
@@ -80,10 +81,6 @@
 		</dependency>
 
 		<!-- Spring Framework -->
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-context-support</artifactId>
-		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

models/spring-ai-vertex-ai-imagen/src/main/java/org/springframework/ai/vertexai/imagen/VertexAiImagenImageModel.java

@@ -148,13 +148,13 @@ private static ImageParametersBuilder getImageParametersBuilder(VertexAiImagenIm
 
 	@Override
 	public ImageResponse call(ImagePrompt imagePrompt) {
-		VertexAiImagenImageOptions finalOptions = mergedOptions(imagePrompt);
+		ImagePrompt finalPrompt = mergedPrompt(imagePrompt);
+		VertexAiImagenImageOptions finalOptions = (VertexAiImagenImageOptions) finalPrompt.getOptions();
 
 		var observationContext = ImageModelObservationContext.builder()
-				.imagePrompt(imagePrompt)
-				.provider(AiProvider.VERTEX_AI.value())
-				.requestOptions(finalOptions)
-				.build();
+			.imagePrompt(finalPrompt)
+			.provider(AiProvider.VERTEX_AI.value())
+			.build();
 
 		return ImageModelObservationDocumentation.IMAGE_MODEL_OPERATION
 				.observation(this.observationConvention, DEFAULT_OBSERVATION_CONVENTION, () -> observationContext,
@@ -164,7 +164,7 @@ public ImageResponse call(ImagePrompt imagePrompt) {
 
 					EndpointName endpointName = this.connectionDetails.getEndpointName(finalOptions.getModel());
 
-					PredictRequest.Builder predictRequestBuilder = getPredictRequestBuilder(imagePrompt, endpointName,
+					PredictRequest.Builder predictRequestBuilder = getPredictRequestBuilder(finalPrompt, endpointName,
 							finalOptions);
 
 					PredictResponse imageResponse = this.retryTemplate
@@ -175,7 +175,7 @@ public ImageResponse call(ImagePrompt imagePrompt) {
 						Value bytesBase64Encoded = prediction.getStructValue().getFieldsOrThrow("bytesBase64Encoded");
 						Value mimeType = prediction.getStructValue().getFieldsOrThrow("mimeType");
 						ImageGenerationMetadata metadata = new VertexAiImagenImageGenerationMetadata(
-								imagePrompt.getInstructions().get(0).getText(), finalOptions.getModel(),
+								finalPrompt.getInstructions().get(0).getText(), finalOptions.getModel(),
 								mimeType.getStringValue());
 						Image image = new Image(null, bytesBase64Encoded.getStringValue());
 						imageGenerationList.add(new ImageGeneration(image, metadata));
@@ -189,17 +189,16 @@ public ImageResponse call(ImagePrompt imagePrompt) {
 				});
 	}
 
-	private VertexAiImagenImageOptions mergedOptions(ImagePrompt imagePrompt) {
+	private ImagePrompt mergedPrompt(ImagePrompt originalPrompt) {
+		VertexAiImagenImageOptions finalOptions = this.defaultOptions;
 
-		VertexAiImagenImageOptions mergedOptions = this.defaultOptions;
-
-		if (imagePrompt.getOptions() != null) {
+		if (originalPrompt.getOptions() != null) {
 			var defaultOptionsCopy = VertexAiImagenImageOptions.builder().from(this.defaultOptions).build();
-			mergedOptions = ModelOptionsUtils.merge(imagePrompt.getOptions(), defaultOptionsCopy,
+			finalOptions = ModelOptionsUtils.merge(originalPrompt.getOptions(), defaultOptionsCopy,
 					VertexAiImagenImageOptions.class);
 		}
 
-		return mergedOptions;
+		return new ImagePrompt(originalPrompt.getInstructions(), finalOptions);
 	}
 
 	protected PredictRequest.Builder getPredictRequestBuilder(ImagePrompt imagePrompt, EndpointName endpointName,

pom.xml

@@ -175,6 +175,7 @@
 		<module>models/spring-ai-transformers</module>
 		<module>models/spring-ai-vertex-ai-embedding</module>
 		<module>models/spring-ai-vertex-ai-gemini</module>
+		<module>models/spring-ai-vertex-ai-imagen</module>
 		<module>models/spring-ai-zhipuai</module>
 		<module>models/spring-ai-deepseek</module>
 
@@ -194,6 +195,7 @@
 		<module>spring-ai-spring-boot-starters/spring-ai-starter-model-transformers</module>
 		<module>spring-ai-spring-boot-starters/spring-ai-starter-model-vertex-ai-embedding</module>
 		<module>spring-ai-spring-boot-starters/spring-ai-starter-model-vertex-ai-gemini</module>
+		<module>spring-ai-spring-boot-starters/spring-ai-starter-model-vertex-ai-imagen</module>
 		<module>spring-ai-spring-boot-starters/spring-ai-starter-model-zhipuai</module>
 		<module>spring-ai-spring-boot-starters/spring-ai-starter-model-deepseek</module>
 
@@ -727,6 +729,7 @@
 								<exclude>org.springframework.ai.transformers/**/*IT.java</exclude>
 								<exclude>org.springframework.ai.vertexai.embedding/**/*IT.java</exclude>
 								<exclude>org.springframework.ai.vertexai.gemini/**/*IT.java</exclude>
+								<exclude>org.springframework.ai.vertexai.imagen/**/*IT.java</exclude>
 								<exclude>org.springframework.ai.zhipuai/**/*IT.java</exclude>
 
 								<!-- Vector Stores -->

spring-ai-spring-boot-starters/spring-ai-starter-vertex-ai-imagen/pom.xml renamed to spring-ai-spring-boot-starters/spring-ai-starter-model-vertex-ai-imagen/pom.xml

@@ -21,8 +21,8 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.ai</groupId>
-		<artifactId>spring-ai</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<artifactId>spring-ai-parent</artifactId>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>