外观专利转 Linux 后台主力执行:activate 不再推送客户端浏览器
- activateTask 改为状态校验:PENDING 保持等 Linux 内部认领,旧前端点启动给出明确提示并中止入队,任务不会重复执行 - 内部认领新增独立等待窗口 internal-min-pending-minutes(默认2分钟),任务创建后快速自动开始 - 客户端兜底拉取默认白名单移除 APPEARANCE_PATENT,防止未来误开时客户端抢抓 - 前端「启动」按钮改「提交后台执行」:不再 enqueue_json 推客户端队列,直接进入轮询
This commit is contained in:
@@ -27,7 +27,7 @@
|
||||
{{ parsing ? '解析中...' : '解析并创建任务' }}
|
||||
</button>
|
||||
<button type="button" class="btn-run btn-queue" :disabled="pushing || !parseResult?.taskId" @click="pushToPythonQueue">
|
||||
{{ pushing ? '启动中...' : '启动任务' }}
|
||||
{{ pushing ? '提交中...' : '提交后台执行' }}
|
||||
</button>
|
||||
</div>
|
||||
<p class="loading-msg">提交后系统自动分批检测,进度显示在右侧任务区,完成后可下载结果。</p>
|
||||
@@ -81,16 +81,13 @@ import ModuleTemplateDownload from '@/shared/components/ModuleTemplateDownload.v
|
||||
import TaskCenterPanel from '@/shared/components/tasks/TaskCenterPanel.vue'
|
||||
import type { TaskItemView, TaskStatCard } from '@/shared/components/tasks/types'
|
||||
import {
|
||||
activateAppearancePatentTask,
|
||||
deleteAppearancePatentHistory,
|
||||
deleteAppearancePatentTask,
|
||||
getAppearancePatentDashboard,
|
||||
getAppearancePatentHistory,
|
||||
getAppearancePatentQueuePayload,
|
||||
getAppearancePatentResultDownloadUrl,
|
||||
getAppearancePatentTaskProgressBatch,
|
||||
parseAppearancePatent,
|
||||
type AppearancePatentParsedPayloadDto,
|
||||
type AppearancePatentDashboardVo,
|
||||
type AppearancePatentHistoryItem,
|
||||
type AppearancePatentParseVo,
|
||||
@@ -106,7 +103,6 @@ import { saveUrlWithProgress } from '@/shared/utils/download-progress'
|
||||
import {
|
||||
EXCEL_EXTENSIONS,
|
||||
checkParseResult,
|
||||
checkQueuePayload,
|
||||
checkSelectedFiles,
|
||||
} from '@/shared/dispatch-guard'
|
||||
import { passGuard } from '@/shared/dispatch-guard-ui'
|
||||
@@ -252,10 +248,6 @@ function effectiveAiPrompt() {
|
||||
return aiPrompt.value.trim()
|
||||
}
|
||||
|
||||
function queueAiPrompt() {
|
||||
return aiPrompt.value.trim()
|
||||
}
|
||||
|
||||
function effectiveLlmApiKey() {
|
||||
return getStoredApiSecret('appearance-patent').trim()
|
||||
}
|
||||
@@ -427,87 +419,23 @@ async function parseFiles() {
|
||||
}
|
||||
|
||||
async function pushToPythonQueue() {
|
||||
const api = getPywebviewApi()
|
||||
const currentParseResult = parseResult.value
|
||||
const taskId = currentParseResult?.taskId
|
||||
if (!taskId) {
|
||||
ElMessage.warning('请先解析文件')
|
||||
return
|
||||
}
|
||||
if (!api?.enqueue_json) {
|
||||
ElMessage.error('当前环境未启用 pywebview enqueue_json')
|
||||
return
|
||||
}
|
||||
if (!effectiveLlmApiKey()) {
|
||||
// 本地无明文不再阻断:服务端已保存该用户密钥,任务执行时按 uid 兜底读取
|
||||
console.log('[appearance-patent] 本地无密钥明文,启动任务由服务端兜底')
|
||||
}
|
||||
// 2026-09-30 外观专利已迁移 Linux 后台执行(无浏览器抓取):
|
||||
// 「启动」不再推送客户端队列,任务保持 PENDING,由服务端内部认领
|
||||
// (/api/internal/tasks/pull-pending + 主机B maixiang-ap worker)在等待窗口后自动接管。
|
||||
pushing.value = true
|
||||
try {
|
||||
const parsedPayload: AppearancePatentParsedPayloadDto = await getAppearancePatentQueuePayload(taskId)
|
||||
const groups = parsedPayload.groups || []
|
||||
const payload = {
|
||||
type: 'appearance-patent-run',
|
||||
ts: Date.now(),
|
||||
data: {
|
||||
taskId,
|
||||
prompt: queueAiPrompt(),
|
||||
api_key: effectiveLlmApiKey(),
|
||||
sourceFileCount: currentParseResult.sourceFileCount || 0,
|
||||
totalRows: currentParseResult.totalRows || 0,
|
||||
acceptedRows: currentParseResult.acceptedRows || 0,
|
||||
groupCount: currentParseResult.groupCount || 0,
|
||||
groups: groups.map((group) => ({
|
||||
sourceFileKey: group.sourceFileKey || '',
|
||||
sourceFilename: group.sourceFilename || '',
|
||||
groupKey: group.groupKey || '',
|
||||
baseId: group.baseId || '',
|
||||
displayId: group.displayId || '',
|
||||
items: (group.items || []).map((row) => ({
|
||||
sourceFileKey: row.sourceFileKey || '',
|
||||
sourceFilename: row.sourceFilename || '',
|
||||
rowToken: row.rowToken || '',
|
||||
groupKey: row.groupKey || '',
|
||||
id: row.displayId,
|
||||
asin: row.asin,
|
||||
country: row.country,
|
||||
sku: row.sku || '',
|
||||
url: row.url || '',
|
||||
title: row.title || '',
|
||||
})),
|
||||
})),
|
||||
},
|
||||
}
|
||||
queuePayloadText.value = `任务 ${taskId} 已准备启动,共 ${groups.length} 组`
|
||||
// 后端返回的 groups 为空时推送出去,Python 端没有可执行批次会一直停在执行中
|
||||
const guard = checkQueuePayload(payload, {
|
||||
expectedType: 'appearance-patent-run',
|
||||
// api_key 不列为必填:密钥已服务端化,本地无明文时由服务端按 uid 兜底
|
||||
// (Java AppearancePatentTaskService.readApiKey),列必填会把这类用户全部拦下
|
||||
requiredDataKeys: ['taskId'],
|
||||
nonEmptyArrayKeys: ['groups'],
|
||||
})
|
||||
if (!(await passGuard(guard))) return
|
||||
// 任务可能已被客户端「兜底拉取」领走(页面长时间没点启动):服务端会拒绝 activate,
|
||||
// 此时必须直接返回,不能再入队,否则同一任务会被执行两次
|
||||
try {
|
||||
await activateAppearancePatentTask(taskId)
|
||||
} catch (activateError) {
|
||||
ElMessage.warning(activateError instanceof Error ? activateError.message : '任务已在执行中,无需重复启动')
|
||||
await Promise.all([loadDashboard(), loadHistory({ force: true })])
|
||||
return
|
||||
}
|
||||
const result = await api.enqueue_json(payload)
|
||||
if (!result?.success) {
|
||||
ElMessage.error(result?.error || '启动失败')
|
||||
return
|
||||
}
|
||||
queuedTaskSummary.value = toTaskSummary(currentParseResult)
|
||||
addPollingTask(taskId)
|
||||
clearParsedTask()
|
||||
await loadDashboard()
|
||||
await loadHistory({ force: true })
|
||||
ElMessage.success('已启动任务')
|
||||
ElMessage.success('已提交,后台自动执行中(无需打开浏览器)')
|
||||
} finally {
|
||||
pushing.value = false
|
||||
}
|
||||
@@ -802,7 +730,7 @@ function hasMeaningfulProgressValue(value: unknown) {
|
||||
function statusText(item: AppearancePatentHistoryItem) {
|
||||
const status = normalizeTaskStatus(item)
|
||||
if (status === 'RUNNING') return '执行中'
|
||||
if (status === 'PENDING') return '已解析待启动'
|
||||
if (status === 'PENDING') return '已解析,等待后台执行'
|
||||
// 已判死(含心跳超时)的任务始终显示失败:后台检测可能仍在跑、文件生成后下载按钮会自动出现,
|
||||
// 但状态文案不能是"结果生成中",否则用户会以为任务还在执行(2026-09-28 29473/29479)
|
||||
if (status === 'FAILED') return isResultBuildFailed(item) ? '结果生成失败' : '失败'
|
||||
|
||||
Reference in New Issue
Block a user