Merge pull request #59 from springaialibaba/0228-yuluo/add-more-chatclient

feat: add image api prompt support

Author: yuluo-yx

spring-ai-alibaba-integration-example/backend/src/main/java/com/alibaba/cloud/ai/application/controller/SAAAudioController.java

@@ -23,7 +23,6 @@
 import com.alibaba.cloud.ai.application.utils.ValidText;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
 import reactor.core.publisher.Flux;
 
 import org.springframework.web.bind.annotation.GetMapping;
@@ -44,8 +43,11 @@
 @RequestMapping("/api/v1/")
 public class SAAAudioController {
 
-	@Resource
-	private SAAAudioService audioService;
+	private final SAAAudioService audioService;
+
+	public SAAAudioController(SAAAudioService audioService) {
+		this.audioService = audioService;
+	}
 
 	/**
 	 * audio2text

spring-ai-alibaba-integration-example/backend/src/main/java/com/alibaba/cloud/ai/application/controller/SAAFunctionController.java

@@ -19,7 +19,6 @@
 
 import com.alibaba.cloud.ai.application.service.SAAFunctionService;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
 
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -34,7 +33,10 @@
 @RequestMapping("/api/v1/")
 public class SAAFunctionController {
 
-	@Resource
-	private SAAFunctionService functionService;
+	private final SAAFunctionService functionService;
+
+	public SAAFunctionController(SAAFunctionService functionService) {
+		this.functionService = functionService;
+	}
 
 }

spring-ai-alibaba-integration-example/backend/src/main/java/com/alibaba/cloud/ai/application/controller/SAAImageController.java

@@ -23,12 +23,11 @@
 import com.alibaba.cloud.ai.application.utils.ValidText;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletResponse;
 import reactor.core.publisher.Flux;
 
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -45,26 +44,40 @@
 @RequestMapping("/api/v1/")
 public class SAAImageController {
 
-	@Resource
-	private SAAImageService imageService;
+	private final SAAImageService imageService;
 
+	public SAAImageController(SAAImageService imageService) {
+		this.imageService = imageService;
+	}
+
+	/**
+	 * Image Recognition
+	 * prompt 可以为空
+	 */
 	@UserIp
 	@PostMapping("/image2text")
 	@Operation(summary = "DashScope Image Recognition")
-	public Flux<Result<String>> image2text(@RequestParam("image") MultipartFile image) {
+	public Flux<Result<String>> image2text(
+			@RequestParam("prompt") String prompt,
+			@RequestParam("image") MultipartFile image
+	) {
 
 		if (image.isEmpty()) {
 			return Flux.just(Result.failed("No image file provided"));
 		}
 
-		return imageService.image2Text(image).map(Result::success);
+		if (!StringUtils.hasText(prompt)) {
+			prompt = "请你用一句话描述这张图片";
+		}
+
+		return imageService.image2Text(prompt, image).map(Result::success);
 	}
 
 	@UserIp
-	@GetMapping("/text2Image/{prompt}")
+	@GetMapping("/text2Image")
 	@Operation(summary = "DashScope Image Generation")
 	public Result<Void> text2Image(
-			@PathVariable("prompt") String prompt,
+			@RequestParam("prompt") String prompt,
 			HttpServletResponse response
 	) {
 

spring-ai-alibaba-integration-example/backend/src/main/java/com/alibaba/cloud/ai/application/service/SAAChatService.java

@@ -49,7 +49,7 @@ public SAAChatService(ChatModel chatModel) {
 							  When you receive a question from a user, you should answer the user's question in a friendly\s
 							  and polite manner. Be careful not to answer the wrong message. If there is a question\s
 							  that you can't answer, guide users to the official website of Spring Ai Alibaba to check it.\s
-							  The web address is https:java2ai.com.
+							  The web address is https://java2ai.com.
 						""")
 				.defaultAdvisors(
 						new MessageChatMemoryAdvisor(new InMemoryChatMemory()),

spring-ai-alibaba-integration-example/backend/src/main/java/com/alibaba/cloud/ai/application/service/SAAImageService.java

@@ -64,10 +64,10 @@ public SAAImageService(ImageModel imageModel, ChatModel chatModel) {
 				.build();
 	}
 
-	public Flux<String> image2Text(MultipartFile file) {
+	public Flux<String> image2Text(String prompt, MultipartFile file) {
 
 		UserMessage message = new UserMessage(
-				"解释图片中的内容",
+				prompt,
 				new Media(
 						MimeTypeUtils.IMAGE_PNG,
 						new FileSystemResource(Objects.requireNonNull(file.getOriginalFilename()))