opensource
/
dify
mirror of https://github.com/langgenius/dify.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor: update MemoryApi(Resource) for version

This commit is contained in:
Stream 2025-09-16 19:25:17 +08:00
parent 3005cf3282
commit ac5dd1f45a
No known key found for this signature in database
GPG Key ID: 033728094B100D70
1 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
api/controllers/service_api/app/chatflow_memory.py
View File

@ -3,6 +3,8 @@ from sqlalchemy.orm import Session
from controllers.service_api import api
from controllers.service_api.wraps import FetchUserArg, WhereisUserArg, validate_app_token
from core.memory.entities import MemoryBlock
from core.workflow.entities.variable_pool import VariablePool
from libs.helper import uuid_value
from models import db
from models.chatflow_memory import ChatflowMemoryVariable
@ -14,53 +16,51 @@ class MemoryListApi(Resource):
@validate_app_token(fetch_user_arg=FetchUserArg(fetch_from=WhereisUserArg.JSON, required=True))
def get(self, app_model):
parser = reqparse.RequestParser()
parser.add_argument("conversation_id", required=False, type=uuid_value, location="args")
parser.add_argument("conversation_id", required=False, type=str | None, default=None)
parser.add_argument("memory_id", required=False, type=str | None, default=None)
parser.add_argument("version", required=False, type=int | None, default=None)
args = parser.parse_args()
conversation_id = args.get("conversation_id")
memory_id = args.get("memory_id")
version = args.get("version")
result = ChatflowMemoryService.get_persistent_memories(app_model)
result = ChatflowMemoryService.get_persistent_memories(app_model, version)
if conversation_id:
result = [*result, *ChatflowMemoryService.get_session_memories(app_model, conversation_id)]
return result
result = [*result, *ChatflowMemoryService.get_session_memories(app_model, conversation_id, version)]
if memory_id:
result = [it for it in result if it.memory_id == memory_id]
return [it for it in result if it.end_user_visible]
class MemoryEditApi(Resource):
@validate_app_token(fetch_user_arg=FetchUserArg(fetch_from=WhereisUserArg.JSON, required=True))
def put(self, app_model):
parser = reqparse.RequestParser()
parser.add_argument('id', type=str, required=True)
parser.add_argument('node_id', type=str, required=False, default=None)
parser.add_argument("conversation_id", type=str | None, required=False, default=None)
parser.add_argument('node_id', type=str | None, required=False, default=None)
parser.add_argument('update', type=str, required=True)
args = parser.parse_args()
workflow = WorkflowService().get_published_workflow(app_model)
update = args.get("update")
conversation_id = args.get("conversation_id")
node_id = args.get("node_id")
if not workflow:
return {'error': 'Workflow not found'}, 404
memory_spec = next((it for it in workflow.memory_blocks if it.id == args['id']), None)
if not memory_spec:
return {'error': 'Memory not found'}, 404
with Session(db.engine) as session:
existing = session.query(ChatflowMemoryVariable).filter_by(
memory_id=args['id'],
ChatflowMemoryService.save_memory(
MemoryBlock(
spec=memory_spec,
tenant_id=app_model.tenant_id,
value=update,
conversation_id=conversation_id,
node_id=node_id,
app_id=app_model.id,
node_id=args['node_id']
).first()
if existing:
existing.value = args['update']
else:
session.add(
ChatflowMemoryVariable(
tenant_id=app_model.tenant_id,
app_id=app_model.id,
node_id=args['node_id'],
memory_id=args['id'],
name=memory_spec.name,
value=args['update'],
scope=memory_spec.scope,
term=memory_spec.term,
)
)
session.commit()
),
variable_pool=VariablePool(),
is_draft=False
)
return '', 204
api.add_resource(MemoryListApi, '/memories')