opensource/dify
2
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-04-28 11:56:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: use underscore as separator for node_id and memory_id

Browse Source
This commit is contained in:
Stream 2025-11-05 17:38:13 +08:00
parent f0ff2e1f2c
commit e47133569b
No known key found for this signature in database
GPG Key ID: 033728094B100D70
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/core/app/apps/advanced_chat/app_runner.py
View File

@ -464,7 +464,7 @@ class AdvancedChatAppRunner(WorkflowBasedAppRunner):
if not node_id: if not node_id:
logger.warning("Memory block %s has no node_id, skip.", memory.spec.id) logger.warning("Memory block %s has no node_id, skip.", memory.spec.id)
continue continue
key = f"{node_id}.{memory.spec.id}" key = f"{node_id}_{memory.spec.id}"
memory_blocks_dict[key] = memory.value memory_blocks_dict[key] = memory.value
return memory_blocks_dict return memory_blocks_dict

4
api/services/chatflow_memory_service.py
View File

@ -105,7 +105,7 @@ class ChatflowMemoryService:
@staticmethod @staticmethod
def save_memory(memory: MemoryBlock, variable_pool: VariablePool, is_draft: bool) -> None: def save_memory(memory: MemoryBlock, variable_pool: VariablePool, is_draft: bool) -> None:
key = f"{memory.node_id}.{memory.spec.id}" if memory.node_id else memory.spec.id key = f"{memory.node_id}_{memory.spec.id}" if memory.node_id else memory.spec.id
variable_pool.add([MEMORY_BLOCK_VARIABLE_NODE_ID, key], memory.value) variable_pool.add([MEMORY_BLOCK_VARIABLE_NODE_ID, key], memory.value)
if memory.created_by.account_id: if memory.created_by.account_id:
created_by_role = CreatorUserRole.ACCOUNT created_by_role = CreatorUserRole.ACCOUNT
@ -139,7 +139,7 @@ class ChatflowMemoryService:
if is_draft: if is_draft:
with Session(bind=db.engine) as session: with Session(bind=db.engine) as session:
draft_var_service = WorkflowDraftVariableService(session) draft_var_service = WorkflowDraftVariableService(session)
memory_selector = memory.spec.id if not memory.node_id else f"{memory.node_id}.{memory.spec.id}" memory_selector = memory.spec.id if not memory.node_id else f"{memory.node_id}_{memory.spec.id}"
existing_vars = draft_var_service.get_draft_variables_by_selectors( existing_vars = draft_var_service.get_draft_variables_by_selectors(
app_id=memory.app_id, app_id=memory.app_id,
selectors=[[MEMORY_BLOCK_VARIABLE_NODE_ID, memory_selector]] selectors=[[MEMORY_BLOCK_VARIABLE_NODE_ID, memory_selector]]

2
api/services/workflow_service.py
View File

@ -1086,6 +1086,6 @@ def _fetch_memory_blocks(
if memory.spec.scope == MemoryScope.APP: if memory.spec.scope == MemoryScope.APP:
memory_blocks[memory.spec.id] = memory.value memory_blocks[memory.spec.id] = memory.value
else: # NODE scope else: # NODE scope
memory_blocks[f"{memory.node_id}.{memory.spec.id}"] = memory.value memory_blocks[f"{memory.node_id}_{memory.spec.id}"] = memory.value
return memory_blocks return memory_blocks