consolidate implementation with recent changes in upstream

Author: lobo

models/spring-ai-huggingface/src/main/java/org/springframework/ai/huggingface/HuggingfaceChatModel.java

@@ -31,10 +31,10 @@
 import org.springframework.ai.chat.prompt.Prompt;
 import org.springframework.ai.huggingface.api.TextGenerationInferenceApi;
 import org.springframework.ai.huggingface.invoker.ApiClient;
-import org.springframework.ai.huggingface.model.AllOfGenerateResponseDetails;
-import org.springframework.ai.huggingface.model.GenerateParameters;
-import org.springframework.ai.huggingface.model.GenerateRequest;
-import org.springframework.ai.huggingface.model.GenerateResponse;
+import org.springframework.ai.huggingface.model.chat.AllOfGenerateResponseDetails;
+import org.springframework.ai.huggingface.model.chat.GenerateParameters;
+import org.springframework.ai.huggingface.model.chat.GenerateRequest;
+import org.springframework.ai.huggingface.model.chat.GenerateResponse;
 
 /**
  * An implementation of {@link ChatModel} that interfaces with HuggingFace Inference

models/spring-ai-huggingface/src/main/java/org/springframework/ai/huggingface/HuggingfaceImageModel.java

@@ -18,6 +18,8 @@
  */
 public class HuggingfaceImageModel implements ImageModel {
 
+	private final String APPLICATION_JSON = "application/json";
+
 	/**
 	 * Token required for authenticating with the HuggingFace Inference API.
 	 */
@@ -47,24 +49,28 @@ public ImageResponse call(ImagePrompt prompt) {
 		final GenerateParameters generateParameters = createGenerateParameters(prompt.getOptions());
 		final GenerateRequest generateRequest = createGenerateRequest(prompt.getInstructions(), generateParameters);
 
-		// huggingface eps with text-to-image models return only single image in default
-		// mode
+		// hf text-to-image endpoints return only a single image in default mode
 		final String base64Encoded = generateImage(generateRequest, prompt);
 		final Image image = new Image(null, base64Encoded);
 		final ImageGeneration imageGeneration = new ImageGeneration(image);
 		return new ImageResponse(List.of(imageGeneration), new ImageResponseMetadata());
 	}
 
 	private String generateImage(GenerateRequest generateRequest, ImagePrompt prompt) {
-		final String mimeType = prompt.getOptions().getResponseFormat();
-		switch (mimeType) {
-			case "application/json" -> {
-				return new String(this.imageGenApi.generate(generateRequest, prompt.getOptions().getResponseFormat()));
+		final String responseFormat = prompt.getOptions().getResponseFormat();
+		final HuggingfaceImageOptions options = (HuggingfaceImageOptions) prompt.getOptions();
+		switch (responseFormat) {
+			case "base64" -> {
+				return new String(this.imageGenApi.generate(generateRequest, APPLICATION_JSON));
 			}
-			default -> {
-				byte[] bytes = this.imageGenApi.generate(generateRequest, prompt.getOptions().getResponseFormat());
+			case "bytes" -> {
+				byte[] bytes = this.imageGenApi.generate(generateRequest, options.getResponseMimeType());
 				return Base64.getEncoder().encodeToString(bytes);
 			}
+			default -> {
+				throw new UnsupportedOperationException(String
+					.format("Unsupported response format: %s, should be 'base64' or 'bytes'", responseFormat));
+			}
 		}
 	}
 

models/spring-ai-huggingface/src/main/java/org/springframework/ai/huggingface/text2image/HuggingfaceImageOptions.java

@@ -12,8 +12,19 @@ public class HuggingfaceImageOptions implements ImageOptions {
 
 	private Integer height;
 
+	/**
+	 * should be one of 'base64' or 'bytes'
+	 */
 	private String responseFormat;
 
+	private String style;
+
+	/**
+	 * considered only if responseFormat = 'bytes' should be one of 'image/png',
+	 * 'image/jpg', 'image/tiff' etc.
+	 */
+	private String responseMimeType;
+
 	private String negativePrompt;
 
 	private Float sigmaItems;
@@ -71,6 +82,23 @@ public void setResponseFormat(String responseFormat) {
 		this.responseFormat = responseFormat;
 	}
 
+	@Override
+	public String getStyle() {
+		return style;
+	}
+
+	public void setStyle(String style) {
+		this.style = style;
+	}
+
+	public String getResponseMimeType() {
+		return responseMimeType;
+	}
+
+	public void setResponseMimeType(String responseMimeType) {
+		this.responseMimeType = responseMimeType;
+	}
+
 	public String getNegativePrompt() {
 		return negativePrompt;
 	}