feat: 知识库文件夹/模板、技能压缩设置与摘要窗口调优
- 知识库新增文件夹与模板支持(模型/仓储/服务/迁移),前端知识管理组件 - 岗位管理模型与接口完善 - 技能新增压缩设置页与相关存储/工具能力 - 系统设置扩展配置项 - 摘要中间件 keep 窗口改用 token 预算(16000),减少重复压缩 Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
1 parent
e6662cf673
commit
5ebbb82d66
54 files changed
+2658
-100
No files matched your search
@@ -18,6 +18,8 @@ from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker
|
||||
from deerflow.knowledge.models import (
|
||||
KnowledgeEmbeddingRow,
|
||||
KnowledgeEntityRow,
|
||||
KnowledgeExtractTemplateRow,
|
||||
KnowledgeFolderRow,
|
||||
KnowledgeGraphBlacklistRow,
|
||||
KnowledgeNoteRow,
|
||||
KnowledgeNoteTagRow,
|
||||
@@ -127,6 +129,7 @@ class KnowledgeRepository:
|
||||
status: str,
|
||||
confidence: float = 0.0,
|
||||
vault_path: str | None = None,
|
||||
folder: str | None = None,
|
||||
tags: list[str] | None = None,
|
||||
created_by: str | None = None,
|
||||
) -> dict[str, Any]:
|
||||
@@ -138,6 +141,7 @@ class KnowledgeRepository:
|
||||
summary=summary,
|
||||
content_md=content_md,
|
||||
vault_path=vault_path,
|
||||
folder=(folder or None),
|
||||
source_type=source_type,
|
||||
source_id=source_id,
|
||||
status=status,
|
||||
@@ -175,6 +179,8 @@ class KnowledgeRepository:
|
||||
status: str | None = None,
|
||||
tags: list[str] | None = None,
|
||||
vault_path: str | None = None,
|
||||
folder: str | None = None,
|
||||
set_folder: bool = False,
|
||||
updated_by: str | None = None,
|
||||
) -> dict[str, Any] | None:
|
||||
async with self._sf() as session:
|
||||
@@ -191,6 +197,10 @@ class KnowledgeRepository:
|
||||
row.status = status
|
||||
if vault_path is not None:
|
||||
row.vault_path = vault_path
|
||||
# ``set_folder`` lets the caller assign *or clear* (folder=None) the
|
||||
# directory; a bare ``folder=None`` without the flag leaves it as-is.
|
||||
if set_folder:
|
||||
row.folder = (folder or None)
|
||||
if updated_by is not None:
|
||||
row.updated_by = updated_by
|
||||
row.updated_at = datetime.now(UTC)
|
||||
@@ -279,6 +289,7 @@ class KnowledgeRepository:
|
||||
entity: str | None = None,
|
||||
source_type: str | None = None,
|
||||
status: str | None = None,
|
||||
folder: str | None = None,
|
||||
include_archived: bool = False,
|
||||
limit: int = 20,
|
||||
offset: int = 0,
|
||||
@@ -294,6 +305,12 @@ class KnowledgeRepository:
|
||||
conditions.append(KnowledgeNoteRow.status != "archived")
|
||||
if source_type:
|
||||
conditions.append(KnowledgeNoteRow.source_type == source_type)
|
||||
if folder is not None:
|
||||
# Exact folder, plus any nested sub-folders (``folder/…``).
|
||||
if folder == "":
|
||||
conditions.append(KnowledgeNoteRow.folder.is_(None))
|
||||
else:
|
||||
conditions.append(or_(KnowledgeNoteRow.folder == folder, KnowledgeNoteRow.folder.like(f"{folder}/%")))
|
||||
if keyword:
|
||||
like = f"%{keyword}%"
|
||||
conditions.append(or_(KnowledgeNoteRow.title.like(like), KnowledgeNoteRow.summary.like(like), KnowledgeNoteRow.content_md.like(like)))
|
||||
@@ -581,3 +598,184 @@ class KnowledgeRepository:
|
||||
)
|
||||
)
|
||||
await session.commit()
|
||||
|
||||
# -- folders ----------------------------------------------------------
|
||||
async def list_folders(self) -> list[dict[str, Any]]:
|
||||
"""Return every managed directory, ordered by sort_order then path."""
|
||||
async with self._sf() as session:
|
||||
stmt = select(KnowledgeFolderRow).order_by(KnowledgeFolderRow.sort_order, KnowledgeFolderRow.path)
|
||||
return [{"id": r.id, "path": r.path, "name": r.name, "sort_order": r.sort_order} for r in (await session.execute(stmt)).scalars()]
|
||||
|
||||
async def create_folder(self, path: str, *, created_by: str | None = None) -> dict[str, Any]:
|
||||
"""Create a directory by its full slash-joined path (idempotent on path).
|
||||
|
||||
Parent directories are auto-created so ``投研/行业/寿险`` materializes all
|
||||
three levels. Returns the leaf folder row.
|
||||
"""
|
||||
segments = [s.strip() for s in (path or "").split("/") if s.strip()]
|
||||
if not segments:
|
||||
raise ValueError("folder path is empty")
|
||||
async with self._sf() as session:
|
||||
acc: list[str] = []
|
||||
leaf: KnowledgeFolderRow | None = None
|
||||
for i, seg in enumerate(segments):
|
||||
acc.append(seg)
|
||||
full = "/".join(acc)
|
||||
row = await self._folder_by_path(session, full)
|
||||
if row is None:
|
||||
row = KnowledgeFolderRow(id=_new_id("kbdir"), path=full, name=seg, sort_order=i, created_by=created_by, created_at=datetime.now(UTC))
|
||||
session.add(row)
|
||||
await session.flush()
|
||||
leaf = row
|
||||
# Capture before commit: the async session expires attributes on
|
||||
# commit, and re-reading them outside an awaited load would error.
|
||||
result = {"id": leaf.id, "path": leaf.path, "name": leaf.name, "sort_order": leaf.sort_order}
|
||||
await session.commit()
|
||||
return result
|
||||
|
||||
@staticmethod
|
||||
async def _folder_by_path(session: AsyncSession, path: str) -> KnowledgeFolderRow | None:
|
||||
return (await session.execute(select(KnowledgeFolderRow).where(KnowledgeFolderRow.path == path))).scalars().first()
|
||||
|
||||
async def rename_folder(self, folder_id: str, new_path: str) -> dict[str, Any] | None:
|
||||
"""Rename/move a folder and re-point every descendant folder + note.
|
||||
|
||||
Both the folder rows under ``old/…`` and notes whose ``folder`` is ``old``
|
||||
or ``old/…`` are rewritten to the new prefix, so the move is atomic.
|
||||
"""
|
||||
new_path = "/".join(s.strip() for s in (new_path or "").split("/") if s.strip())
|
||||
if not new_path:
|
||||
raise ValueError("folder path is empty")
|
||||
async with self._sf() as session:
|
||||
row = await session.get(KnowledgeFolderRow, folder_id)
|
||||
if row is None:
|
||||
return None
|
||||
old = row.path
|
||||
if new_path == old:
|
||||
return {"id": row.id, "path": row.path, "name": row.name, "sort_order": row.sort_order}
|
||||
for f in (await session.execute(select(KnowledgeFolderRow).where(or_(KnowledgeFolderRow.path == old, KnowledgeFolderRow.path.like(f"{old}/%"))))).scalars():
|
||||
f.path = new_path + f.path[len(old):]
|
||||
f.name = f.path.split("/")[-1]
|
||||
for n in (await session.execute(select(KnowledgeNoteRow).where(or_(KnowledgeNoteRow.folder == old, KnowledgeNoteRow.folder.like(f"{old}/%"))))).scalars():
|
||||
n.folder = new_path + (n.folder[len(old):] if n.folder else "")
|
||||
await session.commit()
|
||||
refreshed = await session.get(KnowledgeFolderRow, folder_id)
|
||||
return {"id": refreshed.id, "path": refreshed.path, "name": refreshed.name, "sort_order": refreshed.sort_order}
|
||||
|
||||
async def delete_folder(self, folder_id: str, *, reassign_to: str | None = None) -> bool:
|
||||
"""Delete a folder (and its sub-folders); notes inside move to ``reassign_to`` (or unfiled)."""
|
||||
async with self._sf() as session:
|
||||
row = await session.get(KnowledgeFolderRow, folder_id)
|
||||
if row is None:
|
||||
return False
|
||||
old = row.path
|
||||
target = (reassign_to or "").strip() or None
|
||||
for n in (await session.execute(select(KnowledgeNoteRow).where(or_(KnowledgeNoteRow.folder == old, KnowledgeNoteRow.folder.like(f"{old}/%"))))).scalars():
|
||||
n.folder = target
|
||||
await session.execute(delete(KnowledgeFolderRow).where(or_(KnowledgeFolderRow.path == old, KnowledgeFolderRow.path.like(f"{old}/%"))))
|
||||
await session.commit()
|
||||
return True
|
||||
|
||||
# -- extraction templates ---------------------------------------------
|
||||
@staticmethod
|
||||
def _template_to_dict(row: KnowledgeExtractTemplateRow) -> dict[str, Any]:
|
||||
d = row.to_dict()
|
||||
d["created_at"] = _iso(d.get("created_at"))
|
||||
d["updated_at"] = _iso(d.get("updated_at"))
|
||||
return d
|
||||
|
||||
async def list_templates(self, *, scope: str | None = None, enabled_only: bool = False) -> list[dict[str, Any]]:
|
||||
async with self._sf() as session:
|
||||
stmt = select(KnowledgeExtractTemplateRow)
|
||||
if scope:
|
||||
stmt = stmt.where(or_(KnowledgeExtractTemplateRow.scope == scope, KnowledgeExtractTemplateRow.scope == "both"))
|
||||
if enabled_only:
|
||||
stmt = stmt.where(KnowledgeExtractTemplateRow.enabled.is_(True))
|
||||
stmt = stmt.order_by(KnowledgeExtractTemplateRow.is_default.desc(), KnowledgeExtractTemplateRow.created_at)
|
||||
return [self._template_to_dict(r) for r in (await session.execute(stmt)).scalars()]
|
||||
|
||||
async def get_template(self, template_id: str) -> dict[str, Any] | None:
|
||||
async with self._sf() as session:
|
||||
row = await session.get(KnowledgeExtractTemplateRow, template_id)
|
||||
return self._template_to_dict(row) if row else None
|
||||
|
||||
async def get_default_template(self, scope: str) -> dict[str, Any] | None:
|
||||
"""Return the default enabled template applicable to ``scope`` (thread/document)."""
|
||||
async with self._sf() as session:
|
||||
stmt = (
|
||||
select(KnowledgeExtractTemplateRow)
|
||||
.where(KnowledgeExtractTemplateRow.enabled.is_(True))
|
||||
.where(KnowledgeExtractTemplateRow.is_default.is_(True))
|
||||
.where(or_(KnowledgeExtractTemplateRow.scope == scope, KnowledgeExtractTemplateRow.scope == "both"))
|
||||
.limit(1)
|
||||
)
|
||||
row = (await session.execute(stmt)).scalars().first()
|
||||
return self._template_to_dict(row) if row else None
|
||||
|
||||
async def template_name_taken(self, name: str, *, exclude_id: str | None = None) -> bool:
|
||||
async with self._sf() as session:
|
||||
stmt = select(KnowledgeExtractTemplateRow.id).where(func.lower(KnowledgeExtractTemplateRow.name) == (name or "").strip().lower())
|
||||
if exclude_id:
|
||||
stmt = stmt.where(KnowledgeExtractTemplateRow.id != exclude_id)
|
||||
return (await session.execute(stmt)).first() is not None
|
||||
|
||||
async def create_template(self, *, name: str, system_prompt: str, scope: str = "both", description: str | None = None, is_default: bool = False, enabled: bool = True, created_by: str | None = None) -> dict[str, Any]:
|
||||
async with self._sf() as session:
|
||||
if is_default:
|
||||
await self._clear_default(session, scope)
|
||||
row = KnowledgeExtractTemplateRow(
|
||||
id=_new_id("kbtpl"),
|
||||
name=name.strip()[:256],
|
||||
description=description,
|
||||
scope=scope,
|
||||
system_prompt=system_prompt,
|
||||
is_default=is_default,
|
||||
enabled=enabled,
|
||||
created_by=created_by,
|
||||
updated_by=created_by,
|
||||
created_at=datetime.now(UTC),
|
||||
updated_at=datetime.now(UTC),
|
||||
)
|
||||
session.add(row)
|
||||
await session.commit()
|
||||
await session.refresh(row)
|
||||
return self._template_to_dict(row)
|
||||
|
||||
async def update_template(self, template_id: str, *, name: str | None = None, system_prompt: str | None = None, scope: str | None = None, description: str | None = None, is_default: bool | None = None, enabled: bool | None = None, updated_by: str | None = None) -> dict[str, Any] | None:
|
||||
async with self._sf() as session:
|
||||
row = await session.get(KnowledgeExtractTemplateRow, template_id)
|
||||
if row is None:
|
||||
return None
|
||||
if name is not None:
|
||||
row.name = name.strip()[:256]
|
||||
if system_prompt is not None:
|
||||
row.system_prompt = system_prompt
|
||||
if scope is not None:
|
||||
row.scope = scope
|
||||
if description is not None:
|
||||
row.description = description
|
||||
if enabled is not None:
|
||||
row.enabled = enabled
|
||||
if is_default:
|
||||
await self._clear_default(session, scope or row.scope)
|
||||
row.is_default = True
|
||||
elif is_default is False:
|
||||
row.is_default = False
|
||||
row.updated_by = updated_by
|
||||
row.updated_at = datetime.now(UTC)
|
||||
await session.commit()
|
||||
await session.refresh(row)
|
||||
return self._template_to_dict(row)
|
||||
|
||||
async def delete_template(self, template_id: str) -> bool:
|
||||
async with self._sf() as session:
|
||||
result = await session.execute(delete(KnowledgeExtractTemplateRow).where(KnowledgeExtractTemplateRow.id == template_id))
|
||||
await session.commit()
|
||||
return bool(result.rowcount)
|
||||
|
||||
@staticmethod
|
||||
async def _clear_default(session: AsyncSession, scope: str) -> None:
|
||||
"""Unset is_default on any template that would collide with a new default for ``scope``."""
|
||||
scopes = {scope, "both"} if scope != "both" else {"thread", "document", "both"}
|
||||
for row in (await session.execute(select(KnowledgeExtractTemplateRow).where(KnowledgeExtractTemplateRow.is_default.is_(True)).where(KnowledgeExtractTemplateRow.scope.in_(scopes)))).scalars():
|
||||
row.is_default = False
|
||||
Reference in new issue
Block a user