This commit is contained in:
Lars committed 2025-12-18 12:17:10 +01:00
1 parent 20b219d86c
commit 43f695de54
2 files changed
+130 -127

No files matched your search

+33 -44
View File
@@ -1,7 +1,8 @@
"""
FILE: app/services/edge_registry.py
DESCRIPTION: Single Source of Truth für Kanten-Typen. Parst '01_edge_vocabulary.md'.
Implementiert WP-22 Teil B (Registry & Validation).
DESCRIPTION: Single Source of Truth für Kanten-Typen. Parst '01_User_Manual/01_edge_vocabulary.md'.
WP-22 Teil B: Registry & Validation.
FIX: Beachtet MINDNET_VAULT_ROOT aus .env korrekt.
"""
import re
import os
@@ -14,47 +15,46 @@ logger = logging.getLogger(__name__)
class EdgeRegistry:
_instance = None
def __new__(cls):
def __new__(cls, vault_root: Optional[str] = None):
if cls._instance is None:
cls._instance = super(EdgeRegistry, cls).__new__(cls)
cls._instance.initialized = False
return cls._instance
def __init__(self):
if self.initialized: return
# Pfad korrespondiert mit dem Frontmatter Pfad in 01_edge_vocabulary.md
self.vocab_path = "01_User_Manual/01_edge_vocabulary.md"
def __init__(self, vault_root: Optional[str] = None):
if self.initialized:
return
# Priorität 1: Übergebener Parameter (z.B. für Tests)
# Priorität 2: Environment Variable (z.B. Production ./vault_master)
# Priorität 3: Default Fallback (./vault)
self.vault_root = vault_root or os.getenv("MINDNET_VAULT_ROOT", "./vault")
# Der relative Pfad ist laut Spezifikation fest definiert
self.vocab_rel_path = os.path.join("01_User_Manual", "01_edge_vocabulary.md")
self.unknown_log_path = "data/logs/unknown_edges.jsonl"
self.canonical_map: Dict[str, str] = {} # alias -> canonical
self.canonical_map: Dict[str, str] = {}
self.valid_types: Set[str] = set()
self._load_vocabulary()
self.initialized = True
def _load_vocabulary(self):
"""Parst die Markdown-Tabelle in 01_edge_vocabulary.md"""
# Fallback Suche, falls das Skript aus Root oder app ausgeführt wird
candidates = [
self.vocab_path,
os.path.join("..", self.vocab_path),
"vault/01_User_Manual/01_edge_vocabulary.md"
]
"""Parst die Markdown-Tabelle im Vault."""
# Absoluten Pfad auflösen, um Verwirrung mit cwd zu vermeiden
full_path = os.path.abspath(os.path.join(self.vault_root, self.vocab_rel_path))
found_path = None
for p in candidates:
if os.path.exists(p):
found_path = p
break
if not found_path:
logger.warning(f"Edge Vocabulary not found (checked: {candidates}). Registry empty.")
if not os.path.exists(full_path):
# Wir loggen den vollen Pfad, damit Debugging einfacher ist
logger.warning(f"Edge Vocabulary NOT found at: {full_path}. Registry is empty.")
return
# Regex für Tabellenzeilen: | **canonical** | alias, alias | ...
# Matcht: | **caused_by** | ausgelöst_durch, wegen |
# Regex: | **canonical** | alias, alias |
pattern = re.compile(r"\|\s*\*\*([a-z_]+)\*\*\s*\|\s*([^|]+)\|")
try:
with open(found_path, "r", encoding="utf-8") as f:
with open(full_path, "r", encoding="utf-8") as f:
for line in f:
match = pattern.search(line)
if match:
@@ -62,48 +62,37 @@ class EdgeRegistry:
aliases_str = match.group(2).strip()
self.valid_types.add(canonical)
self.canonical_map[canonical] = canonical # Self-ref
self.canonical_map[canonical] = canonical
# Aliases parsen
if aliases_str and "Kein Alias" not in aliases_str:
aliases = [a.strip() for a in aliases_str.split(",") if a.strip()]
for alias in aliases:
# Clean up user inputs (e.g. remove backticks if present)
clean_alias = alias.replace("`", "")
self.canonical_map[clean_alias] = canonical
logger.info(f"EdgeRegistry loaded: {len(self.valid_types)} canonical types from {found_path}.")
logger.info(f"EdgeRegistry loaded from {full_path}: {len(self.valid_types)} types.")
except Exception as e:
logger.error(f"Failed to parse Edge Vocabulary: {e}")
logger.error(f"Failed to parse Edge Vocabulary at {full_path}: {e}")
def resolve(self, edge_type: str) -> str:
"""
Normalisiert Kanten-Typen. Loggt unbekannte Typen, verwirft sie aber nicht (Learning System).
"""
if not edge_type:
return "related_to"
if not edge_type: return "related_to"
clean_type = edge_type.lower().strip().replace(" ", "_")
# 1. Lookup
if clean_type in self.canonical_map:
return self.canonical_map[clean_type]
# 2. Unknown Handling
self._log_unknown(clean_type)
return clean_type # Pass-through (nicht verwerfen, aber loggen)
return clean_type
def _log_unknown(self, edge_type: str):
"""Schreibt unbekannte Typen in ein Append-Only Log für Review."""
try:
os.makedirs(os.path.dirname(self.unknown_log_path), exist_ok=True)
# Einfaches JSONL Format
entry = {"unknown_type": edge_type, "status": "new"}
with open(self.unknown_log_path, "a", encoding="utf-8") as f:
f.write(json.dumps(entry) + "\n")
except Exception:
pass # Silent fail bei Logging, darf Ingestion nicht stoppen
pass
# Singleton Accessor
# Default Instanz
registry = EdgeRegistry()