diff --git a/docs/docs.go b/docs/docs.go index 250faf25..45ef9ff7 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -11316,6 +11316,113 @@ const docTemplate = `{ } } }, + "/system/admin/runtime/queues/{queue}/tasks": { + "get": { + "produces": [ + "application/json" + ], + "tags": [ + "System Admin" + ], + "summary": "List runtime queue tasks by state", + "parameters": [ + { + "type": "string", + "description": "Queue name", + "name": "queue", + "in": "path", + "required": true + }, + { + "enum": [ + "pending", + "active", + "scheduled", + "retry", + "archived", + "completed" + ], + "type": "string", + "description": "Task state", + "name": "state", + "in": "query", + "required": true + }, + { + "type": "integer", + "default": 1, + "description": "Page", + "name": "page", + "in": "query" + }, + { + "type": "integer", + "default": 20, + "description": "Page size", + "name": "page_size", + "in": "query" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/internal_handler.RuntimeTasksResponse" + } + } + } + } + }, + "/system/admin/runtime/queues/{queue}/tasks/{task_id}/actions/{action}": { + "post": { + "produces": [ + "application/json" + ], + "tags": [ + "System Admin" + ], + "summary": "Run a safe runtime task action", + "parameters": [ + { + "type": "string", + "description": "Queue name", + "name": "queue", + "in": "path", + "required": true + }, + { + "type": "string", + "description": "Task ID", + "name": "task_id", + "in": "path", + "required": true + }, + { + "enum": [ + "cancel", + "run_now", + "delete" + ], + "type": "string", + "description": "Action", + "name": "action", + "in": "path", + "required": true + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "type": "object", + "additionalProperties": { + "type": "boolean" + } + } + } + } + } + }, "/system/admin/settings/{key}": { "get": { "description": "Returns the row matching :key. 404 when the key is unknown\nto the registry; 200 with the row when known.", @@ -14170,7 +14277,11 @@ const docTemplate = `{ "system.setting_changed", "system.admin_promoted", "system.admin_revoked", - "system.user_password_reset" + "system.user_password_reset", + "system.queue_task_retried", + "system.queue_task_deleted", + "system.queue_task_run_now", + "system.queue_task_cancelled" ], "x-enum-varnames": [ "AuditActionMemberAdded", @@ -14192,7 +14303,11 @@ const docTemplate = `{ "AuditActionSystemSettingChanged", "AuditActionSystemAdminPromoted", "AuditActionSystemAdminRevoked", - "AuditActionSystemUserPasswordReset" + "AuditActionSystemUserPasswordReset", + "AuditActionSystemQueueTaskRetried", + "AuditActionSystemQueueTaskDeleted", + "AuditActionSystemQueueTaskRunNow", + "AuditActionSystemQueueTaskCancelled" ] }, "github_com_Tencent_WeKnora_internal_types.AuditLog": { @@ -17324,6 +17439,127 @@ const docTemplate = `{ } } }, + "github_com_Tencent_WeKnora_internal_types.RuntimeTaskAction": { + "type": "string", + "enum": [ + "cancel", + "run_now", + "delete" + ], + "x-enum-varnames": [ + "RuntimeTaskActionCancel", + "RuntimeTaskActionRunNow", + "RuntimeTaskActionDelete" + ] + }, + "github_com_Tencent_WeKnora_internal_types.RuntimeTaskInfo": { + "type": "object", + "properties": { + "allowed_actions": { + "type": "array", + "items": { + "$ref": "#/definitions/github_com_Tencent_WeKnora_internal_types.RuntimeTaskAction" + } + }, + "completed_at": { + "type": "string" + }, + "data_source_id": { + "type": "string" + }, + "deadline": { + "type": "string" + }, + "enqueued_at": { + "type": "string" + }, + "id": { + "type": "string" + }, + "is_orphaned": { + "type": "boolean" + }, + "knowledge_base_id": { + "type": "string" + }, + "knowledge_count": { + "type": "integer" + }, + "knowledge_id": { + "type": "string" + }, + "last_error": { + "type": "string" + }, + "last_failed_at": { + "type": "string" + }, + "max_retry": { + "type": "integer" + }, + "next_process_at": { + "type": "string" + }, + "queue": { + "type": "string" + }, + "retried": { + "type": "integer" + }, + "source_id": { + "type": "string" + }, + "source_kb_id": { + "type": "string" + }, + "started_at": { + "type": "string" + }, + "state": { + "$ref": "#/definitions/github_com_Tencent_WeKnora_internal_types.RuntimeTaskState" + }, + "sync_log_id": { + "type": "string" + }, + "target_id": { + "type": "string" + }, + "target_kb_id": { + "type": "string" + }, + "task_id": { + "type": "string" + }, + "tenant_id": { + "type": "integer" + }, + "type": { + "type": "string" + }, + "worker": { + "type": "string" + } + } + }, + "github_com_Tencent_WeKnora_internal_types.RuntimeTaskState": { + "type": "string", + "enum": [ + "pending", + "active", + "scheduled", + "retry", + "archived", + "completed" + ], + "x-enum-varnames": [ + "RuntimeTaskPending", + "RuntimeTaskActive", + "RuntimeTaskScheduled", + "RuntimeTaskRetry", + "RuntimeTaskArchived", + "RuntimeTaskCompleted" + ] + }, "github_com_Tencent_WeKnora_internal_types.S3EngineConfig": { "type": "object", "properties": { @@ -20140,6 +20376,29 @@ const docTemplate = `{ } } }, + "internal_handler.RuntimeTasksResponse": { + "type": "object", + "properties": { + "available": { + "type": "boolean" + }, + "has_more": { + "type": "boolean" + }, + "page": { + "type": "integer" + }, + "page_size": { + "type": "integer" + }, + "tasks": { + "type": "array", + "items": { + "$ref": "#/definitions/github_com_Tencent_WeKnora_internal_types.RuntimeTaskInfo" + } + } + } + }, "internal_handler.RuntimeWorkerPool": { "description": "Return every row in the system_settings table (system-scope, not tenant-scope). SystemAdmin only.", "type": "object", diff --git a/docs/swagger.json b/docs/swagger.json index 7f621f77..8061ed23 100644 --- a/docs/swagger.json +++ b/docs/swagger.json @@ -11309,6 +11309,113 @@ } } }, + "/system/admin/runtime/queues/{queue}/tasks": { + "get": { + "produces": [ + "application/json" + ], + "tags": [ + "System Admin" + ], + "summary": "List runtime queue tasks by state", + "parameters": [ + { + "type": "string", + "description": "Queue name", + "name": "queue", + "in": "path", + "required": true + }, + { + "enum": [ + "pending", + "active", + "scheduled", + "retry", + "archived", + "completed" + ], + "type": "string", + "description": "Task state", + "name": "state", + "in": "query", + "required": true + }, + { + "type": "integer", + "default": 1, + "description": "Page", + "name": "page", + "in": "query" + }, + { + "type": "integer", + "default": 20, + "description": "Page size", + "name": "page_size", + "in": "query" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/internal_handler.RuntimeTasksResponse" + } + } + } + } + }, + "/system/admin/runtime/queues/{queue}/tasks/{task_id}/actions/{action}": { + "post": { + "produces": [ + "application/json" + ], + "tags": [ + "System Admin" + ], + "summary": "Run a safe runtime task action", + "parameters": [ + { + "type": "string", + "description": "Queue name", + "name": "queue", + "in": "path", + "required": true + }, + { + "type": "string", + "description": "Task ID", + "name": "task_id", + "in": "path", + "required": true + }, + { + "enum": [ + "cancel", + "run_now", + "delete" + ], + "type": "string", + "description": "Action", + "name": "action", + "in": "path", + "required": true + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "type": "object", + "additionalProperties": { + "type": "boolean" + } + } + } + } + } + }, "/system/admin/settings/{key}": { "get": { "description": "Returns the row matching :key. 404 when the key is unknown\nto the registry; 200 with the row when known.", @@ -14163,7 +14270,11 @@ "system.setting_changed", "system.admin_promoted", "system.admin_revoked", - "system.user_password_reset" + "system.user_password_reset", + "system.queue_task_retried", + "system.queue_task_deleted", + "system.queue_task_run_now", + "system.queue_task_cancelled" ], "x-enum-varnames": [ "AuditActionMemberAdded", @@ -14185,7 +14296,11 @@ "AuditActionSystemSettingChanged", "AuditActionSystemAdminPromoted", "AuditActionSystemAdminRevoked", - "AuditActionSystemUserPasswordReset" + "AuditActionSystemUserPasswordReset", + "AuditActionSystemQueueTaskRetried", + "AuditActionSystemQueueTaskDeleted", + "AuditActionSystemQueueTaskRunNow", + "AuditActionSystemQueueTaskCancelled" ] }, "github_com_Tencent_WeKnora_internal_types.AuditLog": { @@ -17317,6 +17432,127 @@ } } }, + "github_com_Tencent_WeKnora_internal_types.RuntimeTaskAction": { + "type": "string", + "enum": [ + "cancel", + "run_now", + "delete" + ], + "x-enum-varnames": [ + "RuntimeTaskActionCancel", + "RuntimeTaskActionRunNow", + "RuntimeTaskActionDelete" + ] + }, + "github_com_Tencent_WeKnora_internal_types.RuntimeTaskInfo": { + "type": "object", + "properties": { + "allowed_actions": { + "type": "array", + "items": { + "$ref": "#/definitions/github_com_Tencent_WeKnora_internal_types.RuntimeTaskAction" + } + }, + "completed_at": { + "type": "string" + }, + "data_source_id": { + "type": "string" + }, + "deadline": { + "type": "string" + }, + "enqueued_at": { + "type": "string" + }, + "id": { + "type": "string" + }, + "is_orphaned": { + "type": "boolean" + }, + "knowledge_base_id": { + "type": "string" + }, + "knowledge_count": { + "type": "integer" + }, + "knowledge_id": { + "type": "string" + }, + "last_error": { + "type": "string" + }, + "last_failed_at": { + "type": "string" + }, + "max_retry": { + "type": "integer" + }, + "next_process_at": { + "type": "string" + }, + "queue": { + "type": "string" + }, + "retried": { + "type": "integer" + }, + "source_id": { + "type": "string" + }, + "source_kb_id": { + "type": "string" + }, + "started_at": { + "type": "string" + }, + "state": { + "$ref": "#/definitions/github_com_Tencent_WeKnora_internal_types.RuntimeTaskState" + }, + "sync_log_id": { + "type": "string" + }, + "target_id": { + "type": "string" + }, + "target_kb_id": { + "type": "string" + }, + "task_id": { + "type": "string" + }, + "tenant_id": { + "type": "integer" + }, + "type": { + "type": "string" + }, + "worker": { + "type": "string" + } + } + }, + "github_com_Tencent_WeKnora_internal_types.RuntimeTaskState": { + "type": "string", + "enum": [ + "pending", + "active", + "scheduled", + "retry", + "archived", + "completed" + ], + "x-enum-varnames": [ + "RuntimeTaskPending", + "RuntimeTaskActive", + "RuntimeTaskScheduled", + "RuntimeTaskRetry", + "RuntimeTaskArchived", + "RuntimeTaskCompleted" + ] + }, "github_com_Tencent_WeKnora_internal_types.S3EngineConfig": { "type": "object", "properties": { @@ -20133,6 +20369,29 @@ } } }, + "internal_handler.RuntimeTasksResponse": { + "type": "object", + "properties": { + "available": { + "type": "boolean" + }, + "has_more": { + "type": "boolean" + }, + "page": { + "type": "integer" + }, + "page_size": { + "type": "integer" + }, + "tasks": { + "type": "array", + "items": { + "$ref": "#/definitions/github_com_Tencent_WeKnora_internal_types.RuntimeTaskInfo" + } + } + } + }, "internal_handler.RuntimeWorkerPool": { "description": "Return every row in the system_settings table (system-scope, not tenant-scope). SystemAdmin only.", "type": "object", diff --git a/docs/swagger.yaml b/docs/swagger.yaml index 73bd2bda..28c62a23 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -294,6 +294,10 @@ definitions: - system.admin_promoted - system.admin_revoked - system.user_password_reset + - system.queue_task_retried + - system.queue_task_deleted + - system.queue_task_run_now + - system.queue_task_cancelled type: string x-enum-varnames: - AuditActionMemberAdded @@ -316,6 +320,10 @@ definitions: - AuditActionSystemAdminPromoted - AuditActionSystemAdminRevoked - AuditActionSystemUserPasswordReset + - AuditActionSystemQueueTaskRetried + - AuditActionSystemQueueTaskDeleted + - AuditActionSystemQueueTaskRunNow + - AuditActionSystemQueueTaskCancelled github_com_Tencent_WeKnora_internal_types.AuditLog: properties: action: @@ -2739,6 +2747,91 @@ definitions: description: 'Optional: role to assign when approving; overrides applicant''s requested role' type: object + github_com_Tencent_WeKnora_internal_types.RuntimeTaskAction: + enum: + - cancel + - run_now + - delete + type: string + x-enum-varnames: + - RuntimeTaskActionCancel + - RuntimeTaskActionRunNow + - RuntimeTaskActionDelete + github_com_Tencent_WeKnora_internal_types.RuntimeTaskInfo: + properties: + allowed_actions: + items: + $ref: '#/definitions/github_com_Tencent_WeKnora_internal_types.RuntimeTaskAction' + type: array + completed_at: + type: string + data_source_id: + type: string + deadline: + type: string + enqueued_at: + type: string + id: + type: string + is_orphaned: + type: boolean + knowledge_base_id: + type: string + knowledge_count: + type: integer + knowledge_id: + type: string + last_error: + type: string + last_failed_at: + type: string + max_retry: + type: integer + next_process_at: + type: string + queue: + type: string + retried: + type: integer + source_id: + type: string + source_kb_id: + type: string + started_at: + type: string + state: + $ref: '#/definitions/github_com_Tencent_WeKnora_internal_types.RuntimeTaskState' + sync_log_id: + type: string + target_id: + type: string + target_kb_id: + type: string + task_id: + type: string + tenant_id: + type: integer + type: + type: string + worker: + type: string + type: object + github_com_Tencent_WeKnora_internal_types.RuntimeTaskState: + enum: + - pending + - active + - scheduled + - retry + - archived + - completed + type: string + x-enum-varnames: + - RuntimeTaskPending + - RuntimeTaskActive + - RuntimeTaskScheduled + - RuntimeTaskRetry + - RuntimeTaskArchived + - RuntimeTaskCompleted github_com_Tencent_WeKnora_internal_types.S3EngineConfig: properties: access_key: @@ -4832,6 +4925,21 @@ definitions: description: compatibility field type: integer type: object + internal_handler.RuntimeTasksResponse: + properties: + available: + type: boolean + has_more: + type: boolean + page: + type: integer + page_size: + type: integer + tasks: + items: + $ref: '#/definitions/github_com_Tencent_WeKnora_internal_types.RuntimeTaskInfo' + type: array + type: object internal_handler.RuntimeWorkerPool: description: Return every row in the system_settings table (system-scope, not tenant-scope). SystemAdmin only. @@ -12614,6 +12722,80 @@ paths: summary: 获取解析任务队列运行时状态 tags: - 系统管理 + /system/admin/runtime/queues/{queue}/tasks: + get: + parameters: + - description: Queue name + in: path + name: queue + required: true + type: string + - description: Task state + enum: + - pending + - active + - scheduled + - retry + - archived + - completed + in: query + name: state + required: true + type: string + - default: 1 + description: Page + in: query + name: page + type: integer + - default: 20 + description: Page size + in: query + name: page_size + type: integer + produces: + - application/json + responses: + "200": + description: OK + schema: + $ref: '#/definitions/internal_handler.RuntimeTasksResponse' + summary: List runtime queue tasks by state + tags: + - System Admin + /system/admin/runtime/queues/{queue}/tasks/{task_id}/actions/{action}: + post: + parameters: + - description: Queue name + in: path + name: queue + required: true + type: string + - description: Task ID + in: path + name: task_id + required: true + type: string + - description: Action + enum: + - cancel + - run_now + - delete + in: path + name: action + required: true + type: string + produces: + - application/json + responses: + "200": + description: OK + schema: + additionalProperties: + type: boolean + type: object + summary: Run a safe runtime task action + tags: + - System Admin /system/admin/settings/{key}: delete: description: |- diff --git a/frontend/src/api/system/index.ts b/frontend/src/api/system/index.ts index 94c05321..067b57b0 100644 --- a/frontend/src/api/system/index.ts +++ b/frontend/src/api/system/index.ts @@ -555,23 +555,42 @@ export interface RuntimeQueuesResponse { timestamp: number } -export interface RuntimeFailedTask { +export type RuntimeTaskState = 'pending' | 'active' | 'scheduled' | 'retry' | 'archived' | 'completed' +export type RuntimeTaskAction = 'cancel' | 'run_now' | 'delete' + +export interface RuntimeTask { id: string queue: string type: string - last_error: string - last_failed_at: string + state: RuntimeTaskState + allowed_actions: RuntimeTaskAction[] + last_error?: string + last_failed_at?: string + next_process_at?: string + started_at?: string + completed_at?: string + deadline?: string + enqueued_at?: string retried: number max_retry: number + is_orphaned?: boolean + worker?: string tenant_id?: number knowledge_base_id?: string knowledge_id?: string task_id?: string + source_id?: string + target_id?: string + source_kb_id?: string + target_kb_id?: string + data_source_id?: string + sync_log_id?: string + knowledge_count?: number } -export interface RuntimeFailedTasksResponse { +export interface RuntimeTasksResponse { available: boolean - tasks: RuntimeFailedTask[] + tasks: RuntimeTask[] page: number page_size: number has_more: boolean @@ -588,24 +607,23 @@ export async function getRuntimeQueues(): Promise { return response as unknown as RuntimeQueuesResponse } -export async function getRuntimeFailedTasks( +export async function getRuntimeTasks( queue: string, + state: RuntimeTaskState, page = 1, pageSize = 20, -): Promise { - return get(`/api/v1/system/admin/runtime/queues/${encodeURIComponent(queue)}/failed-tasks`, { - params: { page, page_size: pageSize }, +): Promise { + return get(`/api/v1/system/admin/runtime/queues/${encodeURIComponent(queue)}/tasks`, { + params: { state, page, page_size: pageSize }, }) } -export async function retryRuntimeFailedTask(queue: string, taskID: string): Promise { +export async function mutateRuntimeTask( + queue: string, + taskID: string, + action: RuntimeTaskAction, +): Promise { await post( - `/api/v1/system/admin/runtime/queues/${encodeURIComponent(queue)}/failed-tasks/${encodeURIComponent(taskID)}/retry`, - ) -} - -export async function deleteRuntimeFailedTask(queue: string, taskID: string): Promise { - await del( - `/api/v1/system/admin/runtime/queues/${encodeURIComponent(queue)}/failed-tasks/${encodeURIComponent(taskID)}`, + `/api/v1/system/admin/runtime/queues/${encodeURIComponent(queue)}/tasks/${encodeURIComponent(taskID)}/actions/${encodeURIComponent(action)}`, ) } diff --git a/frontend/src/i18n/locales/en-US.ts b/frontend/src/i18n/locales/en-US.ts index 77b023a5..90d75d28 100755 --- a/frontend/src/i18n/locales/en-US.ts +++ b/frontend/src/i18n/locales/en-US.ts @@ -3545,7 +3545,7 @@ export default { }, runtime: { title: "Task Queue Runtime", - description: "Live background-queue load and per-process capacity for each isolated worker pool. Read-only; auto-refreshes every 5s.", + description: "Live background-queue load and per-process capacity for each isolated worker pool. Includes task details and safe controls; auto-refreshes every 5s.", refresh: "Refresh", autoRefresh: "Auto-refresh (every 5s)", loading: "Loading...", @@ -3584,6 +3584,7 @@ export default { scheduled: "Scheduled", retry: "Retry", archived: "Failed", + completed: "Completed", latency: "Oldest wait", status: "Status", }, @@ -3600,43 +3601,65 @@ export default { title: "{count} failed tasks need attention", description: "Open a red Failed count in the table below to inspect causes, then retry after fixing the root issue.", }, - failedTasks: { - title: "Failed tasks · {queue}", - description: "Tasks that stopped after exceeding their automatic retry limit, newest failure first.", - guideTitle: "Fix the cause before running again", - guideDescription: "Run once performs one immediate attempt without resetting the retry counter. Clear record only removes it from this queue; it does not complete the original task, and historical logs remain.", - listTitle: "Failed records", - openAria: "View {count} failed tasks in {queue}", - unavailable: "Failed-task details are unavailable in this deployment", - empty: "This queue has no stopped failed tasks", + tasks: { + title: "Task details · {queue}", + description: "Inspect every task state and use only the actions the backend marks safe for the current task.", + listTitle: "{state} tasks", + openAria: "View {count} {state} tasks in {queue}", + unavailable: "Task details are unavailable in this deployment", + empty: "This queue has no {state} tasks", loadError: "Failed to load task details", loadMore: "Load more", loadedSummary: "{count} loaded — scroll or tap to load more", loadedAll: "All {count} loaded", loadingMore: "Loading more…", - attempts: "Retry count {count}", - attemptsShort: "{count}×", - showError: "View error", - hideError: "Hide error", - lastError: "Last error", - noError: "No error details recorded", + attempts: "Attempt {current}/{max}", unknownTarget: "No related object identified", knowledgeBaseLabel: "Knowledge base ID", knowledgeLabel: "Document ID", taskIDLabel: "Business task ID", tenantLabel: "Tenant ID", - tenant: "Workspace {id}", - knowledgeBase: "Knowledge base {id}", - knowledge: "Document {id}", - taskID: "Business task {id}", - retryOnce: "Run once", - retryConfirm: "Confirm that the cause has been fixed. This task will run once immediately.", - retrySuccess: "Task returned to the queue", - retryError: "Failed to run the task", + sourceLabel: "Source ID", + targetLabel: "Target ID", + sourceKBLabel: "Source knowledge base", + targetKBLabel: "Target knowledge base", + dataSourceLabel: "Data source ID", + syncLogLabel: "Sync log ID", + knowledgeCountLabel: "Documents", + enqueuedAt: "Enqueued", + startedAt: "Started", + nextProcessAt: "Next run", + lastFailedAt: "Last failed", + completedAt: "Completed", + deadline: "Deadline", + worker: "Worker", + health: "Runtime health", + orphaned: "Worker heartbeat lost; waiting for recovery", + cancel: "Cancel task", + cancelConfirm: "This uses the business cancellation flow and also stops related tasks for the same document. Cancel it?", + runNow: "Run now", + runNowConfirm: "This task will move to pending immediately without resetting its retry count. Continue?", deleteRecord: "Clear record", deleteConfirm: "This only removes the record from this queue. It will not run or complete the original task, and historical logs remain. Clear it?", - deleteSuccess: "Failure record cleared", - deleteError: "Failed to clear the record", + stateFilter: "Filter by task state", + states: { + active: "Active", + pending: "Pending", + scheduled: "Scheduled", + retry: "Retrying", + archived: "Failed", + completed: "Completed", + }, + guides: { + active: "Inspect the worker, start time, deadline, and orphan status. Cancel is offered only when the business state can be updated safely.", + pending: "Pending tasks have not been claimed. Cancellation updates business state instead of only removing Redis data.", + scheduled: "Scheduled tasks can run early; document pipeline tasks can also use safe business cancellation.", + retry: "Use the last error, attempt count, and next run time to decide whether to run now or cancel.", + archived: "Fix the root cause before running again. Clearing a record does not complete the original business task.", + completed: "Only recently completed tasks with result retention are shown. No management actions are available.", + }, + actionSuccess: { cancel: "Task cancelled", run_now: "Task moved to pending", delete: "Failure record cleared" }, + actionError: { cancel: "Failed to cancel task", run_now: "Failed to run task", delete: "Failed to clear record" }, taskTypes: { documentProcess: "Document parsing", manualProcess: "Manual reprocessing", @@ -3903,6 +3926,8 @@ export default { 'system.user_password_reset': 'User password reset', 'system.queue_task_retried': 'Failed task run again', 'system.queue_task_deleted': 'Failed task record cleared', + 'system.queue_task_run_now': 'Queue task run now', + 'system.queue_task_cancelled': 'Queue task cancelled', }, outcome: { success: 'Success', diff --git a/frontend/src/i18n/locales/ko-KR.ts b/frontend/src/i18n/locales/ko-KR.ts index 93fb5226..8dc51644 100755 --- a/frontend/src/i18n/locales/ko-KR.ts +++ b/frontend/src/i18n/locales/ko-KR.ts @@ -2569,6 +2569,7 @@ export default { scheduled: "예약", retry: "재시도", archived: "실패", + completed: "완료", latency: "최장 대기", status: "상태", }, @@ -2585,21 +2586,21 @@ export default { title: "처리 대기 중인 실패 작업 {count}개", description: "아래 표의 빨간색 '최종 실패' 숫자를 눌러 원인을 확인한 뒤, 수정 후 수동으로 재시도하세요.", }, - failedTasks: { - title: "최종 실패 · {queue}", - description: "자동 재시도 한도를 초과하여 중지된 작업이며 최근 실패 순으로 표시됩니다.", + tasks: { + title: "작업 상세 · {queue}", + description: "모든 작업 상태를 확인하고 백엔드가 현재 상태에 안전하다고 표시한 작업만 실행합니다.", guideTitle: "원인을 해결한 뒤 다시 실행하세요", guideDescription: "‘한 번 다시 실행’은 재시도 횟수를 초기화하지 않고 즉시 한 번 실행합니다. ‘기록 지우기’는 현재 큐에서만 제거하며 원래 작업을 완료하지 않고 기록 로그는 유지됩니다.", - listTitle: "실패 기록", - openAria: "{queue}의 최종 실패 작업 {count}개 보기", + listTitle: "{state} 작업", + openAria: "{queue}의 {state} 작업 {count}개 보기", unavailable: "현재 배포에서는 실패 작업 상세 정보를 볼 수 없습니다", - empty: "이 큐에는 최종 실패 작업이 없습니다", + empty: "이 큐에는 {state} 작업이 없습니다", loadError: "실패 작업 상세 정보를 불러오지 못했습니다", loadMore: "더 보기", loadedSummary: "{count}개 로드됨 · 스크롤하거나 눌러 더 보기", loadedAll: "총 {count}개 모두 로드됨", loadingMore: "더 불러오는 중…", - attempts: "재시도 횟수 {count}", + attempts: "실행 {current}/{max}", attemptsShort: "{count}회", showError: "오류 보기", hideError: "오류 접기", @@ -2610,6 +2611,38 @@ export default { knowledgeLabel: "문서 ID", taskIDLabel: "비즈니스 작업 ID", tenantLabel: "테넌트 ID", + sourceLabel: "소스 ID", + targetLabel: "대상 ID", + sourceKBLabel: "소스 지식 베이스", + targetKBLabel: "대상 지식 베이스", + dataSourceLabel: "데이터 소스 ID", + syncLogLabel: "동기화 기록 ID", + knowledgeCountLabel: "문서 수", + enqueuedAt: "큐 등록 시간", + startedAt: "시작 시간", + nextProcessAt: "다음 실행", + lastFailedAt: "마지막 실패", + completedAt: "완료 시간", + deadline: "마감 시간", + worker: "실행 인스턴스", + health: "실행 상태", + orphaned: "실행 인스턴스 연결 끊김; 복구 대기 중", + cancel: "작업 취소", + cancelConfirm: "비즈니스 취소 흐름을 사용하여 같은 문서의 관련 작업도 중지합니다. 취소할까요?", + runNow: "지금 실행", + runNowConfirm: "재시도 횟수를 초기화하지 않고 즉시 대기 상태로 이동합니다. 계속할까요?", + stateFilter: "작업 상태별 필터", + states: { active: "실행 중", pending: "대기 중", scheduled: "예약", retry: "재시도 중", archived: "최종 실패", completed: "완료" }, + guides: { + active: "실행 인스턴스와 시작 시간, 마감 및 고립 상태를 확인합니다. 안전한 비즈니스 취소가 가능한 작업만 취소할 수 있습니다.", + pending: "아직 worker가 가져가지 않은 작업입니다. 취소 시 비즈니스 상태도 함께 갱신됩니다.", + scheduled: "예약 작업을 즉시 실행하거나 지원되는 문서 작업을 안전하게 취소할 수 있습니다.", + retry: "마지막 오류, 시도 횟수 및 다음 실행 시간을 확인하세요.", + archived: "원인을 해결한 후 다시 실행하세요. 기록 삭제는 원래 작업을 완료하지 않습니다.", + completed: "보존 기간이 설정된 최근 완료 작업만 표시되며 관리 작업은 없습니다.", + }, + actionSuccess: { cancel: "작업을 취소했습니다", run_now: "작업이 대기열로 이동했습니다", delete: "실패 기록을 지웠습니다" }, + actionError: { cancel: "작업을 취소하지 못했습니다", run_now: "작업을 실행하지 못했습니다", delete: "실패 기록을 지우지 못했습니다" }, tenant: "공간 {id}", knowledgeBase: "지식 베이스 {id}", knowledge: "문서 {id}", @@ -2888,6 +2921,8 @@ export default { "system.user_password_reset": "사용자 비밀번호 재설정", "system.queue_task_retried": "실패 작업 다시 실행", "system.queue_task_deleted": "실패 작업 기록 삭제", + "system.queue_task_run_now": "큐 작업 즉시 실행", + "system.queue_task_cancelled": "큐 작업 취소", }, outcome: { success: "성공", diff --git a/frontend/src/i18n/locales/ru-RU.ts b/frontend/src/i18n/locales/ru-RU.ts index b87e536f..2e63d888 100755 --- a/frontend/src/i18n/locales/ru-RU.ts +++ b/frontend/src/i18n/locales/ru-RU.ts @@ -2266,6 +2266,7 @@ export default { scheduled: "Запланир.", retry: "Повтор", archived: "Сбой", + completed: "Завершено", latency: "Макс. ожидание", status: "Статус", }, @@ -2282,21 +2283,21 @@ export default { title: "{count} сбойных задач требуют внимания", description: "Нажмите красное число в столбце «Окончательные сбои», чтобы увидеть причину, затем повторите после исправления.", }, - failedTasks: { - title: "Окончательные сбои · {queue}", - description: "Задачи, остановленные после исчерпания автоматических повторов; новые сбои показаны первыми.", + tasks: { + title: "Сведения о задачах · {queue}", + description: "Просмотр всех состояний; доступны только действия, которые сервер считает безопасными для текущей задачи.", guideTitle: "Сначала устраните причину", guideDescription: "«Запустить один раз» выполняет одну попытку без сброса счётчика повторов. «Очистить запись» удаляет её только из этой очереди, не завершает исходную задачу и сохраняет исторические журналы.", - listTitle: "Сбойные записи", - openAria: "Показать сбоев в очереди {queue}: {count}", + listTitle: "Задачи: {state}", + openAria: "Показать задач {state} в очереди {queue}: {count}", unavailable: "Подробности сбоев недоступны в этой конфигурации", - empty: "В этой очереди нет остановленных задач", + empty: "В этой очереди нет задач {state}", loadError: "Не удалось загрузить сведения о сбоях", loadMore: "Показать ещё", loadedSummary: "Загружено {count} · прокрутите или нажмите, чтобы загрузить ещё", loadedAll: "Загружены все {count}", loadingMore: "Загрузка…", - attempts: "Число повторов {count}", + attempts: "Попытка {current}/{max}", attemptsShort: "×{count}", showError: "Показать ошибку", hideError: "Скрыть ошибку", @@ -2307,6 +2308,38 @@ export default { knowledgeLabel: "ID документа", taskIDLabel: "ID бизнес-задачи", tenantLabel: "ID тенанта", + sourceLabel: "ID источника", + targetLabel: "ID цели", + sourceKBLabel: "Исходная база знаний", + targetKBLabel: "Целевая база знаний", + dataSourceLabel: "ID источника данных", + syncLogLabel: "ID журнала синхронизации", + knowledgeCountLabel: "Документов", + enqueuedAt: "Поставлено в очередь", + startedAt: "Запущено", + nextProcessAt: "Следующий запуск", + lastFailedAt: "Последний сбой", + completedAt: "Завершено", + deadline: "Срок", + worker: "Исполнитель", + health: "Состояние выполнения", + orphaned: "Связь с исполнителем потеряна; ожидается восстановление", + cancel: "Отменить задачу", + cancelConfirm: "Будет использована бизнес-отмена и остановлены связанные задачи документа. Отменить?", + runNow: "Запустить сейчас", + runNowConfirm: "Задача сразу перейдёт в ожидание без сброса счётчика повторов. Продолжить?", + stateFilter: "Фильтр по состоянию задачи", + states: { active: "Активные", pending: "Ожидают", scheduled: "Запланированы", retry: "Повтор", archived: "Окончательный сбой", completed: "Завершены" }, + guides: { + active: "Проверьте исполнителя, время запуска, срок и признак потери связи. Отмена доступна только при безопасном обновлении бизнес-состояния.", + pending: "Задачи ещё не взяты исполнителем. Отмена обновляет бизнес-состояние, а не только удаляет данные Redis.", + scheduled: "Запланированные задачи можно запустить раньше; задачи документов также поддерживают безопасную отмену.", + retry: "Оцените последнюю ошибку, число попыток и время следующего запуска.", + archived: "Сначала устраните причину. Удаление записи не завершает исходную бизнес-задачу.", + completed: "Показаны только недавние завершённые задачи с хранением результата. Действий нет.", + }, + actionSuccess: { cancel: "Задача отменена", run_now: "Задача переведена в ожидание", delete: "Запись о сбое удалена" }, + actionError: { cancel: "Не удалось отменить задачу", run_now: "Не удалось запустить задачу", delete: "Не удалось удалить запись" }, tenant: "Пространство {id}", knowledgeBase: "База знаний {id}", knowledge: "Документ {id}", @@ -2584,7 +2617,9 @@ export default { 'system.admin_revoked': 'Отозван системный администратор', 'system.user_password_reset': 'Сброшен пароль пользователя', 'system.queue_task_retried': 'Повторно запущена сбойная задача', - 'system.queue_task_deleted': 'Удалена запись о сбойной задаче' + 'system.queue_task_deleted': 'Удалена запись о сбойной задаче', + 'system.queue_task_run_now': 'Задача очереди запущена сейчас', + 'system.queue_task_cancelled': 'Задача очереди отменена', }, outcome: { success: 'Успешно', diff --git a/frontend/src/i18n/locales/zh-CN.ts b/frontend/src/i18n/locales/zh-CN.ts index 9a5037a1..90161263 100755 --- a/frontend/src/i18n/locales/zh-CN.ts +++ b/frontend/src/i18n/locales/zh-CN.ts @@ -2533,7 +2533,7 @@ export default { }, runtime: { title: "任务队列运行时", - description: "后台任务队列的实时负载,以及各独立 worker 池的每实例并发配置。仅供观察,每 5 秒自动刷新。", + description: "后台任务队列的实时负载,以及各独立 worker 池的每实例并发配置。支持查看任务明细和安全管理,每 5 秒自动刷新。", refresh: "刷新", autoRefresh: "自动刷新(每 5 秒)", loading: "加载中...", @@ -2572,6 +2572,7 @@ export default { scheduled: "定时", retry: "重试", archived: "最终失败", + completed: "已完成", latency: "最早等待", status: "状态", }, @@ -2588,43 +2589,73 @@ export default { title: "{count} 个任务待处理", description: "点击下方表中红色「最终失败」数字查看原因,修复后可手动重试。", }, - failedTasks: { - title: "最终失败 · {queue}", - description: "这里展示超过自动重试上限后停止的任务,按最近失败时间排序。", - guideTitle: "先修复原因,再重新执行", - guideDescription: "“重新执行一次”只会立即再运行一次,不会重置自动重试次数;“清除记录”只从当前队列移除记录,不会完成原任务,历史日志仍会保留。", - listTitle: "失败记录", - openAria: "查看{queue}的 {count} 个最终失败任务", - unavailable: "当前部署不支持查看失败任务明细", - empty: "这个队列当前没有最终失败任务", - loadError: "获取失败任务明细失败", + tasks: { + title: "任务明细 · {queue}", + description: "查看各状态任务及其安全管理动作。可用动作由后端根据任务当前状态和业务语义返回。", + listTitle: "{state}任务", + openAria: "查看{queue}中 {count} 个{state}任务", + unavailable: "当前部署不支持查看任务明细", + empty: "这个队列当前没有{state}任务", + loadError: "获取任务明细失败", loadMore: "加载更多", loadedSummary: "已加载 {count} 条,继续下滑或点击加载", loadedAll: "已全部加载,共 {count} 条", loadingMore: "正在加载更多…", - attempts: "重试次数 {count}", - attemptsShort: "{count} 次", - showError: "查看错误", - hideError: "收起错误", - lastError: "最后错误", - noError: "未记录错误详情", + attempts: "执行 {current}/{max}", unknownTarget: "未识别到关联对象", knowledgeBaseLabel: "知识库 ID", knowledgeLabel: "文档 ID", taskIDLabel: "业务任务 ID", tenantLabel: "租户 ID", - tenant: "空间 {id}", - knowledgeBase: "知识库 {id}", - knowledge: "文档 {id}", - taskID: "业务任务 {id}", - retryOnce: "重新执行一次", - retryConfirm: "请确认已经修复失败原因。该任务将立即重新执行一次。", - retrySuccess: "任务已重新进入队列", - retryError: "重新执行任务失败", + sourceLabel: "来源 ID", + targetLabel: "目标 ID", + sourceKBLabel: "来源知识库", + targetKBLabel: "目标知识库", + dataSourceLabel: "数据源 ID", + syncLogLabel: "同步记录 ID", + knowledgeCountLabel: "文档数量", + enqueuedAt: "入队时间", + startedAt: "开始时间", + nextProcessAt: "下次执行", + lastFailedAt: "最后失败", + completedAt: "完成时间", + deadline: "执行截止", + worker: "执行实例", + health: "运行健康", + orphaned: "执行实例已失联,等待恢复", + cancel: "终止任务", + cancelConfirm: "将通过业务取消流程终止该任务及同一文档的相关队列任务。确认终止?", + runNow: "立即执行", + runNowConfirm: "该任务将立即进入待执行队列,重试次数不会重置。确认继续?", deleteRecord: "清除记录", deleteConfirm: "仅从当前队列移除这条失败记录,不会执行或完成原任务,历史日志仍会保留。确认清除?", - deleteSuccess: "失败记录已清除", - deleteError: "清除失败记录失败", + stateFilter: "按任务状态筛选", + states: { + active: "运行中", + pending: "排队中", + scheduled: "定时执行", + retry: "重试中", + archived: "最终失败", + completed: "已完成", + }, + guides: { + active: "运行中任务可查看执行实例、开始时间和截止时间。只有具备完整业务取消语义的任务才允许终止。", + pending: "排队任务尚未被 worker 领取。终止操作会同步更新业务状态,而不是只删除 Redis 记录。", + scheduled: "定时任务可提前立即执行;支持业务取消的文档任务也可以安全终止。", + retry: "请结合最后错误、重试次数和下次执行时间判断是否立即执行或终止。", + archived: "请先修复失败原因再立即执行。清除记录不会完成原业务任务。", + completed: "这里只展示设置了结果保留时间的近期完成任务,不提供管理动作。", + }, + actionSuccess: { + cancel: "任务已终止", + run_now: "任务已进入待执行队列", + delete: "失败记录已清除", + }, + actionError: { + cancel: "终止任务失败", + run_now: "立即执行任务失败", + delete: "清除失败记录失败", + }, taskTypes: { documentProcess: "文档解析", manualProcess: "手工重新处理", @@ -2902,6 +2933,8 @@ export default { "system.user_password_reset": "重置用户密码", "system.queue_task_retried": "重新执行失败任务", "system.queue_task_deleted": "清除失败任务记录", + "system.queue_task_run_now": "立即执行队列任务", + "system.queue_task_cancelled": "终止队列任务", }, outcome: { success: "成功", diff --git a/frontend/src/views/system/RuntimeQueues.vue b/frontend/src/views/system/RuntimeQueues.vue index 0e2f2099..64dc4180 100644 --- a/frontend/src/views/system/RuntimeQueues.vue +++ b/frontend/src/views/system/RuntimeQueues.vue @@ -171,18 +171,46 @@ + @@ -254,109 +292,113 @@
-

- {{ t('system.globalSettings.runtime.failedTasks.guideTitle') }} -

-

- {{ t('system.globalSettings.runtime.failedTasks.guideDescription') }} -

+
+ +
+

{{ taskStateGuide }}

- {{ t('system.globalSettings.runtime.failedTasks.listTitle') }} + {{ t('system.globalSettings.runtime.tasks.listTitle', { state: taskStateLabel(taskState) }) }}

{{ t('system.globalSettings.runtime.refresh') }}
-
+
{{ t('system.globalSettings.runtime.loading') }}
-
- {{ failedTasksError }} - +
+ {{ tasksError }} + {{ t('system.globalSettings.runtime.retry') }}
- {{ failedTaskTypeLabel(task.type) }} + {{ runtimeTaskTypeLabel(task.type) }} - - {{ t('system.globalSettings.runtime.failedTasks.attempts', { count: task.retried + 1 }) }} + + {{ taskStateLabel(task.state) }} - + + {{ t('system.globalSettings.runtime.tasks.attempts', { current: task.retried + 1, max: task.max_retry + 1 }) }} +
-
-
+
+
{{ ref.label }}
{{ ref.value }}

- {{ t('system.globalSettings.runtime.failedTasks.unknownTarget') }} + {{ t('system.globalSettings.runtime.tasks.unknownTarget') }}

-

- {{ task.last_error || t('system.globalSettings.runtime.failedTasks.noError') }} +

+ {{ task.last_error }}

-
- - - - - +
+ + + + + + + + @@ -375,28 +454,28 @@
-