mirror of
https://github.com/langgenius/dify.git
synced 2025-09-05 07:12:35 +00:00
chore: Simplify code logic (#21496)
Co-authored-by: 刘江波 <jiangbo721@163.com>
This commit is contained in:
parent
90aba77471
commit
cefb8e4218
@ -36,7 +36,6 @@ from libs.flask_utils import preserve_flask_contexts
|
|||||||
from models import Account, App, Conversation, EndUser, Message, Workflow, WorkflowNodeExecutionTriggeredFrom
|
from models import Account, App, Conversation, EndUser, Message, Workflow, WorkflowNodeExecutionTriggeredFrom
|
||||||
from models.enums import WorkflowRunTriggeredFrom
|
from models.enums import WorkflowRunTriggeredFrom
|
||||||
from services.conversation_service import ConversationService
|
from services.conversation_service import ConversationService
|
||||||
from services.errors.message import MessageNotExistsError
|
|
||||||
from services.workflow_draft_variable_service import DraftVarLoader, WorkflowDraftVariableService
|
from services.workflow_draft_variable_service import DraftVarLoader, WorkflowDraftVariableService
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
@ -480,8 +479,6 @@ class AdvancedChatAppGenerator(MessageBasedAppGenerator):
|
|||||||
# get conversation and message
|
# get conversation and message
|
||||||
conversation = self._get_conversation(conversation_id)
|
conversation = self._get_conversation(conversation_id)
|
||||||
message = self._get_message(message_id)
|
message = self._get_message(message_id)
|
||||||
if message is None:
|
|
||||||
raise MessageNotExistsError("Message not exists")
|
|
||||||
|
|
||||||
# chatbot app
|
# chatbot app
|
||||||
runner = AdvancedChatAppRunner(
|
runner = AdvancedChatAppRunner(
|
||||||
|
@ -26,7 +26,6 @@ from factories import file_factory
|
|||||||
from libs.flask_utils import preserve_flask_contexts
|
from libs.flask_utils import preserve_flask_contexts
|
||||||
from models import Account, App, EndUser
|
from models import Account, App, EndUser
|
||||||
from services.conversation_service import ConversationService
|
from services.conversation_service import ConversationService
|
||||||
from services.errors.message import MessageNotExistsError
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
@ -238,8 +237,6 @@ class AgentChatAppGenerator(MessageBasedAppGenerator):
|
|||||||
# get conversation and message
|
# get conversation and message
|
||||||
conversation = self._get_conversation(conversation_id)
|
conversation = self._get_conversation(conversation_id)
|
||||||
message = self._get_message(message_id)
|
message = self._get_message(message_id)
|
||||||
if message is None:
|
|
||||||
raise MessageNotExistsError("Message not exists")
|
|
||||||
|
|
||||||
# chatbot app
|
# chatbot app
|
||||||
runner = AgentChatAppRunner()
|
runner = AgentChatAppRunner()
|
||||||
|
@ -25,7 +25,6 @@ from factories import file_factory
|
|||||||
from models.account import Account
|
from models.account import Account
|
||||||
from models.model import App, EndUser
|
from models.model import App, EndUser
|
||||||
from services.conversation_service import ConversationService
|
from services.conversation_service import ConversationService
|
||||||
from services.errors.message import MessageNotExistsError
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
@ -224,8 +223,6 @@ class ChatAppGenerator(MessageBasedAppGenerator):
|
|||||||
# get conversation and message
|
# get conversation and message
|
||||||
conversation = self._get_conversation(conversation_id)
|
conversation = self._get_conversation(conversation_id)
|
||||||
message = self._get_message(message_id)
|
message = self._get_message(message_id)
|
||||||
if message is None:
|
|
||||||
raise MessageNotExistsError("Message not exists")
|
|
||||||
|
|
||||||
# chatbot app
|
# chatbot app
|
||||||
runner = ChatAppRunner()
|
runner = ChatAppRunner()
|
||||||
|
@ -201,8 +201,6 @@ class CompletionAppGenerator(MessageBasedAppGenerator):
|
|||||||
try:
|
try:
|
||||||
# get message
|
# get message
|
||||||
message = self._get_message(message_id)
|
message = self._get_message(message_id)
|
||||||
if message is None:
|
|
||||||
raise MessageNotExistsError()
|
|
||||||
|
|
||||||
# chatbot app
|
# chatbot app
|
||||||
runner = CompletionAppRunner()
|
runner = CompletionAppRunner()
|
||||||
|
@ -29,6 +29,7 @@ from models.enums import CreatorUserRole
|
|||||||
from models.model import App, AppMode, AppModelConfig, Conversation, EndUser, Message, MessageFile
|
from models.model import App, AppMode, AppModelConfig, Conversation, EndUser, Message, MessageFile
|
||||||
from services.errors.app_model_config import AppModelConfigBrokenError
|
from services.errors.app_model_config import AppModelConfigBrokenError
|
||||||
from services.errors.conversation import ConversationNotExistsError
|
from services.errors.conversation import ConversationNotExistsError
|
||||||
|
from services.errors.message import MessageNotExistsError
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
@ -251,7 +252,7 @@ class MessageBasedAppGenerator(BaseAppGenerator):
|
|||||||
|
|
||||||
return introduction or ""
|
return introduction or ""
|
||||||
|
|
||||||
def _get_conversation(self, conversation_id: str):
|
def _get_conversation(self, conversation_id: str) -> Conversation:
|
||||||
"""
|
"""
|
||||||
Get conversation by conversation id
|
Get conversation by conversation id
|
||||||
:param conversation_id: conversation id
|
:param conversation_id: conversation id
|
||||||
@ -260,11 +261,11 @@ class MessageBasedAppGenerator(BaseAppGenerator):
|
|||||||
conversation = db.session.query(Conversation).filter(Conversation.id == conversation_id).first()
|
conversation = db.session.query(Conversation).filter(Conversation.id == conversation_id).first()
|
||||||
|
|
||||||
if not conversation:
|
if not conversation:
|
||||||
raise ConversationNotExistsError()
|
raise ConversationNotExistsError("Conversation not exists")
|
||||||
|
|
||||||
return conversation
|
return conversation
|
||||||
|
|
||||||
def _get_message(self, message_id: str) -> Optional[Message]:
|
def _get_message(self, message_id: str) -> Message:
|
||||||
"""
|
"""
|
||||||
Get message by message id
|
Get message by message id
|
||||||
:param message_id: message id
|
:param message_id: message id
|
||||||
@ -272,4 +273,7 @@ class MessageBasedAppGenerator(BaseAppGenerator):
|
|||||||
"""
|
"""
|
||||||
message = db.session.query(Message).filter(Message.id == message_id).first()
|
message = db.session.query(Message).filter(Message.id == message_id).first()
|
||||||
|
|
||||||
|
if message is None:
|
||||||
|
raise MessageNotExistsError("Message not exists")
|
||||||
|
|
||||||
return message
|
return message
|
||||||
|
Loading…
x
Reference in New Issue
Block a user