Update app.py

app.py

@@ -9,14 +9,12 @@ import os
 
 # ---------- CONFIG ----------
 DATA_FILE = "База философских концептов - База философских концептов.csv"
-NODES_FILE = "nodes.csv"
-EDGES_FILE = "edges.csv"
 
 # ---------- APP SETUP ----------
 app = FastAPI(
     title="Philosophy Knowledge Graph",
     description="Онтологическая база философских концептов — Knowledge GraphRAG",
-    version="2.1.0",
+    version="3.0.0",
 )
 
 app.add_middleware(
@@ -35,38 +33,29 @@ df = df.fillna("")
 G = nx.DiGraph()
 
 for _, row in df.iterrows():
-    concept = row["concept"]
     G.add_node(
-        concept,
+        row["concept"],
         definition=row["definition"],
-        source=row["source"],
-        author=row["author"],
-        tech_problem=row["tech_problem"],
-        needs_level=row["needs_level"],
+        needs=row["needs_level"],
+        tech=row["tech_problem"]
     )
 
-    # добавляем связи из поля relations
-    if row["relations"]:
-        relations = re.findall(r'«([^»]+)»\s*[↔→]\s*«([^»]+)»', str(row["relations"]))
-        for a, b in relations:
-            if a in df["concept"].values and b in df["concept"].values:
-                G.add_edge(a, b, label=row["tech_problem"])
-
-# связи с тех. проблемами и потребностями
 for _, row in df.iterrows():
-    if row["tech_problem"]:
-        G.add_edge(row["concept"], row["tech_problem"])
-    if row["needs_level"]:
-        G.add_edge(row["concept"], row["needs_level"])
-
-# ---------- EXPORT FOR NEO4J ----------
-nodes_data = [{"id": n, **G.nodes[n]} for n in G.nodes()]
-edges_data = [{"source": u, "target": v} for u, v in G.edges()]
-
-pd.DataFrame(nodes_data).to_csv(NODES_FILE, index=False)
-pd.DataFrame(edges_data).to_csv(EDGES_FILE, index=False)
-
-# ---------- ROUTES ----------
+    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",
+    "Принадлежность": "#e9c46a",
+    "Самоуважение": "#264653",
+    "Самореализация": "#e76f51"
+}
+
+# ---------- API ----------
 @app.get("/")
 def root():
     return {"message": "Philosophy Knowledge Graph API — работает!"}
@@ -74,28 +63,44 @@ def root():
 
 @app.get("/concepts")
 def get_concepts():
-    return JSONResponse(nodes_data)
+    nodes = [{"concept": n, **G.nodes[n]} for n in G.nodes()]
+    return JSONResponse(nodes)
 
 
 @app.get("/relations")
 def get_relations():
-    return JSONResponse(edges_data)
+    edges = [{"source": u, "target": v, "label": d.get("label", "")} for u, v, d in G.edges(data=True)]
+    return JSONResponse(edges)
+
+
+@app.get("/jsonld")
+def get_jsonld():
+    jsonld = {
+        "@context": {
+            "concept": "http://example.org/concept",
+            "definition": "http://example.org/definition",
+            "relation": "http://example.org/relation"
+        },
+        "@graph": []
+    }
+    for node, data in G.nodes(data=True):
+        jsonld["@graph"].append({
+            "@id": f"http://example.org/{node.replace(' ', '_')}",
+            "concept": node,
+            "definition": data.get("definition", ""),
+            "tech_problem": data.get("tech", ""),
+            "needs_level": data.get("needs", "")
+        })
+    return JSONResponse(jsonld)
 
 
 @app.get("/graph", response_class=HTMLResponse)
 def get_graph():
-    """Интерактивный граф (Plotly)"""
-    color_map = {
-        "Физиологические": "#f4a261",
-        "Безопасность": "#2a9d8f",
-        "Принадлежность": "#e9c46a",
-        "Самоуважение": "#264653",
-        "Самореализация": "#e76f51",
-    }
+    """Интерактивный граф с Plotly"""
+    pos = nx.spring_layout(G, k=0.7, iterations=80, seed=42)
 
-    pos = nx.spring_layout(G, k=0.7, iterations=80)
+    # --- Рёбра ---
     edge_x, edge_y = [], []
-
     for edge in G.edges():
         x0, y0 = pos[edge[0]]
         x1, y1 = pos[edge[1]]
@@ -104,26 +109,26 @@ def get_graph():
 
     edge_trace = go.Scatter(
         x=edge_x, y=edge_y,
-        line=dict(width=0.5, color="#888"),
-        hoverinfo="none",
-        mode="lines",
+        line=dict(width=0.5, color='#888'),
+        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)
         node_y.append(y)
-        need_level = data.get("needs_level", "")
-        node_color.append(color_map.get(need_level, "#8d99ae"))
+        node_color.append(color_map.get(data['needs'], '#8d99ae'))
         node_text.append(
-            f"<b>{node}</b><br>{data.get('definition','')}<br><i>{data.get('tech_problem','')}</i>"
+            f"<b>{node}</b><br>{data['definition']}<br><i>{data['tech']}</i>"
         )
 
     node_trace = go.Scatter(
         x=node_x, y=node_y,
-        mode="markers",
-        hoverinfo="text",
+        mode='markers',
+        hoverinfo='text',
         text=node_text,
         marker=dict(showscale=False, color=node_color, size=12, line_width=1),
     )
@@ -134,40 +139,16 @@ def get_graph():
             title="Онтологическая база философских концептов",
             titlefont_size=20,
             showlegend=False,
-            hovermode="closest",
+            hovermode='closest',
             margin=dict(b=0, l=0, r=0, t=40),
             xaxis=dict(showgrid=False, zeroline=False),
-            yaxis=dict(showgrid=False, zeroline=False),
-        ),
+            yaxis=dict(showgrid=False, zeroline=False)
+        )
     )
 
     return HTMLResponse(content=fig.to_html(full_html=True))
 
 
-@app.get("/jsonld")
-def get_jsonld():
-    """Экспорт в машиночитаемом формате JSON-LD"""
-    jsonld = {
-        "@context": {
-            "concept": "http://example.org/concept",
-            "definition": "http://example.org/definition",
-            "relation": "http://example.org/relation",
-        },
-        "@graph": [],
-    }
-    for node, data in G.nodes(data=True):
-        jsonld["@graph"].append(
-            {
-                "@id": f"http://example.org/{node.replace(' ', '_')}",
-                "concept": node,
-                "definition": data.get("definition", ""),
-                "tech_problem": data.get("tech_problem", ""),
-                "needs_level": data.get("needs_level", ""),
-            }
-        )
-    return JSONResponse(jsonld)
-
-
 # ---------- RUN ----------
 if __name__ == "__main__":
     import uvicorn