From a1d01d25e2c5f48bc51557da55f40e8748d94532 Mon Sep 17 00:00:00 2001 From: Administrator <15274802129@163.com> Date: Wed, 03 Sep 2025 11:02:41 +0800 Subject: [PATCH] feat(ai): 优化对话输入方式并添加思考内容 --- src/main/java/cc/mrbird/febs/ai/strategy/Impl/AliLlmStrategyServiceImpl.java | 49 +++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 45 insertions(+), 4 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 2f4c68f..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 @@ -29,7 +29,8 @@ private GenerationParam generationParam; private static final String apiKey = "sk-babdcf8799144134915cee2683794b2f"; - private static final String model = "qwen-plus"; +// private static final String model = "qwen-plus"; + private static final String model = "qwen3-14b-ft-202509031002-7446"; @PostConstruct public void init() { @@ -75,6 +76,7 @@ List<Message> messages = getMessages(dto); Generation gen = new Generation(); generationParam.setMessages(messages); + generationParam.setEnableThinking( false); FebsResponse febsResponse = new FebsResponse(); try { GenerationResult result = gen.call(generationParam); @@ -92,7 +94,7 @@ } @Override - public Flux<FebsResponse> llmInvokeStreaming(List<LlmStrategyDto> dto) { + public Flux<FebsResponse> llmInvokeStreamingWithThink(List<LlmStrategyDto> dto) { if (CollUtil.isEmpty(dto)){ throw new FebsException("百炼大模型初始化异常"); } @@ -103,7 +105,7 @@ generationParam.setMessages(messages); generationParam.setResultFormat(GenerationParam.ResultFormat.MESSAGE); generationParam.setEnableThinking( true); - generationParam.setIncrementalOutput(true); + generationParam.setIncrementalOutput( true); Flowable<GenerationResult> result; try { result = gen.streamCall(generationParam); @@ -118,7 +120,46 @@ 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().getReasoningContent()); + 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); }) -- Gitblit v1.9.1