feat refactor: move MessageStatus to enums.py

Signed-off-by: neatguycoding <15627489+NeatGuyCoding@users.noreply.github.com>
pull/21867/head
neatguycoding 11 months ago
parent 31eb8548ef
commit ea98c3d548

@ -19,7 +19,8 @@ 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, MessageStatus from models.model import Message
from models.enums import MessageStatus
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)

@ -32,6 +32,7 @@ from core.repositories import SQLAlchemyWorkflowNodeExecutionRepository
from core.workflow.nodes.enums import NodeType from core.workflow.nodes.enums import NodeType
from extensions.ext_database import db from extensions.ext_database import db
from models import EndUser, WorkflowNodeExecutionTriggeredFrom from models import EndUser, WorkflowNodeExecutionTriggeredFrom
from models.enums import MessageStatus
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -293,7 +294,7 @@ class LangFuseDataTrace(BaseTraceInstance):
input=trace_info.inputs, input=trace_info.inputs,
output=message_data.answer, output=message_data.answer,
metadata=metadata, metadata=metadata,
level=(LevelEnum.DEFAULT if message_data.status != "error" else LevelEnum.ERROR), level=(LevelEnum.DEFAULT if message_data.status != MessageStatus.ERROR else LevelEnum.ERROR),
status_message=message_data.error or "", status_message=message_data.error or "",
usage=generation_usage, usage=generation_usage,
) )
@ -339,7 +340,7 @@ class LangFuseDataTrace(BaseTraceInstance):
start_time=trace_info.start_time, start_time=trace_info.start_time,
end_time=trace_info.end_time, end_time=trace_info.end_time,
metadata=trace_info.metadata, metadata=trace_info.metadata,
level=(LevelEnum.DEFAULT if message_data.status != "error" else LevelEnum.ERROR), level=(LevelEnum.DEFAULT if message_data.status != MessageStatus.ERROR else LevelEnum.ERROR),
status_message=message_data.error or "", status_message=message_data.error or "",
usage=generation_usage, usage=generation_usage,
) )

@ -21,3 +21,12 @@ class DraftVariableType(StrEnum):
NODE = "node" NODE = "node"
SYS = "sys" SYS = "sys"
CONVERSATION = "conversation" CONVERSATION = "conversation"
class MessageStatus(StrEnum):
"""
Message Status Enum
"""
NORMAL = "normal"
ERROR = "error"

@ -29,7 +29,7 @@ from libs.helper import generate_string
from .account import Account, Tenant from .account import Account, Tenant
from .base import Base from .base import Base
from .engine import db from .engine import db
from .enums import CreatorUserRole from .enums import CreatorUserRole, MessageStatus
from .types import StringUUID from .types import StringUUID
if TYPE_CHECKING: if TYPE_CHECKING:
@ -892,15 +892,6 @@ 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__ = (

@ -11,7 +11,8 @@ 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 extensions.ext_database import db from extensions.ext_database import db
from models.model import App, AppMode, AppModelConfig, Message, MessageStatus from models.model import App, AppMode, AppModelConfig, Message
from models.enums import MessageStatus
from services.errors.audio import ( from services.errors.audio import (
AudioTooLargeServiceError, AudioTooLargeServiceError,
NoAudioUploadedServiceError, NoAudioUploadedServiceError,

Loading…
Cancel
Save