Revert "Make ImageOptions non-null when constructing ImagePrompt"

This reverts commit 0c0787b.

Author: ilayaperumalg

models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/OpenAiRetryTests.java

@@ -34,6 +34,7 @@
 import org.springframework.ai.chat.prompt.Prompt;
 import org.springframework.ai.document.MetadataMode;
 import org.springframework.ai.image.ImageMessage;
+import org.springframework.ai.image.ImageOptionsBuilder;
 import org.springframework.ai.image.ImagePrompt;
 import org.springframework.ai.openai.OpenAiAudioTranscriptionModel;
 import org.springframework.ai.openai.OpenAiAudioTranscriptionOptions;
@@ -250,7 +251,8 @@ public void openAiImageTransientError() {
 			.willThrow(new TransientAiException("Transient Error 2"))
 			.willReturn(ResponseEntity.of(Optional.of(expectedResponse)));
 
-		var result = this.imageModel.call(new ImagePrompt(List.of(new ImageMessage("Image Message"))));
+		var result = this.imageModel
+			.call(new ImagePrompt(List.of(new ImageMessage("Image Message")), ImageOptionsBuilder.builder().build()));
 
 		assertThat(result).isNotNull();
 		assertThat(result.getResult().getOutput().getUrl()).isEqualTo("url678");
@@ -262,8 +264,8 @@ public void openAiImageTransientError() {
 	public void openAiImageNonTransientError() {
 		given(this.openAiImageApi.createImage(isA(OpenAiImageRequest.class)))
 			.willThrow(new RuntimeException("Transient Error 1"));
-		assertThrows(RuntimeException.class,
-				() -> this.imageModel.call(new ImagePrompt(List.of(new ImageMessage("Image Message")))));
+		assertThrows(RuntimeException.class, () -> this.imageModel
+			.call(new ImagePrompt(List.of(new ImageMessage("Image Message")), ImageOptionsBuilder.builder().build())));
 	}
 
 	private static class TestRetryListener implements RetryListener {

spring-ai-model/src/main/java/org/springframework/ai/image/ImagePrompt.java

@@ -29,7 +29,12 @@ public class ImagePrompt implements ModelRequest<List<ImageMessage>> {
 	private ImageOptions imageModelOptions;
 
 	public ImagePrompt(List<ImageMessage> messages) {
-		this(messages, ImageOptionsBuilder.builder().build());
+		this.messages = messages;
+	}
+
+	public ImagePrompt(List<ImageMessage> messages, ImageOptions imageModelOptions) {
+		this.messages = messages;
+		this.imageModelOptions = imageModelOptions;
 	}
 
 	public ImagePrompt(ImageMessage imageMessage, ImageOptions imageOptions) {
@@ -44,11 +49,6 @@ public ImagePrompt(String instructions) {
 		this(new ImageMessage(instructions), ImageOptionsBuilder.builder().build());
 	}
 
-	public ImagePrompt(List<ImageMessage> messages, ImageOptions imageModelOptions) {
-		this.messages = messages;
-		this.imageModelOptions = imageModelOptions != null ? imageModelOptions : ImageOptionsBuilder.builder().build();
-	}
-
 	@Override
 	public List<ImageMessage> getInstructions() {
 		return this.messages;