mirror of
https://git.mirrors.martin98.com/https://github.com/langgenius/dify.git
synced 2025-04-22 21:59:55 +08:00
chore: optimize memory fetch performance (#6039)
This commit is contained in:
parent
85744b72e5
commit
d522308a29
@ -12,7 +12,8 @@ from core.model_runtime.entities.message_entities import (
|
|||||||
UserPromptMessage,
|
UserPromptMessage,
|
||||||
)
|
)
|
||||||
from extensions.ext_database import db
|
from extensions.ext_database import db
|
||||||
from models.model import AppMode, Conversation, Message
|
from models.model import AppMode, Conversation, Message, MessageFile
|
||||||
|
from models.workflow import WorkflowRun
|
||||||
|
|
||||||
|
|
||||||
class TokenBufferMemory:
|
class TokenBufferMemory:
|
||||||
@ -30,7 +31,13 @@ class TokenBufferMemory:
|
|||||||
app_record = self.conversation.app
|
app_record = self.conversation.app
|
||||||
|
|
||||||
# fetch limited messages, and return reversed
|
# fetch limited messages, and return reversed
|
||||||
query = db.session.query(Message).filter(
|
query = db.session.query(
|
||||||
|
Message.id,
|
||||||
|
Message.query,
|
||||||
|
Message.answer,
|
||||||
|
Message.created_at,
|
||||||
|
Message.workflow_run_id
|
||||||
|
).filter(
|
||||||
Message.conversation_id == self.conversation.id,
|
Message.conversation_id == self.conversation.id,
|
||||||
Message.answer != ''
|
Message.answer != ''
|
||||||
).order_by(Message.created_at.desc())
|
).order_by(Message.created_at.desc())
|
||||||
@ -47,16 +54,21 @@ class TokenBufferMemory:
|
|||||||
tenant_id=app_record.tenant_id,
|
tenant_id=app_record.tenant_id,
|
||||||
app_id=app_record.id
|
app_id=app_record.id
|
||||||
)
|
)
|
||||||
|
|
||||||
prompt_messages = []
|
prompt_messages = []
|
||||||
for message in messages:
|
for message in messages:
|
||||||
files = message.message_files
|
files = db.session.query(MessageFile).filter(MessageFile.message_id == message.id).all()
|
||||||
if files:
|
if files:
|
||||||
|
file_extra_config = None
|
||||||
if self.conversation.mode not in [AppMode.ADVANCED_CHAT.value, AppMode.WORKFLOW.value]:
|
if self.conversation.mode not in [AppMode.ADVANCED_CHAT.value, AppMode.WORKFLOW.value]:
|
||||||
file_extra_config = FileUploadConfigManager.convert(message.app_model_config.to_dict())
|
file_extra_config = FileUploadConfigManager.convert(self.conversation.model_config)
|
||||||
else:
|
else:
|
||||||
|
if message.workflow_run_id:
|
||||||
|
workflow_run = (db.session.query(WorkflowRun)
|
||||||
|
.filter(WorkflowRun.id == message.workflow_run_id).first())
|
||||||
|
|
||||||
|
if workflow_run:
|
||||||
file_extra_config = FileUploadConfigManager.convert(
|
file_extra_config = FileUploadConfigManager.convert(
|
||||||
message.workflow_run.workflow.features_dict,
|
workflow_run.workflow.features_dict,
|
||||||
is_vision=False
|
is_vision=False
|
||||||
)
|
)
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user