Phase 4.2+4.3: YAML workflow spec + ACA protocol abstraction (v2026.07.19.10)
CI / gate (push) Has been cancelled
CI / gate (push) Has been cancelled
This commit is contained in:
1 parent
c716dab851
commit
79c27795a8
9 files changed
+936
-1
No files matched your search
@@ -654,3 +654,131 @@ async def set_agent_orchestration(
|
||||
agent.orchestration = og
|
||||
db.commit()
|
||||
return {"agent_id": agent_id, "orchestration": agent.orchestration, "updated": True}
|
||||
|
||||
|
||||
# ============================================================
|
||||
# Phase 4.2: YAML workflow import/export/validate/templates
|
||||
# ============================================================
|
||||
|
||||
import yaml as _yaml
|
||||
import os as _os
|
||||
from app.core.yaml_workflow import validate_yaml, yaml_to_orchestration, orchestration_to_yaml
|
||||
from app.core.orchestrator import validate_graph
|
||||
|
||||
_YTMPL = _os.path.join(_os.path.dirname(_os.path.dirname(_os.path.dirname(__file__))), "workflow_templates")
|
||||
|
||||
|
||||
class YAMLBody(BaseModel):
|
||||
yaml_text: str
|
||||
|
||||
|
||||
@router.post("/orchestration/yaml/validate", summary="校验 YAML 工作流")
|
||||
async def yaml_validate(req: YAMLBody, admin_user=Depends(get_current_admin)):
|
||||
try:
|
||||
data = _yaml.safe_load(req.yaml_text)
|
||||
except _yaml.YAMLError as e:
|
||||
return {"ok": False, "errors": [f"YAML parse: {str(e)}"], "warnings": []}
|
||||
r = validate_yaml(data)
|
||||
if r["ok"]:
|
||||
try:
|
||||
validate_graph(yaml_to_orchestration(data))
|
||||
except Exception as e:
|
||||
r["ok"] = False; r["errors"].append(f"Graph fail: {str(e)}")
|
||||
return r
|
||||
|
||||
|
||||
@router.post("/{agent_id}/orchestration/yaml/import", summary="YAML 导入编排")
|
||||
async def yaml_import(agent_id: str, req: YAMLBody, admin_user=Depends(get_current_admin), db=Depends(get_db)):
|
||||
ag = db.query(MarketApp).filter(MarketApp.id == agent_id, MarketApp.type == "agent").first()
|
||||
if not ag:
|
||||
raise HTTPException(status_code=404, detail="Agent not found")
|
||||
try:
|
||||
data = _yaml.safe_load(req.yaml_text)
|
||||
except _yaml.YAMLError as e:
|
||||
raise HTTPException(status_code=400, detail=f"YAML parse: {str(e)}")
|
||||
v = validate_yaml(data)
|
||||
if not v["ok"]:
|
||||
raise HTTPException(status_code=400, detail="YAML invalid: " + "; ".join(v["errors"]))
|
||||
orch = yaml_to_orchestration(data)
|
||||
try:
|
||||
validate_graph(orch)
|
||||
except Exception as e:
|
||||
raise HTTPException(status_code=400, detail=f"Graph invalid: {str(e)}")
|
||||
ag.orchestration = orch
|
||||
ag.updated_at = datetime.now()
|
||||
db.commit()
|
||||
return {"agent_id": agent_id, "orchestration": ag.orchestration, "imported": True}
|
||||
|
||||
|
||||
@router.post("/{agent_id}/orchestration/yaml/export", summary="编排导出 YAML")
|
||||
async def yaml_export(agent_id: str, admin_user=Depends(get_current_admin), db=Depends(get_db)):
|
||||
ag = db.query(MarketApp).filter(MarketApp.id == agent_id, MarketApp.type == "agent").first()
|
||||
if not ag:
|
||||
raise HTTPException(status_code=404, detail="Agent not found")
|
||||
if not ag.orchestration:
|
||||
raise HTTPException(status_code=400, detail="No orchestration")
|
||||
yaml_str = _yaml.dump(orchestration_to_yaml(ag.orchestration), allow_unicode=True, default_flow_style=False, sort_keys=False)
|
||||
return {"agent_id": agent_id, "yaml": yaml_str, "version": "1.0"}
|
||||
|
||||
|
||||
@router.get("/orchestration/yaml/templates", summary="内置模板")
|
||||
async def yaml_templates(admin_user=Depends(get_current_admin)):
|
||||
tmpls = []
|
||||
if _os.path.isdir(_YTMPL):
|
||||
for fp in sorted(_os.listdir(_YTMPL)):
|
||||
if fp.endswith((".yaml", ".yml")):
|
||||
try:
|
||||
with open(_os.path.join(_YTMPL, fp), encoding="utf-8") as f:
|
||||
txt = f.read()
|
||||
d = _yaml.safe_load(txt) or {}
|
||||
tmpls.append({"filename": fp, "name": d.get("name", fp),
|
||||
"description": d.get("description", ""),
|
||||
"category": d.get("category", "general"), "yaml": txt})
|
||||
except Exception:
|
||||
tmpls.append({"filename": fp, "name": fp, "error": True})
|
||||
return {"templates": tmpls, "count": len(tmpls)}
|
||||
|
||||
|
||||
# ============================================================
|
||||
# Phase 4.3: ACA 协议抽象 — protocols / tools / health
|
||||
# ============================================================
|
||||
|
||||
from app.core.aca import registry as _aca_registry, init_aca_registry
|
||||
|
||||
# 懒初始化:首次调用 ACA 端点时确保 registry 已填充
|
||||
_aca_initialized = False
|
||||
|
||||
def _ensure_aca():
|
||||
global _aca_initialized
|
||||
if not _aca_initialized:
|
||||
init_aca_registry()
|
||||
_aca_initialized = True
|
||||
|
||||
|
||||
@router.get("/aca/protocols", summary="ACA 已注册协议")
|
||||
async def aca_protocols(admin_user=Depends(get_current_admin)):
|
||||
_ensure_aca()
|
||||
return [
|
||||
{"name": a.name, "version": a.version, "capabilities": a.capabilities}
|
||||
for a in _aca_registry.list_all()
|
||||
]
|
||||
|
||||
|
||||
@router.get("/aca/protocols/{name}/tools", summary="协议工具列表")
|
||||
async def aca_protocol_tools(name: str, admin_user=Depends(get_current_admin)):
|
||||
_ensure_aca()
|
||||
adapter = _aca_registry.get(name)
|
||||
if not adapter:
|
||||
raise HTTPException(status_code=404, detail=f"协议 {name} 未注册")
|
||||
tools = await adapter.list_tools()
|
||||
return {"protocol": name, "tools": tools, "count": len(tools)}
|
||||
|
||||
|
||||
@router.post("/aca/protocols/{name}/health", summary="协议健康检查")
|
||||
async def aca_protocol_health(name: str, admin_user=Depends(get_current_admin)):
|
||||
_ensure_aca()
|
||||
adapter = _aca_registry.get(name)
|
||||
if not adapter:
|
||||
raise HTTPException(status_code=404, detail=f"协议 {name} 未注册")
|
||||
ok = await adapter.health_check()
|
||||
return {"protocol": name, "healthy": ok}
|
||||
Reference in new issue
Block a user