[changes] Queue uniformity, query statement uniformity
This commit is contained in:
@@ -200,7 +200,6 @@ async def get_workspace_end_users(
|
|||||||
from app.tasks import init_community_clustering_for_users
|
from app.tasks import init_community_clustering_for_users
|
||||||
init_community_clustering_for_users.apply_async(
|
init_community_clustering_for_users.apply_async(
|
||||||
kwargs={"end_user_ids": end_user_ids},
|
kwargs={"end_user_ids": end_user_ids},
|
||||||
queue="periodic_tasks",
|
|
||||||
)
|
)
|
||||||
api_logger.info(f"已触发社区聚类补全任务,候选用户数: {len(end_user_ids)}")
|
api_logger.info(f"已触发社区聚类补全任务,候选用户数: {len(end_user_ids)}")
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
|
|||||||
@@ -1184,3 +1184,21 @@ RETURN DISTINCT
|
|||||||
nb.activation_value AS activation_value,
|
nb.activation_value AS activation_value,
|
||||||
CASE WHEN c IS NOT NULL THEN c.community_id ELSE null END AS community_id
|
CASE WHEN c IS NOT NULL THEN c.community_id ELSE null END AS community_id
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
GET_COMMUNITY_GRAPH_DATA = """
|
||||||
|
MATCH (c:Community {end_user_id: $end_user_id})
|
||||||
|
MATCH (e:ExtractedEntity {end_user_id: $end_user_id})-[b:BELONGS_TO_COMMUNITY]->(c)
|
||||||
|
OPTIONAL MATCH (e)-[r:EXTRACTED_RELATIONSHIP]-(e2:ExtractedEntity {end_user_id: $end_user_id})
|
||||||
|
RETURN
|
||||||
|
elementId(c) AS c_id,
|
||||||
|
properties(c) AS c_props,
|
||||||
|
elementId(e) AS e_id,
|
||||||
|
properties(e) AS e_props,
|
||||||
|
elementId(b) AS b_id,
|
||||||
|
elementId(e2) AS e2_id,
|
||||||
|
properties(e2) AS e2_props,
|
||||||
|
elementId(r) AS r_id,
|
||||||
|
type(r) AS r_type,
|
||||||
|
properties(r) AS r_props,
|
||||||
|
startNode(r) = e AS r_from_e
|
||||||
|
"""
|
||||||
|
|||||||
@@ -1749,24 +1749,8 @@ async def analytics_community_graph_data(
|
|||||||
}
|
}
|
||||||
|
|
||||||
# 查询社区节点、实体节点、BELONGS_TO_COMMUNITY 边、实体间关系
|
# 查询社区节点、实体节点、BELONGS_TO_COMMUNITY 边、实体间关系
|
||||||
cypher = """
|
from app.repositories.neo4j.cypher_queries import GET_COMMUNITY_GRAPH_DATA
|
||||||
MATCH (c:Community {end_user_id: $end_user_id})
|
rows = await _neo4j_connector.execute_query(GET_COMMUNITY_GRAPH_DATA, end_user_id=end_user_id)
|
||||||
MATCH (e:ExtractedEntity {end_user_id: $end_user_id})-[b:BELONGS_TO_COMMUNITY]->(c)
|
|
||||||
OPTIONAL MATCH (e)-[r:EXTRACTED_RELATIONSHIP]-(e2:ExtractedEntity {end_user_id: $end_user_id})
|
|
||||||
RETURN
|
|
||||||
elementId(c) AS c_id,
|
|
||||||
properties(c) AS c_props,
|
|
||||||
elementId(e) AS e_id,
|
|
||||||
properties(e) AS e_props,
|
|
||||||
elementId(b) AS b_id,
|
|
||||||
elementId(e2) AS e2_id,
|
|
||||||
properties(e2) AS e2_props,
|
|
||||||
elementId(r) AS r_id,
|
|
||||||
type(r) AS r_type,
|
|
||||||
properties(r) AS r_props,
|
|
||||||
startNode(r) = e AS r_from_e
|
|
||||||
"""
|
|
||||||
rows = await _neo4j_connector.execute_query(cypher, end_user_id=end_user_id)
|
|
||||||
|
|
||||||
nodes_map: Dict[str, dict] = {}
|
nodes_map: Dict[str, dict] = {}
|
||||||
edges_map: Dict[str, dict] = {}
|
edges_map: Dict[str, dict] = {}
|
||||||
|
|||||||
Reference in New Issue
Block a user