feat: 清理 control_node + 引入 task 一等公民
- control_node 标注 DEPRECATED:保留目录壳子供未来远程探针节点复用,删除调用路径与相关测试
- 新增 task 表:极简元数据持久化 regulatory_node 完成的短任务(出报告/写文件/查询整理)
- regulatory_node 自标注:MessageResponse 扩展 task_action/title/summary,_run 末尾非阻塞落库
- query_task_list 改查 task 表,符合用户对"任务列表"的直觉,与 workflow 体系解耦
- 新增 /api/v1/task/list|/{id} 只读 API(task 由 regulatory 内部触发,不开放对外创建)
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
@@ -76,62 +76,7 @@ async def test_regulatory_run_swallows_exception_returns_none(regulatory_instanc
|
||||
assert out is None
|
||||
|
||||
|
||||
# ─── ControlNode ────────────────────────────────────────────────────────────
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def control_instance():
|
||||
from kilostar.core.individual.control_node.control_node import ControlNode
|
||||
cls = ControlNode.__ray_actor_class__
|
||||
obj = cls.__new__(cls)
|
||||
from kilostar.utils.logger import get_logger
|
||||
obj.logger = get_logger("control_node")
|
||||
obj.agent = None
|
||||
obj._model_settings = {}
|
||||
return obj
|
||||
|
||||
|
||||
def _make_workflow_step():
|
||||
from kilostar.core.work.workflow.workflow import WorkflowStep
|
||||
|
||||
return WorkflowStep(
|
||||
step=1,
|
||||
name="do something",
|
||||
action="execute the thing",
|
||||
inputs=None,
|
||||
outputs="result",
|
||||
)
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_control_working_returns_for_workflow_output(control_instance):
|
||||
from kilostar.core.individual.control_node.template import (
|
||||
ForWorkflow,
|
||||
ForWorkflowInput,
|
||||
)
|
||||
|
||||
step = _make_workflow_step()
|
||||
expected = ForWorkflow(output="done")
|
||||
agent_run_result = SimpleNamespace(output=expected)
|
||||
|
||||
control_instance.agent = MagicMock()
|
||||
control_instance.agent.run = AsyncMock(return_value=agent_run_result)
|
||||
|
||||
out = await control_instance.working(ForWorkflowInput(workflow_step=step))
|
||||
assert out is expected
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_control_working_swallows_exception_returns_none(control_instance):
|
||||
from kilostar.core.individual.control_node.template import ForWorkflowInput
|
||||
|
||||
step = _make_workflow_step()
|
||||
control_instance.agent = MagicMock()
|
||||
control_instance.agent.run = AsyncMock(side_effect=RuntimeError("boom"))
|
||||
|
||||
out = await control_instance.working(ForWorkflowInput(workflow_step=step))
|
||||
assert out is None
|
||||
|
||||
# ─── ControlNode 已废弃,相关 fixture 与测试已删除(保留目录壳子供未来改写) ──
|
||||
|
||||
# ─── ConsciousnessNode ──────────────────────────────────────────────────────
|
||||
|
||||
|
||||
@@ -66,8 +66,9 @@ def test_tavily_search_metadata():
|
||||
tool = _get_tool_def(manifest, "tavily_search")
|
||||
assert tool["is_system"] is False
|
||||
assert tool["category"] == "search"
|
||||
assert "control_node" in tool["action_scope"]
|
||||
assert "consciousness_node" in tool["action_scope"]
|
||||
assert "regulatory_node" in tool["action_scope"]
|
||||
assert "control_node" not in tool["action_scope"]
|
||||
assert "api_key" in tool["config_args"]
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,97 @@
|
||||
"""``TaskDatabase`` 单元测试:覆盖 create / get / list / update_status 路径。"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import pytest
|
||||
from unittest.mock import AsyncMock, MagicMock
|
||||
|
||||
from kilostar.core.postgres_database.module.task import TaskDatabase
|
||||
|
||||
|
||||
def _make_db():
|
||||
session = AsyncMock()
|
||||
session.__aenter__ = AsyncMock(return_value=session)
|
||||
session.__aexit__ = AsyncMock(return_value=False)
|
||||
session_maker = MagicMock(return_value=session)
|
||||
return TaskDatabase(session_maker), session
|
||||
|
||||
|
||||
@pytest.mark.anyio
|
||||
async def test_create_task_persists_row():
|
||||
db, session = _make_db()
|
||||
session.add = MagicMock()
|
||||
session.commit = AsyncMock()
|
||||
|
||||
await db.create_task(
|
||||
task_id="t1",
|
||||
user_id="alice",
|
||||
command="写一份周报",
|
||||
title="Q2 周报",
|
||||
chat_id="chat-1",
|
||||
status="completed",
|
||||
result_summary="已生成报告",
|
||||
)
|
||||
session.add.assert_called_once()
|
||||
added = session.add.call_args[0][0]
|
||||
assert added.task_id == "t1"
|
||||
assert added.user_id == "alice"
|
||||
assert added.title == "Q2 周报"
|
||||
assert added.status == "completed"
|
||||
session.commit.assert_awaited_once()
|
||||
|
||||
|
||||
@pytest.mark.anyio
|
||||
async def test_get_task_returns_none_when_missing():
|
||||
db, session = _make_db()
|
||||
execute_result = MagicMock()
|
||||
execute_result.scalar_one_or_none.return_value = None
|
||||
session.execute = AsyncMock(return_value=execute_result)
|
||||
|
||||
result = await db.get_task("missing")
|
||||
assert result is None
|
||||
|
||||
|
||||
@pytest.mark.anyio
|
||||
async def test_list_tasks_by_user_filters_status():
|
||||
"""传 status 时 SQL 应进入 status 过滤分支(execute 被调用一次即视为路径已走通)。"""
|
||||
db, session = _make_db()
|
||||
execute_result = MagicMock()
|
||||
execute_result.scalars.return_value.all.return_value = []
|
||||
session.execute = AsyncMock(return_value=execute_result)
|
||||
|
||||
result = await db.list_tasks_by_user(user_id="alice", status="completed", limit=10)
|
||||
assert result == []
|
||||
session.execute.assert_awaited_once()
|
||||
|
||||
|
||||
@pytest.mark.anyio
|
||||
async def test_list_tasks_by_user_no_status():
|
||||
db, session = _make_db()
|
||||
execute_result = MagicMock()
|
||||
execute_result.scalars.return_value.all.return_value = []
|
||||
session.execute = AsyncMock(return_value=execute_result)
|
||||
|
||||
await db.list_tasks_by_user(user_id="alice")
|
||||
session.execute.assert_awaited_once()
|
||||
|
||||
|
||||
@pytest.mark.anyio
|
||||
async def test_update_status_with_summary():
|
||||
db, session = _make_db()
|
||||
session.execute = AsyncMock()
|
||||
session.commit = AsyncMock()
|
||||
|
||||
await db.update_status("t1", status="failed", result_summary="出错")
|
||||
session.execute.assert_awaited_once()
|
||||
session.commit.assert_awaited_once()
|
||||
|
||||
|
||||
@pytest.mark.anyio
|
||||
async def test_update_status_without_summary():
|
||||
db, session = _make_db()
|
||||
session.execute = AsyncMock()
|
||||
session.commit = AsyncMock()
|
||||
|
||||
await db.update_status("t1", status="running")
|
||||
session.execute.assert_awaited_once()
|
||||
session.commit.assert_awaited_once()
|
||||
Reference in New Issue
Block a user