From ebc4fdc4b253f1621dde45efb32a26d4c3c01124 Mon Sep 17 00:00:00 2001 From: NeatGuyCoding <15627489+NeatGuyCoding@users.noreply.github.com> Date: Thu, 3 Jul 2025 13:56:23 +0800 Subject: [PATCH] moving the `MessageStatus` class from the `models.model` module to `models.enums` module (#21867) Signed-off-by: neatguycoding <15627489+NeatGuyCoding@users.noreply.github.com> --- .../app/task_pipeline/based_generate_task_pipeline.py | 3 ++- api/core/ops/langfuse_trace/langfuse_trace.py | 5 +++-- api/models/enums.py | 9 +++++++++ api/models/model.py | 9 --------- api/services/audio_service.py | 3 ++- 5 files changed, 16 insertions(+), 13 deletions(-) diff --git a/api/core/app/task_pipeline/based_generate_task_pipeline.py b/api/core/app/task_pipeline/based_generate_task_pipeline.py index ed9710469..3ed0c3352 100644 --- a/api/core/app/task_pipeline/based_generate_task_pipeline.py +++ b/api/core/app/task_pipeline/based_generate_task_pipeline.py @@ -19,7 +19,8 @@ from core.app.entities.task_entities import ( from core.errors.error import QuotaExceededError from core.model_runtime.errors.invoke import InvokeAuthorizationError, InvokeError from core.moderation.output_moderation import ModerationRule, OutputModeration -from models.model import Message, MessageStatus +from models.enums import MessageStatus +from models.model import Message logger = logging.getLogger(__name__) diff --git a/api/core/ops/langfuse_trace/langfuse_trace.py b/api/core/ops/langfuse_trace/langfuse_trace.py index d37342012..1d4ae49fc 100644 --- a/api/core/ops/langfuse_trace/langfuse_trace.py +++ b/api/core/ops/langfuse_trace/langfuse_trace.py @@ -32,6 +32,7 @@ from core.repositories import SQLAlchemyWorkflowNodeExecutionRepository from core.workflow.nodes.enums import NodeType from extensions.ext_database import db from models import EndUser, WorkflowNodeExecutionTriggeredFrom +from models.enums import MessageStatus logger = logging.getLogger(__name__) @@ -293,7 +294,7 @@ class LangFuseDataTrace(BaseTraceInstance): input=trace_info.inputs, output=message_data.answer, 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 "", usage=generation_usage, ) @@ -339,7 +340,7 @@ class LangFuseDataTrace(BaseTraceInstance): start_time=trace_info.start_time, end_time=trace_info.end_time, 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 "", usage=generation_usage, ) diff --git a/api/models/enums.py b/api/models/enums.py index 4434c3fec..cc9f28a7b 100644 --- a/api/models/enums.py +++ b/api/models/enums.py @@ -21,3 +21,12 @@ class DraftVariableType(StrEnum): NODE = "node" SYS = "sys" CONVERSATION = "conversation" + + +class MessageStatus(StrEnum): + """ + Message Status Enum + """ + + NORMAL = "normal" + ERROR = "error" diff --git a/api/models/model.py b/api/models/model.py index a1959d842..93737043d 100644 --- a/api/models/model.py +++ b/api/models/model.py @@ -892,15 +892,6 @@ class Conversation(Base): } -class MessageStatus(StrEnum): - """ - Message Status Enum - """ - - NORMAL = "normal" - ERROR = "error" - - class Message(Base): __tablename__ = "messages" __table_args__ = ( diff --git a/api/services/audio_service.py b/api/services/audio_service.py index bc94c5f0e..e8923eb51 100644 --- a/api/services/audio_service.py +++ b/api/services/audio_service.py @@ -11,7 +11,8 @@ from constants import AUDIO_EXTENSIONS from core.model_manager import ModelManager from core.model_runtime.entities.model_entities import ModelType from extensions.ext_database import db -from models.model import App, AppMode, AppModelConfig, Message, MessageStatus +from models.enums import MessageStatus +from models.model import App, AppMode, AppModelConfig, Message from services.errors.audio import ( AudioTooLargeServiceError, NoAudioUploadedServiceError,