sync update from LAN repo (source dhk-1 @ 3b1ec5b4)

This commit is contained in:
gozeros committed 2026-11-05 10:56:34 +08:00
1 parent da6521b6cb
commit 264e2200d6
995 files changed
+148105 -13399

No files matched your search

@@ -11,17 +11,25 @@ Covers:
from __future__ import annotations
import threading
from pathlib import Path
from types import SimpleNamespace
from unittest.mock import AsyncMock
import pytest
import yaml
from fastapi import HTTPException
from app.gateway.routers import skills as skills_router
from app.gateway.routers.skills import _get_editable_skill_or_raise, _get_owned_skill_or_raise
from deerflow.config import paths as paths_module
from deerflow.persistence.agents import MemoryAgentStore
from deerflow.persistence.notifications import MemoryNotificationStore, set_notification_store
from deerflow.persistence.skills import MemorySkillStore
from deerflow.persistence.tags import MemoryTagStore
from deerflow.skills import curator_log
from deerflow.skills.cascade import cascade_skill_unpublished_or_deleted
from deerflow.skills.types import Skill, SkillCategory
@pytest.fixture
@@ -599,3 +607,99 @@ def test_collect_referenced_skill_names_aggregates_from_disk(
monkeypatch.setattr("deerflow.config.paths.get_paths", lambda: _FakePaths())
assert curator._collect_referenced_skill_names() == {"alpha", "beta", "gamma"}
@pytest.mark.asyncio
async def test_skill_listing_offloads_scan_and_keeps_disabled_visible(tmp_path, monkeypatch):
event_loop_thread = threading.get_ident()
config = object()
def skill(name, category, enabled):
return Skill(
name=name,
description=name,
license=None,
skill_dir=tmp_path / name,
skill_file=tmp_path / name / "SKILL.md",
relative_path=Path(name),
category=category,
enabled=enabled,
)
class Storage:
def load_skills(self, *, enabled_only):
assert threading.get_ident() != event_loop_thread
assert enabled_only is False
return [skill("disabled", SkillCategory.PUBLIC, False), skill("private", SkillCategory.CUSTOM, True)]
def configured_storage(*, app_config):
assert app_config is config
return Storage()
monkeypatch.setattr(skills_router, "get_or_new_skill_storage", configured_storage)
monkeypatch.setattr(skills_router, "_list_skill_display_adapters", AsyncMock(return_value={}))
monkeypatch.setattr("deerflow.skills.usage.get_entry", lambda _name: {})
monkeypatch.setattr("deerflow.skills.usage.latest_activity_at", lambda _name: None)
request = SimpleNamespace(state=SimpleNamespace(user=SimpleNamespace(id="user-a", system_role="user")))
result = await skills_router.list_skills(
request=request,
config=config,
skill_store=MemorySkillStore(),
tag_store=MemoryTagStore(),
search=None,
tag_ids=None,
square=None,
scope=None,
sort="name_asc",
admin=False,
)
assert [item.name for item in result.skills] == ["disabled"]
assert result.skills[0].enabled is False
@pytest.mark.asyncio
async def test_mysql_skill_listing_uses_normalized_projection_without_reading_skill_files(monkeypatch):
catalog = [
{
"name": "snapshot-skill",
"description": "loaded from the prepared catalogue",
"license": "MIT",
"category": "public",
"enabled": True,
"created_at": "2026-10-25T10:00:00+00:00",
}
]
async def load_projection(*, user_id, admin=False):
assert user_id == "user-a"
assert admin is False
return catalog
def fail_filesystem_read(**_kwargs):
raise AssertionError("MySQL-backed skill listing must not scan skill files")
monkeypatch.setattr(skills_router, "get_session_factory", lambda: object())
monkeypatch.setattr(skills_router, "load_skill_catalog_projection", load_projection)
monkeypatch.setattr(skills_router, "get_or_new_skill_storage", fail_filesystem_read)
monkeypatch.setattr(skills_router, "_list_skill_display_adapters", AsyncMock(return_value={}))
monkeypatch.setattr(skills_router, "_attach_owner_usernames", AsyncMock(side_effect=lambda rows: rows))
request = SimpleNamespace(state=SimpleNamespace(user=SimpleNamespace(id="user-a", system_role="user")))
result = await skills_router.list_skills(
request=request,
config=object(),
skill_store=MemorySkillStore(),
tag_store=MemoryTagStore(),
search=None,
tag_ids=None,
square=None,
scope=None,
sort="time_desc",
admin=False,
)
assert len(result.skills) == 1
assert result.skills[0].name == "snapshot-skill"
assert result.skills[0].license == "MIT"