mirror of
https://github.com/jxxghp/MoviePilot.git
synced 2026-06-03 06:29:55 +08:00
fix(agent): route streaming finalization through channel modules
This commit is contained in:
@@ -12,7 +12,7 @@ from app.schemas.message import (
|
||||
ChannelCapabilityManager,
|
||||
ChannelCapability,
|
||||
)
|
||||
from app.schemas.types import MessageChannel
|
||||
from app.schemas.types import MessageChannel, NotificationType
|
||||
|
||||
|
||||
class _StreamChain(ChainBase):
|
||||
@@ -212,22 +212,11 @@ class StreamingHandler:
|
||||
await self._flush()
|
||||
|
||||
message_response = self._message_response
|
||||
if (
|
||||
message_response
|
||||
and message_response.channel == MessageChannel.Feishu
|
||||
and isinstance(message_response.metadata, dict)
|
||||
):
|
||||
stream_meta = message_response.metadata.get("feishu_streaming") or {}
|
||||
card_id = str(stream_meta.get("card_id") or "").strip()
|
||||
sequence = int(stream_meta.get("sequence") or 1) + 1
|
||||
if card_id:
|
||||
await run_in_threadpool(
|
||||
_StreamChain().run_module,
|
||||
"close_feishu_streaming_card",
|
||||
card_id=card_id,
|
||||
sequence=sequence,
|
||||
source=message_response.source,
|
||||
)
|
||||
if message_response:
|
||||
await run_in_threadpool(
|
||||
_StreamChain().finalize_message,
|
||||
message_response,
|
||||
)
|
||||
|
||||
# 检查是否所有缓冲内容都已发送
|
||||
with self._lock:
|
||||
@@ -480,6 +469,7 @@ class StreamingHandler:
|
||||
Notification(
|
||||
channel=self._channel,
|
||||
source=self._source,
|
||||
mtype=NotificationType.Agent,
|
||||
userid=self._user_id,
|
||||
username=self._username,
|
||||
title=self._title,
|
||||
@@ -522,6 +512,7 @@ class StreamingHandler:
|
||||
Notification(
|
||||
channel=self._channel,
|
||||
source=self._source,
|
||||
mtype=NotificationType.Agent,
|
||||
userid=self._user_id,
|
||||
username=self._username,
|
||||
title=self._title,
|
||||
|
||||
@@ -1585,6 +1585,16 @@ class ChainBase(metaclass=ABCMeta):
|
||||
message=self._normalize_notification_for_dispatch(message),
|
||||
)
|
||||
|
||||
def finalize_message(
|
||||
self,
|
||||
response: MessageResponse,
|
||||
) -> bool:
|
||||
"""
|
||||
对已发送消息执行渠道收尾动作。
|
||||
例如关闭流式卡片状态;无特殊收尾的渠道直接返回 False。
|
||||
"""
|
||||
return self.run_module("finalize_message", response=response)
|
||||
|
||||
def metadata_img(
|
||||
self,
|
||||
mediainfo: MediaInfo,
|
||||
|
||||
@@ -305,16 +305,18 @@ class FeishuModule(_ModuleBase, _MessageBase[Feishu]):
|
||||
return False
|
||||
return client.delete_message_reaction(message_id=message_id, reaction_id=reaction_id)
|
||||
|
||||
def close_feishu_streaming_card(
|
||||
self,
|
||||
card_id: str,
|
||||
sequence: int,
|
||||
source: str,
|
||||
) -> bool:
|
||||
client_config = self.get_config(source)
|
||||
def finalize_message(self, response: MessageResponse) -> bool:
|
||||
if response.channel != self._channel or not isinstance(response.metadata, dict):
|
||||
return False
|
||||
stream_meta = response.metadata.get("feishu_streaming") or {}
|
||||
card_id = str(stream_meta.get("card_id") or "").strip()
|
||||
if not card_id:
|
||||
return False
|
||||
client_config = self.get_config(response.source)
|
||||
if not client_config:
|
||||
return False
|
||||
client = self.get_instance(client_config.name)
|
||||
if not client:
|
||||
return False
|
||||
sequence = int(stream_meta.get("sequence") or 1) + 1
|
||||
return client.close_streaming_card(card_id=card_id, sequence=sequence)
|
||||
|
||||
Reference in New Issue
Block a user