Skip invalid skills CLI rows (#1553)

This commit is contained in:
red person
2026-06-03 08:11:38 +03:00
committed by GitHub
parent f549058369
commit 83f602e6d1
2 changed files with 40 additions and 5 deletions

View File

@@ -52,6 +52,10 @@ def _preview_text(value, limit: int = 200) -> str:
return text[:limit] return text[:limit]
def _skill_entries(skills):
return [s for s in skills or [] if isinstance(s, dict)]
def _summary(skill: dict) -> dict: def _summary(skill: dict) -> dict:
return { return {
"name": skill.get("name", ""), "name": skill.get("name", ""),
@@ -65,7 +69,7 @@ def _summary(skill: dict) -> dict:
def cmd_list(args): def cmd_list(args):
out = _manager().load_all() out = _skill_entries(_manager().load_all())
if args.category: if args.category:
out = [s for s in out if (s.get("category") or "general") == args.category] out = [s for s in out if (s.get("category") or "general") == args.category]
out.sort(key=lambda s: (-int(s.get("uses") or 0), s.get("name", ""))) out.sort(key=lambda s: (-int(s.get("uses") or 0), s.get("name", "")))
@@ -73,7 +77,7 @@ def cmd_list(args):
def cmd_show(args): def cmd_show(args):
for s in _manager().load_all(): for s in _skill_entries(_manager().load_all()):
if s.get("name") == args.name: if s.get("name") == args.name:
emit(s, args) emit(s, args)
return return
@@ -82,7 +86,7 @@ def cmd_show(args):
def cmd_categories(args): def cmd_categories(args):
counts: dict[str, int] = {} counts: dict[str, int] = {}
for s in _manager().load_all(): for s in _skill_entries(_manager().load_all()):
c = s.get("category") or "general" c = s.get("category") or "general"
counts[c] = counts.get(c, 0) + 1 counts[c] = counts.get(c, 0) + 1
emit([{"category": c, "count": n} for c, n in sorted(counts.items())], args) emit([{"category": c, "count": n} for c, n in sorted(counts.items())], args)
@@ -91,7 +95,7 @@ def cmd_categories(args):
def cmd_delete(args): def cmd_delete(args):
# Locate the skill's directory and rm -rf it. # Locate the skill's directory and rm -rf it.
skills_root = Path(_DATA_DIR) / "skills" skills_root = Path(_DATA_DIR) / "skills"
for s in _manager().load_all(): for s in _skill_entries(_manager().load_all()):
if s.get("name") != args.name: if s.get("name") != args.name:
continue continue
cat = s.get("category") or "general" cat = s.get("category") or "general"
@@ -105,7 +109,7 @@ def cmd_delete(args):
def cmd_export(args): def cmd_export(args):
for s in _manager().load_all(): for s in _skill_entries(_manager().load_all()):
if s.get("name") != args.name: if s.get("name") != args.name:
continue continue
cat = s.get("category") or "general" cat = s.get("category") or "general"

View File

@@ -0,0 +1,31 @@
import importlib.machinery
import importlib.util
import sys
import types
from pathlib import Path
from unittest.mock import MagicMock
ROOT = Path(__file__).resolve().parents[1]
def _load_cli(monkeypatch):
svc = types.ModuleType("services.memory.skills")
svc.SkillsManager = MagicMock()
monkeypatch.setitem(sys.modules, "services.memory.skills", svc)
path = ROOT / "scripts" / "odysseus-skills"
loader = importlib.machinery.SourceFileLoader("odysseus_skills_cli", str(path))
spec = importlib.util.spec_from_loader(loader.name, loader)
module = importlib.util.module_from_spec(spec)
loader.exec_module(module)
return module
def test_skill_entries_skips_invalid_rows(monkeypatch):
cli = _load_cli(monkeypatch)
assert cli._skill_entries([
{"name": "deploy", "category": "ops"},
"bad-row",
None,
]) == [{"name": "deploy", "category": "ops"}]