Fix SQLite DB TaskPriority enum issue -> #3

Author: Evil0ctal

app/api/models/WhisperTaskRequest.py

@@ -37,9 +37,9 @@
 
 
 class TaskPriority(str, Enum):
-    HIGH = "high"
-    NORMAL = "normal"
-    LOW = "low"
+    high = "high"
+    normal = "normal"
+    low = "low"
 
 
 class TaskType(str, Enum):
@@ -57,7 +57,7 @@ class WhisperTaskRequest(BaseModel):
         description="回调URL，任务完成时通知客户端 / Callback URL to notify the client when the task is completed"
     )
     priority: TaskPriority = Form(
-        TaskPriority.NORMAL,
+        TaskPriority.normal,
         description="任务优先级 / Task priority"
     )
     platform: Optional[str] = Form(

app/api/routers/chatgpt_tasks.py

@@ -111,41 +111,41 @@ async def chatgpt_summary(
                 status_code=status.HTTP_404_NOT_FOUND,
                 detail=ErrorResponseModel(
                     code=status.HTTP_404_NOT_FOUND,
-                    message=TaskStatusHttpMessage.NOT_FOUND.value,
+                    message=TaskStatusHttpMessage.not_found.value,
                     router=str(request.url),
                     params=dict(request.query_params),
                 ).model_dump()
             )
 
         # 任务处于排队中 - 返回202 | Task is queued - return 202
-        if task.status == TaskStatus.QUEUED:
+        if task.status == TaskStatus.queued:
             raise HTTPException(
-                status_code=TaskStatusHttpCode.QUEUED.value,
+                status_code=TaskStatusHttpCode.queued.value,
                 detail=ErrorResponseModel(
-                    code=TaskStatusHttpCode.QUEUED.value,
-                    message=TaskStatusHttpMessage.QUEUED.value,
+                    code=TaskStatusHttpCode.queued.value,
+                    message=TaskStatusHttpMessage.queued.value,
                     router=str(request.url),
                     params=dict(request.query_params),
                 ).model_dump()
             )
         # 任务正在处理中 - 返回202 | Task is processing - return 202
-        elif task.status == TaskStatus.PROCESSING:
+        elif task.status == TaskStatus.processing:
             raise HTTPException(
-                status_code=TaskStatusHttpCode.PROCESSING.value,
+                status_code=TaskStatusHttpCode.processing.value,
                 detail=ErrorResponseModel(
-                    code=TaskStatusHttpCode.PROCESSING.value,
-                    message=TaskStatusHttpMessage.PROCESSING.value,
+                    code=TaskStatusHttpCode.processing.value,
+                    message=TaskStatusHttpMessage.processing.value,
                     router=str(request.url),
                     params=dict(request.query_params),
                 ).model_dump()
             )
         # 任务失败 - 返回500 | Task failed - return 500
-        elif task.status == TaskStatus.FAILED:
+        elif task.status == TaskStatus.failed:
             raise HTTPException(
-                status_code=TaskStatusHttpCode.FAILED.value,
+                status_code=TaskStatusHttpCode.failed.value,
                 detail=ErrorResponseModel(
-                    code=TaskStatusHttpCode.FAILED.value,
-                    message=TaskStatusHttpMessage.FAILED.value,
+                    code=TaskStatusHttpCode.failed.value,
+                    message=TaskStatusHttpMessage.failed.value,
                     router=str(request.url),
                     params=dict(request.query_params),
                 ).model_dump()
@@ -193,7 +193,7 @@ async def chatgpt_summary(
             )
 
         return ResponseModel(
-            code=TaskStatusHttpCode.COMPLETED.value,
+            code=TaskStatusHttpCode.completed.value,
             router=str(request.url),
             params=_ChatGPTTaskRequest.model_dump(),
             data=chatgpt_data
@@ -206,7 +206,7 @@ async def chatgpt_summary(
             status_code=status.HTTP_503_SERVICE_UNAVAILABLE,
             detail=ErrorResponseModel(
                 code=status.HTTP_503_SERVICE_UNAVAILABLE,
-                message=TaskStatusHttpMessage.SERVICE_UNAVAILABLE.value,
+                message=TaskStatusHttpMessage.service_unavailable.value,
                 router=str(request.url),
                 params=_ChatGPTTaskRequest.model_dump()
             ).model_dump()

app/api/routers/whisper_tasks.py

@@ -95,7 +95,10 @@ async def task_create(
         - 任务完成后回调程序会发送一个 POST 请求，包含任务数据。
         - 你可以参考接口文档中的回调测试接口在控制台查看回调信息。
         - 例如：`http://localhost/api/whisper/callback/test`
-    - `priority` (TaskPriority): 任务优先级，默认为 `TaskPriority.NORMAL`。
+    - `priority` (TaskPriority): 任务优先级，默认为 `normal`，具体取值如下：
+        - `low`: 低优先级，使用小写字母。
+        - `normal`: 正常优先级，使用小写字母。
+        - `high`: 高优先级，使用小写字母。
     - `platform` (Optional[str]): 指定平台，例如 'tiktok' 或 'douyin'，用于方便区分不同平台的任务在数据库进行查询和分类，默认为空，可以根据需要自定义。
     - `language` (str): 指定输出语言，例如 'en' 或 'zh'，留空则自动检测。
     - `temperature` (str): 采样温度，可以是单个值或使用英文逗号分隔的多个值，将在后端转换为列表，例如 "0.8,1.0"。
@@ -145,7 +148,10 @@ async def task_create(
         - The callback program will send a POST request containing task data after the task is completed.
         - You can view the callback information in the console by referring to the callback test interface in the API documentation.
         - For example: `http://localhost/api/whisper/callback/test`
-    - `priority` (TaskPriority): Task priority, default is `TaskPriority.NORMAL`.
+    - `priority` (TaskPriority): Task priority, default is `normal`, specific values are as follows:
+        - `low`: Low priority, use lowercase letters.
+        - `normal`: Normal priority, use lowercase letters.
+        - `high`: High priority, use lowercase letters.
     - `platform` (Optional[str]): Specify the platform, e.g., 'tiktok' or 'douyin', for easy query and classification of tasks from different platforms in the database, default is empty, can be customized according to needs.
     - `language` (str): Specify the output language, e.g., 'en' or 'zh', leave empty for auto-detection.
     - `temperature` (str): Sampling temperature, can be a single value or multiple values separated by commas, which will be converted to a list on the backend, e.g., "0.8,1.0".
@@ -494,7 +500,7 @@ async def task_delete(
                 status_code=status.HTTP_404_NOT_FOUND,
                 detail=ErrorResponseModel(
                     code=status.HTTP_404_NOT_FOUND,
-                    message=TaskStatusHttpMessage.NOT_FOUND.value,
+                    message=TaskStatusHttpMessage.not_found.value,
                     router=str(request.url),
                     params=dict(request.query_params),
                 ).model_dump()
@@ -586,49 +592,49 @@ async def task_result(
                 status_code=status.HTTP_404_NOT_FOUND,
                 detail=ErrorResponseModel(
                     code=status.HTTP_404_NOT_FOUND,
-                    message=TaskStatusHttpMessage.NOT_FOUND.value,
+                    message=TaskStatusHttpMessage.not_found.value,
                     router=str(request.url),
                     params=dict(request.query_params),
                 ).model_dump()
             )
 
         # 任务处于排队中 - 返回202 | Task is queued - return 202
-        if task.status == TaskStatus.QUEUED:
+        if task.status == TaskStatus.queued:
             raise HTTPException(
-                status_code=TaskStatusHttpCode.QUEUED.value,
+                status_code=TaskStatusHttpCode.queued.value,
                 detail=ErrorResponseModel(
-                    code=TaskStatusHttpCode.QUEUED.value,
-                    message=TaskStatusHttpMessage.QUEUED.value,
+                    code=TaskStatusHttpCode.queued.value,
+                    message=TaskStatusHttpMessage.queued.value,
                     router=str(request.url),
                     params=dict(request.query_params),
                 ).model_dump()
             )
         # 任务正在处理中 - 返回202 | Task is processing - return 202
-        elif task.status == TaskStatus.PROCESSING:
+        elif task.status == TaskStatus.processing:
             raise HTTPException(
-                status_code=TaskStatusHttpCode.PROCESSING.value,
+                status_code=TaskStatusHttpCode.processing.value,
                 detail=ErrorResponseModel(
-                    code=TaskStatusHttpCode.PROCESSING.value,
-                    message=TaskStatusHttpMessage.PROCESSING.value,
+                    code=TaskStatusHttpCode.processing.value,
+                    message=TaskStatusHttpMessage.processing.value,
                     router=str(request.url),
                     params=dict(request.query_params),
                 ).model_dump()
             )
         # 任务失败 - 返回500 | Task failed - return 500
-        elif task.status == TaskStatus.FAILED:
+        elif task.status == TaskStatus.failed:
             raise HTTPException(
-                status_code=TaskStatusHttpCode.FAILED.value,
+                status_code=TaskStatusHttpCode.failed.value,
                 detail=ErrorResponseModel(
-                    code=TaskStatusHttpCode.FAILED.value,
-                    message=TaskStatusHttpMessage.FAILED.value,
+                    code=TaskStatusHttpCode.failed.value,
+                    message=TaskStatusHttpMessage.failed.value,
                     router=str(request.url),
                     params=dict(request.query_params),
                 ).model_dump()
             )
 
         # 任务已完成 - 返回200 | Task is completed - return 200
         return ResponseModel(
-            code=TaskStatusHttpCode.COMPLETED.value,
+            code=TaskStatusHttpCode.completed.value,
             router=str(request.url),
             params=dict(request.query_params),
             data=task.to_dict()
@@ -641,7 +647,7 @@ async def task_result(
             status_code=status.HTTP_503_SERVICE_UNAVAILABLE,
             detail=ErrorResponseModel(
                 code=status.HTTP_503_SERVICE_UNAVAILABLE,
-                message=TaskStatusHttpMessage.SERVICE_UNAVAILABLE.value,
+                message=TaskStatusHttpMessage.service_unavailable.value,
                 router=str(request.url),
                 params=dict(request.query_params),
             ).model_dump()
@@ -1366,13 +1372,13 @@ async def generate_subtitles(
             status_code=status.HTTP_404_NOT_FOUND,
             detail=ErrorResponseModel(
                 code=status.HTTP_404_NOT_FOUND,
-                message=TaskStatusHttpMessage.NOT_FOUND.value,
+                message=TaskStatusHttpMessage.not_found.value,
                 router=str(request.url),
                 params=dict(request.query_params),
             ).model_dump()
         )
 
-    if task.status != TaskStatus.COMPLETED:
+    if task.status != TaskStatus.completed:
         raise HTTPException(
             status_code=status.HTTP_400_BAD_REQUEST,
             detail=ErrorResponseModel(

app/database/DatabaseManager.py

@@ -38,6 +38,7 @@
 from sqlalchemy.ext.asyncio import AsyncSession, create_async_engine, AsyncEngine
 from sqlalchemy.orm import sessionmaker
 from sqlalchemy.exc import SQLAlchemyError, OperationalError
+from sqlalchemy.sql import func
 from contextlib import asynccontextmanager
 from app.database.models.TaskModels import TaskBase, Task, QueryTasksOptionalFilter, TaskStatus, TaskPriority
 from app.database.models.WorkFlowModels import WorkFlowBase, Workflow, WorkflowTask, WorkflowNotification
@@ -232,12 +233,12 @@ async def get_queued_tasks(self, max_concurrent_tasks: int) -> List[Task]:
             try:
                 result = await session.execute(
                     select(Task)
-                    .where(Task.status == TaskStatus.QUEUED)
+                    .where(Task.status == TaskStatus.queued)
                     .order_by(
                         case(
-                            (Task.priority == TaskPriority.HIGH, 1),
-                            (Task.priority == TaskPriority.NORMAL, 2),
-                            (Task.priority == TaskPriority.LOW, 3),
+                            (Task.priority == TaskPriority.high, 1),
+                            (Task.priority == TaskPriority.normal, 2),
+                            (Task.priority == TaskPriority.low, 3),
                         )
                     )
                     .limit(max_concurrent_tasks)

app/database/models/TaskModels.py

@@ -36,6 +36,7 @@
 
 from pydantic import BaseModel, constr, Field, ConfigDict, field_validator
 from sqlalchemy import Column, Integer, String, Enum, Text, JSON, Float, DateTime
+from sqlalchemy.types import Enum as SQLAlchemyEnum
 from sqlalchemy.ext.declarative import declarative_base
 
 # 定义基础类 | Define Base class
@@ -44,47 +45,47 @@
 
 # 定义任务状态的枚举类型 | Define an enum for task status
 class TaskStatus(enum.Enum):
-    QUEUED = 'queued'
-    PROCESSING = 'processing'
-    COMPLETED = 'completed'
-    FAILED = 'failed'
+    queued = 'queued'
+    processing = 'processing'
+    completed = 'completed'
+    failed = 'failed'
 
 
 # TaskStatusHttpCode 枚举类，用于映射 TaskStatus 到 HTTP 状态码
 # TaskStatusHttpCode enum class, used to map TaskStatus to HTTP status code
 class TaskStatusHttpCode(enum.Enum):
     # 202 - Accepted (for ongoing processing)
-    QUEUED = HTTPStatus.ACCEPTED
+    queued = HTTPStatus.ACCEPTED
     # 202 - Accepted (for ongoing processing)
-    PROCESSING = HTTPStatus.ACCEPTED
+    processing = HTTPStatus.ACCEPTED
     # 200 - OK (for successful completion)
-    COMPLETED = HTTPStatus.OK
+    completed = HTTPStatus.OK
     # 500 - Internal Server Error (for task failure)
-    FAILED = HTTPStatus.INTERNAL_SERVER_ERROR
+    failed = HTTPStatus.INTERNAL_SERVER_ERROR
 
 
 # TaskStatusHttpMessage 枚举类，用于映射 TaskStatus 到 HTTP 状态消息
 # TaskStatusHttpMessage enum class, used to map TaskStatus to HTTP status message
 class TaskStatusHttpMessage(enum.Enum):
     # 202 - Accepted (for ongoing processing)
-    QUEUED = "Task is queued and not started yet"
+    queued = "Task is queued and not started yet"
     # 202 - Accepted (for ongoing processing)
-    PROCESSING = "Task is currently being processed"
+    processing = "Task is currently being processed"
     # 200 - OK (for successful completion)
-    COMPLETED = "Task has been completed"
+    completed = "Task has been completed"
     # 404 - Not Found (for task not found or invalid task ID)
-    NOT_FOUND = "Task not found or has been deleted or invalid task ID"
+    not_found = "Task not found or has been deleted or invalid task ID"
     # 500 - Internal Server Error (for task failure)
-    FAILED = "Task failed during processing"
+    failed = "Task failed during processing"
     # 503 - Service Unavailable (for database error)
-    SERVICE_UNAVAILABLE = "Database error occurred. Please try again later."
+    service_unavailable = "Database error occurred. Please try again later."
 
 
 # 定义任务优先级的枚举类型 | Define an enum for task priority
 class TaskPriority(enum.Enum):
-    LOW = 'low'
-    NORMAL = 'normal'
-    HIGH = 'high'
+    high = "high"
+    normal = "normal"
+    low = "low"
 
 
 class Task(TaskBase):
@@ -103,9 +104,9 @@ class Task(TaskBase):
     # 回调时间 | Callback time
     callback_time = Column(DateTime, nullable=True)
     # 任务优先级 | Task priority
-    priority = Column(Enum(TaskPriority), default=TaskPriority.NORMAL)
+    priority = Column(Enum(TaskPriority), default=TaskPriority.normal)
     # 任务状态，初始为 QUEUED | Task status, initially QUEUED
-    status = Column(Enum(TaskStatus), default=TaskStatus.QUEUED)
+    status = Column(Enum(TaskStatus), default=TaskStatus.queued)
     # 检测到的语言 | Detected language
     language = Column(String(10), nullable=True)
     # 任务对应的平台 | Platform for the task

app/processors/task_processor.py

@@ -194,11 +194,12 @@ async def fetch_task_worker(self):
                 tasks = await self.db_manager.get_queued_tasks(self.max_concurrent_tasks)
                 for task in tasks:
                     # 将任务状态更新为处理中 | Update task status to processing
-                    await self.db_manager.update_task(task.id, status=TaskStatus.PROCESSING)
+                    await self.db_manager.update_task(task.id, status=TaskStatus.processing)
                 # 将结果放入 task_result_queue 中 | Put the result into task_result_queue
                 await self.task_processing_queue.put(tasks)
             except Exception as e:
                 self.logger.error(f"Error fetching tasks from database: {str(e)}")
+                self.logger.error(traceback.format_exc())
             finally:
                 # 标记查询完成 | Mark the query as completed
                 self.fetch_queue.task_done()
@@ -464,7 +465,7 @@ def _process_task_sync(self, task: Task) -> dict:
 
                 # 更新任务状态和结果 | Update task status and result
                 task_update = {
-                    "status": TaskStatus.COMPLETED,
+                    "status": TaskStatus.completed,
                     "file_path": task.file_path,
                     "file_size_bytes": task.file_size_bytes,
                     "file_duration": task.file_duration,
@@ -482,7 +483,7 @@ def _process_task_sync(self, task: Task) -> dict:
 
         except Exception as e:
             task_update = {
-                "status": TaskStatus.FAILED,
+                "status": TaskStatus.failed,
                 "error_message": str(e)
             }
             self.update_queue.put_nowait((task.id, task_update))

config/settings.py

@@ -46,7 +46,7 @@ class FastAPISettings:
         # 项目描述 | Project description
         description: str = "⚡ A high-performance asynchronous API for Automatic Speech Recognition (ASR) and translation. No need to purchase the Whisper API—perform inference using a locally running Whisper model with support for multi-GPU concurrency and designed for distributed deployment. It also includes built-in crawlers for social media platforms like TikTok and Douyin, enabling seamless media processing from multiple social platforms. This provides a powerful and scalable solution for automated media content data processing."
         # 项目版本 | Project version
-        version: str = "1.0.4"
+        version: str = "1.0.5"
         # Swagger 文档 URL | Swagger docs URL
         docs_url: str = "/"
         # 是否开启 debug 模式 | Whether to enable debug mode