From 629da7314cfdb172ba734d4abafa51d7f0c32c3a Mon Sep 17 00:00:00 2001 From: Administrator <15274802129@163.com> Date: Wed, 03 Sep 2025 10:45:49 +0800 Subject: [PATCH] feat(ai): 更新阿里云大模型版本并调整生成参数 --- src/main/java/cc/mrbird/febs/ai/strategy/Impl/AliLlmStrategyServiceImpl.java | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 100 insertions(+), 9 deletions(-) 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 78e023b..f9ad98f 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 @@ -1,13 +1,17 @@ package cc.mrbird.febs.ai.strategy.Impl; import cc.mrbird.febs.ai.strategy.LlmStrategyService; +import cc.mrbird.febs.ai.strategy.enumerates.LlmStrategyContextEnum; import cc.mrbird.febs.ai.strategy.param.LlmStrategyDto; import cc.mrbird.febs.common.entity.FebsResponse; import cc.mrbird.febs.common.exception.FebsException; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.dashscope.aigc.generation.Generation; import com.alibaba.dashscope.aigc.generation.GenerationParam; import com.alibaba.dashscope.aigc.generation.GenerationResult; +import com.alibaba.dashscope.common.Message; +import com.alibaba.dashscope.common.Role; import com.alibaba.dashscope.exception.InputRequiredException; import com.alibaba.dashscope.exception.NoApiKeyException; import io.reactivex.Flowable; @@ -15,27 +19,64 @@ import reactor.core.publisher.Flux; import javax.annotation.PostConstruct; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; @Component("AliLlmStrategyService") public class AliLlmStrategyServiceImpl implements LlmStrategyService { private GenerationParam generationParam; + private static final String apiKey = "sk-babdcf8799144134915cee2683794b2f"; +// private static final String model = "qwen-plus"; + private static final String model = "qwen3-14b-ft-202509031002-7446"; + @PostConstruct public void init() { this.generationParam = GenerationParam.builder() // 若没有配置环境变量,请用阿里云百炼API Key将下行替换为:.apiKey("sk-xxx") - .apiKey("sk-babdcf8799144134915cee2683794b2f") + .apiKey(apiKey) // 模型列表:https://help.aliyun.com/zh/model-studio/getting-started/models - .model("qwen-plus") + .model(model) .resultFormat(GenerationParam.ResultFormat.MESSAGE) .build(); } + private List<Message> getMessages(List<LlmStrategyDto> dto) { + List<Message> messages = new ArrayList<>(); + for (LlmStrategyDto dtoItem : dto){ + if (StrUtil.equals(dtoItem.getRole(),Role.SYSTEM.getValue())){ + messages.add(Message.builder() + .role(Role.SYSTEM.getValue()) + .content(dtoItem.getContent()) + .build()); + } + if (StrUtil.equals(dtoItem.getRole(),Role.USER.getValue())){ + messages.add(Message.builder() + .role(Role.USER.getValue()) + .content(dtoItem.getContent()) + .build()); + } + if (StrUtil.equals(dtoItem.getRole(),Role.ASSISTANT.getValue())){ + messages.add(Message.builder() + .role(Role.ASSISTANT.getValue()) + .content(dtoItem.getContent()) + .build()); + } + } + return messages; + } + @Override - public FebsResponse llmInvokeNonStreaming(LlmStrategyDto dto) { + public FebsResponse llmInvokeNonStreaming(List<LlmStrategyDto> dto) { + if (CollUtil.isEmpty(dto)){ + throw new FebsException("百炼大模型初始化异常"); + } + List<Message> messages = getMessages(dto); Generation gen = new Generation(); - generationParam.setMessages(dto.getMessages()); + generationParam.setMessages(messages); + generationParam.setEnableThinking( false); FebsResponse febsResponse = new FebsResponse(); try { GenerationResult result = gen.call(generationParam); @@ -53,13 +94,18 @@ } @Override - public Flux<FebsResponse> llmInvokeStreaming(LlmStrategyDto dto) { + public Flux<FebsResponse> llmInvokeStreamingWithThink(List<LlmStrategyDto> dto) { + if (CollUtil.isEmpty(dto)){ + throw new FebsException("百炼大模型初始化异常"); + } + List<Message> messages = getMessages(dto); long startTime = System.currentTimeMillis(); Generation gen = new Generation(); - generationParam.setMessages(dto.getMessages()); + generationParam.setMessages(messages); generationParam.setResultFormat(GenerationParam.ResultFormat.MESSAGE); - generationParam.setIncrementalOutput(true); + generationParam.setEnableThinking( true); + generationParam.setIncrementalOutput( true); Flowable<GenerationResult> result; try { result = gen.streamCall(generationParam); @@ -69,8 +115,53 @@ return Flux.from(result) .map(message -> { - String content = message.getOutput().getChoices().get(0).getMessage().getContent(); - return new FebsResponse().success().data(content); + HashMap<String, String> stringStringHashMap = new HashMap<>(); + if (StrUtil.isNotEmpty(message.getOutput().getChoices().get(0).getMessage().getReasoningContent())){ + stringStringHashMap.put(LlmStrategyContextEnum.THINK.name(),message.getOutput().getChoices().get(0).getMessage().getReasoningContent()); + } + if (StrUtil.isNotEmpty(message.getOutput().getChoices().get(0).getMessage().getContent())){ + stringStringHashMap.put(LlmStrategyContextEnum.CONTENT.name(),message.getOutput().getChoices().get(0).getMessage().getContent()); + } + return new FebsResponse().success().data(stringStringHashMap); + }) + .doOnComplete(() -> { + long endTime = System.currentTimeMillis(); + System.out.println("百炼大模型输出:" + (endTime - startTime) + "毫秒"); + }) + .doOnError(error -> { + throw new FebsException(StrUtil.format("百炼大模型输出失败:{}",error)); + }); + } + + @Override + public Flux<FebsResponse> llmInvokeStreamingNoThink(List<LlmStrategyDto> dto) { + if (CollUtil.isEmpty(dto)){ + throw new FebsException("百炼大模型初始化异常"); + } + List<Message> messages = getMessages(dto); + + long startTime = System.currentTimeMillis(); + Generation gen = new Generation(); + generationParam.setMessages(messages); + generationParam.setResultFormat(GenerationParam.ResultFormat.MESSAGE); + generationParam.setIncrementalOutput( true); + generationParam.setEnableThinking( false); + Flowable<GenerationResult> result; + try { + result = gen.streamCall(generationParam); + } catch (NoApiKeyException | InputRequiredException e) { + throw new FebsException(StrUtil.format("百炼大模型输出失败:{}",e.getMessage())); + } + + return Flux.from(result) + .map(message -> { + HashMap<String, String> stringStringHashMap = new HashMap<>(); + if (StrUtil.isNotEmpty(message.getOutput().getChoices().get(0).getMessage().getContent())){ + String content = message.getOutput().getChoices().get(0).getMessage().getContent(); + System.out.print( content); + stringStringHashMap.put(LlmStrategyContextEnum.CONTENT.name(),content); + } + return new FebsResponse().success().data(stringStringHashMap); }) .doOnComplete(() -> { long endTime = System.currentTimeMillis(); -- Gitblit v1.9.1