mirror of
https://github.com/langgenius/dify.git
synced 2025-09-04 06:43:44 +00:00
chore: add message status enum (#21825)
Co-authored-by: 刘江波 <jiangbo721@163.com>
This commit is contained in:
parent
4e7c9dd2ae
commit
e17b33e004
@ -19,7 +19,7 @@ from core.app.entities.task_entities import (
|
|||||||
from core.errors.error import QuotaExceededError
|
from core.errors.error import QuotaExceededError
|
||||||
from core.model_runtime.errors.invoke import InvokeAuthorizationError, InvokeError
|
from core.model_runtime.errors.invoke import InvokeAuthorizationError, InvokeError
|
||||||
from core.moderation.output_moderation import ModerationRule, OutputModeration
|
from core.moderation.output_moderation import ModerationRule, OutputModeration
|
||||||
from models.model import Message
|
from models.model import Message, MessageStatus
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
@ -62,7 +62,7 @@ class BasedGenerateTaskPipeline:
|
|||||||
return err
|
return err
|
||||||
|
|
||||||
err_desc = self._error_to_desc(err)
|
err_desc = self._error_to_desc(err)
|
||||||
message.status = "error"
|
message.status = MessageStatus.ERROR
|
||||||
message.error = err_desc
|
message.error = err_desc
|
||||||
return err
|
return err
|
||||||
|
|
||||||
|
@ -892,6 +892,15 @@ class Conversation(Base):
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
class MessageStatus(StrEnum):
|
||||||
|
"""
|
||||||
|
Message Status Enum
|
||||||
|
"""
|
||||||
|
|
||||||
|
NORMAL = "normal"
|
||||||
|
ERROR = "error"
|
||||||
|
|
||||||
|
|
||||||
class Message(Base):
|
class Message(Base):
|
||||||
__tablename__ = "messages"
|
__tablename__ = "messages"
|
||||||
__table_args__ = (
|
__table_args__ = (
|
||||||
|
@ -8,7 +8,7 @@ from werkzeug.datastructures import FileStorage
|
|||||||
from constants import AUDIO_EXTENSIONS
|
from constants import AUDIO_EXTENSIONS
|
||||||
from core.model_manager import ModelManager
|
from core.model_manager import ModelManager
|
||||||
from core.model_runtime.entities.model_entities import ModelType
|
from core.model_runtime.entities.model_entities import ModelType
|
||||||
from models.model import App, AppMode, AppModelConfig, Message
|
from models.model import App, AppMode, AppModelConfig, Message, MessageStatus
|
||||||
from services.errors.audio import (
|
from services.errors.audio import (
|
||||||
AudioTooLargeServiceError,
|
AudioTooLargeServiceError,
|
||||||
NoAudioUploadedServiceError,
|
NoAudioUploadedServiceError,
|
||||||
@ -132,7 +132,7 @@ class AudioService:
|
|||||||
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:
|
if message is None:
|
||||||
return None
|
return None
|
||||||
if message.answer == "" and message.status == "normal":
|
if message.answer == "" and message.status == MessageStatus.NORMAL:
|
||||||
return None
|
return None
|
||||||
|
|
||||||
else:
|
else:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user