mirror of https://github.com/langgenius/dify.git
refactor: use underscore as separator for node_id and memory_id
This commit is contained in:
parent
f0ff2e1f2c
commit
e47133569b
|
|
@ -464,7 +464,7 @@ class AdvancedChatAppRunner(WorkflowBasedAppRunner):
|
|||
if not node_id:
|
||||
logger.warning("Memory block %s has no node_id, skip.", memory.spec.id)
|
||||
continue
|
||||
key = f"{node_id}.{memory.spec.id}"
|
||||
key = f"{node_id}_{memory.spec.id}"
|
||||
memory_blocks_dict[key] = memory.value
|
||||
|
||||
return memory_blocks_dict
|
||||
|
|
|
|||
|
|
@ -105,7 +105,7 @@ class ChatflowMemoryService:
|
|||
|
||||
@staticmethod
|
||||
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)
|
||||
if memory.created_by.account_id:
|
||||
created_by_role = CreatorUserRole.ACCOUNT
|
||||
|
|
@ -139,7 +139,7 @@ class ChatflowMemoryService:
|
|||
if is_draft:
|
||||
with Session(bind=db.engine) as 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(
|
||||
app_id=memory.app_id,
|
||||
selectors=[[MEMORY_BLOCK_VARIABLE_NODE_ID, memory_selector]]
|
||||
|
|
|
|||
|
|
@ -1086,6 +1086,6 @@ def _fetch_memory_blocks(
|
|||
if memory.spec.scope == MemoryScope.APP:
|
||||
memory_blocks[memory.spec.id] = memory.value
|
||||
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
|
||||
|
|
|
|||
Loading…
Reference in New Issue