From 9b0b7231434f6ec9c2a34a7750364330ce17348d Mon Sep 17 00:00:00 2001 From: Soulter <905617992@qq.com> Date: Fri, 7 Feb 2025 22:07:56 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=81=94=E7=BD=91=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=EF=BC=8C=E5=87=BD=E6=95=B0=E8=B0=83=E7=94=A8?= =?UTF-8?q?=E6=97=A0=E8=BF=94=E5=9B=9E=E5=80=BC=20#342?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../process_stage/method/llm_request.py | 3 +++ .../core/provider/sources/openai_source.py | 19 +++++++++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/astrbot/core/pipeline/process_stage/method/llm_request.py b/astrbot/core/pipeline/process_stage/method/llm_request.py index b2ee8d508..38ac3d932 100644 --- a/astrbot/core/pipeline/process_stage/method/llm_request.py +++ b/astrbot/core/pipeline/process_stage/method/llm_request.py @@ -129,6 +129,9 @@ class LLMRequestSubStage(Stage): req.prompt += extra_prompt async for _ in self.process(event, _nested=True): yield + else: + if llm_response.completion_text: + event.set_result(MessageEventResult().message(llm_response.completion_text)) except BaseException as e: logger.error(traceback.format_exc()) diff --git a/astrbot/core/provider/sources/openai_source.py b/astrbot/core/provider/sources/openai_source.py index b2d0c157c..111c2e41e 100644 --- a/astrbot/core/provider/sources/openai_source.py +++ b/astrbot/core/provider/sources/openai_source.py @@ -80,12 +80,14 @@ class ProviderOpenAIOfficial(Provider): raise Exception("API 返回的 completion 为空。") choice = completion.choices[0] + llm_response = LLMResponse("assistant") + if choice.message.content: # text completion completion_text = str(choice.message.content).strip() - - return LLMResponse("assistant", completion_text, raw_completion=completion) - elif choice.message.tool_calls: + llm_response.completion_text = completion_text + + if choice.message.tool_calls: # tools call (function calling) args_ls = [] func_name_ls = [] @@ -95,10 +97,15 @@ class ProviderOpenAIOfficial(Provider): args = json.loads(tool_call.function.arguments) args_ls.append(args) func_name_ls.append(tool_call.function.name) - return LLMResponse(role="tool", tools_call_args=args_ls, tools_call_name=func_name_ls, raw_completion=completion) - else: + llm_response.role = "tool" + llm_response.tools_call_args = args_ls + llm_response.tools_call_name = func_name_ls + + if not llm_response.completion_text and not llm_response.tools_call_args: logger.error(f"API 返回的 completion 无法解析：{completion}。") - raise Exception("Internal Error") + raise Exception(f"API 返回的 completion 无法解析：{completion}。") + + return llm_response async def text_chat( self,