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

Merge pull request #312 from SuanmoSuanyangTechnology/fix/release_memory_bug

Browse Source 
Fix/release memory bug
This commit is contained in:
Mark
2026-02-04 18:08:12 +08:00
committed by GitHub
parent 2d7401922f 34276e2066
commit cc1528f550
2 changed files with 31 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
api/app/core/memory/agent/langgraph_graph/routing/write_router.py
View File

@@ -18,7 +18,6 @@ from app.services.memory_konwledges_server import write_rag
from app.services.task_service import get_task_memory_write_result from app.services.task_service import get_task_memory_write_result
from app.tasks import write_message_task from app.tasks import write_message_task
from app.utils.config_utils import resolve_config_id from app.utils.config_utils import resolve_config_id
logger = get_agent_logger(__name__) logger = get_agent_logger(__name__)
template_root = os.path.join(PROJECT_ROOT_, 'memory', 'agent', 'utils', 'prompt') template_root = os.path.join(PROJECT_ROOT_, 'memory', 'agent', 'utils', 'prompt')
@@ -95,29 +94,24 @@ async def write(storage_type, end_user_id, user_message, ai_message, user_rag_me
async def term_memory_save(long_term_messages,actual_config_id,end_user_id,type,scope): async def term_memory_save(long_term_messages,actual_config_id,end_user_id,type,scope):
with get_db_context() as db_session: with get_db_context() as db_session:
try: repo = LongTermMemoryRepository(db_session)
repo = LongTermMemoryRepository(db_session) await long_term_storage(long_term_type=AgentMemory_Long_Term.STRATEGY_CHUNK, langchain_messages=long_term_messages,
await long_term_storage(long_term_type=AgentMemory_Long_Term.STRATEGY_CHUNK, langchain_messages=long_term_messages, memory_config=actual_config_id, end_user_id=end_user_id, scope=scope)
memory_config=actual_config_id, end_user_id=end_user_id, scope=scope)
from app.core.memory.agent.utils.redis_tool import write_store
result = write_store.get_session_by_userid(end_user_id)
if type==AgentMemory_Long_Term.STRATEGY_CHUNK or AgentMemory_Long_Term.STRATEGY_AGGREGATE:
data = await format_parsing(result, "dict")
chunk_data = data[:scope]
if len(chunk_data)==scope:
repo.upsert(end_user_id, chunk_data)
logger.info(f'---------写入短长期-----------')
else:
long_time_data = write_store.find_user_recent_sessions(end_user_id, 5)
long_messages = await messages_parse(long_time_data)
repo.upsert(end_user_id, long_messages)
logger.info(f'写入短长期：')
from app.core.memory.agent.utils.redis_tool import write_store
result = write_store.get_session_by_userid(end_user_id)
if type==AgentMemory_Long_Term.STRATEGY_CHUNK or AgentMemory_Long_Term.STRATEGY_AGGREGATE:
data = await format_parsing(result, "dict")
chunk_data = data[:scope]
if len(chunk_data)==scope:
repo.upsert(end_user_id, chunk_data)
logger.info(f'---------写入短长期-----------')
else:
long_time_data = write_store.find_user_recent_sessions(end_user_id, 5)
long_messages = await messages_parse(long_time_data)
repo.upsert(end_user_id, long_messages)
logger.info(f'写入短长期：')
# yield db_session
finally:
if db_session.in_transaction():
db_session.rollback()
db_session.close()
'''根据窗口''' '''根据窗口'''

33
api/app/core/memory/agent/langgraph_graph/write_graph.py
View File

@@ -47,25 +47,20 @@ async def long_term_storage(long_term_type:str="chunk",langchain_messages:list=[
write_store.save_session_write(end_user_id, (langchain_messages)) write_store.save_session_write(end_user_id, (langchain_messages))
# 获取数据库会话 # 获取数据库会话
with get_db_context() as db_session: with get_db_context() as db_session:
try: config_service = MemoryConfigService(db_session)
config_service = MemoryConfigService(db_session) memory_config = config_service.load_memory_config(
memory_config = config_service.load_memory_config( config_id=memory_config, # 改为整数
config_id=memory_config, # 改为整数 service_name="MemoryAgentService"
service_name="MemoryAgentService" )
) if long_term_type=='chunk':
if long_term_type=='chunk': '''方案一:对话窗口6轮对话'''
'''方案一:对话窗口6轮对话''' await window_dialogue(end_user_id,langchain_messages,memory_config,scope)
await window_dialogue(end_user_id,langchain_messages,memory_config,scope) if long_term_type=='time':
if long_term_type=='time': """时间"""
"""时间""" await memory_long_term_storage(end_user_id, memory_config,5)
await memory_long_term_storage(end_user_id, memory_config,5) if long_term_type=='aggregate':
if long_term_type=='aggregate': """方案三：聚合判断"""
"""方案三：聚合判断""" await aggregate_judgment(end_user_id, langchain_messages, memory_config)
await aggregate_judgment(end_user_id, langchain_messages, memory_config)
finally:
if db_session.in_transaction():
db_session.rollback()
db_session.close()