d77910ea2e
背景：用户明确迭代状态机语义——当前迭代唯一(状态 in_progress)、按序号 1,2,3 推进、 需用户指令启动下一迭代、启动下一迭代时若当前未结束则强制完成。 1. iteration_capability.py: - create_iteration 自动分配 seq_no = 项目内 max(seq_no)+1 - 新增 get_current_iteration(sor, pid)：当前迭代 = status='in_progress' 唯一迭代 - 新增 start_next_iteration(pid)：强制完成当前迭代 + 作废其活跃任务 + 启动下一个 planning 迭代 - list_iterations 按 seq_no 排序 2. sdlc_ability.py: 4 处 created_at 推断(默认迭代)收口到 get_current_iteration； 新增 start_next_iteration 工具；list_iterations 显示 seq_no + 当前迭代标记 3. agent_loop.py: PM 派发任务默认迭代收口到 get_current_iteration 4. agent_loop_v2.py: create_project 初始迭代 status 从非法的 'active' 改为 'in_progress' + seq_no=1
271 lines
12 KiB
Python
271 lines
12 KiB
Python
"""迭代能力 — sd_iterations 的状态机语义化迁移（通用、产线无关）。
|
||
|
||
定位：迭代 CRUD 走 xls2ui 生成的端点；本模块只做「生命周期状态流转」——
|
||
每个迁移 CAS 原子（防并发/越权）+ 租户隔离 + 审计。
|
||
|
||
迭代的生命周期/流转规则在 iteration skill 里（LLM 读 skill 判断合法性）；本模块只固化操作原语。
|
||
|
||
角色规范：role 参数用 agent.{role}（无前缀自动补 agent.）；人角色用 {orgtype}.{role}。
|
||
|
||
scope 约定：sd_iterations 用 project_id 做范围校验（CAS 的 WHERE 里带 project_id），
|
||
与 pipeline_tasks 用 tenant_id 不同——sd_* 业务表用自己的归属列。
|
||
"""
|
||
|
||
import logging
|
||
from sqlor.dbpools import DBPools
|
||
from appPublic.uniqueID import getID
|
||
from .audit import record_audit
|
||
|
||
DBNAME = "pipeline"
|
||
logger = logging.getLogger("pipeline.iteration_capability")
|
||
|
||
TABLE = "sd_iterations"
|
||
|
||
# 迭代状态（SDLC 默认，状态机语义见 iteration skill）
|
||
S_PLANNING = "planning" # 规划中
|
||
S_IN_PROGRESS = "in_progress" # 进行中
|
||
S_COMPLETED = "completed" # 已完成
|
||
S_CANCELLED = "cancelled" # 已取消
|
||
|
||
|
||
def _get_db():
|
||
db = DBPools()
|
||
if not db.databases:
|
||
from appPublic.jsonConfig import getConfig
|
||
config = getConfig()
|
||
if config.databases:
|
||
db.databases = config.databases
|
||
return db, DBNAME
|
||
|
||
|
||
def _normalize_role(role):
|
||
"""角色规范：agent 角色补 agent. 前缀；人角色 {orgtype}.{role} 保留原样。"""
|
||
role = (role or "").strip()
|
||
if not role:
|
||
return ""
|
||
if "." in role:
|
||
return role
|
||
return f"agent.{role}"
|
||
|
||
|
||
async def _transition(iteration_id, project_id, from_state, to_state, action,
|
||
who=None, agent_id=None, detail=None):
|
||
"""CAS 状态迁移 + 审计。返回 (ok, message)。"""
|
||
if not iteration_id or not project_id:
|
||
return False, "缺少 iteration_id 或 project_id"
|
||
db, dbname = _get_db()
|
||
async with db.sqlorContext(dbname) as sor:
|
||
await sor.sqlExe(
|
||
f"UPDATE {TABLE} SET status=${{to}}$, updated_at=NOW() "
|
||
"WHERE id=${iid}$ AND project_id=${pid}$ AND status=${from}$",
|
||
{"to": to_state, "iid": iteration_id, "pid": project_id, "from": from_state})
|
||
recs = await sor.R(TABLE, {'id': iteration_id})
|
||
await sor.sqlExe("COMMIT", {})
|
||
if not recs:
|
||
return False, "迭代不存在"
|
||
cur = getattr(recs[0], 'status', '')
|
||
if cur != to_state:
|
||
return False, f"状态迁移失败(CAS): 期望 from={from_state} 实际 status={cur}"
|
||
await record_audit(project_id, TABLE, iteration_id, action,
|
||
from_state=from_state, to_state=to_state,
|
||
who=who, agent_id=agent_id, detail=detail, sor=sor)
|
||
return True, to_state
|
||
|
||
|
||
async def create_iteration(project_id, iteration_name, iteration_type="new_feature",
|
||
scope="", priority=5, created_by="", who=None, agent_id=None):
|
||
"""创建迭代：新建记录，status=planning。返回 (ok, iteration_id_or_message)。"""
|
||
if not project_id:
|
||
return False, "缺少 project_id"
|
||
if not iteration_name or not iteration_name.strip():
|
||
return False, "缺少 iteration_name"
|
||
db, dbname = _get_db()
|
||
async with db.sqlorContext(dbname) as sor:
|
||
# 迭代序号 seq_no = 该项目 max(seq_no) + 1（1,2,3... 顺序编号）
|
||
r = await sor.sqlExe(
|
||
f"SELECT COALESCE(MAX(seq_no),0) AS m FROM {TABLE} WHERE project_id=${{pid}}$",
|
||
{"pid": project_id})
|
||
await sor.sqlExe("COMMIT", {})
|
||
seq_no = int(getattr(r[0], 'm', 0) or 0) + 1
|
||
iid = getID()
|
||
try:
|
||
priority = int(priority)
|
||
except (TypeError, ValueError):
|
||
priority = 5
|
||
await sor.C(TABLE, {
|
||
'id': iid,
|
||
'project_id': project_id,
|
||
'iteration_name': iteration_name.strip(),
|
||
'iteration_type': iteration_type or 'new_feature',
|
||
'scope': scope or '',
|
||
'status': S_PLANNING,
|
||
'priority': priority,
|
||
'seq_no': seq_no,
|
||
'created_by': created_by or '',
|
||
})
|
||
await record_audit(project_id, TABLE, iid, 'create',
|
||
to_state=S_PLANNING, who=_normalize_role(who),
|
||
agent_id=agent_id, sor=sor)
|
||
logger.info("create_iteration: %s project=%s seq_no=%s", iid, project_id, seq_no)
|
||
return True, iid
|
||
|
||
|
||
async def start_iteration(iteration_id, project_id, who=None, agent_id=None):
|
||
"""开始迭代：planning → in_progress。"""
|
||
return await _transition(iteration_id, project_id, S_PLANNING, S_IN_PROGRESS, 'start',
|
||
who=who, agent_id=agent_id)
|
||
|
||
|
||
async def complete_iteration(iteration_id, project_id, who=None, agent_id=None):
|
||
"""完成迭代：in_progress → completed。"""
|
||
return await _transition(iteration_id, project_id, S_IN_PROGRESS, S_COMPLETED, 'complete',
|
||
who=who, agent_id=agent_id)
|
||
|
||
|
||
async def cancel_iteration(iteration_id, project_id, who=None, agent_id=None, comment=None):
|
||
"""取消迭代：planning/in_progress → cancelled。"""
|
||
ok, msg = await _transition(iteration_id, project_id, S_PLANNING, S_CANCELLED, 'cancel',
|
||
who=who, agent_id=agent_id, detail=comment)
|
||
if ok:
|
||
return ok, msg
|
||
return await _transition(iteration_id, project_id, S_IN_PROGRESS, S_CANCELLED, 'cancel',
|
||
who=who, agent_id=agent_id, detail=comment)
|
||
|
||
|
||
async def set_iteration_state(iteration_id, project_id, from_state, to_state,
|
||
who=None, agent_id=None, detail=None):
|
||
"""通用 CAS 状态迁移兜底（跨产线自定义状态机用）。"""
|
||
return await _transition(iteration_id, project_id, from_state, to_state, 'set_state',
|
||
who=who, agent_id=agent_id, detail=detail)
|
||
|
||
|
||
async def list_iterations(project_id, status=None, limit=50) -> list:
|
||
"""列出迭代（可按状态过滤）。"""
|
||
db, dbname = _get_db()
|
||
async with db.sqlorContext(dbname) as sor:
|
||
conditions = ["project_id=${pid}$"]
|
||
params = {"pid": project_id}
|
||
if status:
|
||
conditions.append("status=${status}$")
|
||
params["status"] = status
|
||
where = " AND ".join(conditions)
|
||
try:
|
||
limit = int(limit)
|
||
except (TypeError, ValueError):
|
||
limit = 50
|
||
sql = (f"SELECT * FROM {TABLE} WHERE {where} "
|
||
f"ORDER BY seq_no ASC LIMIT {limit}")
|
||
recs = await sor.sqlExe(sql, params)
|
||
# 释放 SELECT 元数据锁
|
||
await sor.sqlExe("COMMIT", {})
|
||
result = []
|
||
for rec in (recs or []):
|
||
result.append(_rec_to_dict(rec))
|
||
return result
|
||
|
||
|
||
async def get_current_iteration(sor, project_id):
|
||
"""当前迭代 = status='in_progress' 的唯一迭代（seq_no 最小）。无则返回 None。
|
||
|
||
取代旧的「ORDER BY created_at DESC LIMIT 1」推断：当前迭代是显式状态，
|
||
不再靠时间戳猜。传入 sor（调用点已在 sqlorContext 内，避免嵌套开连接）。
|
||
"""
|
||
recs = await sor.sqlExe(
|
||
f"SELECT * FROM {TABLE} WHERE project_id=${{pid}}$ AND status='in_progress' "
|
||
"ORDER BY seq_no ASC LIMIT 1",
|
||
{"pid": project_id})
|
||
await sor.sqlExe("COMMIT", {})
|
||
if recs:
|
||
return _rec_to_dict(recs[0])
|
||
return None
|
||
|
||
|
||
async def _cancel_active_tasks(sor, project_id, iteration_name):
|
||
"""作废某迭代内所有活跃任务（非终态 → cancelled + 清 claimed_by）。
|
||
|
||
任务经 params.iteration_id（存迭代名）归属迭代；只作废该迭代的活跃任务，
|
||
已终态(completed/approved/cancelled/failed)的不动。返回作废数量。
|
||
"""
|
||
if not iteration_name:
|
||
return 0
|
||
recs = await sor.sqlExe(
|
||
"SELECT id FROM pipeline_tasks WHERE tenant_id=${pid}$ "
|
||
"AND state NOT IN ('completed','approved','cancelled','failed') "
|
||
"AND JSON_UNQUOTE(JSON_EXTRACT(params,'$.iteration_id'))=${nm}$",
|
||
{"pid": project_id, "nm": iteration_name})
|
||
await sor.sqlExe("COMMIT", {})
|
||
ids = [getattr(r, 'id', '') for r in (recs or []) if getattr(r, 'id', '')]
|
||
if ids:
|
||
in_clause = ",".join(["'" + x.replace("'", "''") + "'" for x in ids])
|
||
await sor.sqlExe(
|
||
f"UPDATE pipeline_tasks SET state='cancelled', claimed_by=NULL, updated_at=NOW() "
|
||
f"WHERE id IN ({in_clause})", {})
|
||
return len(ids)
|
||
|
||
|
||
async def start_next_iteration(project_id, who=None, agent_id=None):
|
||
"""启动下一个迭代（用户指令推进）：
|
||
|
||
1. 若存在当前迭代(in_progress)，先强制完成它 + 作废其活跃任务。
|
||
2. 找下一个 planning 迭代（seq_no 最小且 > 已结束迭代的最大 seq_no），start 它。
|
||
返回 (ok, message)。
|
||
"""
|
||
if not project_id:
|
||
return False, "缺少 project_id"
|
||
db, dbname = _get_db()
|
||
async with db.sqlorContext(dbname) as sor:
|
||
# 1. 强制完成当前迭代 + 作废其活跃任务
|
||
cur = await get_current_iteration(sor, project_id)
|
||
if cur:
|
||
cur_id = cur.get('id', '')
|
||
cur_name = cur.get('iteration_name', '') or ''
|
||
if cur_name:
|
||
await _cancel_active_tasks(sor, project_id, cur_name)
|
||
await sor.sqlExe(
|
||
f"UPDATE {TABLE} SET status='completed', completed_at=NOW(), updated_at=NOW() "
|
||
f"WHERE id=${{iid}}$ AND project_id=${{pid}}$ AND status='in_progress'",
|
||
{"iid": cur_id, "pid": project_id})
|
||
await record_audit(project_id, TABLE, cur_id, 'complete',
|
||
from_state=S_IN_PROGRESS, to_state=S_COMPLETED,
|
||
who=_normalize_role(who), agent_id=agent_id,
|
||
detail='启动下一迭代时强制完成', sor=sor)
|
||
logger.info("start_next_iteration: 强制完成当前迭代 %s (%s)", cur_id, cur_name)
|
||
# 2. 找下一个 planning 迭代（seq_no > 已结束迭代的最大 seq_no）
|
||
nxt = await sor.sqlExe(
|
||
f"SELECT * FROM {TABLE} WHERE project_id=${{pid}}$ AND status='planning' "
|
||
f"AND seq_no > (SELECT COALESCE(MAX(seq_no),0) FROM {TABLE} "
|
||
f"WHERE project_id=${{pid}}$ AND status IN ('completed','cancelled')) "
|
||
"ORDER BY seq_no ASC LIMIT 1",
|
||
{"pid": project_id})
|
||
await sor.sqlExe("COMMIT", {})
|
||
if not nxt:
|
||
return False, "没有可启动的下一个迭代（请先 create_iteration）"
|
||
nxt_id = getattr(nxt[0], 'id', '')
|
||
nxt_name = getattr(nxt[0], 'iteration_name', '')
|
||
nxt_seq = getattr(nxt[0], 'seq_no', '')
|
||
# 3. start 它（planning → in_progress）
|
||
await sor.sqlExe(
|
||
f"UPDATE {TABLE} SET status='in_progress', started_at=NOW(), updated_at=NOW() "
|
||
f"WHERE id=${{iid}}$ AND project_id=${{pid}}$ AND status='planning'",
|
||
{"iid": nxt_id, "pid": project_id})
|
||
await record_audit(project_id, TABLE, nxt_id, 'start',
|
||
from_state=S_PLANNING, to_state=S_IN_PROGRESS,
|
||
who=_normalize_role(who), agent_id=agent_id, sor=sor)
|
||
logger.info("start_next_iteration: 启动 %s (seq_no=%s)", nxt_name, nxt_seq)
|
||
return True, f"已启动迭代「{nxt_name}」(seq_no={nxt_seq})"
|
||
|
||
|
||
def _rec_to_dict(rec):
|
||
"""把 sqlor 记录对象转成 dict（sqlor 行是 DictObject，必须 dict(rec) 取列）。"""
|
||
if isinstance(rec, dict):
|
||
return dict(rec)
|
||
try:
|
||
return dict(rec)
|
||
except (TypeError, ValueError):
|
||
if hasattr(rec, 'to_dict'):
|
||
try:
|
||
return rec.to_dict()
|
||
except Exception:
|
||
pass
|
||
return {}
|