JOJO
7d290d1790
- 989 行单文件拆为 server/context/ 9 模块（identity/broadcast/personalization/usage/upload/conversation/resources/decorators/reaper）+ __init__.py 兼容 re-export，外部 import 路径不变 - 新增 RuntimeIdentity 显式身份快照（identity.py），get_user_resources 支持参数化身份驱动，为任务线程拆除 Flask 隐式上下文做准备 - 测试 patch 目标随迁至 server.context.personalization；新增 test_runtime_identity_resources 覆盖 web/host/api 身份路由矩阵 Co-authored-by: Astrion powered by Kimi-K3 <astrion-agent@users.noreply.github.com> Co-authored-by: Codex powered by ChatGPT-6-Astra <codex@example.com>
51 lines
1.9 KiB
Python
51 lines
1.9 KiB
Python
"""终端事件广播与回调包装（用户房间广播 + conversation_id 注入）。"""
|
||
from __future__ import annotations
|
||
|
||
from typing import Optional
|
||
|
||
from core.web_terminal import WebTerminal
|
||
from server.utils_common import debug_log
|
||
|
||
|
||
def make_terminal_callback(username: str):
|
||
"""生成面向指定用户的广播函数"""
|
||
from server.extensions import socketio
|
||
def _callback(event_type, data):
|
||
try:
|
||
socketio.emit(event_type, data, room=f"user_{username}")
|
||
except Exception as exc:
|
||
debug_log(f"广播事件失败 ({username}): {event_type} - {exc}")
|
||
return _callback
|
||
|
||
|
||
def attach_user_broadcast(terminal: WebTerminal, username: str):
|
||
"""确保终端的广播函数指向当前用户的房间。
|
||
|
||
对话级 terminal 的回调会额外包装注入 conversation_id（见 _wrap_callback_with_conversation_id）。
|
||
"""
|
||
callback = make_terminal_callback(username)
|
||
callback = _wrap_callback_with_conversation_id(
|
||
callback, getattr(terminal, "_bound_conversation_id", None)
|
||
)
|
||
terminal.message_callback = callback
|
||
if terminal.terminal_manager:
|
||
terminal.terminal_manager.broadcast = callback
|
||
|
||
|
||
def _wrap_callback_with_conversation_id(callback, conversation_id: Optional[str]):
|
||
"""包装广播回调，为 dict 类型的事件数据注入 conversation_id（setdefault，不覆盖已有值）。
|
||
|
||
对话级 terminal 的广播（shell 输出、terminal 列表等）仍发到用户房间，
|
||
前端按 conversation_id 过滤，避免同工作区多个对话的终端事件互相串扰。
|
||
"""
|
||
if not callback or not conversation_id:
|
||
return callback
|
||
|
||
def _wrapped(event_type, data):
|
||
if isinstance(data, dict):
|
||
data = dict(data)
|
||
data.setdefault("conversation_id", conversation_id)
|
||
return callback(event_type, data)
|
||
|
||
return _wrapped
|