#!/usr/bin/env python3 # -*- coding: utf-8 -*- """ Script: scripts/import_markdown.py — Markdown → Qdrant (Notes, Chunks, Edges) Version: 3.8.3 Datum: 2025-11-08 Änderungen gegenüber 3.8.2 -------------------------- - Ruft **ensure_collections nie direkt** auf, sondern ausschließlich über `_ensure_collections_compat(client, cfg, dim)`. - Payload-Index-Erzeugung ausschließlich via `_ensure_payload_indexes_compat(client, cfg)`. - Keine Annahmen über Signaturen im Projektstand; alle Varianten sind abgefedert. """ from __future__ import annotations import argparse import json import os import sys from typing import Dict, List, Optional, Tuple, Any, Set from dotenv import load_dotenv from qdrant_client.http import models as rest from app.core.parser import ( read_markdown, normalize_frontmatter, validate_required_frontmatter, ) from app.core.note_payload import make_note_payload from app.core.chunker import assemble_chunks from app.core.chunk_payload import make_chunk_payloads try: from app.core.derive_edges import build_edges_for_note except Exception: # pragma: no cover from app.core.edges import build_edges_for_note # type: ignore # Qdrant-Basics from app.core.qdrant import ( QdrantConfig, get_client, ensure_collections, # nur für Wrapper, unten niemals direkt aufrufen! ) # Abwärtskompatibler Import für Payload-Index-Erzeugung try: from app.core.qdrant import ensure_payload_indexes as _ensure_payload_indexes except Exception: try: from app.core.qdrant import ensure_payload_indices as _ensure_payload_indexes # älterer Funktionsname except Exception: def _ensure_payload_indexes(*_args, **_kwargs): # No-Op: ältere Releases ohne dedizierte Index-Funktion return None # Qdrant-Points Helfer (robust gegen ältere Namen/fehlende Module) try: from app.core.qdrant_points import ( points_for_chunks as _points_for_chunks, points_for_note as _points_for_note, points_for_edges as _points_for_edges, upsert_batch as _upsert_batch, ) except Exception: # Lokale Fallback-Implementierungen (No-Break) from qdrant_client.http import models as _rest def _collection_names(prefix: str): return f"{prefix}_notes", f"{prefix}_chunks", f"{prefix}_edges" def _points_for_note(prefix: str, note_payload: dict, note_vec, dim: int): notes_col, _, _ = _collection_names(prefix) vec = note_vec if note_vec is not None else [0.0] * int(dim) pid = note_payload.get("note_id") or note_payload.get("id") or "missing-note-id" pt = _rest.PointStruct(id=str(pid), vector=vec, payload=note_payload) return notes_col, [pt] def _points_for_chunks(prefix: str, chunk_payloads: list[dict], vectors: list[list[float]]): _, chunks_col, _ = _collection_names(prefix) pts = [] for i, pl in enumerate(chunk_payloads): pid = pl.get("chunk_id") or pl.get("id") or f"{pl.get('note_id','missing')}#{i+1}" vec = vectors[i] if i < len(vectors) else None if vec is None: continue pts.append(_rest.PointStruct(id=str(pid), vector=vec, payload=pl)) return chunks_col, pts def _points_for_edges(prefix: str, edges: list[dict]): _, _, edges_col = _collection_names(prefix) pts = [] for i, e in enumerate(edges): # stabiler String-ID-Aufbau src = e.get("source_id") or e.get("src_id") or "src" dst = e.get("target_id") or e.get("dst_id") or "dst" kind = e.get("kind") or e.get("edge_type") or "edge" nid = e.get("note_id") or "note" pid = f"{nid}:{kind}:{src}->{dst}:{i}" pts.append(_rest.PointStruct(id=str(pid), vector=None, payload=e)) return edges_col, pts def _upsert_batch(client, collection_name: str, points: list): if not points: return client.upsert(collection_name=collection_name, points=points, wait=True) # NEU: Type-Registry (optional) try: from app.core.type_registry import load_type_registry, resolve_note_type, get_type_config, effective_chunk_profile except Exception: load_type_registry = None # type: ignore resolve_note_type = None # type: ignore get_type_config = None # type: ignore effective_chunk_profile = None # type: ignore try: from app.core.embed import embed_texts # optional except Exception: embed_texts = None # --------------------------------------------------------------------- # Helper # --------------------------------------------------------------------- def iter_md(root: str) -> List[str]: out: List[str] = [] for dirpath, _, filenames in os.walk(root): for fn in filenames: if not fn.lower().endswith(".md"): continue p = os.path.join(dirpath, fn) pn = p.replace("\\", "/") if any(ex in pn for ex in ["/.obsidian/", "/_backup_frontmatter/", "/_imported/"]): continue out.append(p) return sorted(out) def collections(prefix: str) -> Tuple[str, str, str]: return f"{prefix}_notes", f"{prefix}_chunks", f"{prefix}_edges" def fetch_existing_note_payload(client, prefix: str, note_id: str) -> Optional[Dict]: notes_col, _, _ = collections(prefix) f = rest.Filter(must=[rest.FieldCondition(key="note_id", match=rest.MatchValue(value=note_id))]) points, _ = client.scroll( collection_name=notes_col, scroll_filter=f, with_payload=True, with_vectors=False, limit=1, ) if not points: return None return points[0].payload or {} def list_qdrant_note_ids(client, prefix: str) -> Set[str]: notes_col, _, _ = collections(prefix) out: Set[str] = set() next_page = None while True: pts, next_page = client.scroll( collection_name=notes_col, with_payload=True, with_vectors=False, limit=256, offset=next_page, ) if not pts: break for p in pts: pl = p.payload or {} nid = pl.get("note_id") if isinstance(nid, str): out.add(nid) if next_page is None: break return out def purge_note_artifacts(client, prefix: str, note_id: str) -> None: _, chunks_col, edges_col = collections(prefix) filt = rest.Filter(must=[rest.FieldCondition(key="note_id", match=rest.MatchValue(value=note_id))]) for col in (chunks_col, edges_col): try: client.delete( collection_name=col, points_selector=rest.FilterSelector(filter=filt), wait=True ) except Exception as e: print(json.dumps({"note_id": note_id, "warn": f"delete in {col} via filter failed: {e}"})) def delete_note_everywhere(client, prefix: str, note_id: str) -> None: notes_col, chunks_col, edges_col = collections(prefix) filt = rest.Filter(must=[rest.FieldCondition(key="note_id", match=rest.MatchValue(value=note_id))]) for col in (edges_col, chunks_col, notes_col): try: client.delete( collection_name=col, points_selector=rest.FilterSelector(filter=filt), wait=True ) except Exception as e: print(json.dumps({"note_id": note_id, "warn": f"delete in {col} failed: {e}"})) def _resolve_mode(val: Optional[str]) -> str: v = (val or os.environ.get("MINDNET_HASH_MODE") or os.environ.get("MINDNET_HASH_COMPARE") or "body").strip().lower() if v in ("full", "fulltext", "body+frontmatter", "bodyplusfrontmatter"): return "full" if v in ("frontmatter", "fm"): return "frontmatter" return "body" def _env(key: str, default: str) -> str: return (os.environ.get(key) or default).strip().lower() def _resolve_dim(cfg) -> int: # Try common attribute names on QdrantConfig for attr in ("dim", "vector_dim", "dimension", "dimensions", "embedding_dim", "embed_dim", "vector_size", "size"): try: v = getattr(cfg, attr) if isinstance(v, int) and v > 0: return v except Exception: pass # Try environment fallbacks for key in ("MINDNET_DIM", "EMBED_DIM", "EMBEDDING_DIM", "QDRANT_VECTOR_DIM", "QDRANT_DIM", "VECTOR_DIM", "DIM"): try: v = int(os.environ.get(key, "").strip() or "0") if v > 0: return v except Exception: continue # Conservative default: MiniLM 384d (im Projekt üblich) return 384 # ---- Compatibility wrappers (no direct calls to project-specific signatures) ---- def _ensure_collections_compat(client, cfg, dim): """ Call ensure_collections with the correct signature across releases: - preferred: ensure_collections(client, cfg) - fallbacks: (client, cfg.prefix, dim) -> (client, cfg.prefix) -> (client) """ try: return ensure_collections(client, cfg) except TypeError: pass try: return ensure_collections(client, cfg.prefix, dim) except TypeError: pass try: return ensure_collections(client, cfg.prefix) except TypeError: pass try: return ensure_collections(client) except TypeError: pass # If everything fails, do nothing return None def _ensure_payload_indexes_compat(client, cfg): """ Try calling payload index creation with cfg, then prefix; ignore if unsupported. """ try: _ensure_payload_indexes(client, cfg) return except TypeError: pass except AttributeError: pass try: _ensure_payload_indexes(client, getattr(cfg, "prefix", None)) return except TypeError: pass except AttributeError: pass # final no-op return # --------------------------------------------------------------------- # Main # --------------------------------------------------------------------- def main() -> None: load_dotenv() ap = argparse.ArgumentParser() ap.add_argument("--vault", required=True, help="Pfad zum Obsidian-Vault (Root-Ordner)") ap.add_argument("--apply", action="store_true", help="Schreibt in Qdrant; ohne Flag nur Dry-Run") ap.add_argument("--purge-before-upsert", action="store_true", help="Vor Upsert Chunks & Edges der GEÄNDERTEN Note löschen") ap.add_argument("--note-id", help="Nur eine bestimmte Note-ID verarbeiten") ap.add_argument("--only-path", help="Exakt diesen Markdown-Pfad verarbeiten (ignoriert --note-id)") ap.add_argument("--embed-note", action="store_true", help="Optional: Note-Volltext einbetten") ap.add_argument("--force-replace", action="store_true", help="Änderungserkennung ignorieren und immer upserten (+ optional Purge)") ap.add_argument("--hash-mode", choices=["body", "frontmatter", "full"], default=None, help="Vergleichsmodus (Body | Frontmatter | Full)") ap.add_argument("--hash-normalize", choices=["canonical", "none"], default=None) ap.add_argument("--hash-source", choices=["parsed", "raw"], default=None, help="Quelle für die Hash-Berechnung (Default: parsed)") ap.add_argument("--note-scope-refs", action="store_true", help="(Optional) erzeugt zusätzlich references:note/backlink:note (Default: aus)") ap.add_argument("--debug-hash-diff", action="store_true", help="(reserviert) optionaler Body-Diff") ap.add_argument("--compare-text", action="store_true", help="Parsed fulltext zusätzlich direkt vergleichen (über Hash hinaus)") ap.add_argument("--baseline-modes", action="store_true", help="Fehlende Hash-Varianten im Feld 'hashes' still nachtragen (Upsert NUR Notes)") ap.add_argument("--sync-deletes", action="store_true", help="Notes/Chunks/Edges löschen, die in Qdrant existieren aber im Vault fehlen (Dry-Run; mit --apply ausführen)") ap.add_argument("--prefix", help="Collection-Prefix (überschreibt ENV COLLECTION_PREFIX)") args = ap.parse_args() mode = _resolve_mode(args.hash_mode) # body|frontmatter|full src = _env("MINDNET_HASH_SOURCE", args.hash_source or "parsed") # parsed|raw norm = _env("MINDNET_HASH_NORMALIZE", args.hash_normalize or "canonical") # canonical|none note_scope_refs_env = (_env("MINDNET_NOTE_SCOPE_REFS", "false") == "true") note_scope_refs_flag = args.note_scope_refs or note_scope_refs_env compare_text = args.compare_text or (_env("MINDNET_COMPARE_TEXT", "false") == "true") cfg = QdrantConfig.from_env() if args.prefix: cfg.prefix = args.prefix.strip() client = get_client(cfg) dim = _resolve_dim(cfg) # Collections & Indexe (nur über Wrapper) _ensure_collections_compat(client, cfg, dim) _ensure_payload_indexes_compat(client, cfg) # Type-Registry laden (optional) reg = None if load_type_registry is not None: reg = load_type_registry() if reg.get("_using_defaults"): print(json.dumps({"warn": "type_registry_missing_or_invalid", "info": reg.get("_warning")})) root = os.path.abspath(args.vault) # Dateiliste bestimmen if args.only_path: only = os.path.abspath(args.only_path) files = [only] else: files = iter_md(root) if not files: print("Keine Markdown-Dateien gefunden.", file=sys.stderr) sys.exit(2) # Optional: Sync-Deletes vorab if args.sync_deletes: vault_note_ids: Set[str] = set() for path in files: try: parsed = read_markdown(path) if not parsed: continue fm = normalize_frontmatter(parsed.frontmatter) nid = fm.get("id") if isinstance(nid, str): vault_note_ids.add(nid) except Exception: continue qdrant_note_ids = list_qdrant_note_ids(client, cfg.prefix) to_delete = sorted(qdrant_note_ids - vault_note_ids) print(json.dumps({ "action": "sync-deletes", "prefix": cfg.prefix, "qdrant_total": len(qdrant_note_ids), "vault_total": len(vault_note_ids), "to_delete_count": len(to_delete), "to_delete": to_delete[:50] + (["…"] if len(to_delete) > 50 else []) }, ensure_ascii=False)) if args.apply and to_delete: for nid in to_delete: print(json.dumps({"action": "delete", "note_id": nid, "decision": "apply"})) delete_note_everywhere(client, cfg.prefix, nid) key_current = f"{mode}:{src}:{norm}" processed = 0 for path in files: # -------- Parse & Validate -------- try: parsed = read_markdown(path) except Exception as e: print(json.dumps({"path": path, "error": f"read_markdown failed: {type(e).__name__}: {e}"})) continue if parsed is None: print(json.dumps({"path": path, "error": "read_markdown returned None"})) continue try: fm = normalize_frontmatter(parsed.frontmatter) validate_required_frontmatter(fm) except Exception as e: print(json.dumps({"path": path, "error": f"Frontmatter invalid: {type(e).__name__}: {e}"})) continue if args.note_id and not args.only_path and fm.get("id") != args.note_id: continue processed += 1 # -------- Type-Registry: Typvalidierung & Konfiguration -------- fm_type = (fm.get("type") or "concept") if resolve_note_type is not None: resolved_type = resolve_note_type(fm_type, reg or {}) else: resolved_type = (fm_type or "concept") type_cfg = get_type_config(resolved_type, reg or {"types":{"concept":{}}}) if get_type_config else {} chunk_profile = effective_chunk_profile(resolved_type, reg or {}) if effective_chunk_profile else None retriever_weight = type_cfg.get("retriever_weight") # -------- Build new payload (includes 'hashes') -------- note_pl = make_note_payload( parsed, vault_root=root, hash_mode=mode, hash_normalize=norm, hash_source=src, file_path=path, ) if not note_pl.get("fulltext"): note_pl["fulltext"] = getattr(parsed, "body", "") or "" # retriever_weight (optional) persistieren if isinstance(retriever_weight, (int, float)): note_pl["retriever_weight"] = float(retriever_weight) note_id = note_pl.get("note_id") or fm.get("id") if not note_id: print(json.dumps({"path": path, "error": "Missing note_id after payload build"})) continue # -------- Fetch old payload -------- old_payload = None if args.force_replace else fetch_existing_note_payload(client, cfg.prefix, note_id) has_old = old_payload is not None old_hashes = (old_payload or {}).get("hashes") or {} old_hash_exact = old_hashes.get(key_current) new_hash_exact = (note_pl.get("hashes") or {}).get(key_current) needs_baseline = (old_hash_exact is None) hash_changed = (old_hash_exact is not None and new_hash_exact is not None and old_hash_exact != new_hash_exact) text_changed = False if compare_text: old_text = (old_payload or {}).get("fulltext") or "" new_text = note_pl.get("fulltext") or "" text_changed = (old_text != new_text) changed = args.force_replace or (not has_old) or hash_changed or text_changed do_baseline_only = (args.baseline_modes and has_old and needs_baseline and not changed) # -------- Chunks / Embeddings -------- chunk_pls: List[Dict[str, Any]] = [] try: body_text = getattr(parsed, "body", "") or "" # assemble_chunks nutzt weiterhin den Note-Typ (keine Breaking Changes) chunks = assemble_chunks(fm["id"], body_text, resolved_type) # chunk_profile beeinflusst ggf. nur die Fenster-Overlap-Synthese chunk_pls = make_chunk_payloads(fm, note_pl["path"], chunks, note_text=body_text, chunk_profile=chunk_profile) except Exception as e: print(json.dumps({"path": path, "note_id": note_id, "error": f"chunk build failed: {type(e).__name__}: {e}"})) continue vecs: List[List[float]] = [[0.0] * dim for _ in chunk_pls] if embed_texts and chunk_pls: try: texts_for_embed = [(pl.get("window") or pl.get("text") or "") for pl in chunk_pls] vecs = embed_texts(texts_for_embed) except Exception as e: print(json.dumps({"path": path, "note_id": note_id, "warn": f"embed_texts failed, using zeros: {e}"})) # -------- Edges (robust) -------- edges: List[Dict[str, Any]] = [] edges_failed = False if changed and (not do_baseline_only): try: note_refs = note_pl.get("references") or [] # Registry kann note-scope references additiv anschalten edge_defaults = [e for e in (type_cfg.get("edge_defaults") or []) if isinstance(e, str)] eff_note_scope_refs = bool(note_scope_refs_flag or ("references" in edge_defaults)) edges = build_edges_for_note( note_id, chunk_pls, note_level_references=note_refs, include_note_scope_refs=eff_note_scope_refs, ) except Exception as e: edges_failed = True edges = [] # WICHTIG: Wir brechen NICHT mehr ab — Note & Chunks werden geschrieben. print(json.dumps({"path": path, "note_id": note_id, "warn": f"build_edges_for_note failed, skipping edges: {type(e).__name__}: {e}"})) # -------- Summary -------- summary = { "note_id": note_id, "title": fm.get("title"), "type": resolved_type, "chunk_profile": chunk_profile, "retriever_weight": retriever_weight, "chunks": len(chunk_pls), "edges": len(edges), "edges_failed": edges_failed, "changed": changed, "needs_baseline_for_mode": needs_baseline, "decision": ("baseline-only" if args.apply and do_baseline_only else "apply" if args.apply and changed else "apply-skip-unchanged" if args.apply and not changed else "dry-run"), "path": note_pl["path"], "hash_mode": mode, "hash_normalize": norm, "hash_source": src, "prefix": cfg.prefix, } print(json.dumps(summary, ensure_ascii=False)) # -------- Writes -------- if not args.apply: continue if do_baseline_only: merged_hashes = {} merged_hashes.update(old_hashes) merged_hashes.update(note_pl.get("hashes") or {}) if has_old and old_payload: note_pl["hash_fulltext"] = old_payload.get("hash_fulltext", note_pl.get("hash_fulltext")) note_pl["hash_signature"] = old_payload.get("hash_signature", note_pl.get("hash_signature")) note_pl["hashes"] = merged_hashes notes_name, note_pts = _points_for_note(cfg.prefix, note_pl, None, dim) _upsert_batch(client, notes_name, note_pts) continue if not changed: continue if args.purge_before_upsert and has_old: try: purge_note_artifacts(client, cfg.prefix, note_id) except Exception as e: print(json.dumps({"path": path, "note_id": note_id, "warn": f"purge failed: {e}"})) notes_name, note_pts = _points_for_note(cfg.prefix, note_pl, None, dim) _upsert_batch(client, notes_name, note_pts) if chunk_pls: chunks_name, chunk_pts = _points_for_chunks(cfg.prefix, chunk_pls, vecs) _upsert_batch(client, chunks_name, chunk_pts) if edges: edges_name, edge_pts = _points_for_edges(cfg.prefix, edges) _upsert_batch(client, edges_name, edge_pts) print(f"Done. Processed notes: {processed}") if __name__ == "__main__": main()