From ba2ff053f97d83638478bd0ab0bbbc34eb7afc5d Mon Sep 17 00:00:00 2001
From: lixinyue <2569494688@qq.com>
Date: Wed, 14 Jan 2026 14:48:37 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=AF=A6=E6=83=85=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/app/schemas/memory_storage_schema.py      | 20 +++++++++++++++++++
 .../memory_entity_relationship_service.py     |  2 +-
 api/app/services/user_memory_service.py       |  6 ++++--
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/api/app/schemas/memory_storage_schema.py b/api/app/schemas/memory_storage_schema.py
index ecb1570f..77afe052 100644
--- a/api/app/schemas/memory_storage_schema.py
+++ b/api/app/schemas/memory_storage_schema.py
@@ -11,6 +11,26 @@ from pydantic import BaseModel, Field, ConfigDict, field_validator, model_valida
 # ============================================================================
 # 原 UserInput 相关 Schema (保留原有功能)
 # ============================================================================
+type_mapping = {
+            "Person": "人物实体节点",
+            "Organization": "组织实体节点",
+            "ORG": "组织实体节点",
+            "Location": "地点实体节点",
+            "LOC": "地点实体节点",
+            "Event": "事件实体节点",
+            "Concept": "概念实体节点",
+            "Time": "时间实体节点",
+            "Position": "职位实体节点",
+            "WorkRole": "职业实体节点",
+            "System": "系统实体节点",
+            "Policy": "政策实体节点",
+            "HistoricalPeriod": "历史时期实体节点",
+            "HistoricalState": "历史国家实体节点",
+            "HistoricalEvent": "历史事件实体节点",
+            "EconomicFactor": "经济因素实体节点",
+            "Condition": "条件实体节点",
+            "Numeric": "数值实体节点"
+        }
 class UserInput(BaseModel):
     message: str
     history: list[dict]
diff --git a/api/app/services/memory_entity_relationship_service.py b/api/app/services/memory_entity_relationship_service.py
index f650217d..8baf038e 100644
--- a/api/app/services/memory_entity_relationship_service.py
+++ b/api/app/services/memory_entity_relationship_service.py
@@ -123,7 +123,7 @@ class MemoryEntityService:
         extracted_entity_list = self._deduplicate_dict_list(extracted_entity_list)
         
         # 合并所有数据并处理相同text的合并
-        all_timeline_data = memory_summary_list + statement_list + extracted_entity_list
+        all_timeline_data = memory_summary_list + statement_list
         all_timeline_data = self._merge_same_text_items(all_timeline_data)
         
         result = {
diff --git a/api/app/services/user_memory_service.py b/api/app/services/user_memory_service.py
index 59bbc211..52bddbcb 100644
--- a/api/app/services/user_memory_service.py
+++ b/api/app/services/user_memory_service.py
@@ -15,6 +15,7 @@ from app.core.memory.utils.llm.llm_utils import MemoryClientFactory
 from app.db import get_db_context
 from app.repositories.end_user_repository import EndUserRepository
 from app.repositories.neo4j.neo4j_connector import Neo4jConnector
+from app.schemas.memory_storage_schema import type_mapping
 from app.services.memory_base_service import MemoryBaseService
 from app.services.memory_config_service import MemoryConfigService
 from pydantic import BaseModel, Field
@@ -1332,7 +1333,7 @@ async def analytics_graph_data(
     db: Session,
     end_user_id: str,
     node_types: Optional[List[str]] = None,
-    limit: int = 100,
+    limit: int = 130,
     depth: int = 1,
     center_node_id: Optional[str] = None
 ) -> Dict[str, Any]:
@@ -1576,10 +1577,11 @@ async  def _extract_node_properties(label: str, properties: Dict[str, Any],node_
     for field in allowed_fields:
         if field in properties:
             value = properties[field]
+            if str(field) == 'entity_type':
+                value=type_mapping.get(value,'')
             # 清理 Neo4j 特殊类型
             filtered_props[field] = _clean_neo4j_value(value)
     filtered_props['associative_memory']=[i['rel_count'] for i in node_results][0]
-    print(filtered_props)
     return filtered_props