DeepTutor: Lifelong Personalized Tutoring. https://deeptutor.info/.
Python ai-agentsai-tutorclawbotcli-tooldeepresearchinteractive-learninglearningmulti-agent-systemsrag
fix(knowledge): resolve workspace-scoped knowledge base files during deletion
李晨7948cd0f2ec1
diff --git a/deeptutor/api/routers/knowledge.py b/deeptutor/api/routers/knowledge.pyindex d9234b30b..959d7cb5b 100644--- a/deeptutor/api/routers/knowledge.py+++ b/deeptutor/api/routers/knowledge.py@@ -3056,10 +3056,8 @@ def _resolve_kb_raw_dir(kb_name: str, *, allow_unsupported: bool = False) -> Patreturn kb_path / "raw"-def _resolve_kb_raw_file_or_404(kb_name: str, filename: str) -> Path:- """Resolve a raw KB file while preventing traversal outside raw/."""- raw_dir = _resolve_kb_raw_dir(kb_name)- assert raw_dir is not None # allow_unsupported=False guarantees a path+def _resolve_raw_file_or_404(raw_dir: Path, filename: str) -> Path:+ """Resolve a raw KB file within ``raw_dir`` while preventing traversal outside it."""if not raw_dir.exists():raise HTTPException(status_code=404, detail="File not found")@@ -3076,6 +3074,13 @@ def _resolve_kb_raw_file_or_404(kb_name: str, filename: str) -> Path:return target+def _resolve_kb_raw_file_or_404(kb_name: str, filename: str) -> Path:+ """Resolve a raw KB file while preventing traversal outside raw/."""+ raw_dir = _resolve_kb_raw_dir(kb_name)+ assert raw_dir is not None # allow_unsupported=False guarantees a path+ return _resolve_raw_file_or_404(raw_dir, filename)++@router.get("/knowledge-bases/{kb_name}/files")async def list_kb_raw_files(kb_name: str):"""List raw documents under <kb>/raw/, recursing into folders.@@ -3305,21 +3310,23 @@ async def delete_kb_file(kb_name: str, filename: str):rejected. Vectors are not pruned here; ``was_indexed`` tells the callerwhether a re-index is needed to purge the file from retrieval."""- manager, kb_name, _ = _writable_kb(kb_name)- kb_entry = _load_kb_entry_or_404(manager, kb_name)- _assert_kb_writable_or_409(kb_name, kb_entry)- target = _resolve_kb_raw_file_or_404(kb_name, filename)+ manager, resolved_name, _ = _writable_kb(kb_name)+ kb_entry = _load_kb_entry_or_404(manager, resolved_name)+ _assert_kb_writable_or_409(resolved_name, kb_entry)++ kb_dir = manager.get_knowledge_base_path(resolved_name)+ raw_dir = kb_dir / "raw"+ target = _resolve_raw_file_or_404(raw_dir, filename)- kb_dir = manager.get_knowledge_base_path(kb_name)provider = _validate_registered_provider(kb_entry.get("rag_provider") or DEFAULT_PROVIDER)if provider in {PAGEINDEX_PROVIDER, PAGEINDEX_OSS_PROVIDER}:from deeptutor.services.rag.factory import get_pipelineawait get_pipeline(provider, kb_base_dir=str(manager.base_dir)).remove_document(- kb_name,+ resolved_name,target.name,)- VisualAssetStore(kb_dir).remove_source(target.relative_to(kb_dir / "raw").as_posix())+ VisualAssetStore(kb_dir).remove_source(target.relative_to(raw_dir).as_posix())removal = remove_raw_document(Path(kb_dir), target)return {"status": "ok",diff --git a/tests/api/test_knowledge_router.py b/tests/api/test_knowledge_router.pyindex eea826b95..843dfa51b 100644--- a/tests/api/test_knowledge_router.py+++ b/tests/api/test_knowledge_router.py@@ -3200,6 +3200,32 @@ def test_delete_reports_a_missing_knowledge_base_as_404(monkeypatch, tmp_path: Passert response.status_code == 404+def test_delete_kb_file_success_and_traversal(monkeypatch, tmp_path: Path) -> None:+ manager = _real_manager(monkeypatch, tmp_path)+ kb_dir = tmp_path / "kbs" / "chem"+ kb_dir.mkdir(parents=True, exist_ok=True)+ raw_dir = kb_dir / "raw"+ raw_dir.mkdir(parents=True, exist_ok=True)+ test_file = raw_dir / "notes.txt"+ test_file.write_text("chemical reaction formulas")+ manager.config.setdefault("knowledge_bases", {})["chem"] = {+ "rag_provider": "llamaindex",+ "status": "ready",+ }+ manager._save_config()++ with TestClient(_build_app()) as client:+ # Non-existent file+ res_404 = client.delete("/api/knowledge-bases/chem/files/nonexistent.txt")+ assert res_404.status_code == 404++ # Successful deletion+ res_ok = client.delete("/api/knowledge-bases/chem/files/notes.txt")+ assert res_ok.status_code == 200+ assert res_ok.json()["status"] == "ok"+ assert not test_file.exists()++@pytest.mark.parametrize("first_upload_fails", [False, True])def test_create_empty_llamaindex_kb_then_upload_and_retry(monkeypatch, tmp_path, first_upload_failsdiff --git a/tests/multi_user/test_workspace_resources.py b/tests/multi_user/test_workspace_resources.pyindex 21de5405c..07dd90c64 100644--- a/tests/multi_user/test_workspace_resources.py+++ b/tests/multi_user/test_workspace_resources.py@@ -224,3 +224,36 @@ def test_migration_reports_workspaces_that_reference_the_source(as_user):}service.update_workspace(row["workspace_id"], resources={"knowledge_bases": []})assert knowledge_migration_blockers("") == []+++async def test_delete_kb_file_in_workspace(as_user):+ from deeptutor.api.routers.knowledge import delete_kb_file+ from deeptutor.services.workspace import ContentWorkspaceService+ from deeptutor.services.workspace.context import workspace_context++ with as_user("alice"):+ service = ContentWorkspaceService()+ ws = service.create_workspace("Chemistry")+ ws_id = ws["workspace_id"]+ kb_name = "初中化学"++ with workspace_context(ws_id):+ mgr = current_kb_manager()+ kb_dir = mgr.base_dir / kb_name+ kb_dir.mkdir(parents=True, exist_ok=True)+ mgr.config.setdefault("knowledge_bases", {})[kb_name] = {+ "rag_provider": "llamaindex",+ "status": "ready",+ }+ mgr._save_config()+ raw_dir = kb_dir / "raw"+ raw_dir.mkdir(parents=True, exist_ok=True)+ doc_file = raw_dir / "chapter1.pdf"+ doc_file.write_text("chemical equations")++ assert doc_file.exists()+ qualified_ref = f"workspace:{ws_id}:kb:{kb_name}"+ result = await delete_kb_file(qualified_ref, "chapter1.pdf")+ assert result["status"] == "ok"+ assert not doc_file.exists()