zhaoxi/KiloStar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(agent): 移除control_node实例化，新增系统节点命名与人设管理前端

Browse Source 
当前阶段只保留regulatory+consciousness两个系统节点，control_node代码保留但不再实例化。
系统节点新增display_name字段支持自定义显示名称，前端新增人设管理Tab支持模板CRUD。

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
zhaoxi
2026-06-04 06:03:28 +00:00
parent 9a7a5edd6e
commit f3a92a793e
11 changed files with 567 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kilostar/api/agent.py
+134 -13
View File
@@ -16,7 +16,7 @@
from typing import Union
from kilostar.utils.ray_hook import ray_actor_hook
from fastapi import APIRouter, Depends, Request
from pydantic import BaseModel
from pydantic import BaseModel, field_validator
from kilostar.utils.access import Accessor, TokenData
from kilostar.core.postgres_database.model import AgentType
from fastapi import HTTPException
@@ -36,6 +36,8 @@ class AgentRegister(BaseModel):
model_id: str
individual_name: str
tools: Optional[List[str]] = None
custom_system_prompt: Optional[str] = None
display_name: Optional[str] = None
class AgentLocalRegister(BaseModel):
@@ -50,7 +52,7 @@ class AgentLocalRegister(BaseModel):
async def get_system_nodes(
_: TokenData = Depends(RoleChecker(allowed_roles=UserAuthority.USER)),
):
"""返回三大系统节点（regulatory/consciousness/control）当前的持久化配置。"""
"""返回两大系统节点（regulatory/consciousness）当前的持久化配置。"""
postgres_database = ray_actor_hook("postgres_database").postgres_database
configs = await postgres_database.get_all_system_node_configs.remote()
return {"system_nodes": configs}
@@ -60,7 +62,7 @@ async def get_system_nodes(
async def load_agent(
agent_register: Union[AgentRegister, AgentLocalRegister],
request: Request,
_: TokenData = Depends(RoleChecker(allowed_roles=UserAuthority.USER)),
_: TokenData = Depends(RoleChecker(allowed_roles=UserAuthority.SUPER_ADMINISTRATOR)),
):
"""加载/重载某个系统节点的 Agent：先持久化配置，再调用对应节点 Actor 的 ``create_agent``。"""
global_state_machine = ray_actor_hook("global_state_machine").global_state_machine
@@ -77,10 +79,13 @@ async def load_agent(
agent_register.provider_title,
agent_register.model_id,
agent_register.tools,
agent_register.custom_system_prompt,
agent_register.display_name,
)
scope = agent_register.individual_name
toolsets = await get_all_toolsets_for_scope(scope)
custom_prompt = agent_register.custom_system_prompt
match scope:
case "regulatory_node":
@@ -92,6 +97,7 @@ async def load_agent(
agent_register.tools,
toolsets,
accept_lang,
custom_prompt,
)
case "consciousness_node":
node = ray_actor_hook("consciousness_node").consciousness_node
@@ -102,16 +108,7 @@ async def load_agent(
agent_register.tools,
toolsets,
accept_lang,
)
case "control_node":
node = ray_actor_hook("control_node").control_node
await node.create_agent.remote(
global_state_machine,
agent_register.provider_title,
agent_register.model_id,
agent_register.tools,
toolsets,
accept_lang,
custom_prompt,
)
case _:
pass
@@ -122,6 +119,9 @@ async def load_agent(
return {"message": "创建成功"}
_VALID_AFFINITIES = {"cpu", "core", "gpu"}
class WorkerIndividualCreate(BaseModel):
"""``POST /worker`` 入参：创建一个 Worker Agent 所需的完整配置。"""
@@ -135,6 +135,14 @@ class WorkerIndividualCreate(BaseModel):
bound_skill: Dict[str, List[str]]
workspace: List[str]
tools: Optional[List[str]] = None
node_affinity: str = "cpu"
@field_validator("node_affinity")
@classmethod
def _check_affinity(cls, v: str) -> str:
if v not in _VALID_AFFINITIES:
raise ValueError(f"node_affinity 必须是 cpu/core/gpu，收到: {v}")
return v
class WorkerIndividualUpdate(BaseModel):
@@ -150,6 +158,14 @@ class WorkerIndividualUpdate(BaseModel):
bound_skill: Optional[Dict[str, List[str]]] = None
workspace: Optional[List[str]] = None
tools: Optional[List[str]] = None
node_affinity: Optional[str] = None
@field_validator("node_affinity")
@classmethod
def _check_affinity(cls, v: Optional[str]) -> Optional[str]:
if v is not None and v not in _VALID_AFFINITIES:
raise ValueError(f"node_affinity 必须是 cpu/core/gpu，收到: {v}")
return v
@agent_router.post("/worker")
@@ -258,3 +274,108 @@ async def delete_worker_individual(
)
await postgres_database.delete_worker_individual.remote(agent_id=agent_id)
return {"message": "success"}
# ──────────────────────────────── Persona Template ────────────────────────────
class PersonaTemplateCreate(BaseModel):
name: str
description: str = ""
system_prompt: str = ""
agent_type: AgentType = "ordinary"
provider_title: Optional[str] = None
model_id: Optional[str] = None
tools: Optional[List[str]] = None
tags: Optional[List[str]] = None
class PersonaTemplateUpdate(BaseModel):
name: Optional[str] = None
description: Optional[str] = None
system_prompt: Optional[str] = None
agent_type: Optional[AgentType] = None
provider_title: Optional[str] = None
model_id: Optional[str] = None
tools: Optional[List[str]] = None
tags: Optional[List[str]] = None
@agent_router.get("/template")
async def list_templates(
include_builtin: bool = True,
token_data: TokenData = Depends(Accessor.get_current_user),
):
postgres_database = ray_actor_hook("postgres_database").postgres_database
templates = await postgres_database.list_templates.remote(
owner_id=token_data.user_id, include_builtin=include_builtin
)
return {"templates": templates}
@agent_router.post("/template")
async def create_template(
data: PersonaTemplateCreate,
token_data: TokenData = Depends(RoleChecker(allowed_roles=UserAuthority.USER)),
):
postgres_database = ray_actor_hook("postgres_database").postgres_database
tpl = await postgres_database.add_template.remote(
**data.model_dump(), owner_id=token_data.user_id, is_builtin=False
)
return {"message": "success", "template_id": tpl.template_id}
@agent_router.put("/template/{template_id}")
async def update_template(
template_id: str,
data: PersonaTemplateUpdate,
token_data: TokenData = Depends(Accessor.get_current_user),
):
postgres_database = ray_actor_hook("postgres_database").postgres_database
tpl = await postgres_database.get_template.remote(template_id)
if not tpl:
raise HTTPException(status_code=404, detail="Template not found")
if not tpl.is_builtin and tpl.owner_id != token_data.user_id:
raise HTTPException(status_code=403, detail="Forbidden")
updated = await postgres_database.update_template.remote(
template_id, **data.model_dump(exclude_unset=True)
)
return {"message": "success", "template": updated}
@agent_router.delete("/template/{template_id}")
async def delete_template(
template_id: str,
token_data: TokenData = Depends(Accessor.get_current_user),
):
postgres_database = ray_actor_hook("postgres_database").postgres_database
tpl = await postgres_database.get_template.remote(template_id)
if not tpl:
raise HTTPException(status_code=404, detail="Template not found")
if tpl.is_builtin or tpl.owner_id != token_data.user_id:
raise HTTPException(status_code=403, detail="Forbidden")
await postgres_database.delete_template.remote(template_id)
return {"message": "success"}
@agent_router.post("/worker/from-template/{template_id}")
async def create_worker_from_template(
template_id: str,
token_data: TokenData = Depends(RoleChecker(allowed_roles=UserAuthority.USER)),
):
"""从人设模板快速创建一个 Worker Agent，字段直接从模板复制。"""
postgres_database = ray_actor_hook("postgres_database").postgres_database
tpl = await postgres_database.get_template.remote(template_id)
if not tpl:
raise HTTPException(status_code=404, detail="Template not found")
worker = await postgres_database.add_worker_individual.remote(
agent_name=tpl.name,
agent_type=tpl.agent_type,
description=tpl.description,
system_prompt=tpl.system_prompt,
provider_title=tpl.provider_title or "",
model_id=tpl.model_id or "",
tools=tpl.tools or [],
owner_id=token_data.user_id,
template_origin_id=template_id,
)
return {"message": "success", "agent_id": worker.agent_id}
kilostar/core/postgres_database/model/system_node.py
+8 -4
View File
@@ -13,10 +13,8 @@
# limitations under the License.
from typing import List, Optional
from sqlalchemy import String
from sqlalchemy.dialects.postgresql import (
JSONB,
) # 针对 Postgres 优化，支持索引和高性能解析
from sqlalchemy import String, Text
from sqlalchemy.dialects.postgresql import JSONB
from sqlalchemy.orm import Mapped, mapped_column
from .base import BaseDataModel
@@ -29,8 +27,14 @@ class SystemNodeConfigModel(BaseDataModel):
__tablename__ = "system_node_config"
node_name: Mapped[str] = mapped_column(String(100), primary_key=True)
display_name: Mapped[Optional[str]] = mapped_column(
String(100), nullable=True, comment="管理员可自定义的显示名称，用于前端展示"
)
provider_title: Mapped[str] = mapped_column(String(50), nullable=False)
model_id: Mapped[str] = mapped_column(String(100), nullable=False)
tools: Mapped[Optional[List[str]]] = mapped_column(
JSONB, default=list, comment="节点可调用的工具标识列表"
)
custom_system_prompt: Mapped[Optional[str]] = mapped_column(
Text, nullable=True, comment="管理员自定义追加的提示词，拼接在默认 system prompt 之后"
)
kilostar/core/postgres_database/module/system_node.py
+10 -2
View File
@@ -19,7 +19,7 @@ from kilostar.core.postgres_database.database_exception import database_exceptio
class SystemNodeDatabase:
"""SystemNodeConfig 表的 DAO：管理 control/consciousness/regulatory 等系统节点的模型配置。"""
"""SystemNodeConfig 表的 DAO：管理 consciousness/regulatory 等系统节点的模型配置。"""
def __init__(self, async_session_maker):
self.async_session_maker = async_session_maker
@@ -31,8 +31,10 @@ class SystemNodeDatabase:
provider_title: str,
model_id: str,
tools: Optional[List[str]] = None,
custom_system_prompt: Optional[str] = None,
display_name: Optional[str] = None,
) -> SystemNodeConfigModel:
"""按 node_name 插入或更新一个系统节点的模型配置（Provider + 模型 ID + 工具列表）。"""
"""按 node_name 插入或更新一个系统节点的模型配置。"""
async with self.async_session_maker() as session:
statement = select(SystemNodeConfigModel).where(
SystemNodeConfigModel.node_name == node_name
@@ -44,12 +46,18 @@ class SystemNodeDatabase:
config.model_id = model_id
if tools is not None:
config.tools = tools
if custom_system_prompt is not None:
config.custom_system_prompt = custom_system_prompt
if display_name is not None:
config.display_name = display_name
else:
config = SystemNodeConfigModel(
node_name=node_name,
provider_title=provider_title,
model_id=model_id,
tools=tools,
custom_system_prompt=custom_system_prompt,
display_name=display_name,
)
session.add(config)
await session.commit()
kilostar/core/postgres_database/postgres.py
+32 -8
View File
@@ -16,6 +16,7 @@ import os
import asyncio
from kilostar.utils.standalone_proxy import actor_class
from kilostar.utils.settings import get_settings
from sqlalchemy.ext.asyncio import create_async_engine, AsyncSession
from sqlalchemy.orm import sessionmaker
from kilostar.core.postgres_database.model.base import BaseDataModel
@@ -42,6 +43,7 @@ from kilostar.core.postgres_database.model.mcp_server import MCPServerModel
from kilostar.core.postgres_database.model.tool_config import ToolConfigModel
from kilostar.core.postgres_database.model.custom_toolset import CustomToolsetModel
from kilostar.core.postgres_database.model.system_event_log import SystemEventLog
from kilostar.core.postgres_database.model.persona_template import PersonaTemplate
from .module.individual import IndividualDatabase
from .module.user import AuthDatabase
@@ -53,6 +55,7 @@ from .module.mcp_server import MCPServerDatabase
from .module.tool_config import ToolConfigDatabase
from .module.custom_toolset import CustomToolsetDatabase
from .module.system_event_log import SystemEventLogDatabase
from .module.persona_template import PersonaTemplateDatabase
@actor_class
@@ -65,13 +68,10 @@ class PostgresDatabase:
"""
def __init__(self):
user = os.environ.get("POSTGRES_USER")
password = os.environ.get("POSTGRES_PASSWORD")
host = os.environ.get("POSTGRES_HOST")
port = os.environ.get("POSTGRES_PORT")
database = os.environ.get("POSTGRES_DB")
_s = get_settings().db
database_url = (
f"postgresql+asyncpg://{user}:{password}@{host}:{port}/{database}"
f"postgresql+asyncpg://{_s.postgres_user}:{_s.postgres_password}"
f"@{_s.postgres_host}:{_s.postgres_port}/{_s.postgres_db}"
)
self.async_engine = create_async_engine(database_url, echo=True)
self.async_session_maker = sessionmaker(
@@ -88,6 +88,7 @@ class PostgresDatabase:
self._tool_config_database = ToolConfigDatabase(self.async_session_maker)
self._custom_toolset_database = CustomToolsetDatabase(self.async_session_maker)
self._system_event_log_database = SystemEventLogDatabase(self.async_session_maker)
self._persona_template_database = PersonaTemplateDatabase(self.async_session_maker)
self.ready_event = asyncio.Event()
@@ -182,11 +183,13 @@ class PostgresDatabase:
provider_title: str,
model_id: str,
tools: list[str] = None,
custom_system_prompt: str = None,
display_name: str = None,
):
"""插入或更新某个系统节点（如 control/consciousness/regulatory）的模型配置。"""
"""插入或更新某个系统节点（如 consciousness/regulatory）的模型配置。"""
await self.ready_event.wait()
return await self._system_node_database.upsert_system_node_config(
node_name, provider_title, model_id, tools
node_name, provider_title, model_id, tools, custom_system_prompt, display_name
)
async def get_all_system_node_configs(self):
@@ -410,3 +413,24 @@ class PostgresDatabase:
limit=limit,
offset=offset,
)
# Persona Template Database Methods
async def add_template(self, **kwargs):
await self.ready_event.wait()
return await self._persona_template_database.add_template(**kwargs)
async def get_template(self, template_id: str):
await self.ready_event.wait()
return await self._persona_template_database.get_template(template_id)
async def list_templates(self, owner_id: str = None, include_builtin: bool = True):
await self.ready_event.wait()
return await self._persona_template_database.list_templates(owner_id, include_builtin)
async def update_template(self, template_id: str, **kwargs):
await self.ready_event.wait()
return await self._persona_template_database.update_template(template_id, **kwargs)
async def delete_template(self, template_id: str):
await self.ready_event.wait()
return await self._persona_template_database.delete_template(template_id)