app/core/note_payload.py aktualisiert
Some checks failed
Deploy mindnet to llm-node / deploy (push) Failing after 2s
Some checks failed
Deploy mindnet to llm-node / deploy (push) Failing after 2s
This commit is contained in:
parent
47797ecd29
commit
0617163c42
|
|
@ -2,7 +2,7 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
"""
|
||||
Modul: app/core/note_payload.py
|
||||
Version: 1.3.0
|
||||
Version: 1.3.1
|
||||
Datum: 2025-09-09
|
||||
|
||||
Kurzbeschreibung
|
||||
|
|
@ -35,9 +35,10 @@ import os
|
|||
from typing import Any, Dict, Optional
|
||||
|
||||
try:
|
||||
from app.core.parser import parse_markdown, extract_wikilinks
|
||||
# In deinem Parser heißen die Funktionen read_markdown / extract_wikilinks
|
||||
from app.core.parser import read_markdown, extract_wikilinks
|
||||
except Exception: # pragma: no cover
|
||||
from .parser import parse_markdown, extract_wikilinks # type: ignore
|
||||
from .parser import read_markdown, extract_wikilinks # type: ignore
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
|
|
@ -46,7 +47,6 @@ except Exception: # pragma: no cover
|
|||
|
||||
def _canon_frontmatter(fm: Dict[str, Any]) -> str:
|
||||
"""Kanonische, stabile JSON-Serialisierung der Frontmatter für Hashbildung."""
|
||||
# Keys sortieren, ASCII nicht erzwingen, um Umlaute stabil zu halten
|
||||
return json.dumps(fm or {}, ensure_ascii=False, separators=(",", ":"), sort_keys=True)
|
||||
|
||||
|
||||
|
|
@ -59,8 +59,7 @@ def compute_hash(*, body: Optional[str], frontmatter: Optional[Dict[str, Any]],
|
|||
- "frontmatter"
|
||||
- "body+frontmatter"
|
||||
"""
|
||||
if mode is None:
|
||||
mode = os.environ.get("MINDNET_HASH_MODE", "body").strip().lower()
|
||||
mode = (mode or os.environ.get("MINDNET_HASH_MODE", "body")).strip().lower()
|
||||
body = body or ""
|
||||
fm_s = _canon_frontmatter(frontmatter or {})
|
||||
|
||||
|
|
@ -97,9 +96,14 @@ def make_note_payload(parsed: Any, vault_root: Optional[str] = None) -> Dict[str
|
|||
Qdrant-Payload für die Notes-Collection.
|
||||
"""
|
||||
# "Duck typing": dict oder Objekt akzeptieren
|
||||
fm = getattr(parsed, "frontmatter", None) or getattr(parsed, "fm", None) or getattr(parsed, "front_matter", None) or parsed.get("frontmatter", {})
|
||||
body = getattr(parsed, "body", None) or parsed.get("body", "")
|
||||
path = getattr(parsed, "path", None) or parsed.get("path", "")
|
||||
fm = (
|
||||
getattr(parsed, "frontmatter", None)
|
||||
or getattr(parsed, "fm", None)
|
||||
or getattr(parsed, "front_matter", None)
|
||||
or (parsed.get("frontmatter") if isinstance(parsed, dict) else {})
|
||||
) or {}
|
||||
body = getattr(parsed, "body", None) or (parsed.get("body") if isinstance(parsed, dict) else "") or ""
|
||||
path = getattr(parsed, "path", None) or (parsed.get("path") if isinstance(parsed, dict) else "") or ""
|
||||
|
||||
# Hash gem. Modus bilden (Default: body)
|
||||
hash_fulltext = compute_hash(body=body, frontmatter=fm, mode=None)
|
||||
|
|
@ -119,14 +123,14 @@ def make_note_payload(parsed: Any, vault_root: Optional[str] = None) -> Dict[str
|
|||
note_level_refs = list(dict.fromkeys(extract_wikilinks(body))) if body else []
|
||||
|
||||
payload: Dict[str, Any] = {
|
||||
"note_id": (fm or {}).get("id") or (fm or {}).get("note_id"),
|
||||
"title": (fm or {}).get("title"),
|
||||
"type": (fm or {}).get("type"),
|
||||
"status": (fm or {}).get("status"),
|
||||
"created": (fm or {}).get("created"),
|
||||
"updated": (fm or {}).get("updated"),
|
||||
"path": rel_path or (fm or {}).get("path"),
|
||||
"tags": (fm or {}).get("tags"),
|
||||
"note_id": fm.get("id") or fm.get("note_id"),
|
||||
"title": fm.get("title"),
|
||||
"type": fm.get("type"),
|
||||
"status": fm.get("status"),
|
||||
"created": fm.get("created"),
|
||||
"updated": fm.get("updated"),
|
||||
"path": rel_path or fm.get("path"),
|
||||
"tags": fm.get("tags"),
|
||||
"hash_fulltext": hash_fulltext,
|
||||
# --- WICHTIG: Volltext persistieren ---
|
||||
"fulltext": body,
|
||||
|
|
@ -136,7 +140,7 @@ def make_note_payload(parsed: Any, vault_root: Optional[str] = None) -> Dict[str
|
|||
|
||||
# Bekannte optionale Frontmatter-Felder durchreichen
|
||||
for k in ("area", "project", "source", "lang", "slug"):
|
||||
if k in (fm or {}):
|
||||
if k in fm:
|
||||
payload[k] = fm[k]
|
||||
|
||||
return payload
|
||||
|
|
@ -153,7 +157,7 @@ def _cli() -> None:
|
|||
ap.add_argument("--print", dest="do_print", action="store_true", help="Payload auf stdout ausgeben")
|
||||
args = ap.parse_args()
|
||||
|
||||
parsed = parse_markdown(args.src)
|
||||
parsed = read_markdown(args.src)
|
||||
payload = make_note_payload(parsed, vault_root=args.vault_root)
|
||||
|
||||
if args.do_print:
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user