From 3749555542556cd63f21c29cc6cb20bfbdef9e4c Mon Sep 17 00:00:00 2001 From: Administrator <15274802129@163.com> Date: Mon, 01 Sep 2025 14:13:43 +0800 Subject: [PATCH] refactor(ai): 重构阿里云大模型调用逻辑 --- src/main/java/cc/mrbird/febs/ai/controller/TestController.java | 25 ++++++++++++ src/main/java/cc/mrbird/febs/ai/strategy/Impl/AliLlmStrategyServiceImpl.java | 37 +++++++++--------- 2 files changed, 43 insertions(+), 19 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/ai/controller/TestController.java b/src/main/java/cc/mrbird/febs/ai/controller/TestController.java index fd74b56..b106fb4 100644 --- a/src/main/java/cc/mrbird/febs/ai/controller/TestController.java +++ b/src/main/java/cc/mrbird/febs/ai/controller/TestController.java @@ -170,6 +170,31 @@ } + + @ApiOperation("提问AI(非流式响应)V4") + @ApiResponses({ + @ApiResponse(code = 200, message = "非流式响应", response = ApiMemberTalkStreamVo.class), + }) + @PostMapping("/answerStreamV4") + public FebsResponse answerStreamV4(@RequestBody @Validated AiTalkAnswerStream dto) { + if (StrUtil.isEmpty(dto.getQuestion())){ + return new FebsResponse().fail().message("请输入问题"); + } + LlmStrategyDto llmStrategyDto = new LlmStrategyDto(); + Message systemMsg = Message.builder() + .role(Role.SYSTEM.getValue()) + .content(dto.getPrompt()) + .build(); + Message userMsg = Message.builder() + .role(Role.USER.getValue()) + .content(dto.getQuestion()) + .build(); + List<Message> messages = Arrays.asList(systemMsg, userMsg); + llmStrategyDto.setMessages(messages); + return llmStrategyFactory.getCalculationStrategyMap().get(LlmStrategyEnum.ALI.getName()).llmInvokeNonStreaming(llmStrategyDto); + } + + public static Flowable<GenerationResult> callWithMessageStream(String question,String prompt) throws NoApiKeyException, InputRequiredException { Generation gen = new Generation(); Message systemMsg = Message.builder() diff --git a/src/main/java/cc/mrbird/febs/ai/strategy/Impl/AliLlmStrategyServiceImpl.java b/src/main/java/cc/mrbird/febs/ai/strategy/Impl/AliLlmStrategyServiceImpl.java index 6841d05..78e023b 100644 --- a/src/main/java/cc/mrbird/febs/ai/strategy/Impl/AliLlmStrategyServiceImpl.java +++ b/src/main/java/cc/mrbird/febs/ai/strategy/Impl/AliLlmStrategyServiceImpl.java @@ -14,23 +14,31 @@ import org.springframework.stereotype.Component; import reactor.core.publisher.Flux; +import javax.annotation.PostConstruct; + @Component("AliLlmStrategyService") public class AliLlmStrategyServiceImpl implements LlmStrategyService { - @Override - public FebsResponse llmInvokeNonStreaming(LlmStrategyDto dto) { - Generation gen = new Generation(); - GenerationParam param = GenerationParam.builder() + private GenerationParam generationParam; + + @PostConstruct + public void init() { + this.generationParam = GenerationParam.builder() // 若没有配置环境变量,请用阿里云百炼API Key将下行替换为:.apiKey("sk-xxx") .apiKey("sk-babdcf8799144134915cee2683794b2f") // 模型列表:https://help.aliyun.com/zh/model-studio/getting-started/models .model("qwen-plus") - .messages(dto.getMessages()) .resultFormat(GenerationParam.ResultFormat.MESSAGE) .build(); + } + + @Override + public FebsResponse llmInvokeNonStreaming(LlmStrategyDto dto) { + Generation gen = new Generation(); + generationParam.setMessages(dto.getMessages()); FebsResponse febsResponse = new FebsResponse(); try { - GenerationResult result = gen.call(param); + GenerationResult result = gen.call(generationParam); if (result != null && result.getOutput() != null && result.getOutput().getChoices().size() > 0){ febsResponse.success().data(result.getOutput().getChoices().get(0).getMessage().getContent()); }else{ @@ -49,21 +57,12 @@ long startTime = System.currentTimeMillis(); Generation gen = new Generation(); - GenerationParam param = GenerationParam.builder() - // 若没有配置环境变量,请用阿里云百炼API Key将下行替换为:.apiKey("sk-xxx") - .apiKey("sk-babdcf8799144134915cee2683794b2f") - // 模型列表:https://help.aliyun.com/zh/model-studio/getting-started/models - .model("qwen-plus") -// .model("deepseek-r1") -// .model("qwen-turbo-0624-ft-202508281725-c2dc") - .messages(dto.getMessages()) -// .resultFormat(GenerationParam.ResultFormat.TEXT) - .resultFormat(GenerationParam.ResultFormat.MESSAGE) - .incrementalOutput(true) - .build(); + generationParam.setMessages(dto.getMessages()); + generationParam.setResultFormat(GenerationParam.ResultFormat.MESSAGE); + generationParam.setIncrementalOutput(true); Flowable<GenerationResult> result; try { - result = gen.streamCall(param); + result = gen.streamCall(generationParam); } catch (NoApiKeyException | InputRequiredException e) { throw new FebsException(StrUtil.format("百炼大模型输出失败:{}",e.getMessage())); } -- Gitblit v1.9.1