diff --git a/app/core/derive_edges.py b/app/core/derive_edges.py index 616f5d9..819dd8d 100644 --- a/app/core/derive_edges.py +++ b/app/core/derive_edges.py @@ -5,7 +5,7 @@ Modul: app/core/derive_edges.py Zweck: - Bewahrt bestehende Edgelogik (belongs_to, prev/next, references, backlink) - Ergänzt typenbasierte Default-Kanten (edge_defaults aus config/types.yaml) -- Unterstützt "typed inline relations" ([[rel:KIND | Target]] / [[rel:KIND Target]]) +- Unterstützt "typed inline relations" ([[rel:KIND | Target]] / [[rel:KIND Target]] / rel: KIND [[Target]]) - Unterstützt Obsidian-Callouts (> [!edge] KIND: [[Target]] [[Target2]] ...) Kompatibilität: @@ -139,11 +139,17 @@ _WIKILINK_RE = re.compile(r"\[\[(?:[^\|\]]+\|)?([a-zA-Z0-9_\-#:. ]+)\]\]") # [[rel:related_to Target]] _REL_PIPE = re.compile(r"\[\[\s*rel:(?P[a-z_]+)\s*\|\s*(?P[^\]]+?)\s*\]\]", re.IGNORECASE) _REL_SPACE = re.compile(r"\[\[\s*rel:(?P[a-z_]+)\s+(?P[^\]]+?)\s*\]\]", re.IGNORECASE) +# rel: depends_on [[Target]] (reines Textmuster) +_REL_TEXT = re.compile(r"rel\s*:\s*(?P[a-z_]+)\s*\[\[\s*(?P[^\]]+?)\s*\]\]", re.IGNORECASE) def _extract_typed_relations(text: str) -> Tuple[List[Tuple[str,str]], str]: """ Gibt Liste (kind, target) zurück und den Text mit entfernten getypten Relation-Links, damit die generische Wikilink-Erkennung sie nicht doppelt zählt. + Unterstützt drei Varianten: + - [[rel:KIND | Target]] + - [[rel:KIND Target]] + - rel: KIND [[Target]] """ pairs: List[Tuple[str,str]] = [] def _collect(m): @@ -152,8 +158,10 @@ def _extract_typed_relations(text: str) -> Tuple[List[Tuple[str,str]], str]: if k and t: pairs.append((k, t)) return "" # Link entfernen + text = _REL_PIPE.sub(_collect, text) text = _REL_SPACE.sub(_collect, text) + text = _REL_TEXT.sub(_collect, text) return pairs, text # Obsidian Callout Parser @@ -238,7 +246,7 @@ def build_edges_for_note( - belongs_to: für jeden Chunk (chunk -> note) - next / prev: zwischen aufeinanderfolgenden Chunks - references: pro Chunk aus window/text (via Wikilinks) - - typed inline relations: [[rel:KIND | Target]] oder [[rel:KIND Target]] + - typed inline relations: [[rel:KIND | Target]] oder [[rel:KIND Target]] oder rel: KIND [[Target]] - Obsidian Callouts: > [!edge] KIND: [[Target]] [[Target2]] - optional note-scope references/backlinks: dedupliziert über alle Chunk-Funde + note_level_references - typenbasierte Default-Kanten (edge_defaults) je gefundener Referenz @@ -276,14 +284,14 @@ def build_edges_for_note( "provenance": "rule", "rule_id": "structure:order", "confidence": 0.95, - })) + }))) edges.append(_edge("prev", "chunk", b_id, a_id, note_id, { "chunk_id": b_id, "edge_id": _mk_edge_id("prev", b_id, a_id, "chunk", "structure:order"), "provenance": "rule", "rule_id": "structure:order", "confidence": 0.95, - })) + }))) # 3) references + typed inline + callouts + defaults (chunk-scope) reg = _load_types_registry() @@ -358,7 +366,7 @@ def build_edges_for_note( "chunk_id": cid, "edge_id": _mk_edge_id(rel, cid, r, "chunk", f"edge_defaults:{note_type}:{rel}"), "provenance": "rule", - "rule_id": f"edge_defaults:{note_type}:{rel}", + "rule_id": f"edge_defaults:{note_type}:{rel}"), "confidence": 0.7, })) if rel in {"related_to", "similar_to"}: @@ -366,9 +374,10 @@ def build_edges_for_note( "chunk_id": cid, "edge_id": _mk_edge_id(rel, r, cid, "chunk", f"edge_defaults:{note_type}:{rel}"), "provenance": "rule", - "rule_id": f"edge_defaults:{note_type}:{rel}", + "rule_id": f"edge_defaults:{note_type}:{rel}"), "confidence": 0.7, })) + refs_all.extend(refs) # 4) optional note-scope refs/backlinks (+ defaults)