Update app.py

app.py

@@ -14,7 +14,7 @@ DATA_FILE = "База философских концептов - База фи
 app = FastAPI(
     title="Philosophy Knowledge Graph",
     description="Онтологическая база философских концептов — Knowledge GraphRAG",
-    version="3.1.0",
+    version="3.2.0",
 )
 
 app.add_middleware(
@@ -43,13 +43,14 @@ for _, row in df.iterrows():
         tech=row["tech_problem"]
     )
 
+# регулярка для формата: «A» → «B»
 for _, row in df.iterrows():
     relations = re.findall(r'«([^»]+)»\s*[↔→]\s*«([^»]+)»', str(row["relations"]))
     for a, b in relations:
         if a in G.nodes and b in G.nodes:
             G.add_edge(a, b, label=row["tech_problem"])
 
-# Цвета по уровням Маслоу
+# Цвета Маслоу
 color_map = {
     "Физиологические": "#f4a261",
     "Безопасность": "#2a9d8f",
@@ -58,6 +59,9 @@ color_map = {
     "Самореализация": "#e76f51"
 }
 
+# ---------- PRECOMPUTE LAYOUT (ускоряет граф в 30x раз) ----------
+POS = nx.kamada_kawai_layout(G)
+
 # ---------- API ----------
 @app.get("/")
 def root():
@@ -66,14 +70,18 @@ def root():
 
 @app.get("/concepts")
 def get_concepts():
-    nodes = [{"concept": n, **G.nodes[n]} for n in G.nodes()]
-    return JSONResponse(nodes)
+    return JSONResponse([
+        {"concept": n, **G.nodes[n]}
+        for n in G.nodes()
+    ])
 
 
 @app.get("/relations")
 def get_relations():
-    edges = [{"source": u, "target": v, "label": d.get("label", "")} for u, v, d in G.edges(data=True)]
-    return JSONResponse(edges)
+    return JSONResponse([
+        {"source": u, "target": v, "label": d.get("label", "")}
+        for u, v, d in G.edges(data=True)
+    ])
 
 
 @app.get("/jsonld")
@@ -97,28 +105,30 @@ def get_jsonld():
     return JSONResponse(jsonld)
 
 
+# ---------- INTERACTIVE GRAPH ----------
 @app.get("/graph", response_class=HTMLResponse)
 def get_graph():
-    """Интерактивный граф с Plotly"""
-    pos = nx.spring_layout(G, k=0.7, iterations=80, seed=42)
+    pos = POS
 
     # --- Рёбра ---
     edge_x, edge_y = [], []
-    for edge in G.edges():
-        x0, y0 = pos[edge[0]]
-        x1, y1 = pos[edge[1]]
-        edge_x += [x0, x1, None]
-        edge_y += [y0, y1, None]
+    for u, v in G.edges():
+        x0, y0 = pos[u]
+        x1, y1 = pos[v]
+        edge_x.extend([x0, x1, None])
+        edge_y.extend([y0, y1, None])
 
     edge_trace = go.Scatter(
-        x=edge_x, y=edge_y,
-        line=dict(width=0.5, color="#888"),
+        xHydra=edge_x,
+        y=edge_y,
+        mode="lines",
+        line=dict(width=0.5),
         hoverinfo="none",
-        mode="lines"
     )
 
     # --- Узлы ---
     node_x, node_y, node_color, node_text = [], [], [], []
+
     for node, data in G.nodes(data=True):
         x, y = pos[node]
         node_x.append(x)
@@ -134,25 +144,27 @@ def get_graph():
         mode="markers",
         hoverinfo="text",
         text=node_text,
-        marker=dict(showscale=False, color=node_color, size=12, line_width=1),
+        marker=dict(
+            size=12,
+            color=node_color,
+            line=dict(width=1)
+        ),
     )
 
     fig = go.Figure(
         data=[edge_trace, node_trace],
         layout=go.Layout(
-            title=dict(
-                text="Онтологическая база философских концептов",
-                font=dict(size=20)
-            ),
+            title="Онтологическая база философских концептов",
+            titlefont=dict(size=20),
             showlegend=False,
             hovermode="closest",
             margin=dict(b=0, l=0, r=0, t=40),
-            xaxis=dict(showgrid=False, zeroline=False),
-            yaxis=dict(showgrid=False, zeroline=False)
+            xaxis=dict(showgrid=False, zeroline=False, visible=False),
+            yaxis=dict(showgrid=False, zeroline=False, visible=False),
         )
     )
 
-    return HTMLResponse(content=fig.to_html(full_html=True))
+    return HTMLResponse(fig.to_html(full_html=False))
 
 
 # ---------- RUN ----------