2025-09-09 11:05:32 +02:00
|
|
|
|
#!/usr/bin/env python3
|
|
|
|
|
|
# -*- coding: utf-8 -*-
|
|
|
|
|
|
"""
|
|
|
|
|
|
Modul: app/core/note_payload.py
|
2025-09-09 12:40:23 +02:00
|
|
|
|
Version: 1.5.1
|
2025-09-09 11:05:32 +02:00
|
|
|
|
Datum: 2025-09-09
|
|
|
|
|
|
|
|
|
|
|
|
Kurzbeschreibung
|
|
|
|
|
|
----------------
|
|
|
|
|
|
Erzeugt den Qdrant-Payload für **Notes**. Neben stabiler Hash-Bildung zur
|
|
|
|
|
|
Idempotenz wird der vollständige Body unter ``fulltext`` persistiert und
|
|
|
|
|
|
der Dateipfad relativ zum Vault gespeichert. Das erlaubt eine verlustfreie
|
|
|
|
|
|
Rekonstruktion im Export (erst ``fulltext``, sonst Chunks).
|
|
|
|
|
|
|
2025-09-09 12:40:23 +02:00
|
|
|
|
Wichtig
|
|
|
|
|
|
-------
|
|
|
|
|
|
- **Nur Inhalte** gehen in den Hash: Weder Dateisystem-Zeitstempel (mtime/ctime)
|
|
|
|
|
|
noch sonstige FS-Metadaten werden berücksichtigt.
|
|
|
|
|
|
- Hash-Quelle: Parser-Body (Default) oder Rohdatei-Body (Frontmatter via Regex entfernt).
|
|
|
|
|
|
|
|
|
|
|
|
Änderungen in v1.5.1
|
|
|
|
|
|
--------------------
|
|
|
|
|
|
- Neue Env-Var **MINDNET_HASH_COMPARE** als Synonym zu MINDNET_HASH_MODE.
|
|
|
|
|
|
- Akzeptiert komfortable Werte (case-insensitive): **Body**, **Frontmatter**, **Full**.
|
|
|
|
|
|
*Full* wird intern zu ``body+frontmatter`` normalisiert.
|
|
|
|
|
|
- CLI akzeptiert weiterhin ``--hash-mode``; Importer reicht diese Einstellung durch.
|
|
|
|
|
|
|
2025-09-09 11:27:18 +02:00
|
|
|
|
Hash-Steuerung
|
|
|
|
|
|
--------------
|
2025-09-09 12:40:23 +02:00
|
|
|
|
- Modus (welche Teile in den Hash einfließen):
|
|
|
|
|
|
* ``body`` (Default)
|
|
|
|
|
|
* ``frontmatter``
|
|
|
|
|
|
* ``body+frontmatter`` (Synonym CLI/ENV: ``full``)
|
|
|
|
|
|
Quelle:
|
|
|
|
|
|
* Funktionsparameter ``hash_mode`` (höchste Priorität)
|
|
|
|
|
|
* Env ``MINDNET_HASH_MODE`` oder **``MINDNET_HASH_COMPARE``** (Fallback)
|
|
|
|
|
|
Normalisierung:
|
|
|
|
|
|
* ``canonical`` (Default) | ``none`` — via Param ``hash_normalize`` oder Env ``MINDNET_HASH_NORMALIZE``
|
|
|
|
|
|
Quelle des Body-Textes:
|
|
|
|
|
|
* ``parsed`` (Default) | ``raw`` — via Param ``hash_source`` oder Env ``MINDNET_HASH_SOURCE``
|
|
|
|
|
|
|
|
|
|
|
|
CLI (Sichtprüfung)
|
|
|
|
|
|
------------------
|
|
|
|
|
|
python3 -m app.core.note_payload --from-file ./vault/demo.md --vault-root ./vault --print --hash-source raw
|
2025-09-09 11:05:32 +02:00
|
|
|
|
"""
|
2025-09-08 12:22:05 +02:00
|
|
|
|
|
2025-09-02 19:51:47 +02:00
|
|
|
|
from __future__ import annotations
|
2025-09-09 11:05:32 +02:00
|
|
|
|
import argparse
|
2025-09-02 19:51:47 +02:00
|
|
|
|
import hashlib
|
2025-09-08 12:22:05 +02:00
|
|
|
|
import json
|
|
|
|
|
|
import os
|
2025-09-09 12:40:23 +02:00
|
|
|
|
from typing import Any, Dict, Optional, Tuple
|
2025-09-08 12:22:05 +02:00
|
|
|
|
|
2025-09-09 11:05:32 +02:00
|
|
|
|
try:
|
2025-09-09 12:40:23 +02:00
|
|
|
|
from app.core.parser import read_markdown, extract_wikilinks, FRONTMATTER_RE
|
2025-09-09 11:05:32 +02:00
|
|
|
|
except Exception: # pragma: no cover
|
2025-09-09 12:40:23 +02:00
|
|
|
|
from .parser import read_markdown, extract_wikilinks, FRONTMATTER_RE # type: ignore
|
2025-09-08 12:22:05 +02:00
|
|
|
|
|
|
|
|
|
|
|
2025-09-09 11:05:32 +02:00
|
|
|
|
# ---------------------------------------------------------------------------
|
2025-09-09 12:40:23 +02:00
|
|
|
|
# Helpers
|
2025-09-09 11:05:32 +02:00
|
|
|
|
# ---------------------------------------------------------------------------
|
2025-09-08 12:22:05 +02:00
|
|
|
|
|
2025-09-09 11:05:32 +02:00
|
|
|
|
def _canon_frontmatter(fm: Dict[str, Any]) -> str:
|
|
|
|
|
|
"""Kanonische, stabile JSON-Serialisierung der Frontmatter für Hashbildung."""
|
|
|
|
|
|
return json.dumps(fm or {}, ensure_ascii=False, separators=(",", ":"), sort_keys=True)
|
2025-09-08 12:22:05 +02:00
|
|
|
|
|
2025-09-09 11:27:18 +02:00
|
|
|
|
def _normalize_body(body: str, mode: str) -> str:
|
|
|
|
|
|
"""Normalisiert den Body für reproduzierbare Hashes (oder nicht)."""
|
|
|
|
|
|
if mode == "none":
|
|
|
|
|
|
return body if body is not None else ""
|
2025-09-09 12:40:23 +02:00
|
|
|
|
# canonical: \r\n→\n, trailing spaces entfernen
|
2025-09-09 11:27:18 +02:00
|
|
|
|
text = (body or "").replace("\r\n", "\n").replace("\r", "\n")
|
|
|
|
|
|
text = "\n".join(line.rstrip() for line in text.split("\n"))
|
|
|
|
|
|
return text
|
|
|
|
|
|
|
2025-09-09 12:40:23 +02:00
|
|
|
|
def _resolve_hash_mode(explicit: Optional[str]) -> str:
|
|
|
|
|
|
"""
|
|
|
|
|
|
Normalisiert den Hash-Modus auf einen der Werte:
|
|
|
|
|
|
'body' | 'frontmatter' | 'body+frontmatter'
|
|
|
|
|
|
Akzeptiert auch 'full' als Alias für 'body+frontmatter'.
|
|
|
|
|
|
Beachtet zusätzlich die Env-Variablen MINDNET_HASH_MODE und MINDNET_HASH_COMPARE.
|
|
|
|
|
|
"""
|
|
|
|
|
|
if explicit:
|
|
|
|
|
|
val = explicit.strip().lower()
|
|
|
|
|
|
else:
|
|
|
|
|
|
val = (os.environ.get("MINDNET_HASH_MODE") or os.environ.get("MINDNET_HASH_COMPARE") or "body").strip().lower()
|
|
|
|
|
|
if val in ("full", "fulltext", "body+frontmatter", "bodyplusfrontmatter"):
|
|
|
|
|
|
return "body+frontmatter"
|
|
|
|
|
|
if val in ("frontmatter", "fm"):
|
|
|
|
|
|
return "frontmatter"
|
|
|
|
|
|
# default & fallbacks
|
|
|
|
|
|
return "body"
|
|
|
|
|
|
|
|
|
|
|
|
def _read_raw_body_from_file(file_path: Optional[str]) -> Tuple[str, Dict[str, Any]]:
|
|
|
|
|
|
"""Liest die Rohdatei und extrahiert Body & Frontmatter ohne Parser-Logik.
|
|
|
|
|
|
|
|
|
|
|
|
Rückgabe:
|
|
|
|
|
|
(body_text, frontmatter_dict)
|
|
|
|
|
|
"""
|
|
|
|
|
|
if not file_path or not os.path.exists(file_path):
|
|
|
|
|
|
return "", {}
|
|
|
|
|
|
try:
|
|
|
|
|
|
with open(file_path, "r", encoding="utf-8") as f:
|
|
|
|
|
|
raw = f.read()
|
|
|
|
|
|
except Exception:
|
|
|
|
|
|
return "", {}
|
|
|
|
|
|
# Frontmatter per Regex entfernen
|
|
|
|
|
|
m = FRONTMATTER_RE.match(raw)
|
|
|
|
|
|
fm = {}
|
|
|
|
|
|
if m:
|
|
|
|
|
|
fm_txt = m.group(1)
|
|
|
|
|
|
try:
|
|
|
|
|
|
import yaml # lazy
|
|
|
|
|
|
fm = yaml.safe_load(fm_txt) or {}
|
|
|
|
|
|
except Exception:
|
|
|
|
|
|
fm = {}
|
|
|
|
|
|
body = raw[m.end():]
|
|
|
|
|
|
else:
|
|
|
|
|
|
body = raw
|
|
|
|
|
|
return body, fm
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
# Hashing
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
|
2025-09-09 11:27:18 +02:00
|
|
|
|
def compute_hash(
|
|
|
|
|
|
*,
|
|
|
|
|
|
body: Optional[str],
|
|
|
|
|
|
frontmatter: Optional[Dict[str, Any]],
|
|
|
|
|
|
mode: Optional[str] = None,
|
|
|
|
|
|
normalize: Optional[str] = None,
|
|
|
|
|
|
) -> str:
|
2025-09-08 12:22:05 +02:00
|
|
|
|
"""
|
2025-09-09 11:27:18 +02:00
|
|
|
|
Berechnet einen Hex-Hash gemäß ``mode`` und ``normalize``.
|
2025-09-08 12:22:05 +02:00
|
|
|
|
|
2025-09-09 11:05:32 +02:00
|
|
|
|
mode:
|
|
|
|
|
|
- "body" (Default)
|
|
|
|
|
|
- "frontmatter"
|
|
|
|
|
|
- "body+frontmatter"
|
2025-09-09 11:27:18 +02:00
|
|
|
|
normalize:
|
|
|
|
|
|
- "canonical" (Default)
|
|
|
|
|
|
- "none"
|
2025-09-08 12:22:05 +02:00
|
|
|
|
"""
|
2025-09-09 12:40:23 +02:00
|
|
|
|
mode = _resolve_hash_mode(mode)
|
2025-09-09 11:27:18 +02:00
|
|
|
|
normalize = (normalize or os.environ.get("MINDNET_HASH_NORMALIZE", "canonical")).strip().lower()
|
|
|
|
|
|
|
|
|
|
|
|
body = _normalize_body(body or "", normalize)
|
2025-09-09 11:05:32 +02:00
|
|
|
|
fm_s = _canon_frontmatter(frontmatter or {})
|
|
|
|
|
|
|
|
|
|
|
|
h = hashlib.sha256()
|
|
|
|
|
|
if mode == "frontmatter":
|
|
|
|
|
|
h.update(fm_s.encode("utf-8"))
|
|
|
|
|
|
elif mode == "body+frontmatter":
|
|
|
|
|
|
h.update(body.encode("utf-8"))
|
|
|
|
|
|
h.update(b"\n--FM--\n")
|
|
|
|
|
|
h.update(fm_s.encode("utf-8"))
|
|
|
|
|
|
else: # body
|
|
|
|
|
|
h.update(body.encode("utf-8"))
|
|
|
|
|
|
return h.hexdigest()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
# Kernfunktion
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
2025-09-08 12:22:05 +02:00
|
|
|
|
|
2025-09-09 11:27:18 +02:00
|
|
|
|
def make_note_payload(
|
|
|
|
|
|
parsed: Any,
|
|
|
|
|
|
vault_root: Optional[str] = None,
|
|
|
|
|
|
*,
|
|
|
|
|
|
hash_mode: Optional[str] = None,
|
|
|
|
|
|
hash_normalize: Optional[str] = None,
|
2025-09-09 12:40:23 +02:00
|
|
|
|
hash_source: Optional[str] = None,
|
|
|
|
|
|
file_path: Optional[str] = None,
|
2025-09-09 11:27:18 +02:00
|
|
|
|
) -> Dict[str, Any]:
|
2025-09-08 12:22:05 +02:00
|
|
|
|
"""
|
2025-09-09 11:05:32 +02:00
|
|
|
|
Erzeugt den Payload für eine geparste Note.
|
|
|
|
|
|
|
|
|
|
|
|
Parameters
|
|
|
|
|
|
----------
|
|
|
|
|
|
parsed : Any
|
|
|
|
|
|
Objekt mit Attributen/Keys ``frontmatter``, ``body``, ``path``.
|
|
|
|
|
|
vault_root : Optional[str]
|
|
|
|
|
|
Vault-Wurzel (für Pfad-Relativierung). Wenn ``None``, wird ``path`` unverändert übernommen.
|
2025-09-09 11:27:18 +02:00
|
|
|
|
hash_mode : Optional[str]
|
2025-09-09 12:40:23 +02:00
|
|
|
|
"body" | "frontmatter" | "body+frontmatter" | "full" (Alias; überschreibt ENV).
|
2025-09-09 11:27:18 +02:00
|
|
|
|
hash_normalize : Optional[str]
|
|
|
|
|
|
"canonical" | "none" (überschreibt ENV).
|
2025-09-09 12:40:23 +02:00
|
|
|
|
hash_source : Optional[str]
|
|
|
|
|
|
"parsed" (Default) oder "raw". Wenn "raw", wird der Body aus der Rohdatei gelesen.
|
|
|
|
|
|
file_path : Optional[str]
|
|
|
|
|
|
Pfad zur Markdown-Datei, erforderlich für ``hash_source=raw``.
|
2025-09-09 11:05:32 +02:00
|
|
|
|
|
|
|
|
|
|
Returns
|
|
|
|
|
|
-------
|
|
|
|
|
|
Dict[str, Any]
|
|
|
|
|
|
Qdrant-Payload für die Notes-Collection.
|
2025-09-08 12:22:05 +02:00
|
|
|
|
"""
|
2025-09-09 11:05:32 +02:00
|
|
|
|
# "Duck typing": dict oder Objekt akzeptieren
|
2025-09-09 12:40:23 +02:00
|
|
|
|
if isinstance(parsed, dict):
|
|
|
|
|
|
fm = parsed.get("frontmatter") or {}
|
|
|
|
|
|
body = parsed.get("body") or ""
|
|
|
|
|
|
path = parsed.get("path") or ""
|
|
|
|
|
|
else:
|
|
|
|
|
|
fm = getattr(parsed, "frontmatter", {}) or {}
|
|
|
|
|
|
body = getattr(parsed, "body", "") or ""
|
|
|
|
|
|
path = getattr(parsed, "path", "") or ""
|
|
|
|
|
|
|
|
|
|
|
|
# Hash-Quelle bestimmen
|
|
|
|
|
|
src = (hash_source or os.environ.get("MINDNET_HASH_SOURCE", "parsed")).strip().lower()
|
|
|
|
|
|
raw_body, raw_fm = ("", {})
|
|
|
|
|
|
if src == "raw":
|
|
|
|
|
|
raw_body, raw_fm = _read_raw_body_from_file(file_path or path)
|
|
|
|
|
|
# Roh-FM ergänzen (nicht überschreiben)
|
|
|
|
|
|
if isinstance(raw_fm, dict) and raw_fm:
|
|
|
|
|
|
merged_fm = dict(fm)
|
|
|
|
|
|
for k, v in raw_fm.items():
|
|
|
|
|
|
merged_fm.setdefault(k, v)
|
|
|
|
|
|
fm = merged_fm
|
|
|
|
|
|
|
|
|
|
|
|
# Hash gemäß Modus/Quelle bilden
|
|
|
|
|
|
body_for_hash = raw_body if src == "raw" else body
|
|
|
|
|
|
hash_fulltext = compute_hash(body=body_for_hash, frontmatter=fm, mode=hash_mode, normalize=hash_normalize)
|
2025-09-08 12:22:05 +02:00
|
|
|
|
|
2025-09-09 11:05:32 +02:00
|
|
|
|
# Pfad relativieren
|
|
|
|
|
|
rel_path = path
|
|
|
|
|
|
try:
|
|
|
|
|
|
if vault_root:
|
|
|
|
|
|
rel = os.path.relpath(path, vault_root)
|
|
|
|
|
|
rel = rel.replace("\\", "/").lstrip("/") # normalisieren
|
|
|
|
|
|
rel_path = rel
|
|
|
|
|
|
except Exception:
|
2025-09-09 12:40:23 +02:00
|
|
|
|
pass # Pfad ist nicht kritisch für Hash/ID
|
2025-09-09 11:05:32 +02:00
|
|
|
|
|
2025-09-09 12:40:23 +02:00
|
|
|
|
# Note-Level-Wikilinks (Fallback, wenn Chunks nicht geliefert werden)
|
2025-09-09 11:05:32 +02:00
|
|
|
|
note_level_refs = list(dict.fromkeys(extract_wikilinks(body))) if body else []
|
|
|
|
|
|
|
2025-09-08 12:22:05 +02:00
|
|
|
|
payload: Dict[str, Any] = {
|
2025-09-09 11:15:01 +02:00
|
|
|
|
"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"),
|
2025-09-08 12:22:05 +02:00
|
|
|
|
"hash_fulltext": hash_fulltext,
|
2025-09-09 12:40:23 +02:00
|
|
|
|
# Volltext persistieren (verlustfreie Rekonstruktion) – aus PARSED-Body
|
2025-09-09 11:05:32 +02:00
|
|
|
|
"fulltext": body,
|
2025-09-09 11:27:18 +02:00
|
|
|
|
# Fallback-Refs auf Note-Ebene
|
2025-09-09 11:05:32 +02:00
|
|
|
|
"references": note_level_refs,
|
2025-09-08 12:22:05 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
2025-09-09 12:40:23 +02:00
|
|
|
|
for k in ("area", "project", "source", "lang", "slug", "aliases"):
|
2025-09-09 11:15:01 +02:00
|
|
|
|
if k in fm:
|
2025-09-08 12:22:05 +02:00
|
|
|
|
payload[k] = fm[k]
|
|
|
|
|
|
|
2025-09-09 12:40:23 +02:00
|
|
|
|
# Optional: Roh-Body-Hash zusätzlich persistieren
|
|
|
|
|
|
if os.environ.get("MINDNET_HASH_STORE_RAW", "false").strip().lower() == "true" and src == "raw":
|
|
|
|
|
|
try:
|
|
|
|
|
|
payload["hash_raw_body"] = compute_hash(body=raw_body, frontmatter=fm, mode="body", normalize="none")
|
|
|
|
|
|
except Exception:
|
|
|
|
|
|
pass
|
|
|
|
|
|
|
2025-09-08 12:22:05 +02:00
|
|
|
|
return payload
|
|
|
|
|
|
|
|
|
|
|
|
|
2025-09-09 11:05:32 +02:00
|
|
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
# CLI – Sichtprüfung
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
|
|
|
|
|
|
def _cli() -> None:
|
|
|
|
|
|
ap = argparse.ArgumentParser(description="Note-Payload aus Markdown erzeugen und anzeigen")
|
|
|
|
|
|
ap.add_argument("--from-file", dest="src", required=True, help="Pfad zur Markdown-Datei")
|
|
|
|
|
|
ap.add_argument("--vault-root", dest="vault_root", default=None, help="Vault-Wurzel zur Pfad-Relativierung")
|
|
|
|
|
|
ap.add_argument("--print", dest="do_print", action="store_true", help="Payload auf stdout ausgeben")
|
2025-09-09 12:40:23 +02:00
|
|
|
|
ap.add_argument("--hash-mode", choices=["body", "frontmatter", "body+frontmatter", "full"], default=None)
|
2025-09-09 11:27:18 +02:00
|
|
|
|
ap.add_argument("--hash-normalize", choices=["canonical", "none"], default=None)
|
2025-09-09 12:40:23 +02:00
|
|
|
|
ap.add_argument("--hash-source", choices=["parsed", "raw"], default=None)
|
2025-09-09 11:05:32 +02:00
|
|
|
|
args = ap.parse_args()
|
|
|
|
|
|
|
2025-09-09 11:15:01 +02:00
|
|
|
|
parsed = read_markdown(args.src)
|
2025-09-09 11:27:18 +02:00
|
|
|
|
payload = make_note_payload(parsed, vault_root=args.vault_root,
|
2025-09-09 12:40:23 +02:00
|
|
|
|
hash_mode=args.hash_mode, hash_normalize=args.hash_normalize,
|
|
|
|
|
|
hash_source=args.hash_source, file_path=args.src)
|
2025-09-09 11:05:32 +02:00
|
|
|
|
|
|
|
|
|
|
if args.do_print:
|
|
|
|
|
|
print(json.dumps(payload, ensure_ascii=False, indent=2))
|
|
|
|
|
|
|
2025-09-08 12:42:51 +02:00
|
|
|
|
|
2025-09-09 11:05:32 +02:00
|
|
|
|
if __name__ == "__main__": # pragma: no cover
|
|
|
|
|
|
_cli()
|