feat: add node image workbench actions
这个提交存在于:
父节点
d108b9d175
当前提交
7e63fa31bf
共有 10 个文件被更改,包括 261 次插入 和 26 次删除
|
|
@ -12,6 +12,14 @@ export const endpoints = {
|
||||||
workflowCancel: (workflowId: string) => `workflows/${workflowId}/cancel`,
|
workflowCancel: (workflowId: string) => `workflows/${workflowId}/cancel`,
|
||||||
workflowArchive: (workflowId: string) => `workflows/${workflowId}/archive`,
|
workflowArchive: (workflowId: string) => `workflows/${workflowId}/archive`,
|
||||||
workflowNodes: (workflowId: string) => `workflows/${workflowId}/nodes`,
|
workflowNodes: (workflowId: string) => `workflows/${workflowId}/nodes`,
|
||||||
|
nodeGenerate: (nodeId: string) => `nodes/${nodeId}/generate`,
|
||||||
|
nodeSelectImage: (nodeId: string) => `nodes/${nodeId}/select-image`,
|
||||||
|
nodeAdoptImage: (nodeId: string) => `nodes/${nodeId}/adopt-image`,
|
||||||
|
nodeImages: (nodeId: string) => `nodes/${nodeId}/images`,
|
||||||
|
image: (imageId: string) => `images/${imageId}`,
|
||||||
|
imageSelect: (imageId: string) => `images/${imageId}/select`,
|
||||||
|
imageUnselect: (imageId: string) => `images/${imageId}/unselect`,
|
||||||
|
imageArchive: (imageId: string) => `images/${imageId}/archive`,
|
||||||
jobs: "jobs",
|
jobs: "jobs",
|
||||||
jobCancel: (taskId: string) => `jobs/${taskId}/cancel`,
|
jobCancel: (taskId: string) => `jobs/${taskId}/cancel`,
|
||||||
jobRetry: (taskId: string) => `jobs/${taskId}/retry`,
|
jobRetry: (taskId: string) => `jobs/${taskId}/retry`,
|
||||||
|
|
|
||||||
29
frontend/shared/types/image.ts
普通文件
29
frontend/shared/types/image.ts
普通文件
|
|
@ -0,0 +1,29 @@
|
||||||
|
export interface GenerationImage {
|
||||||
|
image_id: string
|
||||||
|
profile_id?: string | null
|
||||||
|
workflow_id?: string | null
|
||||||
|
node_id?: string | null
|
||||||
|
task_id?: string | null
|
||||||
|
batch_id?: string | null
|
||||||
|
version_tag?: string | null
|
||||||
|
image_uri: string
|
||||||
|
thumbnail_uri?: string | null
|
||||||
|
positive_prompt?: string | null
|
||||||
|
negative_prompt?: string | null
|
||||||
|
model_used?: string | null
|
||||||
|
model_route?: string | null
|
||||||
|
seed?: number | null
|
||||||
|
width?: number | null
|
||||||
|
height?: number | null
|
||||||
|
is_selected: boolean
|
||||||
|
is_archived: boolean
|
||||||
|
metadata: Record<string, unknown>
|
||||||
|
created_at: string
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface NodeGenerateResult {
|
||||||
|
task_id?: string | null
|
||||||
|
request_id: string
|
||||||
|
node_status: string
|
||||||
|
queue_placeholder?: boolean
|
||||||
|
}
|
||||||
|
|
@ -5,6 +5,7 @@ import { getJson, postJson, request } from "../../shared/api/client"
|
||||||
import type { UiBootstrap } from "../../shared/types/bootstrap"
|
import type { UiBootstrap } from "../../shared/types/bootstrap"
|
||||||
import type { DashboardSummary } from "../../shared/types/dashboard"
|
import type { DashboardSummary } from "../../shared/types/dashboard"
|
||||||
import type { ApiDialect, CapabilityProfile, RenderPlanValidationResult } from "../../shared/types/discovery"
|
import type { ApiDialect, CapabilityProfile, RenderPlanValidationResult } from "../../shared/types/discovery"
|
||||||
|
import type { GenerationImage, NodeGenerateResult } from "../../shared/types/image"
|
||||||
import type { DailyOutfitResult } from "../../shared/types/integration"
|
import type { DailyOutfitResult } from "../../shared/types/integration"
|
||||||
import type { JobListResult } from "../../shared/types/job"
|
import type { JobListResult } from "../../shared/types/job"
|
||||||
import type { LogBundle } from "../../shared/types/logs"
|
import type { LogBundle } from "../../shared/types/logs"
|
||||||
|
|
@ -48,6 +49,10 @@ const text = {
|
||||||
quickDraft: "\u5feb\u901f\u8349\u7a3f",
|
quickDraft: "\u5feb\u901f\u8349\u7a3f",
|
||||||
archive: "\u5f52\u6863",
|
archive: "\u5f52\u6863",
|
||||||
start: "\u542f\u52a8",
|
start: "\u542f\u52a8",
|
||||||
|
generate: "\u751f\u6210",
|
||||||
|
adopt: "\u91c7\u7eb3",
|
||||||
|
select: "\u9009\u62e9",
|
||||||
|
unselect: "\u53d6\u9009",
|
||||||
recognize: "\u8bc6\u522b",
|
recognize: "\u8bc6\u522b",
|
||||||
confirm: "\u786e\u8ba4",
|
confirm: "\u786e\u8ba4",
|
||||||
name: "\u540d\u79f0",
|
name: "\u540d\u79f0",
|
||||||
|
|
@ -99,6 +104,13 @@ const text = {
|
||||||
workflowCreated: "\u5de5\u4f5c\u6d41\u5df2\u521b\u5efa",
|
workflowCreated: "\u5de5\u4f5c\u6d41\u5df2\u521b\u5efa",
|
||||||
emptyWorkflows: "\u6682\u65e0\u5de5\u4f5c\u6d41",
|
emptyWorkflows: "\u6682\u65e0\u5de5\u4f5c\u6d41",
|
||||||
nodes: "\u8282\u70b9",
|
nodes: "\u8282\u70b9",
|
||||||
|
images: "\u56fe\u7247",
|
||||||
|
emptyImages: "\u6682\u65e0\u56fe\u7247",
|
||||||
|
modelRoute: "\u6a21\u578b\u8def\u7531",
|
||||||
|
prompt: "\u63d0\u793a\u8bcd",
|
||||||
|
generationQueued: "\u751f\u6210\u5df2\u5165\u961f",
|
||||||
|
imageArchived: "\u56fe\u7247\u5df2\u5f52\u6863",
|
||||||
|
imageDeleted: "\u56fe\u7247\u5df2\u5220\u9664",
|
||||||
currentBranch: "\u5f53\u524d\u5206\u652f",
|
currentBranch: "\u5f53\u524d\u5206\u652f",
|
||||||
materialCategories: "\u7d20\u6750\u5206\u7c7b",
|
materialCategories: "\u7d20\u6750\u5206\u7c7b",
|
||||||
materialItems: "\u7d20\u6750\u6761\u76ee",
|
materialItems: "\u7d20\u6750\u6761\u76ee",
|
||||||
|
|
@ -175,6 +187,9 @@ const dashboard = ref<DashboardSummary | null>(null)
|
||||||
const profiles = ref<ProfileListResult | null>(null)
|
const profiles = ref<ProfileListResult | null>(null)
|
||||||
const workflows = ref<ProfileWorkflow[]>([])
|
const workflows = ref<ProfileWorkflow[]>([])
|
||||||
const workflowDetail = ref<WorkflowDetail | null>(null)
|
const workflowDetail = ref<WorkflowDetail | null>(null)
|
||||||
|
const selectedNodeId = ref("")
|
||||||
|
const nodeImages = ref<GenerationImage[]>([])
|
||||||
|
const nodeGenerateResult = ref<NodeGenerateResult | null>(null)
|
||||||
const jobs = ref<JobListResult | null>(null)
|
const jobs = ref<JobListResult | null>(null)
|
||||||
const settingsSchema = ref<SettingsSchema | null>(null)
|
const settingsSchema = ref<SettingsSchema | null>(null)
|
||||||
const currentSettings = ref<CurrentSettings | null>(null)
|
const currentSettings = ref<CurrentSettings | null>(null)
|
||||||
|
|
@ -206,6 +221,11 @@ const workflowDraft = ref({
|
||||||
display_name: "",
|
display_name: "",
|
||||||
workflow_type: "single_image",
|
workflow_type: "single_image",
|
||||||
})
|
})
|
||||||
|
const nodeGenerateDraft = ref({
|
||||||
|
model_route: "",
|
||||||
|
prompt: "",
|
||||||
|
negative_prompt: "",
|
||||||
|
})
|
||||||
const materialDraft = ref({
|
const materialDraft = ref({
|
||||||
display_name: "",
|
display_name: "",
|
||||||
image_uri: "",
|
image_uri: "",
|
||||||
|
|
@ -249,6 +269,7 @@ const pendingRecognition = computed(
|
||||||
const confirmedMaterials = computed(() =>
|
const confirmedMaterials = computed(() =>
|
||||||
(materials.value?.items ?? []).filter((item) => item.recognition_status === "confirmed"),
|
(materials.value?.items ?? []).filter((item) => item.recognition_status === "confirmed"),
|
||||||
)
|
)
|
||||||
|
const selectedNode = computed(() => workflowDetail.value?.nodes.find((node) => node.node_id === selectedNodeId.value) ?? null)
|
||||||
const activeTitle = computed(() => {
|
const activeTitle = computed(() => {
|
||||||
const titles: Record<ViewKey, string> = {
|
const titles: Record<ViewKey, string> = {
|
||||||
dashboard: text.dashboard,
|
dashboard: text.dashboard,
|
||||||
|
|
@ -350,6 +371,8 @@ async function loadWorkflows(profileId?: string) {
|
||||||
if (!profileId) {
|
if (!profileId) {
|
||||||
workflows.value = []
|
workflows.value = []
|
||||||
workflowDetail.value = null
|
workflowDetail.value = null
|
||||||
|
selectedNodeId.value = ""
|
||||||
|
nodeImages.value = []
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
workflows.value = await getJson<ProfileWorkflow[]>(endpoints.profileWorkflows(profileId))
|
workflows.value = await getJson<ProfileWorkflow[]>(endpoints.profileWorkflows(profileId))
|
||||||
|
|
@ -365,7 +388,30 @@ async function loadWorkflows(profileId?: string) {
|
||||||
}
|
}
|
||||||
|
|
||||||
async function loadWorkflowDetail(workflowId: string) {
|
async function loadWorkflowDetail(workflowId: string) {
|
||||||
workflowDetail.value = await getJson<WorkflowDetail>(endpoints.workflow(workflowId))
|
const detail = await getJson<WorkflowDetail>(endpoints.workflow(workflowId))
|
||||||
|
workflowDetail.value = detail
|
||||||
|
const retainedNodeId = selectedNodeId.value
|
||||||
|
const nodeId = detail.nodes.some((node) => node.node_id === retainedNodeId)
|
||||||
|
? retainedNodeId
|
||||||
|
: detail.workflow.current_node_id || detail.nodes[0]?.node_id
|
||||||
|
if (nodeId) {
|
||||||
|
await loadNodeImages(nodeId)
|
||||||
|
} else {
|
||||||
|
selectedNodeId.value = ""
|
||||||
|
nodeImages.value = []
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function loadNodeImages(nodeId: string) {
|
||||||
|
selectedNodeId.value = nodeId
|
||||||
|
nodeImages.value = await getJson<GenerationImage[]>(endpoints.nodeImages(nodeId))
|
||||||
|
}
|
||||||
|
|
||||||
|
async function refreshSelectedWorkflow() {
|
||||||
|
const workflowId = workflowDetail.value?.workflow.workflow_id
|
||||||
|
if (workflowId) {
|
||||||
|
await loadWorkflowDetail(workflowId)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function runOperation(label: string, action: () => Promise<unknown>, refresh = true) {
|
async function runOperation(label: string, action: () => Promise<unknown>, refresh = true) {
|
||||||
|
|
@ -493,6 +539,94 @@ function archiveWorkflow(workflowId: string) {
|
||||||
return runOperation(text.archive, () => postJson<ProfileWorkflow>(endpoints.workflowArchive(workflowId)))
|
return runOperation(text.archive, () => postJson<ProfileWorkflow>(endpoints.workflowArchive(workflowId)))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function generateSelectedNode() {
|
||||||
|
const nodeId = selectedNodeId.value
|
||||||
|
if (!nodeId) return Promise.resolve()
|
||||||
|
return runOperation(
|
||||||
|
text.generate,
|
||||||
|
async () => {
|
||||||
|
nodeGenerateResult.value = await postJson<NodeGenerateResult>(endpoints.nodeGenerate(nodeId), {
|
||||||
|
model_route: nodeGenerateDraft.value.model_route || undefined,
|
||||||
|
prompt: nodeGenerateDraft.value.prompt || undefined,
|
||||||
|
negative_prompt: nodeGenerateDraft.value.negative_prompt || undefined,
|
||||||
|
})
|
||||||
|
await refreshSelectedWorkflow()
|
||||||
|
lastOperation.value = text.generationQueued
|
||||||
|
return nodeGenerateResult.value
|
||||||
|
},
|
||||||
|
false,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
function selectNodeImage(imageId: string) {
|
||||||
|
const nodeId = selectedNodeId.value
|
||||||
|
if (!nodeId) return Promise.resolve()
|
||||||
|
return runOperation(
|
||||||
|
text.select,
|
||||||
|
async () => {
|
||||||
|
const image = await postJson<GenerationImage>(endpoints.nodeSelectImage(nodeId), { image_id: imageId })
|
||||||
|
await refreshSelectedWorkflow()
|
||||||
|
return image
|
||||||
|
},
|
||||||
|
false,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
function adoptNodeImage(imageId: string) {
|
||||||
|
const nodeId = selectedNodeId.value
|
||||||
|
if (!nodeId) return Promise.resolve()
|
||||||
|
return runOperation(
|
||||||
|
text.adopt,
|
||||||
|
async () => {
|
||||||
|
const history = await postJson<Record<string, unknown>>(endpoints.nodeAdoptImage(nodeId), {
|
||||||
|
image_id: imageId,
|
||||||
|
title: selectedNode.value?.title,
|
||||||
|
})
|
||||||
|
await refreshSelectedWorkflow()
|
||||||
|
return history
|
||||||
|
},
|
||||||
|
false,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
function unselectImage(imageId: string) {
|
||||||
|
return runOperation(
|
||||||
|
text.unselect,
|
||||||
|
async () => {
|
||||||
|
const image = await postJson<GenerationImage>(endpoints.imageUnselect(imageId))
|
||||||
|
await refreshSelectedWorkflow()
|
||||||
|
return image
|
||||||
|
},
|
||||||
|
false,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
function archiveImage(imageId: string) {
|
||||||
|
return runOperation(
|
||||||
|
text.archive,
|
||||||
|
async () => {
|
||||||
|
const image = await postJson<GenerationImage>(endpoints.imageArchive(imageId))
|
||||||
|
await refreshSelectedWorkflow()
|
||||||
|
lastOperation.value = text.imageArchived
|
||||||
|
return image
|
||||||
|
},
|
||||||
|
false,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
function deleteImage(imageId: string) {
|
||||||
|
return runOperation(
|
||||||
|
text.delete,
|
||||||
|
async () => {
|
||||||
|
const image = await request<GenerationImage>(endpoints.image(imageId), { method: "DELETE" })
|
||||||
|
await refreshSelectedWorkflow()
|
||||||
|
lastOperation.value = text.imageDeleted
|
||||||
|
return image
|
||||||
|
},
|
||||||
|
false,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
function moveFailedJobs() {
|
function moveFailedJobs() {
|
||||||
return runOperation(text.moveFailed, () => postJson(endpoints.jobDeadLetterMoveFailed, { limit: 20 }))
|
return runOperation(text.moveFailed, () => postJson(endpoints.jobDeadLetterMoveFailed, { limit: 20 }))
|
||||||
}
|
}
|
||||||
|
|
@ -966,6 +1100,23 @@ function storageRootBytes(uriPrefix: string) {
|
||||||
<h2>{{ text.nodes }}</h2>
|
<h2>{{ text.nodes }}</h2>
|
||||||
<span>{{ workflowDetail?.workflow.current_branch ?? "main" }}</span>
|
<span>{{ workflowDetail?.workflow.current_branch ?? "main" }}</span>
|
||||||
</header>
|
</header>
|
||||||
|
<div class="form-grid">
|
||||||
|
<label>
|
||||||
|
<span>{{ text.modelRoute }}</span>
|
||||||
|
<input v-model="nodeGenerateDraft.model_route" type="text" placeholder="image_low" />
|
||||||
|
</label>
|
||||||
|
<label>
|
||||||
|
<span>{{ text.prompt }}</span>
|
||||||
|
<input v-model="nodeGenerateDraft.prompt" type="text" />
|
||||||
|
</label>
|
||||||
|
<label class="wide-field">
|
||||||
|
<span>{{ text.negativePrompt }}</span>
|
||||||
|
<input v-model="nodeGenerateDraft.negative_prompt" type="text" />
|
||||||
|
</label>
|
||||||
|
<button type="button" :disabled="Boolean(busy) || !selectedNodeId" @click="generateSelectedNode">
|
||||||
|
{{ text.generate }}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
<ul>
|
<ul>
|
||||||
<li v-for="node in workflowDetail?.nodes ?? []" :key="node.node_id">
|
<li v-for="node in workflowDetail?.nodes ?? []" :key="node.node_id">
|
||||||
<div>
|
<div>
|
||||||
|
|
@ -975,10 +1126,57 @@ function storageRootBytes(uriPrefix: string) {
|
||||||
<div class="inline-actions">
|
<div class="inline-actions">
|
||||||
<span>{{ node.branch_name }}</span>
|
<span>{{ node.branch_name }}</span>
|
||||||
<span class="badge">{{ node.status }}</span>
|
<span class="badge">{{ node.status }}</span>
|
||||||
|
<button type="button" :disabled="Boolean(busy)" @click="loadNodeImages(node.node_id)">
|
||||||
|
{{ text.images }}
|
||||||
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
<li v-if="!workflowDetail?.nodes.length" class="empty">{{ text.emptyWorkflows }}</li>
|
<li v-if="!workflowDetail?.nodes.length" class="empty">{{ text.emptyWorkflows }}</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
<ul>
|
||||||
|
<li v-for="image in nodeImages" :key="image.image_id">
|
||||||
|
<div>
|
||||||
|
<strong>{{ image.image_id }}</strong>
|
||||||
|
<small>{{ image.thumbnail_uri ?? image.image_uri }}</small>
|
||||||
|
</div>
|
||||||
|
<div class="inline-actions">
|
||||||
|
<span v-if="image.is_selected" class="badge">{{ text.select }}</span>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
:disabled="Boolean(busy) || image.is_selected || image.is_archived"
|
||||||
|
@click="selectNodeImage(image.image_id)"
|
||||||
|
>
|
||||||
|
{{ text.select }}
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
:disabled="Boolean(busy) || image.is_archived"
|
||||||
|
@click="adoptNodeImage(image.image_id)"
|
||||||
|
>
|
||||||
|
{{ text.adopt }}
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
:disabled="Boolean(busy) || !image.is_selected"
|
||||||
|
@click="unselectImage(image.image_id)"
|
||||||
|
>
|
||||||
|
{{ text.unselect }}
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
:disabled="Boolean(busy) || image.is_archived"
|
||||||
|
@click="archiveImage(image.image_id)"
|
||||||
|
>
|
||||||
|
{{ text.archive }}
|
||||||
|
</button>
|
||||||
|
<button type="button" :disabled="Boolean(busy)" @click="deleteImage(image.image_id)">
|
||||||
|
{{ text.delete }}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</li>
|
||||||
|
<li v-if="!nodeImages.length" class="empty">{{ text.emptyImages }}</li>
|
||||||
|
</ul>
|
||||||
|
<pre v-if="nodeGenerateResult">{{ JSON.stringify(nodeGenerateResult, null, 2) }}</pre>
|
||||||
<pre v-if="workflowDetail">{{ JSON.stringify(workflowDetail.workflow, null, 2) }}</pre>
|
<pre v-if="workflowDetail">{{ JSON.stringify(workflowDetail.workflow, null, 2) }}</pre>
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
|
|
|
||||||
文件差异因一行或多行过长而隐藏
|
|
@ -1,3 +1,3 @@
|
||||||
<script type="module" crossorigin src="/assets/index-b8CM27h2.js"></script>
|
<script type="module" crossorigin src="/assets/index-CduHkhQE.js"></script>
|
||||||
<link rel="stylesheet" crossorigin href="/assets/index-KxvCyOGk.css">
|
<link rel="stylesheet" crossorigin href="/assets/index-KxvCyOGk.css">
|
||||||
<div id="app"></div>
|
<div id="app"></div>
|
||||||
|
|
|
||||||
文件差异因一行或多行过长而隐藏
文件差异因一行或多行过长而隐藏
文件差异因一行或多行过长而隐藏
17
web/assets/index-DtDjEMov.js
普通文件
17
web/assets/index-DtDjEMov.js
普通文件
文件差异因一行或多行过长而隐藏
|
|
@ -1,3 +1,3 @@
|
||||||
<script type="module" crossorigin src="/api/v1/plugins/extensions/astrbot_plugin_imagestudio/web/assets/index-DnBfG3sU.js"></script>
|
<script type="module" crossorigin src="/api/v1/plugins/extensions/astrbot_plugin_imagestudio/web/assets/index-DtDjEMov.js"></script>
|
||||||
<link rel="stylesheet" crossorigin href="/api/v1/plugins/extensions/astrbot_plugin_imagestudio/web/assets/index-BoTUhgnW.css">
|
<link rel="stylesheet" crossorigin href="/api/v1/plugins/extensions/astrbot_plugin_imagestudio/web/assets/index-BUBaapAF.css">
|
||||||
<div id="app"></div>
|
<div id="app"></div>
|
||||||
|
|
|
||||||
正在加载…
添加表格
在新工单中引用