From 9583a5f3e3f0f6763779f9d5ff55a27723886073 Mon Sep 17 00:00:00 2001 From: KiriAky 107 Date: Fri, 4 Sep 2026 20:04:45 +0800 Subject: [PATCH] =?UTF-8?q?fix(knowledge):=20=E7=BB=9F=E4=B8=80frontmatter?= =?UTF-8?q?=E8=BE=B9=E7=95=8C=E5=B9=B6=E6=8B=92=E7=BB=9D=E6=9C=AA=E9=97=AD?= =?UTF-8?q?=E5=90=88=E7=AD=96=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/app/knowledge/parser.py | 36 ++++++++----- backend/tests/test_policy_and_migrations.py | 57 +++++++++++++++++++++ 2 files changed, 80 insertions(+), 13 deletions(-) diff --git a/backend/app/knowledge/parser.py b/backend/app/knowledge/parser.py index fa2ed89..dabe73b 100644 --- a/backend/app/knowledge/parser.py +++ b/backend/app/knowledge/parser.py @@ -176,11 +176,23 @@ def _split_lines(text: str) -> list[tuple[str, int]]: def _content_start(markdown: str) -> int: """返回正文起始 UTF-16 偏移：有 frontmatter 时跳过 --- 分隔块。""" - if markdown.startswith("---"): - end = markdown.find("\n---", 3) - if end != -1: - return _utf16_len(markdown[: end + 4]) - return 0 + header = _frontmatter(markdown) + return _utf16_len(markdown[:header[1]]) if header else 0 + + +def _frontmatter(markdown: str) -> tuple[str, int] | None: + """Return YAML text and body character offset without changing original text.""" + start = 1 if markdown.startswith("\ufeff") else 0 + opening = re.match(r"---[ \t]*(?:\r\n|\n|\r|\Z)", markdown[start:]) + if opening is None: + return None + content_start = start + opening.end() + offset = content_start + for raw in markdown[content_start:].splitlines(keepends=True): + if re.fullmatch(r"(?:---|\.\.\.)[ \t]*", raw.rstrip("\r\n")): + return markdown[content_start:offset], offset + len(raw) + offset += len(raw) + raise ApiError(422, "INVALID_EMBEDDING_POLICY", "Frontmatter 未闭合，请补全独立一行的结束分隔符后再保存。") def _utf16_len(text: str) -> int: @@ -188,13 +200,13 @@ def _utf16_len(text: str) -> int: def _embedding_policy(markdown: str) -> bool: - end = markdown.find("\n---", 3) if markdown.startswith("---") else -1 - if end == -1: + header = _frontmatter(markdown) + if header is None: return False try: # Compose nodes without constructing objects. This accepts YAML comments, # quoted keys and indentation while retaining duplicate-key information. - node = yaml.compose(markdown[3:end], Loader=yaml.SafeLoader) + node = yaml.compose(header[0], Loader=yaml.SafeLoader) except yaml.YAMLError as exc: raise ApiError(422, "INVALID_EMBEDDING_POLICY", "Frontmatter YAML 无效，无法确认本地索引策略。") from exc if node is None: @@ -218,13 +230,11 @@ def _embedding_policy(markdown: str) -> bool: def _extract_frontmatter(markdown: str) -> dict[str, str]: """极简 frontmatter 解析，只提取 key: value 行。""" - if not markdown.startswith("---"): - return {} - end = markdown.find("\n---", 3) - if end == -1: + header = _frontmatter(markdown) + if header is None: return {} meta: dict[str, str] = {} - for line in markdown[3:end].splitlines(): + for line in header[0].splitlines(): m = _FRONTMATTER_KEY_RE.match(line) if m: meta[m.group(1).lower()] = m.group(2).strip() diff --git a/backend/tests/test_policy_and_migrations.py b/backend/tests/test_policy_and_migrations.py index c65cff2..6fbc7ae 100644 --- a/backend/tests/test_policy_and_migrations.py +++ b/backend/tests/test_policy_and_migrations.py @@ -108,3 +108,60 @@ def test_merge_policy_is_rejected_instead_of_ignored(): parsed('true\n<<: {embedding_local_only: false}') with pytest.raises(ApiError): parsed('!!bool invalid') + + +@pytest.mark.parametrize('bom', ['', '\ufeff']) +@pytest.mark.parametrize('newline', ['\n', '\r\n', '\r']) +@pytest.mark.parametrize('closing', ['---', '...']) +def test_frontmatter_boundaries_preserve_policy_and_utf16_offsets(bom, newline, closing): + markdown = bom + newline.join(['--- ', 'title: Sample', 'embedding_local_only: true # local', closing+' ', '# Heading', '', 'private \U0001f600']) + note = parse_note(markdown=markdown, file_path='note.md', folder='', created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc)) + assert note.embedding_local_only and note.title == 'Sample' + assert all('embedding_local_only' not in block.content for block in note.blocks) + block = next(block for block in note.blocks if block.content == 'private \U0001f600') + original = markdown.encode('utf-16-le')[block.start_offset*2:block.end_offset*2].decode('utf-16-le') + assert original == block.content + + +@pytest.mark.parametrize('ending', ['', '\n---not-a-delimiter', '\n----']) +def test_unclosed_frontmatter_is_rejected_even_with_bom(ending): + for bom in ['', '\ufeff']: + markdown = bom+'---\nembedding_local_only: true'+ending + with pytest.raises(ApiError) as error: + parse_note(markdown=markdown, file_path='note.md', folder='', created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc)) + assert error.value.code == 'INVALID_EMBEDDING_POLICY' + + +def test_boundary_matching_does_not_truncate_yaml_keys(): + markdown = '---\n---metadata: value\nembedding_local_only: true\n---\nbody' + note = parse_note(markdown=markdown,file_path='note.md',folder='',created_at=datetime.now(timezone.utc),updated_at=datetime.now(timezone.utc)) + assert note.embedding_local_only + + +def test_bom_save_and_invalid_update_never_use_remote(monkeypatch): + import asyncio + from types import SimpleNamespace + from app.local_models.runtime import LocalEmbedding + from app.retrieval import routed_vectors + from app.services import note_service, index_service + from app.contracts import IndexRebuildRequest + from app.config import get_settings + calls=[] + class Routing: + async def embed(self, texts, *, local_only=False): + calls.append(local_only) + assert local_only + return SimpleNamespace(source='local', model_id='local-test', dimensions=2, vectors=[[1.0,0.0] for _ in texts], fallback_reason=None) + monkeypatch.setattr(routed_vectors, 'get_model_routing', lambda: Routing()) + monkeypatch.setattr(note_service, 'embedding', LocalEmbedding()) + async def scenario(): + markdown='\ufeff---\nembedding_local_only: true\n---\nprivate text' + note=await note_service.create_note(title='Private',markdown=markdown,folder=None,tags=[]) + await index_service.rebuild(IndexRebuildRequest()) + count=len(calls) + with pytest.raises(ApiError): + await note_service.update_note(note.note_id,markdown='\ufeff---\nembedding_local_only: true\nprivate text') + assert len(calls)==count + assert (get_settings().vault_path/note.file_path).read_text(encoding='utf-8')==markdown + assert (await note_service.get_note(note.note_id)).markdown==markdown + asyncio.run(scenario())