feat: improve citation display and skill persistence
This commit is contained in:
1 parent
b671b49725
commit
8b2f398015
12 files changed
+721
-136
No files matched your search
@@ -36,6 +36,7 @@ from deerflow.skills.types import SKILL_MD_FILE, SkillCategory
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
router = APIRouter(prefix="/api", tags=["skills"])
|
||||
_UNSET = object()
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
@@ -221,7 +222,7 @@ def _skill_to_response(
|
||||
skill: Skill,
|
||||
ownership: dict[str, Any] | None = None,
|
||||
*,
|
||||
display_override: dict[str, Any] | None = None,
|
||||
display_override: dict[str, Any] | None | object = _UNSET,
|
||||
display_sample: dict[str, Any] | None = None,
|
||||
) -> SkillResponse:
|
||||
"""Convert a Skill object to a SkillResponse.
|
||||
@@ -252,8 +253,8 @@ def _skill_to_response(
|
||||
builtin = bool(ownership.get("builtin", owner_user_id is None))
|
||||
detail = ownership.get("detail")
|
||||
|
||||
display = display_override
|
||||
if display is None:
|
||||
display = None if display_override is _UNSET else display_override
|
||||
if display_override is _UNSET:
|
||||
try:
|
||||
skill_config = get_extensions_config().skills.get(skill.name)
|
||||
if skill_config and skill_config.display:
|
||||
@@ -318,6 +319,10 @@ def _json_text_dumps(value: dict[str, Any] | None) -> str | None:
|
||||
return json.dumps(value, ensure_ascii=False)
|
||||
|
||||
|
||||
def _display_override_from_adapter(adapter: dict[str, Any] | None) -> dict[str, Any] | None | object:
|
||||
return adapter.get("display") if adapter is not None else _UNSET
|
||||
|
||||
|
||||
async def _get_skill_display_adapter(skill_name: str) -> dict[str, Any] | None:
|
||||
if not await _ensure_skill_display_table():
|
||||
return None
|
||||
@@ -698,7 +703,7 @@ async def list_skills(
|
||||
display_adapters = await _list_skill_display_adapters([skill.name for skill in all_skills])
|
||||
responses: list[SkillResponse] = []
|
||||
for skill in all_skills:
|
||||
adapter = display_adapters.get(skill.name, {})
|
||||
adapter = display_adapters.get(skill.name)
|
||||
# Public/built-in skills (no DB row) are visible to everyone.
|
||||
# Custom skills must have an ownership record in the visible set.
|
||||
if skill.category != SkillCategory.CUSTOM:
|
||||
@@ -708,8 +713,8 @@ async def list_skills(
|
||||
_skill_to_response(
|
||||
skill,
|
||||
ownership.get(skill.name),
|
||||
display_override=adapter.get("display"),
|
||||
display_sample=adapter.get("sample"),
|
||||
display_override=_display_override_from_adapter(adapter),
|
||||
display_sample=adapter.get("sample") if adapter else None,
|
||||
)
|
||||
)
|
||||
continue
|
||||
@@ -720,8 +725,8 @@ async def list_skills(
|
||||
_skill_to_response(
|
||||
skill,
|
||||
record,
|
||||
display_override=adapter.get("display"),
|
||||
display_sample=adapter.get("sample"),
|
||||
display_override=_display_override_from_adapter(adapter),
|
||||
display_sample=adapter.get("sample") if adapter else None,
|
||||
)
|
||||
)
|
||||
responses = await _attach_and_filter_tags(tag_store, responses, search, tag_ids)
|
||||
@@ -984,16 +989,19 @@ async def list_custom_skills(
|
||||
custom = [s for s in get_or_new_skill_storage(app_config=config).load_skills(enabled_only=False) if s.category == SkillCategory.CUSTOM]
|
||||
ownership = await _build_ownership_index(skill_store, user_id)
|
||||
display_adapters = await _list_skill_display_adapters([skill.name for skill in custom])
|
||||
responses = [
|
||||
_skill_to_response(
|
||||
skill,
|
||||
ownership[skill.name],
|
||||
display_override=display_adapters.get(skill.name, {}).get("display"),
|
||||
display_sample=display_adapters.get(skill.name, {}).get("sample"),
|
||||
responses = []
|
||||
for skill in custom:
|
||||
if skill.name not in ownership:
|
||||
continue
|
||||
adapter = display_adapters.get(skill.name)
|
||||
responses.append(
|
||||
_skill_to_response(
|
||||
skill,
|
||||
ownership[skill.name],
|
||||
display_override=_display_override_from_adapter(adapter),
|
||||
display_sample=adapter.get("sample") if adapter else None,
|
||||
)
|
||||
)
|
||||
for skill in custom
|
||||
if skill.name in ownership
|
||||
]
|
||||
return SkillsListResponse(skills=responses)
|
||||
except Exception as e:
|
||||
logger.error("Failed to list custom skills: %s", e, exc_info=True)
|
||||
@@ -1008,7 +1016,15 @@ async def get_custom_skill(skill_name: str, config: AppConfig = Depends(get_conf
|
||||
skill = next((s for s in skills if s.name == skill_name and s.category == SkillCategory.CUSTOM), None)
|
||||
if skill is None:
|
||||
raise HTTPException(status_code=404, detail=f"Custom skill '{skill_name}' not found")
|
||||
return CustomSkillContentResponse(**_skill_to_response(skill).model_dump(), content=get_or_new_skill_storage(app_config=config).read_custom_skill(skill_name))
|
||||
adapter = await _get_skill_display_adapter(skill_name)
|
||||
return CustomSkillContentResponse(
|
||||
**_skill_to_response(
|
||||
skill,
|
||||
display_override=_display_override_from_adapter(adapter),
|
||||
display_sample=adapter.get("sample") if adapter else None,
|
||||
).model_dump(),
|
||||
content=get_or_new_skill_storage(app_config=config).read_custom_skill(skill_name),
|
||||
)
|
||||
except HTTPException:
|
||||
raise
|
||||
except Exception as e:
|
||||
@@ -1365,7 +1381,13 @@ async def get_skill(
|
||||
|
||||
# Attach ownership (owner/published/detail) when the caller may see it.
|
||||
ownership = await skill_store.get_visible(skill_name, _current_user_id(request))
|
||||
return _skill_to_response(skill, ownership)
|
||||
adapter = await _get_skill_display_adapter(skill_name)
|
||||
return _skill_to_response(
|
||||
skill,
|
||||
ownership,
|
||||
display_override=_display_override_from_adapter(adapter),
|
||||
display_sample=adapter.get("sample") if adapter else None,
|
||||
)
|
||||
except HTTPException:
|
||||
raise
|
||||
except Exception as e:
|
||||
@@ -1944,11 +1966,11 @@ async def update_skill_display(
|
||||
updated_skill = next((s for s in skills if s.name == skill_name), None)
|
||||
if updated_skill is None:
|
||||
raise HTTPException(status_code=500, detail=f"Failed to reload skill '{skill_name}' after display update")
|
||||
adapter = await _get_skill_display_adapter(skill_name) or {}
|
||||
adapter = await _get_skill_display_adapter(skill_name)
|
||||
return _skill_to_response(
|
||||
updated_skill,
|
||||
display_override=adapter.get("display"),
|
||||
display_sample=adapter.get("sample"),
|
||||
display_override=_display_override_from_adapter(adapter),
|
||||
display_sample=adapter.get("sample") if adapter else None,
|
||||
)
|
||||
except HTTPException:
|
||||
raise
|
||||
|
||||
Reference in new issue
Block a user