Merge pull request #69 from jianyi-gronk/main

前端样式和交互优化

Author: yuluo-yx

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

@@ -67,7 +67,7 @@ public SAAChatController(SAAChatService chatService, SAABaseService baseService)
 	@UserIp
 	@GetMapping("/chat")
 	@Operation(summary = "DashScope Flux Chat")
-	public Flux<Result<String>> chat(
+	public Flux<String> chat(
 			@RequestParam("prompt") String prompt,
 			HttpServletResponse response,
 			@RequestHeader(value = "models", required = false) String models,
@@ -79,7 +79,7 @@ public Flux<Result<String>> chat(
 		if (!ValidText.isValidate(prompt)) {
 
 			response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
-			return Flux.just(Result.failed("No chat prompt provided"));
+			return Flux.just("No chat prompt provided");
 		}
 
 		Set<Map<String, String>> dashScope = baseService.getDashScope();
@@ -90,7 +90,7 @@ public Flux<Result<String>> chat(
 
 		if (StringUtils.hasText(models)) {
 			if (!modelName.contains(models)) {
-				return Flux.just(Result.failed("Input models not support."));
+				return Flux.just("Input models not support.");
 			}
 		}
 		else {
@@ -103,7 +103,7 @@ public Flux<Result<String>> chat(
 			chatId = "spring-ai-alibaba-playground";
 		}
 
-		return chatService.chat(chatId, models, prompt).map(Result::success);
+		return chatService.chat(chatId, models, prompt);
 	}
 
 }

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

@@ -57,24 +57,24 @@ public SAAImageController(SAAImageService imageService) {
 	@UserIp
 	@PostMapping("/image2text")
 	@Operation(summary = "DashScope Image Recognition")
-	public Flux<Result<String>> image2text(
+	public Flux<String> image2text(
 			@RequestParam(value = "prompt", required = false) String prompt,
 			@RequestParam("image") MultipartFile image
 	) {
 
 		if (image.isEmpty()) {
-			return Flux.just(Result.failed("No image file provided"));
+			return Flux.just("No image file provided");
 		}
 
 		if (!StringUtils.hasText(prompt)) {
 			prompt = "请你用一句话描述这张图片";
 		}
 
-		Flux<Result<String>> res;
+		Flux<String> res;
 		try {
-			 res = imageService.image2Text(prompt, image).map(Result::success);
+			 res = imageService.image2Text(prompt, image);
 		} catch (Exception e) {
-			return Flux.just(Result.failed(e.getMessage()));
+			return Flux.just(e.getMessage());
 		}
 
 		return res;