diff --git a/pkg/platform/sources/webchat.py b/pkg/platform/sources/webchat.py index 6c148614..7fd54d1e 100644 --- a/pkg/platform/sources/webchat.py +++ b/pkg/platform/sources/webchat.py @@ -235,7 +235,7 @@ class WebChatAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter): message_chain.insert(0, platform_message.Source(id=message_id, time=datetime.now().timestamp())) if session_type == 'person': - sender = platform_entities.Friend(id='webchatperson', nickname='User') + sender = platform_entities.Friend(id='webchatperson', nickname='User', remark='User') event = platform_events.FriendMessage( sender=sender, message_chain=message_chain, time=datetime.now().timestamp() ) diff --git a/pkg/provider/runners/localagent.py b/pkg/provider/runners/localagent.py index f91a145c..4f0e933e 100644 --- a/pkg/provider/runners/localagent.py +++ b/pkg/provider/runners/localagent.py @@ -94,17 +94,19 @@ class LocalAgentRunner(runner.RequestRunner): except AttributeError: is_stream = False - remove_think = self.pipeline_config['output'].get('misc', '').get('remove-think') + remove_think = query.pipeline_config['output'].get('misc', '').get('remove-think') + + use_llm_model = await self.ap.model_mgr.get_model_by_uuid(query.use_llm_model_uuid) if not is_stream: # 非流式输出,直接请求 - msg = await query.use_llm_model.requester.invoke_llm( + msg = await use_llm_model.requester.invoke_llm( query, - query.use_llm_model, + use_llm_model, req_messages, query.use_funcs, - extra_args=query.use_llm_model.model_entity.extra_args, + extra_args=use_llm_model.model_entity.extra_args, remove_think=remove_think, ) yield msg @@ -116,12 +118,12 @@ class LocalAgentRunner(runner.RequestRunner): accumulated_content = '' # 从开始累积的所有内容 last_role = 'assistant' msg_sequence = 1 - async for msg in query.use_llm_model.requester.invoke_llm_stream( + async for msg in use_llm_model.requester.invoke_llm_stream( query, - query.use_llm_model, + use_llm_model, req_messages, query.use_funcs, - extra_args=query.use_llm_model.model_entity.extra_args, + extra_args=use_llm_model.model_entity.extra_args, remove_think=remove_think, ): msg_idx = msg_idx + 1 @@ -215,12 +217,12 @@ class LocalAgentRunner(runner.RequestRunner): last_role = 'assistant' msg_sequence = first_end_sequence - async for msg in query.use_llm_model.requester.invoke_llm_stream( + async for msg in use_llm_model.requester.invoke_llm_stream( query, - query.use_llm_model, + use_llm_model, req_messages, query.use_funcs, - extra_args=query.use_llm_model.model_entity.extra_args, + extra_args=use_llm_model.model_entity.extra_args, remove_think=remove_think, ): msg_idx += 1 @@ -271,12 +273,12 @@ class LocalAgentRunner(runner.RequestRunner): ) else: # 处理完所有调用,再次请求 - msg = await query.use_llm_model.requester.invoke_llm( + msg = await use_llm_model.requester.invoke_llm( query, - query.use_llm_model, + use_llm_model, req_messages, query.use_funcs, - extra_args=query.use_llm_model.model_entity.extra_args, + extra_args=use_llm_model.model_entity.extra_args, remove_think=remove_think, )