Dateien nach "scripts" hochladen
Deploy mindnet to llm-node / deploy (push) Successful in 3s

This commit is contained in:
Lars committed 2025-11-08 17:00:27 +01:00
1 parent 2794d26181
commit 3b192e2eed
2 files changed
+263 -389

No files matched your search

+78 -251
View File
@@ -2,16 +2,59 @@
# -*- coding: utf-8 -*-
"""
Script: scripts/import_markdown.py — Markdown → Qdrant (Notes, Chunks, Edges)
Version: 3.8.5
Date: 2025-11-08
Version: 3.7.2
Datum: 2025-09-30
Notes
-----
- Uses compatibility wrappers for ensure_collections and payload index creation.
- Provides robust local fallbacks for qdrant_points helpers.
- Generates valid Qdrant point IDs (int or UUIDv5) if none provided.
- Detects Named-Vector schema and coerces points accordingly.
- Integrates Type-Registry without breaking older behavior.
Kurzbeschreibung
----------------
- Liest Markdown-Dateien ein und erzeugt Notes/Chunks/Edges **idempotent**.
- Änderungserkennung „Option C“: mehrere Hash-Varianten werden parallel in der Note
gespeichert (Feld `hashes` mit Schlüsseln `<mode>:<source>:<normalize>`). Der Vergleich
nutzt NUR den aktuellen Modus-Key — ein Moduswechsel triggert keine Massenänderungen mehr.
- „Erstimport-Fix“: Bei leerem Qdrant gilt Create-Fall automatisch als geändert.
- `--baseline-modes`: fehlende Hash-Varianten still nachtragen (nur Notes upserten).
- `--sync-deletes`: gezielte Lösch-Synchronisation (Dry-Run + Apply).
- `--only-path`: exakt **eine** Datei (Pfad) importieren — nützlich für Diagnosefälle.
Neu in 3.7.1/3.7.2
------------------
- Chunk-Payloads: `window` (für Embeddings), `text` (überlappungsfrei, verlustfrei rekonstruierbar),
`start/end/overlap_*`. Embeddings nutzen `window`.
- **3.7.2:** Edges-Fehler führen nicht mehr zum Abbruch der gesamten Note; Note/Chunks werden trotzdem geschrieben.
Hash/Compare Konfiguration
--------------------------
- Vergleichsmodus:
--hash-mode body|frontmatter|full
oder ENV: MINDNET_HASH_MODE | MINDNET_HASH_COMPARE
- Quelle:
--hash-source parsed|raw (ENV: MINDNET_HASH_SOURCE, Default parsed)
- Normalisierung:
--hash-normalize canonical|none (ENV: MINDNET_HASH_NORMALIZE, Default canonical)
- Optional: --compare-text (oder ENV MINDNET_COMPARE_TEXT=true) vergleicht zusätzlich
den parsed Body-Text direkt.
Qdrant / ENV
------------
- QDRANT_URL | QDRANT_HOST/QDRANT_PORT | QDRANT_API_KEY
- COLLECTION_PREFIX (Default: mindnet), via --prefix überschreibbar
- VECTOR_DIM (Default: 384)
- MINDNET_NOTE_SCOPE_REFS: true|false (Default: false)
Beispiele
---------
# Standard (Body, parsed, canonical)
python3 -m scripts.import_markdown --vault ./vault
# Erstimport nach truncate (Create-Fall)
python3 -m scripts.import_markdown --vault ./vault --apply --purge-before-upsert
# Nur eine Datei (Diagnose)
python3 -m scripts.import_markdown --vault ./vault --only-path ./vault/30_projects/project-demo.md --apply
# Sync-Deletes (Dry-Run → Apply)
python3 -m scripts.import_markdown --vault ./vault --sync-deletes
python3 -m scripts.import_markdown --vault ./vault --sync-deletes --apply
"""
from __future__ import annotations
@@ -19,19 +62,11 @@ import argparse
import json
import os
import sys
import uuid as _uuid
from typing import Dict, List, Optional, Tuple, Any, Set
from dotenv import load_dotenv
from qdrant_client.http import models as rest
# Deterministic UUIDv5 for stable Qdrant point IDs
_MN_NAMESPACE = _uuid.uuid5(_uuid.NAMESPACE_URL, "mindnet-default-namespace")
def _uuid5_deterministic(*parts: str) -> str:
base = ":".join(str(p) for p in parts if p is not None)
return str(_uuid.uuid5(_MN_NAMESPACE, base))
# --- Project imports (as in stable 20251105) ---
from app.core.parser import (
read_markdown,
normalize_frontmatter,
@@ -44,125 +79,18 @@ 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
from app.core.qdrant import (
QdrantConfig,
get_client,
ensure_collections, # used only via wrapper
ensure_collections,
ensure_payload_indexes,
)
from app.core.qdrant_points import (
points_for_chunks,
points_for_note,
points_for_edges,
upsert_batch,
)
# Backward-compatible import for payload index creation
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 # older name
except Exception:
def _ensure_payload_indexes(*_args, **_kwargs):
# No-Op for older releases without explicit payload index creation
return None
# Qdrant points helpers (try project first, then safe local fallbacks)
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:
# ---- Local fallbacks ----
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)
raw = (
note_payload.get("point_id")
or note_payload.get("qdrant_id")
or note_payload.get("note_id")
or note_payload.get("id")
or note_payload.get("path")
)
pid: Any = None
if isinstance(raw, int):
pid = raw
elif isinstance(raw, str) and raw.isdigit():
try:
pid = int(raw)
except Exception:
pid = None
if pid is None:
pid = _uuid5_deterministic("note", str(raw or ""))
vec = note_vec if note_vec is not None else [0.0] * int(dim)
pt = rest.PointStruct(id=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):
raw = (
pl.get("point_id")
or pl.get("qdrant_id")
or pl.get("chunk_id")
or pl.get("id")
or f"{pl.get('note_id','missing')}#{i+1}"
)
pid: Any = None
if isinstance(raw, int):
pid = raw
elif isinstance(raw, str) and raw.isdigit():
try:
pid = int(raw)
except Exception:
pid = None
if pid is None:
pid = _uuid5_deterministic("chunk", str(raw))
vec = vectors[i] if i < len(vectors) else None
if vec is None:
continue
pts.append(rest.PointStruct(id=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):
src_id = e.get("source_id") or e.get("src_id") or "src"
dst_id = 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"
raw = e.get("point_id") or e.get("qdrant_id")
if raw is None:
raw = f"{nid}:{kind}:{src_id}->{dst_id}:{i}"
pid: Any = None
if isinstance(raw, int):
pid = raw
elif isinstance(raw, str) and raw.isdigit():
try:
pid = int(raw)
except Exception:
pid = None
if pid is None:
pid = _uuid5_deterministic("edge", str(raw))
pts.append(rest.PointStruct(id=pid, vector=None, payload=e))
return edges_col, pts
def _upsert_batch(client, collection_name: str, points: list):
if not points:
return
# Collections are single-vector (size/distance) per original setup script.
client.upsert(collection_name=collection_name, points=points, wait=True)
# 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
@@ -272,76 +200,6 @@ 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
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
# ---------------------------------------------------------------------
@@ -380,25 +238,15 @@ def main() -> None:
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
note_scope_refs = 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")}))
ensure_collections(client, cfg.prefix, cfg.dim)
ensure_payload_indexes(client, cfg.prefix)
root = os.path.abspath(args.vault)
@@ -467,16 +315,6 @@ def main() -> None:
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,
@@ -489,10 +327,6 @@ def main() -> None:
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"}))
@@ -522,15 +356,13 @@ def main() -> None:
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)
chunks = assemble_chunks(fm["id"], body_text, fm.get("type", "concept"))
chunk_pls = make_chunk_payloads(fm, note_pl["path"], chunks, note_text=body_text)
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]
vecs: List[List[float]] = [[0.0] * cfg.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]
@@ -544,27 +376,22 @@ def main() -> None:
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,
include_note_scope_refs=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,
@@ -590,12 +417,12 @@ def main() -> None:
merged_hashes = {}
merged_hashes.update(old_hashes)
merged_hashes.update(note_pl.get("hashes") or {})
if has_old and old_payload:
if 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)
notes_name, note_pts = points_for_note(cfg.prefix, note_pl, None, cfg.dim)
upsert_batch(client, notes_name, note_pts)
continue
if not changed:
@@ -607,17 +434,17 @@ def main() -> None:
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)
notes_name, note_pts = points_for_note(cfg.prefix, note_pl, None, cfg.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)
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)
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()
main()