Dynamische Layout-Einstellungen (Slider).

"Bearbeiten" Button im Graph.
Vollständige Chat- & Editor-Funktionen.
Switch-Helper für den Wechsel vom Graphen zum Editor.
Fix für ausgehende Kanten (Note-Level).
Fix für pydantic Validierung (MatchExcept).
Hover-Text (Tooltip) mit Inhalt.
Logik zum Ausblenden von Labels.
This commit is contained in:
Lars committed 2025-12-14 11:39:49 +01:00
1 parent f1bcbb1543
commit 4e8512c812
2 files changed
+127 -59

No files matched your search

+23 -12
View File
@@ -11,7 +11,11 @@ class GraphExplorerService:
self.edges_col = f"{prefix}_edges"
self._note_cache = {}
def get_ego_graph(self, center_note_id: str, depth=2):
def get_ego_graph(self, center_note_id: str, depth=2, show_labels=True):
"""
Erstellt den Graphen.
show_labels=False versteckt die Kantenbeschriftung für mehr Übersicht.
"""
nodes_dict = {}
unique_edges = {}
@@ -20,20 +24,18 @@ class GraphExplorerService:
if not center_note: return [], []
self._add_node_to_dict(nodes_dict, center_note, level=0)
# Wir sammeln IDs für Level 2 Suche
level_1_ids = {center_note_id}
# Suche Kanten für Center
l1_edges = self._find_connected_edges([center_note_id], center_note.get("title"))
# Verarbeite L1 Kanten
for edge_data in l1_edges:
src_id, tgt_id = self._process_edge(edge_data, nodes_dict, unique_edges, current_depth=1)
if src_id: level_1_ids.add(src_id)
if tgt_id: level_1_ids.add(tgt_id)
# Level 2 Suche (begrenzt, um Chaos zu vermeiden)
if depth > 1 and len(level_1_ids) > 1 and len(level_1_ids) < 40: # Limit für Performance
# Level 2 Suche (begrenzt für Performance)
if depth > 1 and len(level_1_ids) > 1 and len(level_1_ids) < 60:
l1_subset = list(level_1_ids - {center_note_id})
if l1_subset:
l2_edges = self._find_connected_edges_batch(l1_subset)
@@ -48,9 +50,12 @@ class GraphExplorerService:
color = get_edge_color(kind)
is_smart = (prov != "explicit" and prov != "rule")
# Label Logik: Wenn show_labels False ist, zeigen wir keinen Text an
label_text = kind if show_labels else " "
final_edges.append(Edge(
source=src, target=tgt, label=kind, color=color, dashes=is_smart,
title=f"Provenance: {prov}\nType: {kind}"
source=src, target=tgt, label=label_text, color=color, dashes=is_smart,
title=f"Relation: {kind}\nProvenance: {prov}" # Tooltip bleibt immer
))
return list(nodes_dict.values()), final_edges
@@ -69,13 +74,13 @@ class GraphExplorerService:
results = []
# --- OUTGOING SEARCH (Quelle = Chunk ODER Note) ---
# FIX: Wir suchen jetzt auch nach der note_id als source_id, falls Edges direkt an der Note hängen
# Wir suchen jetzt auch nach der note_id als source_id, falls Edges direkt an der Note hängen
source_candidates = chunk_ids + note_ids
if source_candidates:
out_f = models.Filter(must=[
models.FieldCondition(key="source_id", match=models.MatchAny(any=source_candidates)),
# FIX: Pydantic "except" keyword workaround
# FIX: MatchExcept mit **kwargs nutzen wegen 'except' Keyword
models.FieldCondition(key="kind", match=models.MatchExcept(**{"except": SYSTEM_EDGES}))
])
res_out, _ = self.client.scroll(self.edges_col, scroll_filter=out_f, limit=100, with_payload=True)
@@ -90,7 +95,7 @@ class GraphExplorerService:
if shoulds:
in_f = models.Filter(
# FIX: Pydantic "except" keyword workaround
# FIX: MatchExcept mit **kwargs nutzen wegen 'except' Keyword
must=[models.FieldCondition(key="kind", match=models.MatchExcept(**{"except": SYSTEM_EDGES}))],
should=shoulds
)
@@ -110,6 +115,7 @@ class GraphExplorerService:
kind = payload.get("kind")
provenance = payload.get("provenance", "explicit")
# Resolve
src_note = self._resolve_note_from_ref(src_ref)
tgt_note = self._resolve_note_from_ref(tgt_ref)
@@ -118,12 +124,15 @@ class GraphExplorerService:
tgt_id = tgt_note['note_id']
if src_id != tgt_id:
# Add Nodes
self._add_node_to_dict(nodes_dict, src_note, level=current_depth)
self._add_node_to_dict(nodes_dict, tgt_note, level=current_depth)
# Add Edge (Deduplication Logic)
key = (src_id, tgt_id)
existing = unique_edges.get(key)
# Update logic: Explicit > Smart
should_update = True
is_current_explicit = (provenance in ["explicit", "rule"])
if existing:
@@ -183,7 +192,9 @@ class GraphExplorerService:
ntype = note_payload.get("type", "default")
color = GRAPH_COLORS.get(ntype, GRAPH_COLORS["default"])
# Size Adjustment für Hierarchie
# HOVER TEXT: Vorschau bauen
hover_text = f"Titel: {note_payload.get('title')}\nTyp: {ntype}\nTags: {note_payload.get('tags', [])}"
if level == 0: size = 45
elif level == 1: size = 25
else: size = 15
@@ -194,6 +205,6 @@ class GraphExplorerService:
size=size,
color=color,
shape="dot" if level > 0 else "diamond",
title=f"Type: {ntype}\nTags: {note_payload.get('tags')}",
title=hover_text, # Hover im Browser
font={'color': 'black', 'face': 'arial', 'size': 14 if level < 2 else 0}
)