JOJO
aa9bf377a3
- session.* 传输暴露：新增 gateway_api 蓝图（list/create/history），RuntimeService 补 create_session - host Bearer 通道：gateway_auth 双通道认证（host 模式+回环限定，token 存 DATA_DIR/host_api_token），tasks/approval 路由接入 - api_v1 会话路由转调公共入口消双轨，会话索引/列表补齐 run_mode/model_key/custom_prompt_name/personalization_name - flask 包依赖拆解：_flask_bridge 延迟桥接 + context 子包 PEP 562 懒加载，import server.tasks/runtime 不再拉起 flask - 审批链路：mark_expired 终态回写（超时/软停止/取消三路径）+ 终态 TTL 惰性清理（3600s） - 测试 patch 点随迁；全量 75 测试失败恰为 4 项存量，独立启动验收 4/4 全绿 Co-authored-by: Astrion powered by Kimi-K3 <astrion-agent@users.noreply.github.com>
206 lines
7.8 KiB
Python
206 lines
7.8 KiB
Python
from __future__ import annotations
|
||
|
||
import threading
|
||
import time
|
||
import uuid
|
||
from typing import Any, Dict, List, Optional
|
||
|
||
from modules.i18n import tr
|
||
|
||
# 终态条目保留时长（秒）：与任务记录终态清理（3600s）对齐。
|
||
# pending 条目永不自动清理；等待方退出时经 mark_expired 转为终态后惰性回收。
|
||
RESOLVED_TTL_SECONDS = 3600.0
|
||
|
||
|
||
class UserQuestionManager:
|
||
"""In-memory manager for blocking model-to-user questions."""
|
||
|
||
def __init__(self):
|
||
self._items: Dict[str, Dict[str, Any]] = {}
|
||
self._lock = threading.Lock()
|
||
|
||
def _prune_resolved(self, now: Optional[float] = None) -> None:
|
||
"""惰性清理过期终态条目（锁内调用）。"""
|
||
now = now if now is not None else time.time()
|
||
expired_keys = [
|
||
key
|
||
for key, item in self._items.items()
|
||
if item.get("status") != "pending"
|
||
and float(item.get("answered_at") or item.get("created_at") or 0.0) + RESOLVED_TTL_SECONDS <= now
|
||
]
|
||
for key in expired_keys:
|
||
self._items.pop(key, None)
|
||
|
||
def mark_expired(self, question_id: str) -> Optional[Dict[str, Any]]:
|
||
"""将 pending 条目标记为 expired 终态（等待方超时/停止/取消时调用，幂等）。"""
|
||
with self._lock:
|
||
self._prune_resolved()
|
||
item = self._items.get(question_id)
|
||
if not item or item.get("status") != "pending":
|
||
return dict(item) if item else None
|
||
item["status"] = "expired"
|
||
item["answered_at"] = time.time()
|
||
return dict(item)
|
||
|
||
@staticmethod
|
||
def _normalize_options(options: Any) -> List[Dict[str, str]]:
|
||
if not isinstance(options, list):
|
||
return []
|
||
normalized: List[Dict[str, str]] = []
|
||
seen = set()
|
||
for idx, raw in enumerate(options[:8], start=1):
|
||
if not isinstance(raw, dict):
|
||
continue
|
||
label = str(raw.get("label") or "").strip()
|
||
if not label:
|
||
continue
|
||
option_id = str(raw.get("id") or "").strip() or f"option_{idx}"
|
||
base = option_id
|
||
suffix = 2
|
||
while option_id in seen:
|
||
option_id = f"{base}_{suffix}"
|
||
suffix += 1
|
||
seen.add(option_id)
|
||
item = {
|
||
"id": option_id,
|
||
"label": label[:120],
|
||
}
|
||
desc = str(raw.get("description") or "").strip()
|
||
if desc:
|
||
item["description"] = desc[:500]
|
||
normalized.append(item)
|
||
return normalized
|
||
|
||
def create_question(
|
||
self,
|
||
*,
|
||
username: str,
|
||
conversation_id: Optional[str],
|
||
task_id: Optional[str],
|
||
tool_call_id: Optional[str],
|
||
question: str,
|
||
context: Optional[str] = None,
|
||
options: Any = None,
|
||
batch_id: Optional[str] = None,
|
||
batch_index: int = 0,
|
||
batch_total: int = 1,
|
||
) -> Dict[str, Any]:
|
||
question_id = f"question_{uuid.uuid4().hex}"
|
||
text = str(question or "").strip()
|
||
item = {
|
||
"question_id": question_id,
|
||
"batch_id": batch_id,
|
||
"batch_index": int(batch_index),
|
||
"batch_total": int(batch_total),
|
||
"username": username,
|
||
"conversation_id": conversation_id,
|
||
"task_id": task_id,
|
||
"tool_call_id": tool_call_id,
|
||
"question": text,
|
||
"context": str(context or "").strip(),
|
||
"options": self._normalize_options(options),
|
||
"status": "pending",
|
||
"created_at": time.time(),
|
||
"answered_at": None,
|
||
"answer": None,
|
||
}
|
||
with self._lock:
|
||
self._items[question_id] = item
|
||
return dict(item)
|
||
|
||
def get(self, question_id: str) -> Optional[Dict[str, Any]]:
|
||
with self._lock:
|
||
self._prune_resolved()
|
||
item = self._items.get(question_id)
|
||
return dict(item) if item else None
|
||
|
||
def list_pending(self, username: str, conversation_id: Optional[str] = None) -> List[Dict[str, Any]]:
|
||
with self._lock:
|
||
self._prune_resolved()
|
||
rows = []
|
||
for item in self._items.values():
|
||
if item.get("username") != username:
|
||
continue
|
||
if item.get("status") != "pending":
|
||
continue
|
||
if conversation_id and item.get("conversation_id") != conversation_id:
|
||
continue
|
||
rows.append(dict(item))
|
||
rows.sort(key=lambda x: (x.get("created_at", 0.0), x.get("batch_index", 0)))
|
||
return rows
|
||
|
||
def answer(
|
||
self,
|
||
*,
|
||
question_id: str,
|
||
username: str,
|
||
selected_option_id: Optional[str] = None,
|
||
text: Optional[str] = None,
|
||
dismissed: bool = False,
|
||
) -> Dict[str, Any]:
|
||
clean_option_id = str(selected_option_id or "").strip()
|
||
clean_text = str(text or "").strip()
|
||
if not dismissed and not clean_option_id and not clean_text:
|
||
raise ValueError(tr("user_question.answer_empty"))
|
||
with self._lock:
|
||
item = self._items.get(question_id)
|
||
if not item:
|
||
raise KeyError(tr("user_question.question_not_found"))
|
||
if item.get("username") != username:
|
||
raise PermissionError(tr("user_question.no_permission"))
|
||
if item.get("status") != "pending":
|
||
return dict(item)
|
||
|
||
# 用户主动选择不回答：标记为 dismissed，工具结果会提示模型改为在对话中提问
|
||
if dismissed:
|
||
item["status"] = "answered"
|
||
item["answered_at"] = time.time()
|
||
item["answer"] = {"type": "dismissed", "text": ""}
|
||
return dict(item)
|
||
|
||
selected_option = None
|
||
if clean_option_id:
|
||
for opt in item.get("options") or []:
|
||
if str(opt.get("id") or "") == clean_option_id:
|
||
selected_option = dict(opt)
|
||
break
|
||
if selected_option is None:
|
||
raise ValueError(tr("user_question.option_not_found"))
|
||
|
||
answer_type = "option_with_text" if selected_option and clean_text else "option" if selected_option else "free_text"
|
||
answer = {
|
||
"type": answer_type,
|
||
"text": clean_text,
|
||
}
|
||
if selected_option:
|
||
answer["selected_option_id"] = selected_option.get("id")
|
||
answer["selected_option_label"] = selected_option.get("label")
|
||
if selected_option.get("description"):
|
||
answer["selected_option_description"] = selected_option.get("description")
|
||
if not clean_text:
|
||
answer["text"] = selected_option.get("label") or ""
|
||
|
||
item["status"] = "answered"
|
||
item["answered_at"] = time.time()
|
||
item["answer"] = answer
|
||
return dict(item)
|
||
|
||
|
||
def format_user_question_answer(item: Dict[str, Any]) -> str:
|
||
"""Return the compact, model-facing result text for an answered question."""
|
||
answer = item.get("answer") if isinstance(item, dict) else None
|
||
if not isinstance(answer, dict):
|
||
return "用户未回答。"
|
||
if answer.get("type") == "dismissed":
|
||
return "用户没有回答或不想回答这个问题，请直接输出内容向用户提问"
|
||
lines: List[str] = []
|
||
label = str(answer.get("selected_option_label") or "").strip()
|
||
text = str(answer.get("text") or "").strip()
|
||
if label:
|
||
lines.append(f"用户选择：{label}")
|
||
if text and text != label:
|
||
lines.append(f"用户补充：{text}")
|
||
elif text:
|
||
lines.append(f"用户回答：{text}")
|
||
return "\n".join(lines).strip() or "用户未回答。"
|