adai/MemoryBear
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

检查项目，修复group_id的遗留问题

Browse Source
This commit is contained in:
lixinyue
2026-01-23 10:35:41 +08:00
parent 9e828b1750
commit 86fe6fe5ab
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/app/core/memory/evaluation/longmemeval/qwen_search_eval.py
View File

@@ -1009,7 +1009,7 @@ async def run_longmemeval_test(
kw_fallback = await search_graph( kw_fallback = await search_graph(
connector=connector, connector=connector,
q=question, q=question,
group_id=group_id, end_user_id=end_user_id,
limit=max(search_limit, 5), limit=max(search_limit, 5),
) )
fb_dialogs = kw_fallback.get("dialogues", []) or [] fb_dialogs = kw_fallback.get("dialogues", []) or []
@@ -1223,7 +1223,7 @@ async def run_longmemeval_test(
"count_avg": statistics.mean(per_query_context_counts) if per_query_context_counts else 0.0, "count_avg": statistics.mean(per_query_context_counts) if per_query_context_counts else 0.0,
}, },
"params": { "params": {
"group_id": group_id, "end_user_id": end_user_id,
"search_limit": search_limit, "search_limit": search_limit,
"context_char_budget": context_char_budget, "context_char_budget": context_char_budget,
"search_type": search_type, "search_type": search_type,

8
api/app/core/memory/evaluation/longmemeval/test_eval.py
View File

@@ -876,7 +876,7 @@ async def run_longmemeval_test(
opt_res = await search_graph( opt_res = await search_graph(
connector=connector, connector=connector,
q=str(opt), q=str(opt),
end_user_id=group_id, end_user_id=end_user_id,
limit=max(3, search_limit // 2), limit=max(3, search_limit // 2),
) )
if isinstance(opt_res, dict): if isinstance(opt_res, dict):
@@ -971,7 +971,7 @@ async def run_longmemeval_test(
kw_fallback = await search_graph( kw_fallback = await search_graph(
connector=connector, connector=connector,
q=question, q=question,
group_id=group_id, end_user_id=end_user_id,
limit=max(search_limit, 5), limit=max(search_limit, 5),
) )
fb_dialogs = kw_fallback.get("dialogues", []) or [] fb_dialogs = kw_fallback.get("dialogues", []) or []
@@ -1199,7 +1199,7 @@ async def run_longmemeval_test(
"count_avg": statistics.mean(per_query_context_counts) if per_query_context_counts else 0.0, "count_avg": statistics.mean(per_query_context_counts) if per_query_context_counts else 0.0,
}, },
"params": { "params": {
"group_id": group_id, "end_user_id": end_user_id,
"search_limit": search_limit, "search_limit": search_limit,
"context_char_budget": context_char_budget, "context_char_budget": context_char_budget,
"search_type": search_type, "search_type": search_type,
@@ -1278,7 +1278,7 @@ def main():
result = asyncio.run( result = asyncio.run(
run_longmemeval_test( run_longmemeval_test(
sample_size=sample_size, sample_size=sample_size,
group_id=args.group_id, end_user_id=args.end_user_id,
search_limit=args.search_limit, search_limit=args.search_limit,
context_char_budget=args.context_char_budget, context_char_budget=args.context_char_budget,
llm_temperature=args.llm_temperature, llm_temperature=args.llm_temperature,

2
api/app/models/memory_config_model.py
View File

@@ -17,7 +17,7 @@ class MemoryConfig(Base):
# 组织信息 # 组织信息
workspace_id = Column(UUID(as_uuid=True), nullable=True, comment="工作空间ID") workspace_id = Column(UUID(as_uuid=True), nullable=True, comment="工作空间ID")
group_id = Column(String, nullable=True, comment="组ID") end_user_id = Column(String, nullable=True, comment="组ID")
user_id = Column(String, nullable=True, comment="用户ID") user_id = Column(String, nullable=True, comment="用户ID")
apply_id = Column(String, nullable=True, comment="应用ID") apply_id = Column(String, nullable=True, comment="应用ID")

8
api/app/repositories/neo4j/memory_summary_repository.py
View File

@@ -217,14 +217,14 @@ class MemorySummaryRepository(BaseNeo4jRepository):
async def find_by_content_keywords( async def find_by_content_keywords(
self, self,
group_id: str, end_user_id: str,
keywords: List[str], keywords: List[str],
limit: int = 100 limit: int = 100
) -> List[Dict[str, Any]]: ) -> List[Dict[str, Any]]:
"""Query memory summaries by content keywords """Query memory summaries by content keywords
Args: Args:
group_id: Group ID to filter by end_user_id: Group ID to filter by
keywords: List of keywords to search for in content keywords: List of keywords to search for in content
limit: Maximum number of results to return limit: Maximum number of results to return
@@ -233,7 +233,7 @@ class MemorySummaryRepository(BaseNeo4jRepository):
""" """
# Build keyword search conditions # Build keyword search conditions
keyword_conditions = [] keyword_conditions = []
params = {"end_user_id": group_id, "limit": limit} params = {"end_user_id": end_user_id, "limit": limit}
for i, keyword in enumerate(keywords): for i, keyword in enumerate(keywords):
keyword_conditions.append(f"toLower(n.content) CONTAINS toLower($keyword_{i})") keyword_conditions.append(f"toLower(n.content) CONTAINS toLower($keyword_{i})")
@@ -257,7 +257,7 @@ class MemorySummaryRepository(BaseNeo4jRepository):
"""Get count of memory summaries for a group """Get count of memory summaries for a group
Args: Args:
group_id: Group ID to count summaries for end_user_id: Group ID to count summaries for
Returns: Returns:
int: Number of memory summaries int: Number of memory summaries