sync update from LAN repo (source dhk-1 @ c21a2a4a)
This commit is contained in:
1 parent
264e2200d6
commit
a1fa13a238
122 files changed
+8881
-623
No files matched your search
@@ -12,7 +12,7 @@ import time
|
||||
import zipfile
|
||||
from datetime import UTC, datetime
|
||||
from pathlib import Path
|
||||
from typing import Any
|
||||
from typing import Any, Literal
|
||||
|
||||
from fastapi import APIRouter, Depends, File, HTTPException, Query, Request, Response, UploadFile
|
||||
from fastapi.responses import FileResponse
|
||||
@@ -35,6 +35,7 @@ from app.gateway.skill_catalog_cache import (
|
||||
load_or_warm_skill_catalog_snapshot,
|
||||
load_skill_catalog_projection,
|
||||
refresh_skill_catalog_projection,
|
||||
set_skill_catalog_enabled,
|
||||
)
|
||||
from deerflow.agents.lead_agent.prompt import refresh_skills_system_prompt_cache_async
|
||||
from deerflow.config.app_config import AppConfig
|
||||
@@ -369,6 +370,24 @@ class SkillRollbackRequest(BaseModel):
|
||||
history_index: int = Field(default=-1, description="History entry index to restore from, defaulting to the latest change.")
|
||||
|
||||
|
||||
class SkillVersionEntryResponse(BaseModel):
|
||||
version: int
|
||||
sha256: str
|
||||
created_at: str
|
||||
created_by: str | None = None
|
||||
action: str
|
||||
summary: str | None = None
|
||||
based_on_version: int | None = None
|
||||
active: bool = False
|
||||
|
||||
|
||||
class SkillVersionsResponse(BaseModel):
|
||||
enabled: bool
|
||||
skill_name: str
|
||||
active_version: int | None = None
|
||||
versions: list[SkillVersionEntryResponse] = Field(default_factory=list)
|
||||
|
||||
|
||||
def _skill_to_response(
|
||||
skill: Skill,
|
||||
ownership: dict[str, Any] | None = None,
|
||||
@@ -1305,6 +1324,10 @@ async def install_skill_upload(
|
||||
request: Request,
|
||||
file: UploadFile = File(..., description="The .zip or .skill archive to install"),
|
||||
overwrite: bool = False,
|
||||
install_mode: Literal["iterate", "overwrite"] | None = Query(
|
||||
default=None,
|
||||
description="Same-name custom upload mode when versioning is enabled: iterate or overwrite.",
|
||||
),
|
||||
target_category: SkillCategory = SkillCategory.CUSTOM,
|
||||
config: AppConfig = Depends(get_config),
|
||||
skill_store: SkillStore = Depends(get_skill_store),
|
||||
@@ -1339,9 +1362,31 @@ async def install_skill_upload(
|
||||
target_category=target_category,
|
||||
conflict_kind=validation.get("conflict_kind"),
|
||||
)
|
||||
if (overwrite and not can_install_as_is and not can_overwrite) or (not overwrite and not can_install_as_is):
|
||||
requested_overwrite = overwrite or install_mode in {"iterate", "overwrite"}
|
||||
if (requested_overwrite and not can_install_as_is and not can_overwrite) or (
|
||||
not requested_overwrite and not can_install_as_is
|
||||
):
|
||||
raise HTTPException(status_code=409, detail=conflict_message)
|
||||
if install_mode == "iterate":
|
||||
from deerflow.skills.versioning import record_custom_skill_version, skill_versioning_enabled
|
||||
|
||||
if not skill_versioning_enabled():
|
||||
raise HTTPException(status_code=409, detail="技能迭代功能未开启")
|
||||
if target_category != SkillCategory.CUSTOM or not _owned_by_me or not can_overwrite:
|
||||
raise HTTPException(status_code=409, detail="只有本人已有的同名自定义技能可以迭代")
|
||||
overwrite = True
|
||||
await asyncio.to_thread(
|
||||
record_custom_skill_version,
|
||||
preview_name,
|
||||
storage=storage,
|
||||
action="baseline",
|
||||
author=user_id,
|
||||
summary="同名上传迭代前的活动版本",
|
||||
)
|
||||
elif install_mode == "overwrite":
|
||||
overwrite = True
|
||||
result = await storage.ainstall_skill_from_archive(tmp_path, overwrite=overwrite, require_skill_suffix=False, target_category=target_category)
|
||||
storage.invalidate_skills_cache()
|
||||
try:
|
||||
from deerflow.skills.usage import mark_uploaded
|
||||
mark_uploaded(result["skill_name"])
|
||||
@@ -1360,8 +1405,49 @@ async def install_skill_upload(
|
||||
await skill_store.ensure_legacy(
|
||||
{"name": result["skill_name"], "owner_user_id": user_id, "published": False}
|
||||
)
|
||||
try:
|
||||
from deerflow.skills.versioning import (
|
||||
record_custom_skill_version,
|
||||
reset_custom_skill_versions,
|
||||
skill_versioning_enabled,
|
||||
)
|
||||
|
||||
if skill_versioning_enabled():
|
||||
if result.get("overwritten") and install_mode == "iterate":
|
||||
await asyncio.to_thread(
|
||||
record_custom_skill_version,
|
||||
result["skill_name"],
|
||||
storage=storage,
|
||||
action="upload_iteration",
|
||||
author=user_id,
|
||||
summary="上传同名技能并迭代为新版本",
|
||||
)
|
||||
elif result.get("overwritten"):
|
||||
await asyncio.to_thread(
|
||||
reset_custom_skill_versions,
|
||||
result["skill_name"],
|
||||
storage=storage,
|
||||
author=user_id,
|
||||
summary="上传同名技能并直接覆盖",
|
||||
)
|
||||
else:
|
||||
await asyncio.to_thread(
|
||||
record_custom_skill_version,
|
||||
result["skill_name"],
|
||||
storage=storage,
|
||||
action="upload",
|
||||
author=user_id,
|
||||
summary="上传技能初始版本",
|
||||
)
|
||||
except Exception:
|
||||
logger.exception("Failed to persist custom skill version after upload: %s", result["skill_name"])
|
||||
# The package is already installed. Do not report the whole
|
||||
# upload as failed (which would invite an unsafe duplicate
|
||||
# retry); opening the version list lazily snapshots the current
|
||||
# package and repairs the manifest.
|
||||
await _refresh_catalog_snapshot(config)
|
||||
await refresh_skills_system_prompt_cache_async()
|
||||
await _sync_skill_view(result["skill_name"])
|
||||
return SkillInstallResponse(**result)
|
||||
except FileNotFoundError as e:
|
||||
raise HTTPException(status_code=404, detail=str(e))
|
||||
@@ -1603,6 +1689,7 @@ async def install_skill(
|
||||
target_category=target_category,
|
||||
require_skill_suffix=False,
|
||||
)
|
||||
storage.invalidate_skills_cache()
|
||||
try:
|
||||
from deerflow.skills.usage import mark_uploaded
|
||||
mark_uploaded(result.skill_name)
|
||||
@@ -1616,8 +1703,16 @@ async def install_skill(
|
||||
await skill_store.ensure_legacy(
|
||||
{"name": result.skill_name, "owner_user_id": user_id, "published": False}
|
||||
)
|
||||
await _record_custom_version(
|
||||
result.skill_name,
|
||||
storage=storage,
|
||||
action="artifact_install",
|
||||
author=user_id,
|
||||
summary="从会话产物安装技能初始版本",
|
||||
)
|
||||
await _refresh_catalog_snapshot(config)
|
||||
await refresh_skills_system_prompt_cache_async()
|
||||
await _sync_skill_view(result.skill_name)
|
||||
return result
|
||||
except FileNotFoundError as e:
|
||||
raise HTTPException(status_code=404, detail=str(e))
|
||||
@@ -1730,6 +1825,14 @@ async def duplicate_skill(
|
||||
mark_uploaded(new_name)
|
||||
except Exception:
|
||||
pass
|
||||
storage.invalidate_skills_cache()
|
||||
await _record_custom_version(
|
||||
new_name,
|
||||
storage=storage,
|
||||
action="duplicate",
|
||||
author=user_id,
|
||||
summary=f"从技能 {source_name} 复制创建",
|
||||
)
|
||||
await _refresh_catalog_snapshot(config)
|
||||
await refresh_skills_system_prompt_cache_async()
|
||||
return SkillInstallResponse(
|
||||
@@ -1784,6 +1887,13 @@ async def reconcile_custom_skills(
|
||||
mark_uploaded(skill.name)
|
||||
except Exception:
|
||||
pass
|
||||
await _record_custom_version(
|
||||
skill.name,
|
||||
storage=storage,
|
||||
action="reconcile",
|
||||
author=user_id,
|
||||
summary="接管已有自定义技能并建立初始版本",
|
||||
)
|
||||
adopted.append(skill.name)
|
||||
|
||||
if adopted:
|
||||
@@ -1869,8 +1979,16 @@ async def update_custom_skill(skill_name: str, request: CustomSkillUpdateRequest
|
||||
scan = await scan_skill_content(request.content, executable=False, location=f"{skill_name}/{SKILL_MD_FILE}", app_config=config)
|
||||
if scan.decision == "block":
|
||||
raise HTTPException(status_code=400, detail=f"Security scan blocked the edit: {scan.reason}")
|
||||
await _record_custom_version(
|
||||
skill_name,
|
||||
storage=storage,
|
||||
action="baseline",
|
||||
author=None,
|
||||
summary="编辑前的活动版本",
|
||||
)
|
||||
prev_content = storage.read_custom_skill(skill_name)
|
||||
storage.write_custom_skill(skill_name, SKILL_MD_FILE, request.content)
|
||||
storage.invalidate_skills_cache()
|
||||
await _refresh_catalog_snapshot(config)
|
||||
storage.append_history(
|
||||
skill_name,
|
||||
@@ -1889,7 +2007,15 @@ async def update_custom_skill(skill_name: str, request: CustomSkillUpdateRequest
|
||||
bump_patch(skill_name)
|
||||
except Exception:
|
||||
pass
|
||||
await _record_custom_version(
|
||||
skill_name,
|
||||
storage=storage,
|
||||
action="human_edit",
|
||||
author=None,
|
||||
summary="编辑 SKILL.md",
|
||||
)
|
||||
await refresh_skills_system_prompt_cache_async()
|
||||
await _sync_skill_view(skill_name)
|
||||
return await get_custom_skill(skill_name, config)
|
||||
except HTTPException:
|
||||
raise
|
||||
@@ -1941,6 +2067,12 @@ async def delete_custom_skill(
|
||||
await skill_store.delete_admin(skill_name)
|
||||
else:
|
||||
await skill_store.delete(skill_name, user_id)
|
||||
try:
|
||||
from deerflow.skills.versioning import delete_custom_skill_versions
|
||||
|
||||
await asyncio.to_thread(delete_custom_skill_versions, skill_name)
|
||||
except Exception:
|
||||
logger.warning("Failed to delete version history for %s", skill_name, exc_info=True)
|
||||
await _refresh_catalog_snapshot(config)
|
||||
|
||||
try:
|
||||
@@ -2279,6 +2411,108 @@ async def get_custom_skill_history(skill_name: str, config: AppConfig = Depends(
|
||||
raise HTTPException(status_code=500, detail=f"Failed to read history: {str(e)}")
|
||||
|
||||
|
||||
@router.get(
|
||||
"/skills/custom/{skill_name}/versions",
|
||||
response_model=SkillVersionsResponse,
|
||||
summary="List Custom Skill Versions",
|
||||
)
|
||||
async def get_custom_skill_versions(
|
||||
skill_name: str,
|
||||
request: Request,
|
||||
config: AppConfig = Depends(get_config),
|
||||
skill_store: SkillStore = Depends(get_skill_store),
|
||||
) -> SkillVersionsResponse:
|
||||
"""List complete-package snapshots for one owned/admin-managed custom skill."""
|
||||
|
||||
try:
|
||||
skill_name = SkillStorage.validate_skill_name(skill_name.replace("\r\n", "").replace("\n", ""))
|
||||
await _get_editable_skill_or_raise(
|
||||
skill_store,
|
||||
skill_name,
|
||||
_current_user_id(request),
|
||||
is_admin=_is_admin_user(request),
|
||||
)
|
||||
storage = get_or_new_skill_storage(app_config=config)
|
||||
if not storage.custom_skill_exists(skill_name):
|
||||
raise HTTPException(status_code=404, detail=f"Custom skill '{skill_name}' not found")
|
||||
from deerflow.skills.versioning import list_custom_skill_versions
|
||||
|
||||
payload = await asyncio.to_thread(
|
||||
list_custom_skill_versions,
|
||||
skill_name,
|
||||
storage=storage,
|
||||
author=_current_user_id(request),
|
||||
)
|
||||
return SkillVersionsResponse.model_validate(payload)
|
||||
except HTTPException:
|
||||
raise
|
||||
except (FileNotFoundError, ValueError) as e:
|
||||
raise HTTPException(status_code=404, detail=str(e))
|
||||
except Exception as e:
|
||||
logger.error("Failed to list versions for %s: %s", skill_name, e, exc_info=True)
|
||||
raise HTTPException(status_code=500, detail=f"Failed to list skill versions: {e}")
|
||||
|
||||
|
||||
@router.post(
|
||||
"/skills/custom/{skill_name}/versions/{version}/activate",
|
||||
response_model=SkillVersionsResponse,
|
||||
summary="Activate Custom Skill Version",
|
||||
)
|
||||
async def activate_custom_skill_version_endpoint(
|
||||
skill_name: str,
|
||||
version: int,
|
||||
request: Request,
|
||||
config: AppConfig = Depends(get_config),
|
||||
skill_store: SkillStore = Depends(get_skill_store),
|
||||
) -> SkillVersionsResponse:
|
||||
"""Switch the sole model-visible package without touching usage counters."""
|
||||
|
||||
try:
|
||||
skill_name = SkillStorage.validate_skill_name(skill_name.replace("\r\n", "").replace("\n", ""))
|
||||
await _get_editable_skill_or_raise(
|
||||
skill_store,
|
||||
skill_name,
|
||||
_current_user_id(request),
|
||||
is_admin=_is_admin_user(request),
|
||||
)
|
||||
storage = get_or_new_skill_storage(app_config=config)
|
||||
if not storage.custom_skill_exists(skill_name):
|
||||
raise HTTPException(status_code=404, detail=f"Custom skill '{skill_name}' not found")
|
||||
from deerflow.skills.versioning import (
|
||||
activate_custom_skill_version,
|
||||
list_custom_skill_versions,
|
||||
)
|
||||
|
||||
await asyncio.to_thread(
|
||||
activate_custom_skill_version,
|
||||
skill_name,
|
||||
version,
|
||||
storage=storage,
|
||||
)
|
||||
storage.invalidate_skills_cache()
|
||||
await _refresh_catalog_snapshot(config)
|
||||
await refresh_skills_system_prompt_cache_async()
|
||||
await _sync_skill_view(skill_name)
|
||||
payload = await asyncio.to_thread(
|
||||
list_custom_skill_versions,
|
||||
skill_name,
|
||||
storage=storage,
|
||||
author=_current_user_id(request),
|
||||
)
|
||||
return SkillVersionsResponse.model_validate(payload)
|
||||
except HTTPException:
|
||||
raise
|
||||
except RuntimeError as e:
|
||||
raise HTTPException(status_code=409, detail=str(e))
|
||||
except FileNotFoundError as e:
|
||||
raise HTTPException(status_code=404, detail=str(e))
|
||||
except ValueError as e:
|
||||
raise HTTPException(status_code=400, detail=str(e))
|
||||
except Exception as e:
|
||||
logger.error("Failed to activate %s version %s: %s", skill_name, version, e, exc_info=True)
|
||||
raise HTTPException(status_code=500, detail=f"Failed to activate skill version: {e}")
|
||||
|
||||
|
||||
@router.post("/skills/custom/{skill_name}/rollback", response_model=CustomSkillContentResponse, summary="Rollback Custom Skill")
|
||||
async def rollback_custom_skill(skill_name: str, request: SkillRollbackRequest, config: AppConfig = Depends(get_config)) -> CustomSkillContentResponse:
|
||||
try:
|
||||
@@ -2309,10 +2543,26 @@ async def rollback_custom_skill(skill_name: str, request: SkillRollbackRequest,
|
||||
if scan.decision == "block":
|
||||
storage.append_history(skill_name, history_entry)
|
||||
raise HTTPException(status_code=400, detail=f"Rollback blocked by security scanner: {scan.reason}")
|
||||
await _record_custom_version(
|
||||
skill_name,
|
||||
storage=storage,
|
||||
action="baseline",
|
||||
author=None,
|
||||
summary="旧历史回滚前的活动版本",
|
||||
)
|
||||
storage.write_custom_skill(skill_name, SKILL_MD_FILE, target_content)
|
||||
storage.invalidate_skills_cache()
|
||||
await _refresh_catalog_snapshot(config)
|
||||
storage.append_history(skill_name, history_entry)
|
||||
await _record_custom_version(
|
||||
skill_name,
|
||||
storage=storage,
|
||||
action="legacy_rollback",
|
||||
author=None,
|
||||
summary="从旧编辑历史恢复 SKILL.md",
|
||||
)
|
||||
await refresh_skills_system_prompt_cache_async()
|
||||
await _sync_skill_view(skill_name)
|
||||
return await get_custom_skill(skill_name, config)
|
||||
except HTTPException:
|
||||
raise
|
||||
@@ -2775,6 +3025,28 @@ async def _sync_skill_view(name: str) -> None:
|
||||
logger.warning("Failed to sync skill %s into the sandbox view", name, exc_info=True)
|
||||
|
||||
|
||||
async def _record_custom_version(
|
||||
name: str,
|
||||
*,
|
||||
storage: SkillStorage,
|
||||
action: str,
|
||||
author: str | None,
|
||||
summary: str,
|
||||
) -> None:
|
||||
"""Capture one complete custom-skill package when versioning is enabled."""
|
||||
|
||||
from deerflow.skills.versioning import record_custom_skill_version
|
||||
|
||||
await asyncio.to_thread(
|
||||
record_custom_skill_version,
|
||||
name,
|
||||
storage=storage,
|
||||
action=action,
|
||||
author=author,
|
||||
summary=summary,
|
||||
)
|
||||
|
||||
|
||||
@router.put(
|
||||
"/skills/{skill_name}/files/content",
|
||||
response_model=SkillFileSaveResponse,
|
||||
@@ -2826,7 +3098,18 @@ async def save_skill_file(
|
||||
# SKILL.md edits must keep their frontmatter valid (name must match).
|
||||
storage.validate_skill_markdown_content(skill.name, body.content)
|
||||
|
||||
if skill.category == SkillCategory.CUSTOM:
|
||||
await _record_custom_version(
|
||||
skill.name,
|
||||
storage=storage,
|
||||
action="baseline",
|
||||
author=_current_user_id(request),
|
||||
summary="文件编辑前的活动版本",
|
||||
)
|
||||
|
||||
_write_skill_text_file_atomically(target, body.content)
|
||||
if skill.category == SkillCategory.CUSTOM:
|
||||
storage.invalidate_skills_cache()
|
||||
|
||||
try:
|
||||
if skill.category == SkillCategory.CUSTOM:
|
||||
@@ -2852,6 +3135,15 @@ async def save_skill_file(
|
||||
pass
|
||||
await refresh_skills_system_prompt_cache_async()
|
||||
|
||||
if skill.category == SkillCategory.CUSTOM:
|
||||
await _record_custom_version(
|
||||
skill.name,
|
||||
storage=storage,
|
||||
action="human_edit_file",
|
||||
author=_current_user_id(request),
|
||||
summary=f"编辑文件 {relative_posix}",
|
||||
)
|
||||
|
||||
await _sync_skill_view(skill.name)
|
||||
|
||||
stat = target.stat()
|
||||
@@ -2911,10 +3203,19 @@ async def delete_skill_file(
|
||||
prev_content = target.read_text(encoding="utf-8")
|
||||
except UnicodeDecodeError:
|
||||
pass
|
||||
if skill.category == SkillCategory.CUSTOM:
|
||||
await _record_custom_version(
|
||||
skill.name,
|
||||
storage=get_or_new_skill_storage(app_config=config),
|
||||
action="baseline",
|
||||
author=_current_user_id(request),
|
||||
summary="文件删除前的活动版本",
|
||||
)
|
||||
target.unlink()
|
||||
|
||||
if skill.category == SkillCategory.CUSTOM:
|
||||
storage = get_or_new_skill_storage(app_config=config)
|
||||
storage.invalidate_skills_cache()
|
||||
try:
|
||||
storage.append_history(
|
||||
skill.name,
|
||||
@@ -2928,6 +3229,13 @@ async def delete_skill_file(
|
||||
)
|
||||
except Exception as history_err: # noqa: BLE001
|
||||
logger.warning("Failed to append deletion history for %s/%s: %s", skill.name, relative_posix, history_err)
|
||||
await _record_custom_version(
|
||||
skill.name,
|
||||
storage=storage,
|
||||
action="human_delete_file",
|
||||
author=_current_user_id(request),
|
||||
summary=f"删除文件 {relative_posix}",
|
||||
)
|
||||
else:
|
||||
logger.info("Administrator deleted built-in skill file %s/%s", skill.name, relative_posix)
|
||||
await _sync_skill_view(skill.name)
|
||||
@@ -3010,6 +3318,11 @@ async def update_skill(
|
||||
logger.info(f"Skills configuration updated and saved to: {config_path}")
|
||||
await refresh_skills_system_prompt_cache_async()
|
||||
await _sync_skill_view(skill_name)
|
||||
# The list endpoint reads skills.enabled from the catalog projection.
|
||||
# Write that one row before the client refetches. A missing row still
|
||||
# needs the full snapshot so a newly discovered skill can appear.
|
||||
if not await set_skill_catalog_enabled(skill_name, request.enabled):
|
||||
await _refresh_catalog_snapshot(config)
|
||||
|
||||
skills = get_or_new_skill_storage(app_config=config).load_skills(enabled_only=False)
|
||||
updated_skill = next((s for s in skills if s.name == skill_name), None)
|
||||
|
||||
Reference in new issue
Block a user