Skip to content

fix: send file attachments before final stream reply in WeCom WebSocket channel #2729

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
highland0971 wants to merge 1 commit into
base: main
Choose a base branch
from
+21 −8
Open

fix: send file attachments before final stream reply in WeCom WebSocket channel #2729

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 21 additions & 8 deletions backend/app/channels/wecom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,18 @@ async def _on_outbound(self, msg: OutboundMessage) -> None:
if msg.channel_name != self.name:
return

# Send attachments BEFORE the final stream reply.
# WeCom WS protocol closes stream context after
# reply_stream(is_final=True); subsequent file replies are ignored.
if msg.is_final:
for attachment in msg.attachments:
try:
success = await self.send_file(msg, attachment)
if not success:
logger.warning("[%s] file upload skipped for %s", self.name, attachment.filename)
except Exception:
logger.exception("[%s] failed to upload file %s", self.name, attachment.filename)

try:
await self.send(msg)
except Exception:
Expand All @@ -121,17 +133,18 @@ async def _on_outbound(self, msg: OutboundMessage) -> None:
self._clear_ws_context(msg.thread_ts)
return

for attachment in msg.attachments:
try:
success = await self.send_file(msg, attachment)
if not success:
logger.warning("[%s] file upload skipped for %s", self.name, attachment.filename)
except Exception:
logger.exception("[%s] failed to upload file %s", self.name, attachment.filename)
# Remaining attachments (non-final messages only)
if not msg.is_final:
for attachment in msg.attachments:
try:
success = await self.send_file(msg, attachment)
if not success:
logger.warning("[%s] file upload skipped for %s", self.name, attachment.filename)
except Exception:
logger.exception("[%s] failed to upload file %s", self.name, attachment.filename)

if msg.is_final:
self._clear_ws_context(msg.thread_ts)

async def send_file(self, msg: OutboundMessage, attachment: ResolvedAttachment) -> bool:
if not msg.is_final:
return True
Expand Down