From 1c12f98335c0b6849698d59514e7d543bc19d251 Mon Sep 17 00:00:00 2001 From: cjh <2927398119@qq.com> Date: Sat, 10 Oct 2026 17:32:34 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=20Excel=20?= =?UTF-8?q?=E9=A2=84=E8=A7=88=E5=B9=B6=E6=8F=90=E5=89=8D=E7=94=9F=E6=88=90?= =?UTF-8?q?=20Office=20=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/package/yuxi/knowledge/preview.py | 37 +- backend/package/yuxi/services/file_preview.py | 11 +- .../services/knowledge_preview_service.py | 77 ++++ .../yuxi/services/knowledge_task_service.py | 3 +- .../package/yuxi/services/task_registry.py | 5 + .../services/viewer_filesystem_service.py | 4 +- .../yuxi/services/workspace_service.py | 4 +- backend/package/yuxi/storage/minio/client.py | 6 +- backend/package/yuxi/utils/filepreview.py | 3 +- backend/server/routers/knowledge_router.py | 11 +- backend/server/routers/workspace_router.py | 15 +- .../api/test_knowledge_preview_http.py | 430 ++++++++++++++++++ .../unit/knowledge/test_office_pdf_preview.py | 13 +- .../routers/test_knowledge_router_cleanup.py | 8 +- .../routers/test_workspace_knowledge_tree.py | 10 +- .../services/test_binary_preview_response.py | 35 ++ .../test_knowledge_preview_service.py | 300 ++++++++++++ .../unit/services/test_workspace_service.py | 49 +- .../unit/storage/test_minio_public_images.py | 26 +- backend/test/unit/utils/test_filepreview.py | 7 +- ...eview-preparation-and-buffered-response.md | 57 +++ docs/mechanisms/knowledge-base.md | 14 +- ...3\351\227\255\350\257\246\346\203\205.jpg" | Bin 0 -> 29910 bytes ...2\345\212\250\351\242\204\350\247\210.jpg" | Bin 0 -> 36353 bytes web/src/components/FileDetailModal.vue | 51 ++- web/src/components/TaskCenterDrawer.vue | 1 + web/src/utils/file_preview.js | 6 +- web/src/views/WorkspaceView.vue | 22 +- .../unit/file_detail_preview_polling.test.js | 137 ++++++ web/test/unit/file_preview.test.js | 42 ++ .../unit/workspace_preview_polling.test.js | 102 +++++ 31 files changed, 1393 insertions(+), 93 deletions(-) create mode 100644 backend/package/yuxi/services/knowledge_preview_service.py create mode 100644 backend/test/integration/api/test_knowledge_preview_http.py create mode 100644 backend/test/unit/services/test_binary_preview_response.py create mode 100644 backend/test/unit/services/test_knowledge_preview_service.py create mode 100644 docs/develop-guides/decisions/implemented/2026-10-10-office-preview-preparation-and-buffered-response.md create mode 100644 "docs/public/\351\242\204\350\247\210\344\274\230\345\214\226/\347\246\273\351\241\265\345\205\263\351\227\255\350\257\246\346\203\205.jpg" create mode 100644 "docs/public/\351\242\204\350\247\210\344\274\230\345\214\226/\350\257\246\346\203\205\350\207\252\345\212\250\351\242\204\350\247\210.jpg" create mode 100644 web/test/unit/file_detail_preview_polling.test.js create mode 100644 web/test/unit/file_preview.test.js create mode 100644 web/test/unit/workspace_preview_polling.test.js diff --git a/backend/package/yuxi/knowledge/preview.py b/backend/package/yuxi/knowledge/preview.py index 6748cdc964..160f444a17 100644 --- a/backend/package/yuxi/knowledge/preview.py +++ b/backend/package/yuxi/knowledge/preview.py @@ -2,6 +2,8 @@ from __future__ import annotations +from collections.abc import Awaitable, Callable + from yuxi.knowledge.utils.kb_utils import is_minio_url, parse_minio_url from yuxi.repositories.knowledge_file_repository import KnowledgeFileRepository from yuxi.storage.minio import get_minio_client @@ -15,7 +17,13 @@ ) -async def read_knowledge_file_preview(kb_id: str, file_id: str) -> dict: +async def read_knowledge_file_preview( + kb_id: str, + file_id: str, + *, + prepare_office: bool = True, + before_cache_write: Callable[[], Awaitable[None]] | None = None, +) -> dict: """从 Knowledge metadata 与 MinIO 对象生成只读文件预览。""" file_record = await KnowledgeFileRepository().get_by_file_id(file_id) if file_record is None or file_record.kb_id != kb_id: @@ -48,7 +56,23 @@ async def read_knowledge_file_preview(kb_id: str, file_id: str) -> dict: return {**response, **preview_too_large().payload()} if is_office_pdf_preview_file(filename): - pdf_content = await _read_office_pdf_preview(kb_id, file_id, filename, original_path) + pdf_content = await _read_office_pdf_preview( + kb_id, + file_id, + filename, + original_path, + prepare_office=prepare_office, + before_cache_write=before_cache_write, + ) + if pdf_content is None: + return { + **response, + "content": None, + "preview_type": "office", + "supported": True, + "status": "loading", + "message": "正在生成预览，完成后将自动显示...", + } return { **response, "content": pdf_content, @@ -82,10 +106,15 @@ async def _read_office_pdf_preview( file_id: str, filename: str, original_path: str, -) -> bytes: + *, + prepare_office: bool = True, + before_cache_write: Callable[[], Awaitable[None]] | None = None, +) -> bytes | None: minio_client = get_minio_client() bucket_name = minio_client.KB_BUCKETS["parsed"] object_name = f"{kb_id}/preview/{file_id}.pdf" + if not prepare_office: + return await minio_client.adownload_file(bucket_name, object_name, missing_ok=True) if await minio_client.astat_file(bucket_name, object_name) is not None: return await minio_client.adownload_file(bucket_name, object_name) @@ -94,6 +123,8 @@ async def _read_office_pdf_preview( pdf_content = await convert_office_to_pdf(filename, raw_content) except OfficePreviewConversionError as exc: raise ValueError(str(exc)) from exc + if before_cache_write is not None: + await before_cache_write() await minio_client.aupload_file( bucket_name=bucket_name, object_name=object_name, diff --git a/backend/package/yuxi/services/file_preview.py b/backend/package/yuxi/services/file_preview.py index 4f8f3777ed..4d63e5360d 100644 --- a/backend/package/yuxi/services/file_preview.py +++ b/backend/package/yuxi/services/file_preview.py @@ -2,10 +2,9 @@ from __future__ import annotations -import io from urllib.parse import quote -from fastapi.responses import StreamingResponse +from fastapi.responses import Response from yuxi.utils.filepreview import PreviewResult from yuxi.workspace.preview import preview_workspace_file @@ -15,18 +14,18 @@ async def render_file_preview( raw_content: bytes, *, office_cache_key: str, -) -> dict | StreamingResponse: +) -> dict | Response: """把持久文件预览结果转换为 Workspace/Viewer HTTP 响应。""" result = await preview_workspace_file(path, raw_content, office_cache_key=office_cache_key) return _preview_response(result) -def _preview_response(result: PreviewResult) -> dict | StreamingResponse: +def _preview_response(result: PreviewResult) -> dict | Response: if not isinstance(result.content, bytes): return result.payload() filename = result.filename or "preview" - return StreamingResponse( - io.BytesIO(result.content), + return Response( + result.content, media_type=result.media_type or "application/octet-stream", headers={ "Content-Disposition": f"inline; filename*=UTF-8''{quote(filename)}", diff --git a/backend/package/yuxi/services/knowledge_preview_service.py b/backend/package/yuxi/services/knowledge_preview_service.py new file mode 100644 index 0000000000..ac89dc3184 --- /dev/null +++ b/backend/package/yuxi/services/knowledge_preview_service.py @@ -0,0 +1,77 @@ +"""知识库文件注册、后台预览与只读预览状态用例。""" + +from __future__ import annotations + +from yuxi.knowledge.preview import read_knowledge_file_preview +from yuxi.knowledge.runtime import knowledge_base +from yuxi.repositories.knowledge_file_repository import KnowledgeFileRepository +from yuxi.services.task_service import Task, TaskContext, tasker +from yuxi.utils.filepreview import MAX_BINARY_PREVIEW_SIZE_BYTES, is_office_pdf_preview_file +from yuxi.utils.logging_config import logger + + +async def register_knowledge_file(kb_id: str, item: str, *, params: dict, operator_id: str) -> dict: + """注册原件后立即提交独立预览任务，解析与预览各自保留状态。""" + file_meta = await knowledge_base.add_file_record(kb_id, item, params=params, operator_id=operator_id) + size = file_meta.get("size") + if is_office_pdf_preview_file(file_meta["filename"]) and ( + size is None or int(size) <= MAX_BINARY_PREVIEW_SIZE_BYTES + ): + try: + await enqueue_knowledge_preview(kb_id, file_meta["file_id"]) + except Exception: + logger.exception( + "预览任务提交失败，原件注册已完成: kb_id={}, file_id={}", + kb_id, + file_meta["file_id"], + ) + return file_meta + + +async def enqueue_knowledge_preview(kb_id: str, file_id: str) -> Task: + """按知识库和文件去重，复用持久 Task 的提交后投递与恢复。""" + payload = {"kb_id": kb_id, "file_id": file_id} + task, _ = await tasker.enqueue_unique_by_payload( + name="知识库文件预览", + task_type="knowledge_preview", + payload=payload, + payload_match=payload, + ) + return task + + +async def read_workspace_knowledge_preview(kb_id: str, file_id: str) -> dict: + """读取现成缓存，缺失时呈现后台任务状态而不在请求中转换。""" + response = await read_knowledge_file_preview(kb_id, file_id, prepare_office=False) + if response.get("status") != "loading": + return response + + task = await tasker.find_task_by_payload( + task_type="knowledge_preview", payload_match={"kb_id": kb_id, "file_id": file_id} + ) + if task is not None and task.status in {"failed", "cancelled"}: + return {**response, "status": "error", "supported": False, "message": "预览生成失败，请下载原件查看"} + if task is None or task.status == "success": + task = await enqueue_knowledge_preview(kb_id, file_id) + return response + + +async def run_knowledge_preview(context: TaskContext) -> dict: + """由真实 worker 生成共享 PDF，发布前核对租约和原件记录。""" + kb_id, file_id = context.payload["kb_id"], context.payload["file_id"] + await context.raise_if_cancelled() + await context.set_progress(10, "正在生成文件预览") + + async def before_cache_write(): + """转换可以较慢，发布缓存前重新检查执行权与文件存在性。""" + await context.raise_if_cancelled() + record = await KnowledgeFileRepository().get_by_file_id(file_id) + if record is None or record.kb_id != kb_id: + raise ValueError("原件已删除，停止发布预览") + + preview = await read_knowledge_file_preview(kb_id, file_id, before_cache_write=before_cache_write) + if not preview.get("binary") or preview.get("preview_type") != "pdf": + raise ValueError("当前文件无法生成 PDF 预览") + result = {"kb_id": kb_id, "file_id": file_id, "preview_type": "pdf", "size": len(preview["content"])} + await context.set_progress(100, "文件预览已就绪") + return result diff --git a/backend/package/yuxi/services/knowledge_task_service.py b/backend/package/yuxi/services/knowledge_task_service.py index 0e09e6b193..ab6f465b40 100644 --- a/backend/package/yuxi/services/knowledge_task_service.py +++ b/backend/package/yuxi/services/knowledge_task_service.py @@ -7,6 +7,7 @@ from yuxi.knowledge.utils import params_for_uploaded_document from yuxi.repositories.knowledge_file_repository import KnowledgeFileRepository from yuxi.services.knowledge_folder_service import knowledge_folder_service +from yuxi.services.knowledge_preview_service import register_knowledge_file from yuxi.services.task_service import TaskContext from yuxi.utils.logging_config import logger @@ -60,7 +61,7 @@ async def run_knowledge_ingest(context: TaskContext) -> dict: await context.raise_if_cancelled() await context.set_progress(5.0 + (index / total) * 25.0, f"[1/3] 添加记录 {index}/{total}") try: - file_meta = await knowledge_base.add_file_record( + file_meta = await register_knowledge_file( kb_id, item, params=params_for_uploaded_document(item, params), diff --git a/backend/package/yuxi/services/task_registry.py b/backend/package/yuxi/services/task_registry.py index 03cf92a32e..715d5d3794 100644 --- a/backend/package/yuxi/services/task_registry.py +++ b/backend/package/yuxi/services/task_registry.py @@ -50,6 +50,11 @@ def _load(self, function: str, label: str): "run_knowledge_ingest", failure_function="fail_knowledge_file_task", ), + TaskDefinition( + "knowledge_preview", + "yuxi.services.knowledge_preview_service", + "run_knowledge_preview", + ), TaskDefinition( "knowledge_parse", "yuxi.services.knowledge_task_service", diff --git a/backend/package/yuxi/services/viewer_filesystem_service.py b/backend/package/yuxi/services/viewer_filesystem_service.py index 00d75f410b..ecdd38f69c 100644 --- a/backend/package/yuxi/services/viewer_filesystem_service.py +++ b/backend/package/yuxi/services/viewer_filesystem_service.py @@ -10,7 +10,7 @@ from urllib.parse import quote from fastapi import HTTPException, UploadFile -from fastapi.responses import FileResponse, StreamingResponse +from fastapi.responses import FileResponse, Response from starlette.background import BackgroundTask from yuxi.agents.backends.paths import is_runtime_path, runtime_path_for_workdir_scope from yuxi.services.file_preview import render_file_preview @@ -123,7 +123,7 @@ async def _download_to_temp(workdir, path: str, max_bytes: int) -> str: return temp_path -async def read_viewer_file_content(*, thread_id: str, path: str, current_user, db) -> dict | StreamingResponse: +async def read_viewer_file_content(*, thread_id: str, path: str, current_user, db) -> dict | Response: """从实时 Workdir 读取预览，不经过 MinIO revision。""" access = await _viewer_state(thread_id=thread_id, current_user=current_user, db=db) _validate_viewer_path(access, path) diff --git a/backend/package/yuxi/services/workspace_service.py b/backend/package/yuxi/services/workspace_service.py index 5818c32c64..53ca8dfadb 100644 --- a/backend/package/yuxi/services/workspace_service.py +++ b/backend/package/yuxi/services/workspace_service.py @@ -8,7 +8,7 @@ from urllib.parse import quote from fastapi import HTTPException, UploadFile -from fastapi.responses import FileResponse, StreamingResponse +from fastapi.responses import FileResponse, Response from starlette.background import BackgroundTask from yuxi.agents.backends.paths import runtime_user_data_path from yuxi.repositories.project_repository import ProjectRepository @@ -141,7 +141,7 @@ async def read_workspace_file_bytes(*, path: str, current_user: User) -> tuple[s return PurePosixPath(workspace_path).name, content -async def read_workspace_file_content(*, path: str, current_user: User) -> dict | StreamingResponse: +async def read_workspace_file_content(*, path: str, current_user: User) -> dict | Response: backend = _workspace_backend(current_user) workspace_path = _workspace_path(path) try: diff --git a/backend/package/yuxi/storage/minio/client.py b/backend/package/yuxi/storage/minio/client.py index 0063a123fd..5bfd551979 100644 --- a/backend/package/yuxi/storage/minio/client.py +++ b/backend/package/yuxi/storage/minio/client.py @@ -231,8 +231,8 @@ async def adownload_response(self, bucket_name: str, object_name: str) -> BaseHT raise StorageError(f"对象 '{object_name}' 在存储桶 '{bucket_name}' 中不存在") raise StorageError(f"下载文件失败: {e}") - async def adownload_file(self, bucket_name: str, object_name: str) -> bytes: - """异步下载文件""" + async def adownload_file(self, bucket_name: str, object_name: str, *, missing_ok: bool = False) -> bytes | None: + """异步下载文件，派生缓存可显式允许对象缺失。""" response = None try: response = await asyncio.to_thread(self.client.get_object, bucket_name=bucket_name, object_name=object_name) @@ -242,6 +242,8 @@ async def adownload_file(self, bucket_name: str, object_name: str) -> bytes: except S3Error as e: if e.code == "NoSuchKey": + if missing_ok: + return None raise StorageError(f"对象 '{object_name}' 在存储桶 '{bucket_name}' 中不存在") raise StorageError(f"下载文件失败: {e}") finally: diff --git a/backend/package/yuxi/utils/filepreview.py b/backend/package/yuxi/utils/filepreview.py index d95d18b46f..2093607d47 100644 --- a/backend/package/yuxi/utils/filepreview.py +++ b/backend/package/yuxi/utils/filepreview.py @@ -17,8 +17,9 @@ _MARKDOWN_EXTENSIONS = frozenset({".md", ".markdown", ".mdx"}) _PDF_EXTENSIONS = frozenset({".pdf"}) _HTML_EXTENSIONS = frozenset({".html", ".htm"}) -_OFFICE_PDF_PREVIEW_EXTENSIONS = frozenset({".docx", ".pptx"}) +_OFFICE_PDF_PREVIEW_EXTENSIONS = frozenset({".docx", ".pptx", ".xlsx", ".xls"}) _OFFICE_MEDIA_TYPES = { + ".xls": "application/vnd.ms-excel", ".docx": "application/vnd.openxmlformats-officedocument.wordprocessingml.document", ".pptx": "application/vnd.openxmlformats-officedocument.presentationml.presentation", ".xlsx": "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", diff --git a/backend/server/routers/knowledge_router.py b/backend/server/routers/knowledge_router.py index 68b5090f9e..2550f000c2 100644 --- a/backend/server/routers/knowledge_router.py +++ b/backend/server/routers/knowledge_router.py @@ -9,13 +9,14 @@ from fastapi import APIRouter, Body, Depends, File, HTTPException, Query, UploadFile from fastapi.responses import FileResponse from pydantic import BaseModel, Field +from sqlalchemy.ext.asyncio import AsyncSession from starlette.responses import StreamingResponse from yuxi.config.options import system_options from yuxi.knowledge.base import KBNameConflictError, KBNotFoundError from yuxi.knowledge.chunking.ragflow_like.presets import get_chunk_preset_options from yuxi.knowledge.graphs.milvus_graph_service import GRAPH_TASK_TYPE, MilvusGraphService -from yuxi.knowledge.read_models import KnowledgeBaseDetail from yuxi.knowledge.parser.capabilities import SUPPORTED_FILE_EXTENSIONS, is_supported_file_extension +from yuxi.knowledge.read_models import KnowledgeBaseDetail from yuxi.knowledge.runtime import knowledge_base from yuxi.knowledge.utils import calculate_content_hash, is_minio_url, params_for_uploaded_document, parse_minio_url from yuxi.knowledge.utils.mindmap_utils import ( @@ -37,6 +38,7 @@ resolve_knowledge_base_permission, ) from yuxi.services.knowledge_folder_service import knowledge_folder_service +from yuxi.services.knowledge_preview_service import register_knowledge_file from yuxi.services.ocr_service import parse_document from yuxi.services.task_service import tasker from yuxi.services.workspace_service import read_workspace_file_bytes @@ -46,13 +48,14 @@ from yuxi.utils.upload_utils import MAX_UPLOAD_SIZE_BYTES, read_upload_with_limit, write_upload_to_path from server.utils.auth_middleware import get_admin_user, get_db, get_required_user -from sqlalchemy.ext.asyncio import AsyncSession -from server.utils.knowledge_response import serialize_knowledge_base, serialize_knowledge_base_list from server.utils.knowledge_permissions import ( ensure_knowledge_base_permission as _ensure_database_permission, +) +from server.utils.knowledge_permissions import ( require_knowledge_base_manage, require_knowledge_base_read, ) +from server.utils.knowledge_response import serialize_knowledge_base, serialize_knowledge_base_list knowledge = APIRouter(prefix="/knowledge", tags=["knowledge"]) @@ -780,7 +783,7 @@ async def add_uploaded_documents( failed_items: list[dict] = [] for index, item in enumerate(payload.items): try: - file_meta = await knowledge_base.add_file_record( + file_meta = await register_knowledge_file( kb_id, item, params=params_for_uploaded_document(item, params), diff --git a/backend/server/routers/workspace_router.py b/backend/server/routers/workspace_router.py index dd28b74471..e99eefe0aa 100644 --- a/backend/server/routers/workspace_router.py +++ b/backend/server/routers/workspace_router.py @@ -4,10 +4,9 @@ from urllib.parse import quote from fastapi import APIRouter, Depends, File, Form, HTTPException, Query, UploadFile -from fastapi.responses import StreamingResponse +from fastapi.responses import Response, StreamingResponse from pydantic import BaseModel from sqlalchemy.ext.asyncio import AsyncSession -from server.utils.auth_middleware import get_db, get_required_user from yuxi.services.workspace_service import ( create_workspace_directory, delete_workspace_path, @@ -20,6 +19,8 @@ ) from yuxi.storage.postgres.models_business import User +from server.utils.auth_middleware import get_db, get_required_user + workspace = APIRouter(prefix="/workspace", tags=["workspace"]) workspace_knowledge = APIRouter(prefix="/workspace", tags=["workspace"]) @@ -129,11 +130,11 @@ async def search_workspace_files_route( return await search_workspace_files(query=query, current_user=current_user) -def _binary_preview_response(data: dict) -> StreamingResponse: +def _binary_preview_response(data: dict) -> Response: filename = data.get("filename") or "preview" preview_type = data.get("preview_type") or "unsupported" - return StreamingResponse( - io.BytesIO(data.get("content") or b""), + return Response( + data.get("content") or b"", media_type=data.get("media_type") or "application/octet-stream", headers={ "Content-Disposition": f"inline; filename*=UTF-8''{quote(filename)}", @@ -204,9 +205,9 @@ async def get_workspace_knowledge_file( await _ensure_knowledge_read_access(current_user, kb_id) await _ensure_knowledge_supports_documents(kb_id) try: - from yuxi.knowledge.preview import read_knowledge_file_preview + from yuxi.services.knowledge_preview_service import read_workspace_knowledge_preview - return _preview_response(await read_knowledge_file_preview(kb_id=kb_id, file_id=file_id)) + return _preview_response(await read_workspace_knowledge_preview(kb_id=kb_id, file_id=file_id)) except ValueError as error: _raise_knowledge_read_error(error) diff --git a/backend/test/integration/api/test_knowledge_preview_http.py b/backend/test/integration/api/test_knowledge_preview_http.py new file mode 100644 index 0000000000..01d5e534b1 --- /dev/null +++ b/backend/test/integration/api/test_knowledge_preview_http.py @@ -0,0 +1,430 @@ +"""在隔离 PostgreSQL、Redis、MinIO 与真实 worker 验证提前预览。""" + +import hashlib +import io +import json +import os +import socket +import subprocess +import sys +import time +import uuid +from concurrent.futures import ThreadPoolExecutor +from types import SimpleNamespace + +import httpx +import psycopg +import pytest +from minio import Minio +from openpyxl import Workbook +from pypdf import PdfReader +from redis import Redis +from sqlalchemy.engine import make_url +from yuxi.utils.auth_utils import SECURITY_SECRET_NAMES + +pytestmark = [pytest.mark.integration, pytest.mark.e2e] + + +def wait_until(read, accept, *, seconds=90): + """等待外部事实达到预期，超时保留最后一次读回值。""" + deadline = time.monotonic() + seconds + value = None + while time.monotonic() < deadline: + value = read() + if accept(value): + return value + time.sleep(0.1) + pytest.fail(f"外部事实未收敛: {value}") + + +@pytest.fixture(scope="module") +def preview_server(tmp_path_factory): + """独立数据库和进程保留真实认证、任务发布、claim 与转换边界。""" + isolated_redis_url = os.environ.get("PREVIEW_TEST_REDIS_URL") + if not isolated_redis_url: + pytest.skip("需要 PREVIEW_TEST_REDIS_URL 指向独立验收 Redis，不能复用开发队列") + with Redis.from_url(isolated_redis_url) as redis: + if next(redis.scan_iter(match="yuxi:worker:health:*"), None) is not None: + pytest.fail("验收 Redis 上已有 worker，拒绝跨数据库消费任务") + configured_url = os.environ.get("POSTGRES_URL") + if not configured_url: + pytest.fail("POSTGRES_URL 未配置真实 PostgreSQL 测试入口") + temporary = tmp_path_factory.mktemp("knowledge-preview-http") + database = "preview_test_" + uuid.uuid4().hex + base = make_url(configured_url) + admin_url = base.set(drivername="postgresql", database="postgres").render_as_string(hide_password=False) + url = base.set(database=database) + sync_url = url.set(drivername="postgresql").render_as_string(hide_password=False) + with psycopg.connect(admin_url, autocommit=True) as connection: + connection.execute(f'CREATE DATABASE "{database}"') + + env = dict( + os.environ, + POSTGRES_URL=url.render_as_string(hide_password=False), + REDIS_URL=isolated_redis_url, + YUXI_SKILL_DATA_DIR=str(temporary / "skill-sources"), + ) + env.update({name: uuid.uuid4().hex + uuid.uuid4().hex for name in SECURITY_SECRET_NAMES}) + processes = [] + logs = [] + client = None + minio_client = None + kb_id = "kb_preview_" + uuid.uuid4().hex[:16] + private_kb = kb_id + "_private" + + seed = """ +import asyncio +from loguru import logger +logger.remove() +from yuxi.storage.postgres.manager import pg_manager, BUSINESS_SCHEMA_VERSION, KNOWLEDGE_SCHEMA_VERSION +from yuxi.storage.postgres.models_business import User, Department +from yuxi.storage.postgres.models_knowledge import KnowledgeBase +from yuxi.utils.auth_utils import AuthUtils +async def seed(): + pg_manager.initialize() + await pg_manager.create_business_tables() + await pg_manager.create_knowledge_tables() + await pg_manager.create_schema_version_table() + await pg_manager.record_schema_version('business', BUSINESS_SCHEMA_VERSION) + await pg_manager.record_schema_version('knowledge', KNOWLEDGE_SCHEMA_VERSION) + async with pg_manager.get_async_session_context() as session: + department = Department(name='预览测试部门') + session.add(department) + await session.flush() + for uid, role in [('preview_admin', 'superadmin'), ('preview_reader', 'user')]: + session.add(User(uid=uid, username=uid, role=role, department_id=department.id, + password_hash=AuthUtils.hash_password('Synthetic-preview-pass!'))) + session.add(KnowledgeBase(kb_id=KB_ID, name='预览测试库', kb_type='milvus', created_by='preview_admin', + share_config={'version': 2, 'read_scope': {'access_level': 'global'}, 'manage_scope': None})) + session.add(KnowledgeBase(kb_id=PRIVATE_KB, name='预览私有库', kb_type='milvus', created_by='preview_admin', + share_config={'version': 2, 'read_scope': None, 'manage_scope': None})) + await pg_manager.close() +asyncio.run(seed()) +""" + seed = f"KB_ID={kb_id!r}\nPRIVATE_KB={private_kb!r}\n" + seed + + def start_process(command, name): + """使用私有日志启动验收进程，关闭时回收。""" + log = (temporary / (name + ".log")).open("w") + logs.append(log) + process = subprocess.Popen(command, env=env, cwd=temporary, stdout=log, stderr=log) + processes.append(process) + return process + + try: + seeded = subprocess.run([sys.executable, "-c", seed], env=env, cwd=temporary, capture_output=True, text=True) + assert seeded.returncode == 0, seeded.stderr[-4000:] + app_file = temporary / "preview_http_app.py" + app_file.write_text( + "from loguru import logger\nlogger.remove()\n" + "from fastapi import FastAPI\n" + "from server.routers.auth_router import auth\n" + "from server.routers.knowledge_router import knowledge\n" + "from server.routers.workspace_router import workspace, workspace_knowledge\n" + "from server.utils.access_log_middleware import AccessLogMiddleware\n" + "from yuxi.storage.postgres.manager import pg_manager\n" + "pg_manager.initialize()\napp = FastAPI()\n" + "app.add_middleware(AccessLogMiddleware)\n" + "app.include_router(auth, prefix='/api')\n" + "app.include_router(knowledge, prefix='/api')\n" + "app.include_router(workspace, prefix='/api')\n" + "app.include_router(workspace_knowledge, prefix='/api')\n", + encoding="utf-8", + ) + with socket.socket() as listener: + listener.bind(("127.0.0.1", 0)) + port = listener.getsockname()[1] + api = start_process( + [ + sys.executable, + "-m", + "uvicorn", + "preview_http_app:app", + "--app-dir", + str(temporary), + "--host", + "127.0.0.1", + "--port", + str(port), + "--no-access-log", + ], + "api", + ) + endpoint = f"http://127.0.0.1:{port}" + client = httpx.Client(base_url=endpoint, timeout=30, trust_env=False) + + def live(): + """API 必须真的接受 HTTP 请求。""" + if api.poll() is not None: + pytest.fail((temporary / "api.log").read_text()[-4000:]) + try: + return client.get("/api/auth/check-first-run").status_code + except httpx.ConnectError: + return None + + wait_until(live, lambda status: status == 200) + headers = {} + for role, uid in [("admin", "preview_admin"), ("reader", "preview_reader")]: + login = client.post("/api/auth/token", data={"username": uid, "password": "Synthetic-preview-pass!"}) + assert login.status_code == 200, login.text + headers[role] = {"Authorization": "Bearer " + login.json()["access_token"]} + minio_client = Minio( + os.environ["MINIO_URI"].split("://", 1)[-1], + access_key=os.environ["MINIO_ACCESS_KEY"], + secret_key=os.environ["MINIO_SECRET_KEY"], + secure=False, + ) + yield SimpleNamespace( + temporary=temporary, + client=client, + url=sync_url, + kb_id=kb_id, + private_kb=private_kb, + headers=headers, + start_worker=lambda: start_process([sys.executable, "-m", "server.worker_main"], "worker"), + minio=minio_client, + ) + finally: + for process in reversed(processes): + process.terminate() + try: + process.wait(timeout=20) + except subprocess.TimeoutExpired: + process.kill() + process.wait(timeout=10) + for log in logs: + log.close() + if client is not None: + client.close() + try: + if minio_client is not None and minio_client.bucket_exists("knowledgebases"): + for item in minio_client.list_objects("knowledgebases", prefix=kb_id + "/", recursive=True): + minio_client.remove_object("knowledgebases", item.object_name) + finally: + with psycopg.connect(admin_url, autocommit=True) as connection: + connection.execute(f'DROP DATABASE "{database}" WITH (FORCE)') + + +def task_rows(server, file_id): + """从 PostgreSQL 读取对应文件的真实 Task 终态。""" + with psycopg.connect(server.url) as connection: + return connection.execute( + "SELECT id, status, result, error FROM tasks " + "WHERE type='knowledge_preview' AND payload->>'file_id'=%s ORDER BY created_at", + (file_id,), + ).fetchall() + + +def upload_and_add(server, filename, content): + """执行产品实际上传和只添加入口。""" + uploaded = server.client.post( + "/api/knowledge/files/upload", + params={"kb_id": server.kb_id}, + files={"file": (filename, content)}, + headers=server.headers["admin"], + ) + assert uploaded.status_code == 200, (uploaded.text, (server.temporary / "api.log").read_text()[-3500:]) + original = uploaded.json() + path = original["file_path"] + added = server.client.post( + f"/api/knowledge/databases/{server.kb_id}/documents/add", + json={ + "items": [path], + "params": {"content_hashes": {path: original["content_hash"]}, "file_sizes": {path: len(content)}}, + }, + headers=server.headers["admin"], + ) + assert added.status_code == 200 and added.json()["added"] == 1, added.text + return added.json()["items"][0]["file_id"], original + + +def object_bytes(server, key): + """回读真实 MinIO 字节并关闭连接。""" + response = server.minio.get_object("knowledgebases", key) + try: + return response.read() + finally: + response.close() + response.release_conn() + + +def test_uploaded_office_prepares_cache_before_preview_and_reuses_it(preview_server): + """先回读 worker 产物再点预览，原件、权限、去重与失败均由外部事实证明。""" + server = preview_server + workbook = Workbook() + workbook.active["A1"] = "preview-cache-marker" + for row in range(2, 180): + workbook.active.append([row, row * 3, row * 7]) + output = io.BytesIO() + workbook.save(output) + original = output.getvalue() + file_id, uploaded = upload_and_add(server, "preview.xlsx", original) + rows = task_rows(server, file_id) + assert len(rows) == 1 and rows[0][1] == "pending" + preview_params = {"kb_id": server.kb_id, "file_id": file_id} + reader = server.headers["reader"] + # 存量文件没有提前任务时，并发读取在真实唯一索引上收敛。 + legacy_id = "file_preview_legacy" + with psycopg.connect(server.url) as connection: + connection.execute( + "INSERT INTO knowledge_files (file_id, kb_id, filename, minio_url, path, file_size, status) " + "SELECT %s, kb_id, filename, minio_url, path, file_size, status FROM knowledge_files WHERE file_id=%s", + (legacy_id, file_id), + ) + legacy_params = {**preview_params, "file_id": legacy_id} + with ThreadPoolExecutor(max_workers=8) as pool: + responses = list( + pool.map( + lambda _: server.client.get("/api/workspace/knowledge/file", params=legacy_params, headers=reader), + range(8), + ) + ) + assert all(response.status_code == 200 and response.json().get("status") == "loading" for response in responses), [ + (response.status_code, response.text[:500]) for response in responses + ] + assert len(task_rows(server, legacy_id)) == 1 + assert task_rows(server, file_id) == rows + + cache_key = f"{server.kb_id}/preview/{file_id}.pdf" + assert not list(server.minio.list_objects("knowledgebases", prefix=cache_key)) + worker = server.start_worker() + + def worker_facts(): + """启动失败立即保留原因，不能把未运行 worker 当成慢转换。""" + if worker.poll() is not None: + pytest.fail((server.temporary / "worker.log").read_text()[-4500:]) + return task_rows(server, file_id) + + finished = wait_until(worker_facts, lambda records: records and records[0][1] in {"success", "failed"}) + assert finished[0][1] == "success", finished + pdf = object_bytes(server, cache_key) + assert pdf.startswith(b"%PDF-") + assert "preview-cache-marker" in "".join(page.extract_text() or "" for page in PdfReader(io.BytesIO(pdf)).pages) + original_hash = hashlib.sha256(original).hexdigest() + assert hashlib.sha256(object_bytes(server, uploaded["object_name"])).hexdigest() == original_hash + before = server.minio.stat_object("knowledgebases", cache_key) + measurements = [] + for _ in range(2): + started = time.monotonic() + response = server.client.get("/api/workspace/knowledge/file", params=preview_params, headers=reader) + measurements.append(round(time.monotonic() - started, 4)) + assert response.status_code == 200 and response.content == pdf + assert int(response.headers["content-length"]) == len(pdf) + assert response.headers["content-type"] == "application/pdf" + after = server.minio.stat_object("knowledgebases", cache_key) + assert (before.etag, before.last_modified) == (after.etag, after.last_modified) + assert len(task_rows(server, file_id)) == 1 + print(json.dumps({"cached_http_seconds": measurements, "pdf_bytes": len(pdf)}, ensure_ascii=False)) + + # 生成真正的旧版 XLS，再经产品上传和 worker 回读，避免只改变文件后缀。 + legacy_directory = server.temporary / "legacy-xls" + legacy_directory.mkdir() + source = legacy_directory / "legacy.xlsx" + source.write_bytes(original) + converted = subprocess.run( + [ + "libreoffice", + "-env:UserInstallation=" + (legacy_directory / "profile").as_uri(), + "--headless", + "--convert-to", + "xls", + "--outdir", + str(legacy_directory), + str(source), + ], + capture_output=True, + timeout=60, + ) + legacy_file = legacy_directory / "legacy.xls" + assert converted.returncode == 0 and legacy_file.is_file(), converted.stderr + legacy_original = legacy_file.read_bytes() + assert legacy_original.startswith(bytes.fromhex("d0cf11e0a1b11ae1")) + xls_id, xls_uploaded = upload_and_add(server, "legacy.xls", legacy_original) + xls_tasks = wait_until( + lambda: task_rows(server, xls_id), lambda records: records and records[0][1] in {"success", "failed"} + ) + assert len(xls_tasks) == 1 and xls_tasks[0][1] == "success", xls_tasks + xls_pdf = object_bytes(server, f"{server.kb_id}/preview/{xls_id}.pdf") + assert "preview-cache-marker" in "".join(page.extract_text() or "" for page in PdfReader(io.BytesIO(xls_pdf)).pages) + assert ( + hashlib.sha256(object_bytes(server, xls_uploaded["object_name"])).digest() + == hashlib.sha256(legacy_original).digest() + ) + xls_response = server.client.get( + "/api/workspace/knowledge/file", params={"kb_id": server.kb_id, "file_id": xls_id}, headers=reader + ) + assert xls_response.status_code == 200 and xls_response.content == xls_pdf + assert int(xls_response.headers["content-length"]) == len(xls_pdf) + print(json.dumps({"xls_prepared_before_click": True, "xls_pdf_bytes": len(xls_pdf)})) + + count = len(task_rows(server, file_id)) + assert server.client.get("/api/workspace/knowledge/file", params=preview_params).status_code == 401 + assert ( + server.client.get( + "/api/workspace/knowledge/file", params={**preview_params, "kb_id": server.private_kb}, headers=reader + ).status_code + == 403 + ) + assert ( + server.client.get( + "/api/workspace/knowledge/file", params={**preview_params, "file_id": "missing_file"}, headers=reader + ).status_code + == 400 + ) + assert len(task_rows(server, file_id)) == count + + broken_id, broken = upload_and_add(server, "broken.xlsx", b"PK\x03\x04broken workbook") + failed = wait_until(lambda: task_rows(server, broken_id), lambda records: records and records[0][1] == "failed") + assert len(failed) == 1 + response = server.client.get( + "/api/workspace/knowledge/file", params={"kb_id": server.kb_id, "file_id": broken_id}, headers=reader + ) + assert response.status_code == 200 and response.json()["status"] == "error" + assert object_bytes(server, broken["object_name"]) == b"PK\x03\x04broken workbook" + assert not list(server.minio.list_objects("knowledgebases", prefix=f"{server.kb_id}/preview/{broken_id}.pdf")) + + workbook.active["B1"] = "independent-submission-failure" + recovered_output = io.BytesIO() + workbook.save(recovered_output) + recovered_original = recovered_output.getvalue() + + # 只拒绝预览 Task 的真实 INSERT，确认独立事务失败不抹掉已注册原件。 + with psycopg.connect(server.url) as connection: + connection.execute( + "CREATE FUNCTION reject_preview_submission() RETURNS trigger LANGUAGE plpgsql AS $$ " + "BEGIN IF NEW.type='knowledge_preview' THEN " + "RAISE EXCEPTION 'synthetic preview submission failure'; END IF; RETURN NEW; END $$" + ) + connection.execute( + "CREATE TRIGGER reject_preview_submission BEFORE INSERT ON tasks " + "FOR EACH ROW EXECUTE FUNCTION reject_preview_submission()" + ) + try: + recovered_id, recovered_upload = upload_and_add(server, "submission-failure.xlsx", recovered_original) + with psycopg.connect(server.url) as connection: + registered = connection.execute( + "SELECT filename, path, file_size FROM knowledge_files WHERE file_id=%s AND kb_id=%s", + (recovered_id, server.kb_id), + ).fetchone() + assert registered == ("submission-failure.xlsx", recovered_upload["file_path"], len(recovered_original)) + assert object_bytes(server, recovered_upload["object_name"]) == recovered_original + assert not task_rows(server, recovered_id) + finally: + with psycopg.connect(server.url) as connection: + connection.execute("DROP TRIGGER reject_preview_submission ON tasks") + connection.execute("DROP FUNCTION reject_preview_submission()") + + response = server.client.get( + "/api/workspace/knowledge/file", params={"kb_id": server.kb_id, "file_id": recovered_id}, headers=reader + ) + assert response.status_code == 200 and response.json()["status"] == "loading" + recovered_tasks = wait_until( + lambda: task_rows(server, recovered_id), lambda records: records and records[0][1] in {"success", "failed"} + ) + assert len(recovered_tasks) == 1 and recovered_tasks[0][1] == "success", recovered_tasks + recovered_pdf = object_bytes(server, f"{server.kb_id}/preview/{recovered_id}.pdf") + assert "independent-submission-failure" in "".join( + page.extract_text() or "" for page in PdfReader(io.BytesIO(recovered_pdf)).pages + ) + assert object_bytes(server, recovered_upload["object_name"]) == recovered_original + print(json.dumps({"submission_failure_kept_original": True, "read_recovered_preview": True})) diff --git a/backend/test/unit/knowledge/test_office_pdf_preview.py b/backend/test/unit/knowledge/test_office_pdf_preview.py index 249afd51bb..54aff701f0 100644 --- a/backend/test/unit/knowledge/test_office_pdf_preview.py +++ b/backend/test/unit/knowledge/test_office_pdf_preview.py @@ -110,9 +110,11 @@ def test_office_file_entry_exposes_logical_file_availability(tmp_path) -> None: assert "default_preview_mode" not in entry +@pytest.mark.parametrize("filename", ["demo.docx", "demo.pptx", "表格.xlsx", "表格.xls"]) @pytest.mark.asyncio -async def test_read_office_pdf_preview_converts_and_caches_pdf(monkeypatch: pytest.MonkeyPatch) -> None: - stub_file_record(monkeypatch, make_file_record()) +async def test_read_office_pdf_preview_converts_and_caches_pdf(monkeypatch: pytest.MonkeyPatch, filename: str) -> None: + """各类 Office 文件复用 PDF 缓存并保留原件。""" + stub_file_record(monkeypatch, make_file_record(filename=filename)) minio_client = FakeMinioClient() minio_client.objects[("knowledgebases", "db1/upload/demo.docx")] = b"office" convert_calls = 0 @@ -120,7 +122,7 @@ async def test_read_office_pdf_preview_converts_and_caches_pdf(monkeypatch: pyte async def fake_convert(filename: str, content: bytes) -> bytes: nonlocal convert_calls convert_calls += 1 - assert filename == "demo.docx" + assert filename.endswith((".docx", ".pptx", ".xlsx", ".xls")) assert content == b"office" return b"%PDF-1.4\nconverted" @@ -138,11 +140,12 @@ async def fake_convert(filename: str, content: bytes) -> bytes: assert cached_response["content"] == b"%PDF-1.4\nconverted" assert minio_client.objects[("knowledgebases", "db1/preview/file1.pdf")] == b"%PDF-1.4\nconverted" assert convert_calls == 1 + assert minio_client.objects[("knowledgebases", "db1/upload/demo.docx")] == b"office" @pytest.mark.asyncio -async def test_non_docx_pptx_office_files_do_not_get_pdf_preview(monkeypatch: pytest.MonkeyPatch) -> None: - stub_file_record(monkeypatch, make_file_record(filename="demo.xlsx")) +async def test_macro_enabled_spreadsheet_does_not_get_pdf_preview(monkeypatch: pytest.MonkeyPatch) -> None: + stub_file_record(monkeypatch, make_file_record(filename="demo.xlsm")) minio_client = FakeMinioClient() minio_client.objects[("knowledgebases", "db1/upload/demo.docx")] = b"PK\x03\x04excel" monkeypatch.setattr(preview, "get_minio_client", lambda: minio_client) diff --git a/backend/test/unit/routers/test_knowledge_router_cleanup.py b/backend/test/unit/routers/test_knowledge_router_cleanup.py index 2ead392626..e2f0523342 100644 --- a/backend/test/unit/routers/test_knowledge_router_cleanup.py +++ b/backend/test/unit/routers/test_knowledge_router_cleanup.py @@ -3,12 +3,12 @@ import pytest from fastapi import HTTPException, UploadFile - -from server.routers import knowledge_router from yuxi.knowledge.read_models import KnowledgeBaseDetail from yuxi.services import knowledge_task_service from yuxi.services.task_registry import get_task_definition +from server.routers import knowledge_router + pytestmark = pytest.mark.asyncio @@ -437,7 +437,7 @@ async def fake_get_database_info(kb_id: str) -> KnowledgeBaseDetail: return _database_detail() async def fake_add_file_record(kb_id: str, item_path: str, params: dict, operator_id: str | None = None): - return {"file_id": "file_1", "status": "indexing"} + return {"file_id": "file_1", "status": "indexing", "filename": "demo.txt"} async def fake_parse_file(kb_id: str, file_id: str, operator_id: str | None = None, **_kwargs): return {"file_id": file_id, "status": "parsed", "error": None} @@ -495,7 +495,7 @@ async def fake_get_database_info(kb_id: str) -> KnowledgeBaseDetail: async def fake_add_file_record(kb_id: str, item_path: str, params: dict, operator_id: str | None = None): captured_records.append({"kb_id": kb_id, "item": item_path, "params": params, "operator_id": operator_id}) - return {"file_id": f"file_{len(captured_records)}", "status": "uploaded"} + return {"file_id": f"file_{len(captured_records)}", "status": "uploaded", "filename": "demo.txt"} async def fake_parse_file(kb_id: str, file_id: str, operator_id: str | None = None, **_kwargs): return {"file_id": file_id, "status": "parsed", "error": None} diff --git a/backend/test/unit/routers/test_workspace_knowledge_tree.py b/backend/test/unit/routers/test_workspace_knowledge_tree.py index 999073df42..2128488714 100644 --- a/backend/test/unit/routers/test_workspace_knowledge_tree.py +++ b/backend/test/unit/routers/test_workspace_knowledge_tree.py @@ -2,13 +2,13 @@ from fastapi import FastAPI from fastapi.testclient import TestClient +from yuxi.knowledge.read_models import KnowledgeBaseDetail +from yuxi.services import knowledge_preview_service as preview +from yuxi.storage.postgres.models_business import User from server.routers import workspace_router from server.routers.workspace_router import workspace_knowledge from server.utils.auth_middleware import get_required_user -from yuxi.knowledge import preview -from yuxi.knowledge.read_models import KnowledgeBaseDetail -from yuxi.storage.postgres.models_business import User class FakeKnowledgeBase: @@ -135,7 +135,7 @@ def test_workspace_knowledge_tree_rejects_non_document_kb(monkeypatch): assert "不支持文件浏览" in response.json()["detail"] -def test_workspace_knowledge_file_calls_knowledge_preview_directly(monkeypatch): +def test_workspace_knowledge_file_calls_preview_usecase(monkeypatch): client = _build_client(monkeypatch, FakeKnowledgeBase()) calls = [] @@ -150,7 +150,7 @@ async def read_preview(*, kb_id: str, file_id: str) -> dict: "supported": True, } - monkeypatch.setattr(preview, "read_knowledge_file_preview", read_preview) + monkeypatch.setattr(preview, "read_workspace_knowledge_preview", read_preview) response = client.get( "/api/workspace/knowledge/file", diff --git a/backend/test/unit/services/test_binary_preview_response.py b/backend/test/unit/services/test_binary_preview_response.py new file mode 100644 index 0000000000..f113dec6ac --- /dev/null +++ b/backend/test/unit/services/test_binary_preview_response.py @@ -0,0 +1,35 @@ +"""内存二进制预览完整响应的协议回归。""" + +import pytest +from yuxi.services.file_preview import _preview_response +from yuxi.utils.filepreview import PreviewResult + +from server.routers.workspace_router import _binary_preview_response + + +@pytest.mark.parametrize("owner", ["knowledge", "workspace"]) +async def test_memory_pdf_is_one_body_with_length(owner): + """带大量换行的 PDF 必须逐字完整且只发送一个正文块。""" + content = b"%PDF-1.4\n" + b"binary-data\n" * 7100 + if owner == "knowledge": + response = _binary_preview_response( + {"content": content, "filename": "报表.pdf", "preview_type": "pdf", "media_type": "application/pdf"} + ) + else: + response = _preview_response(PreviewResult(content, "pdf", True, "application/pdf", "报表.pdf")) + messages = [] + + async def send(message): + """观察真实 ASGI 协议输出。""" + messages.append(message) + + async def receive(): + """仅提供标准请求结束信号。""" + return {"type": "http.request", "body": b"", "more_body": False} + + await response({"type": "http", "asgi": {"spec_version": "2.4"}}, receive, send) + body = [message for message in messages if message["type"] == "http.response.body"] + assert len(body) == 1 + assert body[0]["body"] == content and not body[0].get("more_body", False) + assert response.headers["content-length"] == str(len(content)) + assert response.headers["x-yuxi-preview-type"] == "pdf" diff --git a/backend/test/unit/services/test_knowledge_preview_service.py b/backend/test/unit/services/test_knowledge_preview_service.py new file mode 100644 index 0000000000..ecd612dae2 --- /dev/null +++ b/backend/test/unit/services/test_knowledge_preview_service.py @@ -0,0 +1,300 @@ +"""知识库预览的注册入口、任务状态与发布控制点。""" + +import asyncio +from types import SimpleNamespace +from unittest.mock import AsyncMock, Mock + +import pytest +from minio.error import S3Error +from yuxi.knowledge import preview +from yuxi.services import knowledge_preview_service as service +from yuxi.services import knowledge_task_service +from yuxi.services.task_registry import get_task_definition +from yuxi.storage.minio.client import MinIOClient +from yuxi.utils.filepreview import MAX_BINARY_PREVIEW_SIZE_BYTES + +from server.routers import knowledge_router + + +@pytest.fixture +def preview_case(monkeypatch): + """准备元数据与外部边界，不替换被测用例。""" + record = SimpleNamespace( + kb_id="kb_1", + file_id="file_1", + filename="book.xlsx", + original_filename=None, + file_size=10, + is_folder=False, + minio_url="minio://knowledgebases/kb_1/upload/book.xlsx", + path=None, + ) + repo = SimpleNamespace(get_by_file_id=AsyncMock(return_value=record)) + client = SimpleNamespace( + KB_BUCKETS={"parsed": "knowledgebases"}, + astat_file=AsyncMock(return_value=None), + adownload_file=AsyncMock(return_value=None), + ) + tasks = SimpleNamespace( + find_task_by_payload=AsyncMock(return_value=None), + enqueue_unique_by_payload=AsyncMock(return_value=(SimpleNamespace(id="preview_1", status="pending"), True)), + ) + monkeypatch.setattr(service, "KnowledgeFileRepository", lambda: repo) + monkeypatch.setattr(preview, "KnowledgeFileRepository", lambda: repo) + monkeypatch.setattr(preview, "get_minio_client", lambda: client) + monkeypatch.setattr(service, "tasker", tasks) + return record, repo, client, tasks + + +@pytest.mark.parametrize("filename", ["book.xlsx", "book.xls", "report.docx", "slides.pptx"]) +async def test_registration_prepares_preview_without_parsing(monkeypatch, preview_case, filename): + """元数据注册后产生独立预览意图，原件状态仍为 uploaded。""" + _, _, _, tasks = preview_case + metadata = {"file_id": "file_1", "filename": filename, "size": 10, "status": "uploaded"} + register = AsyncMock(return_value=metadata) + monkeypatch.setattr(service.knowledge_base, "add_file_record", register) + result = await service.register_knowledge_file("kb_1", "minio://source", params={}, operator_id="u_1") + assert result == metadata and result["status"] == "uploaded" + assert tasks.enqueue_unique_by_payload.await_args.kwargs["payload"] == {"kb_id": "kb_1", "file_id": "file_1"} + assert tasks.enqueue_unique_by_payload.await_args.kwargs["payload_match"] == {"kb_id": "kb_1", "file_id": "file_1"} + + +@pytest.mark.parametrize(("filename", "size"), [("data.txt", 10), ("book.xlsx", MAX_BINARY_PREVIEW_SIZE_BYTES + 1)]) +async def test_registration_skips_unneeded_conversion(monkeypatch, preview_case, filename, size): + """非 Office 与超限原件不进入转换任务。""" + _, _, _, tasks = preview_case + monkeypatch.setattr( + service.knowledge_base, + "add_file_record", + AsyncMock(return_value={"file_id": "file_1", "filename": filename, "size": size, "status": "uploaded"}), + ) + await service.register_knowledge_file("kb_1", "minio://source", params={}, operator_id="u_1") + tasks.enqueue_unique_by_payload.assert_not_awaited() + + +async def test_upload_only_route_uses_prepared_preview_registration(monkeypatch, preview_case): + """直接添加入口必须在首次点击之前提交预览任务。""" + _, _, _, tasks = preview_case + item = "minio://knowledgebases/kb_1/upload/book.xlsx" + monkeypatch.setattr(knowledge_router, "_ensure_database_supports_documents", AsyncMock()) + monkeypatch.setattr( + service.knowledge_base, + "add_file_record", + AsyncMock(return_value={"file_id": "file_1", "filename": "book.xlsx", "size": 10, "status": "uploaded"}), + ) + result = await knowledge_router.add_uploaded_documents( + "kb_1", + knowledge_router.AddUploadedDocumentsRequest(items=[item], params={"content_hashes": {item: "hash_1"}}), + current_user=SimpleNamespace(uid="u_1"), + ) + assert result["added"] == 1 and result["failed"] == 0 + tasks.enqueue_unique_by_payload.assert_awaited_once() + + +async def test_ingest_route_prepares_preview_before_parse(monkeypatch, preview_case): + """批量处理入口的解析失败不取消独立预览意图。""" + _, _, _, tasks = preview_case + monkeypatch.setattr( + service.knowledge_base, + "add_file_record", + AsyncMock(return_value={"file_id": "file_1", "filename": "book.xlsx", "size": 10, "status": "uploaded"}), + ) + monkeypatch.setattr(service.knowledge_base, "parse_file", AsyncMock(side_effect=ValueError("解析器拒绝测试文件"))) + context = SimpleNamespace( + payload={"kb_id": "kb_1", "items": ["minio://source"], "params": {}, "operator_id": "u_1"}, + task_id="ingest_1", + worker_id="owner_1", + set_progress=AsyncMock(), + set_result=AsyncMock(), + raise_if_cancelled=AsyncMock(), + ) + with pytest.raises(RuntimeError, match="失败 1"): + await knowledge_task_service.run_knowledge_ingest(context) + tasks.enqueue_unique_by_payload.assert_awaited_once() + + +@pytest.mark.parametrize("entrypoint", ["upload", "ingest"]) +async def test_preview_submission_failure_keeps_registered_file_and_ingest(monkeypatch, preview_case, entrypoint): + """独立预览意图提交失败，已提交原件仍返回成功并继续解析入库。""" + _, _, _, tasks = preview_case + metadata = {"file_id": "file_1", "filename": "book.xlsx", "size": 10, "status": "uploaded"} + register = AsyncMock(return_value=metadata) + parse = AsyncMock(return_value={**metadata, "status": "parsed"}) + index = AsyncMock(return_value={**metadata, "status": "indexed"}) + monkeypatch.setattr(service.knowledge_base, "add_file_record", register) + monkeypatch.setattr(service.knowledge_base, "parse_file", parse) + monkeypatch.setattr(service.knowledge_base, "update_file_params", AsyncMock()) + monkeypatch.setattr(service.knowledge_base, "index_file", index) + # 告警是同步 logger，业务结果通过返回值与实际解析参数核对。 + alert = Mock() + monkeypatch.setattr(service, "logger", SimpleNamespace(exception=alert), raising=False) + tasks.enqueue_unique_by_payload.side_effect = RuntimeError("测试预览意图无法提交") + item = "minio://knowledgebases/kb_1/upload/book.xlsx" + + if entrypoint == "upload": + monkeypatch.setattr(knowledge_router, "_ensure_database_supports_documents", AsyncMock()) + result = await knowledge_router.add_uploaded_documents( + "kb_1", + knowledge_router.AddUploadedDocumentsRequest(items=[item], params={"content_hashes": {item: "hash_1"}}), + current_user=SimpleNamespace(uid="u_1"), + ) + assert result["added"] == 1 and result["failed"] == 0 + assert result["items"][0]["file_id"] == "file_1" + parse.assert_not_awaited() + else: + context = SimpleNamespace( + payload={"kb_id": "kb_1", "items": [item], "params": {"auto_index": True}, "operator_id": "u_1"}, + task_id="ingest_1", + worker_id="owner_1", + set_progress=AsyncMock(), + set_result=AsyncMock(), + raise_if_cancelled=AsyncMock(), + ) + result = await knowledge_task_service.run_knowledge_ingest(context) + assert result["failed"] == 0 and result["items"] == [{**metadata, "status": "indexed"}] + assert parse.await_args.args == ("kb_1", "file_1") + assert index.await_args.args == ("kb_1", "file_1") + + register.assert_awaited_once() + alert.assert_called_once() + assert alert.call_args.args[1:] == ("kb_1", "file_1") + + +async def test_missing_cache_returns_loading_without_inline_conversion(monkeypatch, preview_case): + """预览请求只提交任务并立即返回状态，转换不能在请求中执行。""" + _, _, _, tasks = preview_case + render = AsyncMock(side_effect=AssertionError("不能在读取请求中转换")) + monkeypatch.setattr(preview, "convert_office_to_pdf", render) + response = await service.read_workspace_knowledge_preview("kb_1", "file_1") + assert response["status"] == "loading" and response["supported"] + assert "生成预览" in response["message"] + tasks.enqueue_unique_by_payload.assert_awaited_once() + render.assert_not_awaited() + + +@pytest.mark.parametrize("status", ["pending", "running"]) +async def test_repeated_read_reuses_active_preview_task(monkeypatch, preview_case, status): + """非终态 Task 在多次读取中保持唯一意图。""" + _, _, _, tasks = preview_case + tasks.find_task_by_payload.return_value = SimpleNamespace(status=status) + for _ in range(2): + result = await service.read_workspace_knowledge_preview("kb_1", "file_1") + assert result["status"] == "loading" + tasks.enqueue_unique_by_payload.assert_not_awaited() + + +@pytest.mark.parametrize("status", ["failed", "cancelled"]) +async def test_failed_preview_ends_loading(preview_case, status): + """失败与取消必须返回错误终态，不能持续轮询。""" + _, _, _, tasks = preview_case + tasks.find_task_by_payload.return_value = SimpleNamespace(status=status) + result = await service.read_workspace_knowledge_preview("kb_1", "file_1") + assert result["status"] == "error" and not result["supported"] + tasks.enqueue_unique_by_payload.assert_not_awaited() + + +async def test_cache_is_authority_after_success_or_task_failure(monkeypatch, preview_case): + """可读取的缓存字节直接返回，不依据任务报告推断缓存缺失。""" + _, _, client, tasks = preview_case + client.astat_file.return_value = 16 + expected = {"content": b"%PDF-1.4", "binary": True, "preview_type": "pdf"} + monkeypatch.setattr(service, "read_knowledge_file_preview", AsyncMock(return_value=expected)) + for _ in range(2): + assert await service.read_workspace_knowledge_preview("kb_1", "file_1") == expected + tasks.find_task_by_payload.assert_not_awaited() + tasks.enqueue_unique_by_payload.assert_not_awaited() + + +async def test_deleted_cache_is_regenerated_after_success(preview_case): + """成功记录不能代替已经丢失的派生对象。""" + _, _, _, tasks = preview_case + tasks.find_task_by_payload.return_value = SimpleNamespace(status="success") + assert (await service.read_workspace_knowledge_preview("kb_1", "file_1"))["status"] == "loading" + tasks.enqueue_unique_by_payload.assert_awaited_once() + + +@pytest.mark.parametrize("target", ["wrong_kb", "folder"]) +async def test_invalid_target_never_submits_preview(preview_case, target): + """目标文件必须属于路由已经授权的同一知识库。""" + record, _, client, tasks = preview_case + record.is_folder = target == "folder" + with pytest.raises(ValueError, match="not found" if target == "wrong_kb" else "folder"): + await service.read_workspace_knowledge_preview("other_kb" if target == "wrong_kb" else "kb_1", "file_1") + client.astat_file.assert_not_awaited() + tasks.enqueue_unique_by_payload.assert_not_awaited() + + +@pytest.mark.parametrize("reason", ["lease_lost", "source_deleted"]) +async def test_worker_guard_stops_cache_write_after_ownership_or_source_loss(monkeypatch, preview_case, reason): + """转换期间失权或原件删除时，实际缓存发布控制点拒绝写入。""" + record, repo, _, _ = preview_case + objects = {("knowledgebases", "kb_1/upload/book.xlsx"): b"office"} + + class Minio: + """保留对象字节以观察发布结果。""" + + KB_BUCKETS = {"parsed": "knowledgebases"} + + async def astat_file(self, bucket, key): + """读取对象存在性。""" + return len(objects[(bucket, key)]) if (bucket, key) in objects else None + + async def adownload_file(self, bucket, key): + """返回真实对象字节。""" + return objects[(bucket, key)] + + async def aupload_file(self, bucket_name, object_name, data, content_type): + """记录发布后的缓存。""" + objects[(bucket_name, object_name)] = data + + monkeypatch.setattr(preview, "KnowledgeFileRepository", lambda: repo) + monkeypatch.setattr(preview, "get_minio_client", Minio) + monkeypatch.setattr(preview, "convert_office_to_pdf", AsyncMock(return_value=b"%PDF-1.4")) + if reason == "source_deleted": + repo.get_by_file_id.side_effect = [record, None] + context = SimpleNamespace( + payload={"kb_id": "kb_1", "file_id": "file_1"}, + set_progress=AsyncMock(), + raise_if_cancelled=AsyncMock( + side_effect=[None, asyncio.CancelledError("lease_lost")] if reason == "lease_lost" else [None, None] + ), + ) + with pytest.raises( + asyncio.CancelledError if reason == "lease_lost" else ValueError, + match="lease_lost" if reason == "lease_lost" else "原件已删除", + ): + await service.run_knowledge_preview(context) + assert objects == {("knowledgebases", "kb_1/upload/book.xlsx"): b"office"} + + +def test_preview_handler_is_registered_on_shipping_path(): + """registry 必须惰性装配实际 worker Handler。""" + assert get_task_definition("knowledge_preview").load_handler() is service.run_knowledge_preview + + +async def test_cache_disappearing_before_download_submits_task_without_inline_conversion(monkeypatch, preview_case): + """缓存存在性快照失效后，实际对象缺失只能交给后台任务。""" + _, _, client, tasks = preview_case + client.astat_file.side_effect = [14, None] + storage = MinIOClient() + + class MissingObject: + """对象存储在下载时报告缓存已删除。""" + + def get_object(self, bucket_name, object_name): + """使用真实存储错误，覆盖缓存读取和 SDK 异常边界。""" + raise S3Error(None, "NoSuchKey", "cache disappeared", object_name, "test", "test") + + storage._client = MissingObject() + client.adownload_file = storage.adownload_file + converter = AsyncMock(side_effect=AssertionError("HTTP 请求不能转换 Office")) + publisher = AsyncMock(side_effect=AssertionError("HTTP 请求不能发布缓存")) + client.aupload_file = publisher + monkeypatch.setattr(preview, "convert_office_to_pdf", converter) + + result = await service.read_workspace_knowledge_preview("kb_1", "file_1") + + assert result["status"] == "loading" + tasks.enqueue_unique_by_payload.assert_awaited_once() + converter.assert_not_awaited() + publisher.assert_not_awaited() diff --git a/backend/test/unit/services/test_workspace_service.py b/backend/test/unit/services/test_workspace_service.py index e539f5e386..ab9ecce5fa 100644 --- a/backend/test/unit/services/test_workspace_service.py +++ b/backend/test/unit/services/test_workspace_service.py @@ -7,11 +7,10 @@ from types import SimpleNamespace import pytest -from fastapi import HTTPException, UploadFile - import yuxi.workspace.preview as file_preview -from yuxi.workspace import paths as workspace_paths +from fastapi import HTTPException, UploadFile from yuxi.services import workspace_service as svc +from yuxi.workspace import paths as workspace_paths def _user() -> SimpleNamespace: @@ -99,7 +98,7 @@ def test_workspace_root_rejects_symlink_root(tmp_path: Path, monkeypatch) -> Non ("filename", "content"), [ ("bad.txt", b"\xff\xfe\x00"), - ("sheet.xlsx", b"PK\x03\x04excel"), + ("sheet.xlsm", b"PK\x03\x04excel"), ], ) @pytest.mark.asyncio @@ -122,29 +121,31 @@ async def test_read_workspace_file_content_returns_unsupported_for_unreadable_fi assert result["supported"] is False +@pytest.mark.parametrize("filename", ["demo.docx", "slides.pptx", "sheet.xlsx", "sheet.xls"]) @pytest.mark.asyncio async def test_read_workspace_file_content_returns_pdf_preview_for_office_file( tmp_path: Path, monkeypatch, + filename: str, ) -> None: + """Office 与 Excel 文件返回可展示的 PDF 响应。""" monkeypatch.setenv("YUXI_USER_DATA_DIR", str(tmp_path / "threads")) user = _user() root = _workspace_root(user) - target = root / "demo.docx" + target = root / filename target.write_bytes(b"office") - async def fake_convert(filename: str, content: bytes) -> bytes: - assert filename == "demo.docx" + async def fake_convert(name: str, content: bytes) -> bytes: + assert name == filename assert content == b"office" return b"%PDF-1.4\npreview" monkeypatch.setenv("YUXI_RUNTIME_DIR", str(tmp_path / "runtime")) monkeypatch.setattr(file_preview, "convert_office_to_pdf", fake_convert) - result = await svc.read_workspace_file_content(path="/demo.docx", current_user=user) - body = b"" - async for chunk in result.body_iterator: - body += chunk + result = await svc.read_workspace_file_content(path=f"/{filename}", current_user=user) + body = result.body + assert result.headers["content-length"] == str(len(body)) assert result.media_type == "application/pdf" assert result.headers["x-yuxi-preview-type"] == "pdf" @@ -152,7 +153,7 @@ async def fake_convert(filename: str, content: bytes) -> bytes: @pytest.mark.asyncio -async def test_read_workspace_file_content_rejects_xlsx_preview( +async def test_read_workspace_file_content_reports_excel_conversion_failure( tmp_path: Path, monkeypatch, ) -> None: @@ -162,11 +163,19 @@ async def test_read_workspace_file_content_rejects_xlsx_preview( target = root / "sheet.xlsx" target.write_bytes(b"PK\x03\x04excel") - result = await svc.read_workspace_file_content(path="/sheet.xlsx", current_user=user) + async def fail_convert(filename: str, content: bytes) -> bytes: + """模拟转换器明确拒绝损坏表格。""" + from yuxi.utils.filepreview import OfficePreviewConversionError - assert result["content"] is None - assert result["preview_type"] == "unsupported" - assert result["supported"] is False + raise OfficePreviewConversionError("表格已损坏") + + monkeypatch.setenv("YUXI_RUNTIME_DIR", str(tmp_path / "runtime")) + monkeypatch.setattr(file_preview, "convert_office_to_pdf", fail_convert) + with pytest.raises(HTTPException) as exc_info: + await svc.read_workspace_file_content(path="/sheet.xlsx", current_user=user) + + assert exc_info.value.status_code == 400 + assert exc_info.value.detail == "表格已损坏" @pytest.mark.parametrize( @@ -174,6 +183,8 @@ async def test_read_workspace_file_content_rejects_xlsx_preview( [ ("demo.docx", b"office"), ("slides.pptx", b"presentation"), + ("sheet.xlsx", b"spreadsheet"), + ("sheet.xls", b"legacy spreadsheet"), ], ) @pytest.mark.asyncio @@ -206,10 +217,8 @@ async def read_pdf() -> bytes: response = await svc.read_workspace_file_content(path=f"/{filename}", current_user=user) assert response.media_type == "application/pdf" assert response.headers["x-yuxi-preview-type"] == "pdf" - body = b"" - async for chunk in response.body_iterator: - body += chunk - return body + assert response.headers["content-length"] == str(len(response.body)) + return response.body assert await read_pdf() == b"%PDF-1.4\npreview" assert await read_pdf() == b"%PDF-1.4\npreview" diff --git a/backend/test/unit/storage/test_minio_public_images.py b/backend/test/unit/storage/test_minio_public_images.py index cdc17403b7..f59da22cbe 100644 --- a/backend/test/unit/storage/test_minio_public_images.py +++ b/backend/test/unit/storage/test_minio_public_images.py @@ -4,8 +4,7 @@ import pytest from minio.error import S3Error from urllib3 import HTTPResponse - -from yuxi.storage.minio.client import MinIOClient, normalize_public_minio_url +from yuxi.storage.minio.client import MinIOClient, StorageError, normalize_public_minio_url class FakeMinio: @@ -134,3 +133,26 @@ def list_objects(self, *_args, **_kwargs): client._client = MissingBucketClient() assert await client.adelete_objects_by_prefix("kb-images", "kb-1/") == 0 + + +@pytest.mark.asyncio +@pytest.mark.parametrize("code", ["NoSuchKey", "AccessDenied"]) +async def test_optional_cache_download_only_allows_missing_object(code): + """仅对象缺失可以返回空结果，权限等存储故障保持失败。""" + client = MinIOClient() + + class FailingObject: + """提供真实 SDK 错误码。""" + + def get_object(self, bucket_name, object_name): + """模拟真实存储读取失败。""" + raise S3Error(None, code, "test error", object_name, "test", "test") + + client._client = FailingObject() + if code == "NoSuchKey": + assert await client.adownload_file("bucket", "object", missing_ok=True) is None + else: + with pytest.raises(StorageError): + await client.adownload_file("bucket", "object", missing_ok=True) + with pytest.raises(StorageError): + await client.adownload_file("bucket", "object") diff --git a/backend/test/unit/utils/test_filepreview.py b/backend/test/unit/utils/test_filepreview.py index 4d316f6cf1..d3bd295697 100644 --- a/backend/test/unit/utils/test_filepreview.py +++ b/backend/test/unit/utils/test_filepreview.py @@ -71,9 +71,12 @@ def test_render_preview_keeps_unsupported_binary_content_hidden(): assert result.supported is False -def test_office_pdf_preview_scope_only_includes_docx_and_pptx(): +def test_office_pdf_preview_scope_includes_spreadsheets(): assert is_office_pdf_preview_file("demo.docx") is True assert is_office_pdf_preview_file("demo.pptx") is True - assert is_office_pdf_preview_file("demo.xlsx") is False + assert is_office_pdf_preview_file("demo.xlsx") is True + assert is_office_pdf_preview_file("表格.XLS") is True + assert is_office_pdf_preview_file("表格.XLSX") is True + assert is_office_pdf_preview_file("demo.xlsm") is False assert is_office_pdf_preview_file("demo.doc") is False assert is_office_pdf_preview_file("demo.ppt") is False diff --git a/docs/develop-guides/decisions/implemented/2026-10-10-office-preview-preparation-and-buffered-response.md b/docs/develop-guides/decisions/implemented/2026-10-10-office-preview-preparation-and-buffered-response.md new file mode 100644 index 0000000000..729af2943b --- /dev/null +++ b/docs/develop-guides/decisions/implemented/2026-10-10-office-preview-preparation-and-buffered-response.md @@ -0,0 +1,57 @@ +# 知识库文件预览提前生成与完整响应 + +状态：implemented +类型：feature +Owner：backend/package/yuxi/services/knowledge_preview_service.py + +## 问题 + +知识库 Office 文件首次点击时才转换，已有 PDF 缓存也会反复等待。已完整读取到内存的 PDF 经 BytesIO 同步流式响应按行迭代，约 200 KB 的文件产生数千个正文块。工作区还缺少 `.xlsx` 与 `.xls` 的 Office 预览识别。 + +目标是支持 Excel 原件预览、上传注册后在后台准备共享 PDF、缓存命中后完整返回，以及生成中自动显示和失败结束等待。聊天附件提前转换、存量文件批量补转、浏览器持久缓存、PDF 排版和登录导航不在范围内。 + +## 决策 + +### 实现方案 + +扩展现有 Office 格式识别到 `.xlsx` 与 `.xls`，复用 LibreOffice、30 MB 预览大小限制和转换超时。`.xlsm` 保持不支持。 + +原件注册后提交去重的 `knowledge_preview` Task。直接添加与上传后解析共用注册 service；PostgreSQL Task 拥有意图、lease 与终态，提交后投递现有 worker。worker 在发布 MinIO PDF 前核对 lease 与原件记录，原件与文档解析状态保持独立。预览意图提交异常记录带知识库与文件标识的告警，已提交的原件注册结果仍返回，解析与入库继续；后续缺失缓存读取补交任务。现成 PDF 对象拥有可读取结果。 + +工作区在授权后只读缓存；缺失时展示任务状态并补交存量文件的去重任务，失败或取消明确结束等待。已在内存的二进制通过完整 Response 和 Content-Length 返回。WorkspaceView 与 FileDetailModal 每两秒检查当前文件，切换、关闭和离开页面后隔离旧请求。FileDetailModal 的本地激活状态直接控制可见性，KeepAlive 离页即隐藏弹窗与遮罩，父组件的 open prop 延迟回传不影响隐藏。 + +## 替代方案 + +仅提前转换仍会保留缓存命中后的正文传输等待。同步上传等待转换会增加多文件处理时间。独立队列或浏览器持久缓存会新增执行状态或权限失效规则。复用现有 Task、转换器与共享缓存满足当前需求。 + +## 验证 + +| 验收主张 | 失败面 | 语义 Owner | 直接证据 / 命令 | 负向案例 | 当前结果 | +|---|---|---|---|---|---| +| XLSX 与真实 XLS 上传后在首次点击前生成对应 PDF，原件不变 | 只有格式识别或伪造成功状态 | Office 转换器、注册 service、worker、MinIO | `test/integration/api/test_knowledge_preview_http.py` 回读 Task、PDF 标记、原件哈希 | 损坏工作簿转换失败，缓存不发布 | Passed | +| 已有缓存完整返回且无需同步转换 | HTTP 成功但正文逐行阻塞或缓存重写 | Knowledge 预览模块、HTTP Response | `test/unit/services/test_binary_preview_response.py` 与真实 HTTP 重复读取 | 验收进程恢复旧 BytesIO 响应后正文分块断言失败 | Passed | +| 去重、授权、执行权与原件检查守住发布边界 | 并发重复任务、失权或无权限路径被成功伪装 | Task repository、权限依赖、预览 worker | service unit 与真实 HTTP 的并发、拒绝和最终对象断言 | 私有库、错误库、文件夹、失权、删除原件和存储错误 | Passed | +| 页面自动展示完成结果、错误结束等待、旧请求不覆盖新文件 | 永久 loading 或迟到结果覆盖 | WorkspaceView、file_preview | `web/test/unit/workspace_preview_polling.test.js`、`web/test/unit/file_detail_preview_polling.test.js` 与真实页面合成数据验证 | 失败、切换、deactivated、unmounted 和迟到响应 | Passed | + +### 执行命令与观察边界 + +后端在匹配锁文件的离线运行镜像中只读挂载源码执行；验收服务为独立 PostgreSQL 数据库、专用 Redis、MinIO 与真实 worker。前端与文档使用锁文件对应的已有依赖。实际执行如下： + +- `python -m pytest test/unit -m "not slow" -q -o addopts= --disable-warnings`：2547 passed，7 subtests passed。 +- `python -m pytest test/integration/api/test_knowledge_preview_http.py --confcutdir=test/integration/api -m "not slow" -q -o addopts= -s`：1 passed；真实 HTTP、认证、Task、worker、LibreOffice 和 MinIO 字节回读。临时 trigger 只拒绝预览 Task 插入，上传和添加仍成功；删除 trigger 后首次读取补交并生成 PDF。 +- `node --test --test-concurrency=1 "test/**/*.test.js" "test/**/*.spec.js"`：413 passed；详情轮询的 9 项用例执行提取的真实函数及 watcher/lifecycle 回调，属于 unit。 +- `node node_modules/eslint/bin/eslint.js . --max-warnings=0` 与 `node node_modules/vite/bin/vite.js build`：Passed。 +- Ruff 0.16.4 的 `check package`、`format package --check`，以及新增 service unit 与 HTTP 验收文件的 check/format：Passed。 +- `python scripts/verify_engineering_contracts.py` 与 `python -m unittest scripts.test_verify_engineering_contracts`：Passed，后者 63 tests。 +- 在 `docs/` 执行 `node node_modules/vitepress/bin/vitepress.js build`：Passed。 +- 在仓库根目录执行 `git diff HEAD --check` 与 `git diff --cached --check`：Passed。 + +真实浏览器使用组件原始 Vue 实现和合成网络响应，覆盖生成中提示与完成后自动展示。真实 Vue KeepAlive 页面验证生成中离页关闭弹窗、请求计数停止、弹窗与遮罩的 DOM display 为 none，返回页面重新打开后自动显示 PDF。恢复旧可见性 getter 的独立测试进程保留陈旧 props.open=true，两条关闭断言因 visible=true 失败。浏览器合成数据验收和真实 HTTP/worker 验收是两条独立证据，不构成连接真实后端的浏览器 E2E。真实业务文件、其他浏览器和 PDF 排版视觉回归为 Not run。 + +恢复旧 BytesIO 逐行响应的测试进程产生 7102 个正文块，两条协议断言均因目标原因失败。恢复读取时同步转换后，读取边界测试因“不能在读取请求中转换”失败；缺少专用 Redis 或发现已有 worker 的 fixture 在写入前拒绝。XLSX 与真正 OLE 格式 XLS 均在首次点击前生成对应 PDF。 + +## 后果 + +提前转换占用现有 worker 槽位。文件记录与 Task 分开提交，进程崩溃造成的提交间隙由后续缺失缓存读取补交任务恢复。PostgreSQL 检查与 MinIO 发布不构成跨存储事务，删除竞态仍可留下无可读取元数据的派生对象。API 与 worker 需要部署一致的后端版本。 + +验证使用独立 PostgreSQL 数据库、显式指定的专用 Redis、MinIO、真实 HTTP 和 worker；fixture 在断言失败时也清理自身资源。该贡献不需要新增依赖、配置或 Schema 迁移。 diff --git a/docs/mechanisms/knowledge-base.md b/docs/mechanisms/knowledge-base.md index 4ff0cf66c6..3d5d35058c 100644 --- a/docs/mechanisms/knowledge-base.md +++ b/docs/mechanisms/knowledge-base.md @@ -70,13 +70,25 @@ stateDiagram-v2 | 存储 | 拥有的事实 | 不拥有的事实 | | --- | --- | --- | | PostgreSQL | 知识库配置、权限、文件元数据和状态、chunk 正文、图谱处理状态、Task 执行意图与 lease | 原文件字节、向量索引 | -| MinIO | 上传原件、解析 Markdown、解析图片 | 文件当前状态、用户权限 | +| MinIO | 上传原件、解析 Markdown、解析图片、共享 Office 预览 PDF | 文件当前状态、用户权限 | | Milvus | chunk 向量、BM25/混合检索字段、图实体和关系向量 | 权限、文件状态 | | Neo4j | 可选的实体、关系和 chunk 关联 | 原文件、权限和检索排序 | | Redis / ARQ | Task 投递与 worker 唤醒、知识库最小运行配置缓存 | Task 最终状态、配置最终值、文件状态 | Milvus 索引会把 chunk 写入 PostgreSQL 和 Milvus。它不是跨存储事务：任一侧失败时会尝试补偿并把文件置为 `error_indexing`，排查时需要同时查看两侧。 +## Office 文件预览 + +知识库 `.docx`、`.pptx`、`.xlsx` 和 `.xls` 文件在注册原件记录后提交独立的 `knowledge_preview` 任务，上传后只添加和上传后解析两个入口共同使用这个注册用例。已知大小超过 30 MB 的文件不提交预览转换；大小未知时由现有预览读取边界检查对象大小。转换与解析、索引各自保留状态，预览完成不会把文件标记为已解析或已入库。 + +现有 Durable Task worker 调用 Office 转换器，把 PDF 保存到 MinIO 的 `knowledgebases/{kb_id}/preview/{file_id}.pdf`。同一知识库和文件只保留一个非终态预览任务。Task 记录拥有执行意图、租约和终态；对象存储中的 PDF 字节拥有可读取的预览结果。worker 在发布缓存前重新检查执行权和原件记录，跨 PostgreSQL 与 MinIO 的检查和写入不构成事务，删除竞态中的派生对象不授予文件读取权限。 + +个人空间的共享知识库预览先执行知识库读权限检查。缓存已准备好时，接口返回带 `Content-Length` 的完整 PDF；缓存缺失时，接口返回生成中状态，个人空间与文件详情弹窗每两秒检查当前文件，完成后自动显示。切换、关闭或离开页面后，过期响应不能覆盖当前预览；缓存页面离开时组件本地激活状态直接关闭详情弹窗与遮罩。存量文件第一次读取可以提交同一个去重任务；本链路不批量补转存量文件，也不为个人空间文件或聊天附件提前转换。 + +转换失败或取消时，页面结束等待并提示下载原件；原件仍保存独立字节。成功任务的缓存对象丢失时，后续读取重新提交预览任务。预览意图提交异常记录知识库和文件标识，已经提交的原件注册结果仍返回，解析与入库继续。文件记录和任务之间的提交间隙由后续读取缺失缓存时补交任务闭合，Task 首次投递失败仍按持久任务恢复流程处理。 + +注册与预览状态由 `knowledge_preview_service` 用例装配，转换和缓存字节由 Knowledge 预览模块拥有，页面轮询属于呈现。验证时在首次预览请求之前回读任务和 MinIO PDF，再核对重复请求返回字节、缓存版本、原件哈希和权限拒绝结果。 + ## Durable Task 和恢复 上传原文件是同步对象存储操作；批量添加、解析、索引和图谱构建把 `task_type`、Handler 版本和可序列化 payload 保存到 PostgreSQL。提交后 API 只发布 `task_id`，ARQ worker 从 registry 加载领域 Handler。 diff --git "a/docs/public/\351\242\204\350\247\210\344\274\230\345\214\226/\347\246\273\351\241\265\345\205\263\351\227\255\350\257\246\346\203\205.jpg" "b/docs/public/\351\242\204\350\247\210\344\274\230\345\214\226/\347\246\273\351\241\265\345\205\263\351\227\255\350\257\246\346\203\205.jpg" new file mode 100644 index 0000000000000000000000000000000000000000..b5849b15d79ba67b2ba8524fa13fcfbc4ae89749 GIT binary patch literal 29910 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 literal 0 HcmV?d00001 diff --git "a/docs/public/\351\242\204\350\247\210\344\274\230\345\214\226/\350\257\246\346\203\205\350\207\252\345\212\250\351\242\204\350\247\210.jpg" "b/docs/public/\351\242\204\350\247\210\344\274\230\345\214\226/\350\257\246\346\203\205\350\207\252\345\212\250\351\242\204\350\247\210.jpg" new file mode 100644 index 0000000000000000000000000000000000000000..85668ad0d2d76ffdca989765bca50712d821e60c GIT binary patch literal 36353 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 literal 0 HcmV?d00001 diff --git a/web/src/components/FileDetailModal.vue b/web/src/components/FileDetailModal.vue index e4bbd57acc..1d322c7f1c 100644 --- a/web/src/components/FileDetailModal.vue +++ b/web/src/components/FileDetailModal.vue @@ -64,7 +64,6 @@ :file="sourcePreviewFile" :file-path="file?.filename || ''" :status="sourcePreview.loading ? 'loading' : ''" - loading-message="正在加载文件内容..." :show-header="false" :show-download="false" :show-inline-html-controls="true" @@ -118,7 +117,7 @@ diff --git a/web/src/components/TaskCenterDrawer.vue b/web/src/components/TaskCenterDrawer.vue index 84266fec2d..e1e244c363 100644 --- a/web/src/components/TaskCenterDrawer.vue +++ b/web/src/components/TaskCenterDrawer.vue @@ -191,6 +191,7 @@ const STATUS_CONFIG = { } const TASK_TYPE_LABELS = { knowledge_ingest: '知识库导入', + knowledge_preview: '文件预览', knowledge_parse: '文档解析', knowledge_index: '文档入库', knowledge_graph_index: '图谱构建', diff --git a/web/src/utils/file_preview.js b/web/src/utils/file_preview.js index 20fde6a59d..92681f6b41 100644 --- a/web/src/utils/file_preview.js +++ b/web/src/utils/file_preview.js @@ -12,7 +12,7 @@ const IMAGE_EXTENSIONS = new Set([ ]) const PDF_EXTENSIONS = new Set(['.pdf']) const HTML_EXTENSIONS = new Set(['.html', '.htm']) -const OFFICE_EXTENSIONS = new Set(['.docx', '.pptx']) +const OFFICE_EXTENSIONS = new Set(['.docx', '.pptx', '.xlsx', '.xls']) const TEXT_EXTENSIONS = new Set([ '.txt', '.text', @@ -170,7 +170,9 @@ export const normalizePreviewResponse = async (response, baseFile = {}) => { ...baseFile, ...payload, content: payload.content ?? '', - loading: false, + loading: payload.status === 'loading', + loadingMessage: payload.status === 'loading' ? payload.message || '正在生成预览...' : '', + errorMessage: payload.status === 'error' ? payload.message || '文件预览失败' : '', status: payload.status || (payload.supported === false ? 'unsupported' : 'ready'), previewType, supported: payload.supported !== false, diff --git a/web/src/views/WorkspaceView.vue b/web/src/views/WorkspaceView.vue index efa2b6a1d7..53535b2df4 100644 --- a/web/src/views/WorkspaceView.vue +++ b/web/src/views/WorkspaceView.vue @@ -210,7 +210,7 @@ ')) + +/** 执行真实弹窗函数、视图 watcher 与卸载清理，仅替换接口与时钟。 */ +function setup(responses) { + const timers = [] + const calls = [] + const revoked = [] + const hooks = {} + const props = reactive({ open: true, kbId: 'kb_1', fileId: 'file_1' }) + const emitted = [] + const visibilityState = runInNewContext(`${visibility}; ({ componentActive, visible })`, { + computed, ref, props, emit: (event, value) => emitted.push([event, value]) + }) + const state = { file: ref({ file_id: 'file_1', filename: 'book.xlsx' }), + sourcePreview: ref({ loading: false, url: '', content: '', type: '', message: '', supported: true }), + viewMode: ref('source'), hasSourcePreview: ref(true), ...visibilityState, + sourcePreviewCandidateType: ref('office'), contentState: ref({}), basicLoading: ref(false), + detailError: ref(''), downloadingOriginal: ref(false), downloadingMarkdown: ref(false) } + const context = { ...state, props, console: { error() {} }, message: { error() {} }, + window: { URL: { revokeObjectURL: (url) => revoked.push(url) }, + setTimeout: (callback, delay) => { assert.equal(delay, 2000); timers.push(callback) } }, + watch: (_sources, callback) => { hooks.viewChanged = callback }, + onActivated: (callback) => { hooks.activated = callback }, + onDeactivated: (callback) => { hooks.deactivated = callback }, + onBeforeUnmount: (callback) => { hooks.unmounted = callback }, + getWorkspaceKnowledgeFileContent: async (kbId, fileId) => { calls.push([kbId, fileId]); return await responses.shift() }, + normalizePreviewResponse: async (response) => response } + const functions = runInNewContext(`let basicRequestSeq = 0, contentRequestSeq = 0, sourceRequestSeq = 0; + ${resets} +${polling} +${watches} +${lifecycle}; + ({ loadSourcePreview, resetSourcePreview })`, context) + return { ...state, ...functions, props, timers, calls, revoked, hooks, emitted } +} + +async function flush() { + await new Promise((resolve) => setImmediate(resolve)) +} + +test('详情弹窗生成中保持等待，完成后自动显示 PDF', async () => { + const state = setup([{ status: 'loading', message: '正在生成预览' }, + { status: 'ready', previewType: 'pdf', previewUrl: 'blob:ready' }]) + const finished = state.loadSourcePreview() + await flush() + assert.equal(state.sourcePreview.value.loading, true) + assert.equal(state.sourcePreview.value.message, '正在生成预览') + await state.loadSourcePreview() + assert.equal(state.calls.length, 1, '重复 watcher 不启动并行读取') + state.timers.shift()() + await finished + assert.equal(state.sourcePreview.value.url, 'blob:ready') + assert.equal(state.sourcePreview.value.type, 'pdf') + assert.equal(state.sourcePreview.value.loading, false) + assert.equal(state.calls.length, 2) +}) + +test('详情弹窗失败进入终态并停止轮询', async () => { + const state = setup([{ status: 'error', supported: false, message: '预览生成失败' }]) + await state.loadSourcePreview() + assert.equal(state.sourcePreview.value.message, '预览生成失败') + assert.equal(state.sourcePreview.value.supported, false) + assert.equal(state.sourcePreview.value.loading, false) + assert.equal(state.timers.length, 0) +}) + +for (const event of ['close', 'view', 'unmount', 'deactivate', 'file']) { + test(`详情弹窗 ${event} 后旧轮询结束，返回源文件可以重新加载`, async () => { + const state = setup([{ status: 'loading', message: '正在生成预览' }, + { status: 'ready', previewUrl: 'blob:new' }]) + const finished = state.loadSourcePreview() + await flush() + if (event === 'unmount') state.hooks.unmounted() + else if (event === 'deactivate') { + state.hooks.deactivated() + assert.equal(state.visible.value, false) + } else if (event === 'file') { + state.resetSourcePreview() + state.props.fileId = 'file_2' + state.file.value = { file_id: 'file_2', filename: 'new.xlsx' } + } else { + state.viewMode.value = event === 'view' ? 'markdown' : 'source' + state.props.open = event !== 'close' + await state.hooks.viewChanged([state.props.open, state.file.value, state.viewMode.value]) + } + state.timers.shift()() + await finished + assert.equal(state.calls.length, 1) + assert.equal(state.sourcePreview.value.loading, false) + assert.equal(state.sourcePreview.value.message, '') + if (event === 'unmount' || event === 'deactivate') return + state.props.open = true + state.viewMode.value = 'source' + await state.loadSourcePreview() + assert.equal(state.sourcePreview.value.url, 'blob:new') + assert.equal(state.calls.length, 2) + }) +} + +test('关闭后的迟到 PDF 不覆盖弹窗状态并释放对象 URL', async () => { + let complete + const state = setup([new Promise((resolve) => { complete = resolve })]) + const finished = state.loadSourcePreview() + state.props.open = false + await state.hooks.viewChanged([false, state.file.value, 'source']) + complete({ status: 'ready', previewUrl: 'blob:old' }) + await finished + assert.equal(state.sourcePreview.value.url, '') + assert.deepEqual(state.revoked, ['blob:old']) +}) + +test('缓存页面关闭直接隐藏弹窗，父 prop 迟到回传也不残留遮罩', () => { + const state = setup([]) + assert.equal(state.visible.value, true) + state.hooks.deactivated() + assert.equal(state.props.open, true, '保留尚未回传的父组件 open prop') + assert.equal(state.visible.value, false, '本地激活状态必须立即关闭 Teleport 弹窗') + assert.deepEqual(state.emitted, [['update:open', false]]) + state.props.open = false + state.hooks.activated() + assert.equal(state.visible.value, false, '返回页面保持关闭，直到用户重新打开') + state.props.open = true + assert.equal(state.visible.value, true) +}) diff --git a/web/test/unit/file_preview.test.js b/web/test/unit/file_preview.test.js new file mode 100644 index 0000000000..78405267ad --- /dev/null +++ b/web/test/unit/file_preview.test.js @@ -0,0 +1,42 @@ +import assert from 'node:assert/strict' +import test from 'node:test' +import { getPreviewTypeByPath, normalizePreviewResponse } from '../../src/utils/file_preview.js' + +for (const path of ['/报表.xlsx', '/历史.XLS']) { + test(`${path} 进入 Office 预览，PDF 响应保留原件身份`, async () => { + assert.equal(getPreviewTypeByPath(path), 'office') + const result = await normalizePreviewResponse( + new Response('%PDF-1.4\npreview', { headers: { 'content-type': 'application/pdf' } }), + { path, filename: path.slice(1) } + ) + assert.equal(result.previewType, 'pdf') + assert.equal(result.supported, true) + assert.equal(result.path, path) + assert.equal(result.filename, path.slice(1)) + }) +} + +test('Excel 超限或转换失败时保留服务端拒绝结果', async () => { + const result = await normalizePreviewResponse( + Response.json({ preview_type: 'unsupported', supported: false, message: '文件过大' }), + { path: '/报表.xlsx' } + ) + assert.equal(result.status, 'unsupported') + assert.equal(result.supported, false) + assert.equal(result.message, '文件过大') + assert.equal(getPreviewTypeByPath('/报表.xlsm'), 'unsupported') +}) + +test('后台预览生成状态保留加载提示，错误终态结束加载', async () => { + const loading = await normalizePreviewResponse(Response.json({ + status: 'loading', preview_type: 'office', supported: true, message: '正在生成预览...' + }), { path: '/报表.xlsx' }) + assert.equal(loading.loading, true) + assert.equal(loading.loadingMessage, '正在生成预览...') + const failed = await normalizePreviewResponse(Response.json({ + status: 'error', preview_type: 'office', supported: false, message: '预览生成失败' + }), { path: '/报表.xlsx' }) + assert.equal(failed.loading, false) + assert.equal(failed.status, 'error') + assert.equal(failed.errorMessage, '预览生成失败') +}) diff --git a/web/test/unit/workspace_preview_polling.test.js b/web/test/unit/workspace_preview_polling.test.js new file mode 100644 index 0000000000..2f27d9fdbe --- /dev/null +++ b/web/test/unit/workspace_preview_polling.test.js @@ -0,0 +1,102 @@ +import { setImmediate } from 'node:timers' +import assert from 'node:assert/strict' +import { readFileSync } from 'node:fs' +import { runInNewContext } from 'node:vm' +import test from 'node:test' +import { ref } from 'vue' + +const source = readFileSync(new URL('../../src/views/WorkspaceView.vue', import.meta.url), 'utf8') +const helpers = source.slice(source.indexOf('const startPreviewRequest ='), source.indexOf('const loadWorkspacePreview =')) +const polling = source.slice(source.indexOf('const loadKnowledgePreview ='), source.indexOf('const syncSelectedPaths =')) +const closing = source.slice(source.indexOf('const closePreview ='), source.indexOf('const handleSavePreviewFile =')) +const lifecycle = source.slice(source.indexOf('onDeactivated(() =>'), source.indexOf('watch(useInlinePreview')) +const entry = { source: 'knowledge', kb_id: 'kb_1', file_id: 'file_1', path: '/knowledge/file_1' } + +/** 执行真实预览函数和请求隔离逻辑，只替换网络与时间边界。 */ +function setup(responses) { + const timers = [] + const calls = [] + const errors = [] + const hooks = {} + const state = { previewRequestId: ref(0), selectedEntry: ref(null), previewFile: ref(null), + inlinePreviewVisible: ref(false), previewModalVisible: ref(false), useInlinePreview: ref(true), + loadingPreview: ref(false), previewObjectUrl: ref('') } + const context = { ...state, workspaceResizeObserver: null, stopPreviewResize() {}, + onDeactivated: (handler) => { hooks.deactivated = handler }, onUnmounted: (handler) => { hooks.unmounted = handler }, buildPreviewLoadingFile: (item) => ({ ...item, status: 'loading' }), + buildPreviewErrorFile: (item, error) => ({ ...item, status: 'error', message: error.message }), + revokePreviewObjectUrl() {}, window: { URL: { revokeObjectURL() {} }, setTimeout: (callback) => timers.push(callback) }, + message: { error: (value) => errors.push(value) }, console: { warn() {} }, + KNOWLEDGE_PREVIEW_LOAD_MESSAGES: { log: '预览失败', resolveUserMessage: (error) => error.message }, + getWorkspaceKnowledgeFileContent: async (kbId, fileId) => { calls.push([kbId, fileId]); return await responses.shift() }, + normalizePreviewFile: async (item, response) => ({ ...item, ...response }) } + const funcs = runInNewContext(`${helpers}\n${polling}\n${closing}\n${lifecycle}\n;({ loadKnowledgePreview, startPreviewRequest })`, context) + return { ...state, ...funcs, timers, calls, errors, hooks } +} + +async function flush() { + await new Promise((resolve) => setImmediate(resolve)) +} + +test('生成中显示状态，准备好后自动显示当前文件并结束等待', async () => { + const state = setup([{ status: 'loading', message: '正在生成预览' }, { status: 'ready', content: 'pdf-byte-marker' }]) + const finished = state.loadKnowledgePreview(entry) + await flush() + assert.equal(state.previewFile.value.status, 'loading') + assert.equal(state.loadingPreview.value, true) + assert.equal(state.calls.length, 1) + state.timers.shift()() + await finished + assert.equal(state.previewFile.value.content, 'pdf-byte-marker') + assert.equal(state.loadingPreview.value, false) + assert.equal(state.calls.length, 2) + assert.equal(state.timers.length, 0) +}) + +test('切换文件后旧轮询退出且不清除新文件加载状态', async () => { + const state = setup([{ status: 'loading' }]) + const finished = state.loadKnowledgePreview(entry) + await flush() + state.startPreviewRequest({ ...entry, file_id: 'file_2', path: '/knowledge/file_2' }) + state.timers.shift()() + await finished + assert.equal(state.selectedEntry.value.file_id, 'file_2') + assert.equal(state.previewFile.value.file_id, 'file_2') + assert.equal(state.loadingPreview.value, true) + assert.equal(state.calls.length, 1) +}) + +test('任务失败立即呈现错误，不继续轮询', async () => { + const state = setup([{ status: 'error', message: '预览生成失败' }]) + await state.loadKnowledgePreview(entry) + assert.equal(state.previewFile.value.status, 'error') + assert.equal(state.loadingPreview.value, false) + assert.equal(state.calls.length, 1) + assert.equal(state.timers.length, 0) +}) + +test('过期网络响应不能覆盖后选择的文件', async () => { + let complete + const pending = new Promise((resolve) => { complete = resolve }) + const state = setup([pending]) + const finished = state.loadKnowledgePreview(entry) + state.startPreviewRequest({ ...entry, file_id: 'file_2', path: '/knowledge/file_2' }) + complete({ status: 'ready', content: 'old-pdf' }) + await finished + assert.equal(state.previewFile.value.file_id, 'file_2') + assert.equal(state.loadingPreview.value, true) +}) + +for (const event of ['deactivated', 'unmounted']) { + test(`页面 ${event} 后结束旧轮询并释放预览`, async () => { + const state = setup([{ status: 'loading' }]) + const finished = state.loadKnowledgePreview(entry) + await flush() + state.hooks[event]() + state.timers.shift()() + await finished + assert.equal(state.calls.length, 1) + assert.equal(state.loadingPreview.value, false) + assert.equal(state.selectedEntry.value, null) + assert.equal(state.previewFile.value, null) + }) +} From b3cfbe282d5af8677e4768e7bc554d2b78b37129 Mon Sep 17 00:00:00 2001 From: cjh <2927398119@qq.com> Date: Sat, 10 Oct 2026 18:15:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?docs:=20=E8=A1=A5=E5=85=A8=E7=9F=A5?= =?UTF-8?q?=E8=AF=86=E5=BA=93=E9=A2=84=E8=A7=88=E4=BB=BB=E5=8A=A1=E7=9A=84?= =?UTF-8?q?=E6=9E=B6=E6=9E=84=E5=BD=92=E5=B1=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ARCHITECTURE.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ARCHITECTURE.md b/ARCHITECTURE.md index 6e94304b06..eaa68de585 100644 --- a/ARCHITECTURE.md +++ b/ARCHITECTURE.md @@ -58,7 +58,9 @@ Yuxi 只交付完整知识能力路径。API 始终注册 `external_kb`、`knowl - AgentRun：拥有 Conversation、Message、LangGraph interrupt、线程 FIFO 和 execution tree 语义，通过专用 Run/Attempt 表维护状态、输出与租约。 - 用户定时 Agent：任务定义和 occurrence 独立持久化；worker 锁定到期任务后复用统一 AgentRun Request/Run 链路，排队与执行状态仍由 AgentRunRequest 和 AgentRun 拥有。 -- Durable Task：用于知识库解析、评估和图谱构建。API 只提交持久 `task_type + handler_version + payload`；`worker` 从 registry 惰性加载领域 Handler，并通过 Task 行的唯一 owner、heartbeat 和 lease 执行。知识文件中间态绑定 Task/attempt owner，失联 failure hook 与 Task 终态同事务收敛文件错误态；PG pending 行由启动与周期 publisher 补发。共享 ARQ worker 的执行槽由 Compose 配置，Durable Task 的 PG claim 上限为 4，不能占满 AgentRun 容量。 +- Durable Task：用于知识库解析、Office 文件预览、评估和图谱构建。API 只提交持久 `task_type + handler_version + payload`；`worker` 从 registry 惰性加载领域 Handler，并通过 Task 行的唯一 owner、heartbeat 和 lease 执行。知识文件中间态绑定 Task/attempt owner，失联 failure hook 与 Task 终态同事务收敛文件错误态；PG pending 行由启动与周期 publisher 补发。共享 ARQ worker 的执行槽由 Compose 配置，Durable Task 的 PG claim 上限为 4，不能占满 AgentRun 容量。 + +`knowledge_preview` 在原件注册后生成知识库 Office 文件的共享 PDF，预览 Task 的终态与文件解析、索引状态独立。转换、缓存与读取链路见[Office 文件预览](docs/mechanisms/knowledge-base.md#office-文件预览)。 测试代码位于 `backend/test`，按 `unit`、`integration`、`e2e` 分层。新增或修改后端行为时，测试应放在最能覆盖真实风险的层级。