feat(canvas): 生成合同 - 统一节点参数并补充模型上下文能力
This commit is contained in:
ddCat
@@ -11,6 +11,7 @@ import { normalizeVideoDuration, normalizeVideoResolution } from "@/lib/video-ge
|
||||
import { defaultModelCapabilityConfig, modelCapabilityConfigFor, normalizeImageValue, normalizeVideoValue, workflowFieldChoiceValues, workflowFieldCurrentValue, workflowFieldKey, workflowFieldNumberBounds, workflowFieldRandomKey, workflowFieldSubmissionValue, workflowFieldValueError, workflowImageCapabilityConfig, workflowOutputSizeValue, workflowParameterFields, workflowVideoCapabilityConfig, workflowVideoFieldsFromJson, type WorkflowVideoFieldLike } from "@/lib/model-capabilities";
|
||||
import { defaultImageParamsForModel, modelCompatibilityError, modelRequestOptions, resolveCompatibleModel, resolveModelGenerationDefaults, type ModelRequirements } from "@/lib/model-selection";
|
||||
import { resolveCanvasWorkflowProvider } from "@/lib/canvas/canvas-workflow";
|
||||
import { canonicalGenerationMetadata } from "@/lib/canvas/generation-contract";
|
||||
import type { CanvasAudioSettingKey } from "./canvas-audio-settings-popover";
|
||||
import { useActiveTheme } from "@/stores/canvas/use-canvas-theme-store";
|
||||
import { workflowProviderPluginEnabled } from "@/lib/plugins/builtin/workflows";
|
||||
@@ -66,6 +67,7 @@ export function CanvasConfigNodePanel({ node, isRunning, inputSummary, onConfigC
|
||||
const runtimeStatuses = usePluginStore((state) => state.runtimeStatuses);
|
||||
const theme = canvasThemes[useActiveTheme()];
|
||||
const mode = node.metadata?.generationMode === "video" || node.metadata?.generationMode === "audio" ? node.metadata.generationMode : "image";
|
||||
node = { ...node, metadata: canonicalGenerationMetadata(node, mode) };
|
||||
const simpleMode = workspaceMode === "simple";
|
||||
const resolvedProvider = resolveCanvasWorkflowProvider(node.metadata);
|
||||
const workflowProvider = resolvedProvider;
|
||||
@@ -74,16 +76,16 @@ export function CanvasConfigNodePanel({ node, isRunning, inputSummary, onConfigC
|
||||
capability: mode,
|
||||
input: inputSummary,
|
||||
videoOperation: node.metadata?.videoEditOperation,
|
||||
videoSeconds: mode === "video" ? node.metadata?.seconds || globalConfig.videoSeconds : undefined,
|
||||
videoSeconds: mode === "video" ? node.metadata?.seconds ?? globalConfig.videoSeconds : undefined,
|
||||
options: modelRequestOptions({
|
||||
...globalConfig,
|
||||
size: node.metadata?.size || globalConfig.size,
|
||||
quality: node.metadata?.quality || globalConfig.quality,
|
||||
count: String(node.metadata?.count || globalConfig.count),
|
||||
videoSeconds: node.metadata?.seconds || globalConfig.videoSeconds,
|
||||
videoSeconds: node.metadata?.seconds ?? globalConfig.videoSeconds,
|
||||
vquality: node.metadata?.vquality || globalConfig.vquality,
|
||||
videoGenerateAudio: node.metadata?.generateAudio || globalConfig.videoGenerateAudio,
|
||||
videoWatermark: node.metadata?.watermark || globalConfig.videoWatermark,
|
||||
videoGenerateAudio: node.metadata?.generateAudio ?? globalConfig.videoGenerateAudio,
|
||||
videoWatermark: node.metadata?.watermark ?? globalConfig.videoWatermark,
|
||||
audioVoice: node.metadata?.audioVoice || globalConfig.audioVoice,
|
||||
audioFormat: node.metadata?.audioFormat || globalConfig.audioFormat,
|
||||
audioSpeed: node.metadata?.audioSpeed || globalConfig.audioSpeed,
|
||||
@@ -450,6 +452,7 @@ function WorkflowSelectedLabel({ kind, label }: { kind: "app" | "workflow"; labe
|
||||
}
|
||||
|
||||
function buildNodeConfig(globalConfig: AiConfig, node: CanvasNodeData, mode: CanvasGenerationMode, requirements: ModelRequirements): AiConfig {
|
||||
node = { ...node, metadata: canonicalGenerationMetadata(node, mode) };
|
||||
const workflowProvider = mode === "text" ? "model" : resolveCanvasWorkflowProvider(node.metadata);
|
||||
if (workflowProvider === "model") return buildModelNodeConfig(globalConfig, node, mode, requirements);
|
||||
const defaultModel = mode === "image" ? globalConfig.imageModel : mode === "video" ? globalConfig.videoModel : mode === "audio" ? globalConfig.audioModel : globalConfig.textModel;
|
||||
@@ -476,7 +479,7 @@ function buildNodeConfig(globalConfig: AiConfig, node: CanvasNodeData, mode: Can
|
||||
const workflowParameter = (source: string) => workflowParameters[`source:${source}`] === undefined ? "" : String(workflowParameters[`source:${source}`]);
|
||||
const normalizedImage = imageProfile ? normalizeImageValue(imageProfile, { size: workflowOutputSize || node.metadata?.size || globalConfig.size || defaultConfig.size, quality: node.metadata?.quality || workflowParameter("quality") || globalConfig.quality || defaultConfig.quality, transparentBackground: node.metadata?.transparentBackground || globalConfig.transparentBackground, count: String(node.metadata?.count || globalConfig.canvasImageCount || globalConfig.count || defaultConfig.count) }) : undefined;
|
||||
const videoProfile = mode === "video" ? capabilityProfile.video! : undefined;
|
||||
const rawVideoSettings = { seconds: node.metadata?.seconds || workflowParameter("videoSeconds") || globalConfig.videoSeconds || defaultConfig.videoSeconds, ratio: workflowOutputSize || node.metadata?.size || globalConfig.size || defaultConfig.size, resolution: node.metadata?.vquality || workflowParameter("vquality") || globalConfig.vquality || defaultConfig.vquality };
|
||||
const rawVideoSettings = { seconds: node.metadata?.seconds ?? workflowParameter("videoSeconds") ?? globalConfig.videoSeconds ?? defaultConfig.videoSeconds, ratio: workflowOutputSize || node.metadata?.size || globalConfig.size || defaultConfig.size, resolution: node.metadata?.vquality || workflowParameter("vquality") || globalConfig.vquality || defaultConfig.vquality };
|
||||
const normalizedVideo = videoProfile
|
||||
? { seconds: String(rawVideoSettings.seconds), ratio: rawVideoSettings.ratio, resolution: rawVideoSettings.resolution }
|
||||
: undefined;
|
||||
@@ -489,10 +492,10 @@ function buildNodeConfig(globalConfig: AiConfig, node: CanvasNodeData, mode: Can
|
||||
quality: workflowParameter("quality") || normalizedImage?.quality || node.metadata?.quality || globalConfig.quality || defaultConfig.quality,
|
||||
size: normalizedImage?.size || normalizedVideo?.ratio || node.metadata?.size || globalConfig.size || defaultConfig.size,
|
||||
transparentBackground: normalizedImage?.transparentBackground || ((node.metadata?.transparentBackground || globalConfig.transparentBackground) === "true" ? "true" : "false"),
|
||||
videoSeconds: normalizedVideo?.seconds || normalizeVideoDuration(node.metadata?.seconds || globalConfig.videoSeconds || defaultConfig.videoSeconds),
|
||||
videoSeconds: normalizedVideo?.seconds ?? normalizeVideoDuration(node.metadata?.seconds ?? globalConfig.videoSeconds ?? defaultConfig.videoSeconds),
|
||||
vquality: String(node.metadata?.vquality || globalConfig.vquality || defaultConfig.vquality),
|
||||
videoGenerateAudio: videoProfile?.generateAudio.supported ? node.metadata?.generateAudio || globalConfig.videoGenerateAudio || String(videoProfile.generateAudio.default) : "false",
|
||||
videoWatermark: videoProfile?.watermark.supported ? node.metadata?.watermark || globalConfig.videoWatermark || String(videoProfile.watermark.default) : "false",
|
||||
videoGenerateAudio: videoProfile?.generateAudio.supported ? node.metadata?.generateAudio ?? globalConfig.videoGenerateAudio ?? String(videoProfile.generateAudio.default) : "false",
|
||||
videoWatermark: videoProfile?.watermark.supported ? node.metadata?.watermark ?? globalConfig.videoWatermark ?? String(videoProfile.watermark.default) : "false",
|
||||
audioVoice: node.metadata?.audioVoice || globalConfig.audioVoice || defaultConfig.audioVoice,
|
||||
audioFormat: node.metadata?.audioFormat || globalConfig.audioFormat || defaultConfig.audioFormat,
|
||||
audioSpeed: node.metadata?.audioSpeed || globalConfig.audioSpeed || defaultConfig.audioSpeed,
|
||||
@@ -502,6 +505,7 @@ function buildNodeConfig(globalConfig: AiConfig, node: CanvasNodeData, mode: Can
|
||||
}
|
||||
|
||||
function buildModelNodeConfig(globalConfig: AiConfig, node: CanvasNodeData, mode: CanvasGenerationMode, requirements: ModelRequirements): AiConfig {
|
||||
node = { ...node, metadata: canonicalGenerationMetadata(node, mode) };
|
||||
const defaultModel = mode === "image" ? globalConfig.imageModel : mode === "video" ? globalConfig.videoModel : mode === "audio" ? globalConfig.audioModel : globalConfig.textModel;
|
||||
const fallbackModel = mode === "image" ? defaultConfig.imageModel : mode === "video" ? defaultConfig.videoModel : mode === "audio" ? defaultConfig.audioModel : defaultConfig.textModel;
|
||||
const storedModel = node.metadata?.model;
|
||||
@@ -544,10 +548,10 @@ function buildModelNodeConfig(globalConfig: AiConfig, node: CanvasNodeData, mode
|
||||
quality: generationDefaults.quality || globalConfig.quality || defaultConfig.quality,
|
||||
size: generationDefaults.size ?? globalConfig.size ?? defaultConfig.size,
|
||||
transparentBackground: generationDefaults.transparentBackground || "false",
|
||||
videoSeconds: generationDefaults.videoSeconds || normalizeVideoDuration(globalConfig.videoSeconds || defaultConfig.videoSeconds),
|
||||
videoSeconds: generationDefaults.videoSeconds ?? normalizeVideoDuration(globalConfig.videoSeconds || defaultConfig.videoSeconds),
|
||||
vquality: generationDefaults.vquality ?? normalizeVideoResolution(globalConfig.vquality || defaultConfig.vquality),
|
||||
videoGenerateAudio: videoProfile?.generateAudio.supported ? generationDefaults.videoGenerateAudio || String(videoProfile.generateAudio.default) : "false",
|
||||
videoWatermark: videoProfile?.watermark.supported ? generationDefaults.videoWatermark || String(videoProfile.watermark.default) : "false",
|
||||
videoGenerateAudio: videoProfile?.generateAudio.supported ? generationDefaults.videoGenerateAudio ?? String(videoProfile.generateAudio.default) : "false",
|
||||
videoWatermark: videoProfile?.watermark.supported ? generationDefaults.videoWatermark ?? String(videoProfile.watermark.default) : "false",
|
||||
audioVoice: node.metadata?.audioVoice || globalConfig.audioVoice || defaultConfig.audioVoice,
|
||||
audioFormat: node.metadata?.audioFormat || globalConfig.audioFormat || defaultConfig.audioFormat,
|
||||
audioSpeed: node.metadata?.audioSpeed || globalConfig.audioSpeed || defaultConfig.audioSpeed,
|
||||
|
||||
@@ -6,6 +6,7 @@ import { ArrowLeftRight, ArrowUp, AtSign, Boxes, Camera, ChevronDown, FileText,
|
||||
import { ModelPicker } from "@/components/model-picker";
|
||||
import { defaultConfig, modelOptionName, resolveModelChannel, useEffectiveConfig, type AiConfig } from "@/stores/use-config-store";
|
||||
import { resolveCanvasGenerationModel } from "@/lib/canvas/canvas-project-generation";
|
||||
import { canonicalGenerationMetadata } from "@/lib/canvas/generation-contract";
|
||||
import { clampPromptEditorModalSize, PROMPT_EDITOR_VIEWPORT_MARGIN } from "@/lib/canvas/canvas-prompt-editor-size";
|
||||
import { CreditSymbol, requestCreditCost } from "@/constant/credits";
|
||||
import { canvasThemes } from "@/lib/canvas-theme";
|
||||
@@ -78,6 +79,7 @@ export function CanvasNodePromptPanel({ projectId, node, isRunning, onPromptChan
|
||||
const promptOptimizerEnabled = usePluginStore((state) => state.pluginStates[PROMPT_OPTIMIZER_PLUGIN_ID]?.effectiveEnabled ?? Boolean(state.installations.find((item) => item.manifest.id === PROMPT_OPTIMIZER_PLUGIN_ID)?.enabled));
|
||||
const simpleMode = workspaceMode === "simple";
|
||||
const mode = defaultMode(node.type);
|
||||
node = { ...node, metadata: canonicalGenerationMetadata(node, mode) };
|
||||
const hasTextContent = node.type === CanvasNodeType.Text && Boolean(node.metadata?.content?.trim());
|
||||
const hasImageContent = node.type === CanvasNodeType.Image && Boolean(node.metadata?.content);
|
||||
const savedPrompt = node.metadata?.composerContent ?? node.metadata?.prompt ?? "";
|
||||
@@ -106,17 +108,17 @@ export function CanvasNodePromptPanel({ projectId, node, isRunning, onPromptChan
|
||||
characterCount: activeReferences.filter((item) => item.kind === "character").length,
|
||||
},
|
||||
videoOperation: node.metadata?.videoEditOperation,
|
||||
videoSeconds: mode === "video" ? node.metadata?.seconds || globalConfig.videoSeconds : undefined,
|
||||
videoSeconds: mode === "video" ? node.metadata?.seconds ?? globalConfig.videoSeconds : undefined,
|
||||
options: modelRequestOptions({
|
||||
...globalConfig,
|
||||
size: node.metadata?.size || globalConfig.size,
|
||||
quality: node.metadata?.quality || globalConfig.quality,
|
||||
count: String(node.metadata?.count || globalConfig.count),
|
||||
transparentBackground: node.metadata?.transparentBackground || globalConfig.transparentBackground,
|
||||
videoSeconds: node.metadata?.seconds || globalConfig.videoSeconds,
|
||||
videoSeconds: node.metadata?.seconds ?? globalConfig.videoSeconds,
|
||||
vquality: node.metadata?.vquality || globalConfig.vquality,
|
||||
videoGenerateAudio: node.metadata?.generateAudio || globalConfig.videoGenerateAudio,
|
||||
videoWatermark: node.metadata?.watermark || globalConfig.videoWatermark,
|
||||
videoGenerateAudio: node.metadata?.generateAudio ?? globalConfig.videoGenerateAudio,
|
||||
videoWatermark: node.metadata?.watermark ?? globalConfig.videoWatermark,
|
||||
audioVoice: node.metadata?.audioVoice || globalConfig.audioVoice,
|
||||
audioFormat: node.metadata?.audioFormat || globalConfig.audioFormat,
|
||||
audioSpeed: node.metadata?.audioSpeed || globalConfig.audioSpeed,
|
||||
@@ -1034,6 +1036,7 @@ function defaultMode(type: CanvasNodeData["type"]): CanvasNodeGenerationMode {
|
||||
}
|
||||
|
||||
export function buildNodeConfig(globalConfig: AiConfig, node: CanvasNodeData, mode: CanvasNodeGenerationMode, requirements: ModelRequirements): AiConfig {
|
||||
node = { ...node, metadata: canonicalGenerationMetadata(node, mode) };
|
||||
const defaultModel = mode === "image" ? globalConfig.imageModel : mode === "video" ? globalConfig.videoModel : mode === "audio" ? globalConfig.audioModel : globalConfig.textModel;
|
||||
const fallbackModel = mode === "image" ? defaultConfig.imageModel : mode === "video" ? defaultConfig.videoModel : mode === "audio" ? defaultConfig.audioModel : defaultConfig.textModel;
|
||||
const preferredModel = resolveCanvasGenerationModel(globalConfig, node.metadata?.model, mode) || resolveCanvasGenerationModel(globalConfig, defaultModel, mode) || fallbackModel;
|
||||
@@ -1074,7 +1077,7 @@ export function buildNodeConfig(globalConfig: AiConfig, node: CanvasNodeData, mo
|
||||
quality: defaults.quality ?? globalConfig.quality ?? defaultConfig.quality,
|
||||
size: defaults.size ?? globalConfig.size ?? defaultConfig.size,
|
||||
transparentBackground: defaults.transparentBackground ?? "false",
|
||||
videoSeconds: defaults.videoSeconds || normalizeVideoDuration(globalConfig.videoSeconds || defaultConfig.videoSeconds),
|
||||
videoSeconds: defaults.videoSeconds ?? normalizeVideoDuration(globalConfig.videoSeconds ?? defaultConfig.videoSeconds),
|
||||
vquality: defaults.vquality ?? normalizeVideoResolution(globalConfig.vquality || defaultConfig.vquality),
|
||||
videoGenerateAudio: defaults.videoGenerateAudio ?? globalConfig.videoGenerateAudio ?? defaultConfig.videoGenerateAudio,
|
||||
videoWatermark: defaults.videoWatermark ?? globalConfig.videoWatermark ?? defaultConfig.videoWatermark,
|
||||
|
||||
@@ -350,7 +350,7 @@ export function ModelCapabilityEditor({ value, onChange, protocol, capability =
|
||||
}
|
||||
|
||||
function TextCapabilityEditor({ value, onChange, protocol, disabled, section }: Pick<Props, "value" | "onChange" | "protocol" | "disabled" | "section">) {
|
||||
const profile = value?.text || defaultModelCapabilityConfig(protocol).text!;
|
||||
const profile = normalizeModelCapabilityConfig(value || defaultModelCapabilityConfig(protocol)).text!;
|
||||
const update = (patch: Partial<TextCapabilityConfig>) => {
|
||||
onChange?.({ version: 1, text: { ...profile, ...patch } });
|
||||
};
|
||||
@@ -369,8 +369,17 @@ function TextCapabilityEditor({ value, onChange, protocol, disabled, section }:
|
||||
}
|
||||
|
||||
if (section === "references") {
|
||||
const contextWindowFields = (
|
||||
<CapabilityGroup title="上下文能力" description="这是上游文本模型的能力合同，决定 Agent 本轮可保留的输入预算；不会改变运行时 checkpoint 的持久化上限。">
|
||||
<div className="grid gap-3 sm:grid-cols-2">
|
||||
<NumberField label="上下文窗口 Token" value={profile.contextWindowTokens} min={4_096} max={10_000_000} disabled={Boolean(disabled)} onChange={(next) => update({ contextWindowTokens: next || 4_096 })} />
|
||||
<NumberField label="最大输出 Token" value={profile.maxOutputTokens} min={256} max={1_000_000} disabled={Boolean(disabled)} onChange={(next) => update({ maxOutputTokens: next || 256 })} />
|
||||
</div>
|
||||
</CapabilityGroup>
|
||||
);
|
||||
return (
|
||||
<div className="admin-capability-reference-editor">
|
||||
{contextWindowFields}
|
||||
<div className="admin-capability-reference-grid is-three">
|
||||
<ReferenceCard title="图片引用" description="文本模型可接收的图片范围">
|
||||
<NumberField label="最大参考图片数" value={profile.references.maxImages} min={0} max={100} disabled={Boolean(disabled)} onChange={(next) => updateReferences({ maxImages: next || 0 })} />
|
||||
@@ -394,6 +403,12 @@ function TextCapabilityEditor({ value, onChange, protocol, disabled, section }:
|
||||
<div className="text-sm font-medium">文本理解能力</div>
|
||||
<div className="mt-0.5 text-[var(--fs-tiny)] text-foreground/48">默认不假设支持图片或视频，只有明确配置后相关请求才会进入该模型。</div>
|
||||
</div>
|
||||
<CapabilityGroup title="上下文能力" description="这是上游文本模型的能力合同，决定 Agent 本轮可保留的输入预算；不会改变运行时 checkpoint 的持久化上限。">
|
||||
<div className="grid gap-3 sm:grid-cols-2">
|
||||
<NumberField label="上下文窗口 Token" value={profile.contextWindowTokens} min={4_096} max={10_000_000} disabled={Boolean(disabled)} onChange={(next) => update({ contextWindowTokens: next || 4_096 })} />
|
||||
<NumberField label="最大输出 Token" value={profile.maxOutputTokens} min={256} max={1_000_000} disabled={Boolean(disabled)} onChange={(next) => update({ maxOutputTokens: next || 256 })} />
|
||||
</div>
|
||||
</CapabilityGroup>
|
||||
<CapabilityGroup title="图片" description="文本模型可接收的图片参考范围">
|
||||
<div className="grid gap-3 sm:grid-cols-2">
|
||||
<NumberField label="最大参考图片数" value={profile.references.maxImages} min={0} max={100} disabled={Boolean(disabled)} onChange={(next) => updateReferences({ maxImages: next || 0 })} />
|
||||
|
||||
@@ -29,12 +29,12 @@ test("媒体节点已有结果时只更新下一版提示词草稿", () => {
|
||||
});
|
||||
|
||||
assert.equal(canvasNodeHasCommittedContent(current), true);
|
||||
assert.deepEqual(writeCanvasNodePrompt(current, "下一版提示词").metadata, {
|
||||
content: `https://example.com/${type}`,
|
||||
prompt: "已提交提示词",
|
||||
composerContent: "下一版提示词",
|
||||
status: "success",
|
||||
});
|
||||
const metadata = writeCanvasNodePrompt(current, "下一版提示词").metadata;
|
||||
assert.equal(metadata?.content, `https://example.com/${type}`);
|
||||
assert.equal(metadata?.prompt, "已提交提示词");
|
||||
assert.equal(metadata?.composerContent, "下一版提示词");
|
||||
assert.equal(metadata?.status, "success");
|
||||
assert.equal(metadata?.generationSpec?.prompt, "下一版提示词");
|
||||
}
|
||||
});
|
||||
|
||||
@@ -42,11 +42,11 @@ test("空媒体草稿同时初始化提交提示词和编辑提示词", () => {
|
||||
const current = node(CanvasNodeType.Video, { status: "idle" });
|
||||
|
||||
assert.equal(canvasNodeHasCommittedContent(current), false);
|
||||
assert.deepEqual(writeCanvasNodePrompt(current, "第一版提示词").metadata, {
|
||||
status: "idle",
|
||||
prompt: "第一版提示词",
|
||||
composerContent: "第一版提示词",
|
||||
});
|
||||
const metadata = writeCanvasNodePrompt(current, "第一版提示词").metadata;
|
||||
assert.equal(metadata?.status, "idle");
|
||||
assert.equal(metadata?.prompt, "第一版提示词");
|
||||
assert.equal(metadata?.composerContent, "第一版提示词");
|
||||
assert.equal(metadata?.generationSpec?.prompt, "第一版提示词");
|
||||
});
|
||||
|
||||
test("图片仅保留 storageKey 时仍视为已有媒体结果", () => {
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import { getNodeResourceKind } from "@/lib/canvas/node-registry";
|
||||
import type { CanvasNodeData, CanvasNodeMetadata } from "@/types/canvas";
|
||||
import { synchronizeGenerationSpec } from "@/lib/canvas/generation-contract";
|
||||
|
||||
export type WriteCanvasNodePromptOptions = {
|
||||
metadata?: CanvasNodeMetadata;
|
||||
@@ -28,10 +29,10 @@ export function writeCanvasNodePrompt(node: CanvasNodeData, prompt: string, opti
|
||||
const promptTemplateMetadata = clearPromptTemplate
|
||||
? { promptTemplateOperation: undefined, promptTemplateVariables: undefined }
|
||||
: {};
|
||||
return {
|
||||
return synchronizeGenerationSpec({
|
||||
...node,
|
||||
metadata: canvasNodeHasCommittedContent(node)
|
||||
? { ...metadata, ...promptTemplateMetadata, composerContent: prompt }
|
||||
: { ...metadata, ...promptTemplateMetadata, prompt, composerContent: prompt },
|
||||
};
|
||||
});
|
||||
}
|
||||
|
||||
@@ -13,6 +13,7 @@ import { batchReferenceHandleY } from "@/lib/canvas/canvas-batch-table";
|
||||
import { reconcileImageBatchRoot } from "@/lib/canvas/canvas-image-batch-retry";
|
||||
import { scopedLocalStorage } from "@/lib/user-scope";
|
||||
import type { GenerationTask } from "@/services/api/task-center";
|
||||
import { synchronizeGenerationSpec } from "@/lib/canvas/generation-contract";
|
||||
import { CanvasNodeType, type CanvasConnection, type CanvasNodeData, type CanvasNodeMetadata, type CanvasNodeTypeId, type ConnectionHandle, type Position, type StoryboardColumn, type StoryboardRow } from "@/types/canvas";
|
||||
|
||||
export function createCanvasNode(type: CanvasNodeTypeId, position: Position, metadata?: CanvasNodeMetadata): CanvasNodeData {
|
||||
@@ -183,7 +184,7 @@ const NODE_MODEL_GENERATION_PARAMS: ReadonlyArray<keyof CanvasNodeMetadata> = [
|
||||
export function applyNodeConfigPatch(node: CanvasNodeData, patch: Partial<CanvasNodeMetadata>) {
|
||||
const safePatch = patch || {};
|
||||
const nextPatch = resetGenerationParamsOnModelSwitch(node, safePatch);
|
||||
const next = { ...node, metadata: { ...node.metadata, ...nextPatch } };
|
||||
const next = synchronizeGenerationSpec(node, nextPatch);
|
||||
const spec = node.type === CanvasNodeType.Video ? NODE_DEFAULT_SIZE[CanvasNodeType.Video] : NODE_DEFAULT_SIZE[CanvasNodeType.Image];
|
||||
const size = typeof safePatch.size === "string" && !node.metadata?.content ? nodeSizeFromRatio(safePatch.size, spec.width, spec.height) : null;
|
||||
return size && (node.type === CanvasNodeType.Image || node.type === CanvasNodeType.Video) ? { ...next, ...size, position: { x: node.position.x + node.width / 2 - size.width / 2, y: node.position.y + node.height / 2 - size.height / 2 } } : next;
|
||||
|
||||
@@ -17,6 +17,7 @@ import type { CanvasNodeGenerationMode } from "@/components/canvas/canvas-node-p
|
||||
import { CanvasNodeType, type CanvasAssistantSession, type CanvasConnection, type CanvasImageGenerationType, type CanvasNodeData, type CanvasNodeMetadata, type CanvasVideoEditOperation } from "@/types/canvas";
|
||||
import type { ReferenceImage } from "@/types/image";
|
||||
import type { ReferenceAudio, ReferenceVideo } from "@/types/media";
|
||||
import { generationSpecMetadata, readNodeGenerationSpec, resolveGenerationSelection } from "@/lib/canvas/generation-contract";
|
||||
|
||||
export async function runBackendCanvasGenerationTask(
|
||||
{
|
||||
@@ -416,12 +417,18 @@ export function generationWorkflowMetadata(config: AiConfig): Pick<CanvasNodeMet
|
||||
};
|
||||
}
|
||||
|
||||
export function buildGenerationConfig(config: AiConfig, node: CanvasNodeData | undefined, mode: CanvasNodeGenerationMode, requirements?: ModelRequirements): AiConfig {
|
||||
export function buildGenerationConfig(config: AiConfig, node: CanvasNodeData | undefined, mode: CanvasNodeGenerationMode, requirements?: ModelRequirements, displayOnly = false): AiConfig {
|
||||
const generationSpec = node ? readNodeGenerationSpec(node) : undefined;
|
||||
const selection = generationSpec?.mode === mode ? generationSpec.modelSelection : undefined;
|
||||
const selectedModel = resolveGenerationSelection(config, selection);
|
||||
if (selection && !selectedModel && !displayOnly) throw new Error("节点选择的模型或渠道已不可用，请重新选择模型后生成");
|
||||
if (node && generationSpec?.mode === mode) node = { ...node, metadata: { ...node.metadata, ...generationSpecMetadata(generationSpec) } };
|
||||
// 只有独立 Config 节点读取工作流元数据；普通图片/视频/音频节点始终按基础模型生成。
|
||||
const workflowProvider = mode !== "text" && node?.type === CanvasNodeType.Config && resolveCanvasWorkflowProvider(node.metadata) === "runninghub" ? "runninghub" : "model";
|
||||
const defaultModel = mode === "image" ? config.imageModel : mode === "video" ? config.videoModel : mode === "audio" ? config.audioModel : config.textModel;
|
||||
const fallbackModel = mode === "image" ? defaultConfig.imageModel : mode === "video" ? defaultConfig.videoModel : mode === "audio" ? defaultConfig.audioModel : defaultConfig.textModel;
|
||||
const storedModel = resolveCanvasGenerationModel(config, node?.metadata?.model, mode);
|
||||
const storedModel = resolveCanvasGenerationModel(config, selectedModel || node?.metadata?.model, mode);
|
||||
if (selection && selectedModel && !storedModel && !displayOnly) throw new Error("节点选择的模型不支持当前生成模式，请重新选择");
|
||||
const preferredModel = storedModel || resolveCanvasGenerationModel(config, defaultModel, mode) || fallbackModel;
|
||||
// 先合并节点上的实时选择，再做兼容性匹配。否则路由只看到全局默认值，节点改过的时长、分辨率或布尔能力无法参与分流。
|
||||
const workflowParameters = node?.metadata?.workflowParameters || {};
|
||||
@@ -507,10 +514,10 @@ export function buildGenerationConfig(config: AiConfig, node: CanvasNodeData | u
|
||||
quality: generationDefaults.quality || requestedConfig.quality,
|
||||
size: generationDefaults.size ?? requestedConfig.size,
|
||||
transparentBackground: generationDefaults.transparentBackground || (requestedConfig.transparentBackground === "true" ? "true" : "false"),
|
||||
videoSeconds: generationDefaults.videoSeconds || requestedConfig.videoSeconds,
|
||||
videoSeconds: generationDefaults.videoSeconds ?? requestedConfig.videoSeconds,
|
||||
vquality: generationDefaults.vquality ?? requestedConfig.vquality,
|
||||
videoGenerateAudio: generationDefaults.videoGenerateAudio || requestedConfig.videoGenerateAudio,
|
||||
videoWatermark: generationDefaults.videoWatermark || requestedConfig.videoWatermark,
|
||||
videoGenerateAudio: generationDefaults.videoGenerateAudio ?? requestedConfig.videoGenerateAudio,
|
||||
videoWatermark: generationDefaults.videoWatermark ?? requestedConfig.videoWatermark,
|
||||
videoArkPrivateAssetUpload: requestedConfig.videoArkPrivateAssetUpload,
|
||||
count: generationDefaults.count || requestedConfig.count,
|
||||
};
|
||||
|
||||
153
web/src/lib/canvas/generation-contract.generated.ts
Normal file
153
web/src/lib/canvas/generation-contract.generated.ts
Normal file
@@ -0,0 +1,153 @@
|
||||
// Generated by go generate ./internal/canvas/contract. Do not edit.
|
||||
export const GENERATION_CONTRACT_VERSION = 1;
|
||||
export const GENERATION_LIMITS = { nodeTitle: 240, prompt: 16000, canvasOperations: 20 } as const;
|
||||
|
||||
export type ModelSelection = { kind: "logical"; logicalModelId: string; channelId?: never; modelKey?: never } | { kind: "channel"; channelId: string; modelKey: string; logicalModelId?: never };
|
||||
|
||||
export type Options = {
|
||||
size?: string;
|
||||
quality?: string;
|
||||
count?: number;
|
||||
transparentBackground?: boolean;
|
||||
durationSeconds?: number;
|
||||
resolution?: string;
|
||||
generateAudio?: boolean;
|
||||
watermark?: boolean;
|
||||
audioVoice?: string;
|
||||
audioFormat?: string;
|
||||
audioSpeed?: string;
|
||||
audioInstructions?: string;
|
||||
};
|
||||
|
||||
export type ReferenceBinding = {
|
||||
id: string;
|
||||
nodeId?: string;
|
||||
resourceId?: string;
|
||||
transientId?: string;
|
||||
mediaType: "image" | "video" | "audio" | "text";
|
||||
role: "reference" | "source-text" | "first-frame" | "last-frame" | "mask";
|
||||
order: number;
|
||||
resolution: "latest" | "snapshot";
|
||||
};
|
||||
|
||||
export type GenerationSpec = {
|
||||
version: number;
|
||||
mode: "image" | "video" | "audio";
|
||||
prompt: string;
|
||||
modelSelection?: ModelSelection;
|
||||
options: Options;
|
||||
referenceBindings: ReferenceBinding[];
|
||||
textInputMode: "prompt-only" | "append-sources";
|
||||
};
|
||||
|
||||
export const GENERATION_OPTION_FIELDS = [
|
||||
{
|
||||
"kind": "string",
|
||||
"modes": [
|
||||
"image",
|
||||
"video"
|
||||
],
|
||||
"name": "size",
|
||||
"node": "size",
|
||||
"task": "size"
|
||||
},
|
||||
{
|
||||
"kind": "string",
|
||||
"modes": [
|
||||
"image"
|
||||
],
|
||||
"name": "quality",
|
||||
"node": "quality",
|
||||
"task": "quality"
|
||||
},
|
||||
{
|
||||
"kind": "number",
|
||||
"modes": [
|
||||
"image"
|
||||
],
|
||||
"name": "count",
|
||||
"node": "count",
|
||||
"task": "count"
|
||||
},
|
||||
{
|
||||
"kind": "boolean",
|
||||
"modes": [
|
||||
"image"
|
||||
],
|
||||
"name": "transparentBackground",
|
||||
"node": "transparentBackground",
|
||||
"task": "transparentBackground"
|
||||
},
|
||||
{
|
||||
"kind": "number",
|
||||
"modes": [
|
||||
"video"
|
||||
],
|
||||
"name": "durationSeconds",
|
||||
"node": "seconds",
|
||||
"task": "videoSeconds"
|
||||
},
|
||||
{
|
||||
"kind": "string",
|
||||
"modes": [
|
||||
"video"
|
||||
],
|
||||
"name": "resolution",
|
||||
"node": "vquality",
|
||||
"task": "vquality"
|
||||
},
|
||||
{
|
||||
"kind": "boolean",
|
||||
"modes": [
|
||||
"video"
|
||||
],
|
||||
"name": "generateAudio",
|
||||
"node": "generateAudio",
|
||||
"task": "videoGenerateAudio"
|
||||
},
|
||||
{
|
||||
"kind": "boolean",
|
||||
"modes": [
|
||||
"video"
|
||||
],
|
||||
"name": "watermark",
|
||||
"node": "watermark",
|
||||
"task": "videoWatermark"
|
||||
},
|
||||
{
|
||||
"kind": "string",
|
||||
"modes": [
|
||||
"audio"
|
||||
],
|
||||
"name": "audioVoice",
|
||||
"node": "audioVoice",
|
||||
"task": "audioVoice"
|
||||
},
|
||||
{
|
||||
"kind": "string",
|
||||
"modes": [
|
||||
"audio"
|
||||
],
|
||||
"name": "audioFormat",
|
||||
"node": "audioFormat",
|
||||
"task": "audioFormat"
|
||||
},
|
||||
{
|
||||
"kind": "string",
|
||||
"modes": [
|
||||
"audio"
|
||||
],
|
||||
"name": "audioSpeed",
|
||||
"node": "audioSpeed",
|
||||
"task": "audioSpeed"
|
||||
},
|
||||
{
|
||||
"kind": "string",
|
||||
"modes": [
|
||||
"audio"
|
||||
],
|
||||
"name": "audioInstructions",
|
||||
"node": "audioInstructions",
|
||||
"task": "audioInstructions"
|
||||
}
|
||||
] as const;
|
||||
201
web/src/lib/canvas/generation-contract.ts
Normal file
201
web/src/lib/canvas/generation-contract.ts
Normal file
@@ -0,0 +1,201 @@
|
||||
import { decodeChannelModel, encodeChannelModel, type AiConfig } from "@/stores/use-config-store";
|
||||
import type { CanvasNodeData, CanvasNodeMetadata } from "@/types/canvas";
|
||||
import { GENERATION_CONTRACT_VERSION, GENERATION_LIMITS, GENERATION_OPTION_FIELDS, type GenerationSpec, type ModelSelection, type Options, type ReferenceBinding } from "./generation-contract.generated";
|
||||
|
||||
export type { GenerationSpec, ModelSelection, ReferenceBinding } from "./generation-contract.generated";
|
||||
|
||||
export function canvasGenerationMode(mode: string): GenerationSpec["mode"] | undefined {
|
||||
return mode === "image" || mode === "video" || mode === "audio" ? mode : undefined;
|
||||
}
|
||||
|
||||
function fieldError(path: string, message: string): never {
|
||||
throw new Error(`生成参数 ${path}：${message}`);
|
||||
}
|
||||
|
||||
function object(value: unknown, path: string): Record<string, unknown> {
|
||||
if (!value || typeof value !== "object" || Array.isArray(value)) return fieldError(path, "必须是对象");
|
||||
return value as Record<string, unknown>;
|
||||
}
|
||||
|
||||
function allowKeys(value: Record<string, unknown>, keys: string[], path: string) {
|
||||
const unexpected = Object.keys(value).find((key) => !keys.includes(key));
|
||||
if (unexpected) fieldError(path, "包含不支持的字段，请更新生成配置");
|
||||
}
|
||||
|
||||
function optionValue(value: unknown, kind: string, path: string) {
|
||||
if (kind === "boolean") {
|
||||
if (value === true || value === "true") return true;
|
||||
if (value === false || value === "false") return false;
|
||||
} else if (kind === "number") {
|
||||
const number = typeof value === "number" ? value : typeof value === "string" && /^-?\d+$/.test(value) ? Number(value) : NaN;
|
||||
if (Number.isSafeInteger(number)) return number;
|
||||
} else if (typeof value === "string") return value;
|
||||
return fieldError(path, `必须是${kind === "boolean" ? "布尔值" : kind === "number" ? "整数" : "文本"}`);
|
||||
}
|
||||
|
||||
export function validateGenerationSpec(value: unknown): GenerationSpec {
|
||||
const raw = object(value, "generationSpec");
|
||||
allowKeys(raw, ["version", "mode", "prompt", "modelSelection", "options", "referenceBindings", "textInputMode"], "generationSpec");
|
||||
if (raw.version !== GENERATION_CONTRACT_VERSION) fieldError("version", "合同版本不受支持");
|
||||
const mode = typeof raw.mode === "string" ? canvasGenerationMode(raw.mode) : undefined;
|
||||
if (!mode) fieldError("mode", "不支持的生成模式");
|
||||
if (typeof raw.prompt !== "string" || Array.from(raw.prompt).length > GENERATION_LIMITS.prompt) fieldError("prompt", "提示词无效或超出长度限制");
|
||||
if (raw.textInputMode !== "prompt-only" && raw.textInputMode !== "append-sources") fieldError("textInputMode", "未知文本输入模式");
|
||||
let modelSelection: ModelSelection | undefined;
|
||||
if (raw.modelSelection !== undefined) {
|
||||
const selection = object(raw.modelSelection, "modelSelection");
|
||||
if (selection.kind === "logical") {
|
||||
allowKeys(selection, ["kind", "logicalModelId"], "modelSelection");
|
||||
if (typeof selection.logicalModelId !== "string" || !selection.logicalModelId.trim()) fieldError("modelSelection.logicalModelId", "不能为空");
|
||||
modelSelection = { kind: "logical", logicalModelId: selection.logicalModelId };
|
||||
} else if (selection.kind === "channel") {
|
||||
allowKeys(selection, ["kind", "channelId", "modelKey"], "modelSelection");
|
||||
if (typeof selection.channelId !== "string" || !selection.channelId.trim() || typeof selection.modelKey !== "string" || !selection.modelKey.trim()) fieldError("modelSelection", "渠道与模型标识不能为空");
|
||||
modelSelection = { kind: "channel", channelId: selection.channelId, modelKey: selection.modelKey };
|
||||
} else fieldError("modelSelection.kind", "未知模型选择类型");
|
||||
}
|
||||
const rawOptions = object(raw.options, "options");
|
||||
allowKeys(rawOptions, GENERATION_OPTION_FIELDS.map((field) => field.name), "options");
|
||||
const options: Record<string, unknown> = {};
|
||||
for (const field of GENERATION_OPTION_FIELDS) {
|
||||
const current = rawOptions[field.name];
|
||||
if (current === undefined) continue;
|
||||
if (!(field.modes as readonly string[]).includes(mode)) fieldError(`options.${field.name}`, "不适用于当前模式");
|
||||
if (typeof current !== field.kind) fieldError(`options.${field.name}`, "合同类型不正确");
|
||||
options[field.name] = optionValue(current, field.kind, `options.${field.name}`);
|
||||
}
|
||||
if (typeof options.durationSeconds === "number" && options.durationSeconds < 0) fieldError("options.durationSeconds", "不能为负数");
|
||||
if (typeof options.count === "number" && options.count < 1) fieldError("options.count", "必须为正整数");
|
||||
if (!Array.isArray(raw.referenceBindings)) fieldError("referenceBindings", "必须是数组");
|
||||
const ids = new Set<string>();
|
||||
const orders = new Set<number>();
|
||||
const referenceBindings = raw.referenceBindings.map((value, index): ReferenceBinding => {
|
||||
const ref = object(value, `referenceBindings[${index}]`);
|
||||
allowKeys(ref, ["id", "nodeId", "resourceId", "transientId", "mediaType", "role", "order", "resolution"], "referenceBindings");
|
||||
if (typeof ref.id !== "string" || !ref.id || ids.has(ref.id)) fieldError("referenceBindings.id", "必须有效且唯一");
|
||||
if (typeof ref.order !== "number" || !Number.isSafeInteger(ref.order) || ref.order < 0 || orders.has(ref.order)) fieldError("referenceBindings.order", "必须有效且唯一");
|
||||
for (const key of ["nodeId", "resourceId", "transientId"]) if (ref[key] !== undefined && (typeof ref[key] !== "string" || !ref[key])) fieldError(`referenceBindings.${key}`, "必须是有效标识");
|
||||
if (!ref.nodeId && !ref.resourceId && !ref.transientId) fieldError("referenceBindings", "缺少引用来源");
|
||||
if (ref.transientId && (ref.nodeId || ref.resourceId)) fieldError("referenceBindings", "临时引用不能混用其他来源");
|
||||
if (!["image", "video", "audio", "text"].includes(String(ref.mediaType))) fieldError("referenceBindings.mediaType", "未知参考类型");
|
||||
if (!["reference", "source-text", "first-frame", "last-frame", "mask"].includes(String(ref.role))) fieldError("referenceBindings.role", "未知参考角色");
|
||||
if (ref.role === "source-text" && ref.mediaType !== "text") fieldError("referenceBindings.role", "文本来源必须引用文本");
|
||||
if (["first-frame", "last-frame", "mask"].includes(String(ref.role)) && ref.mediaType !== "image") fieldError("referenceBindings.role", "帧和遮罩必须引用图片");
|
||||
if (ref.resolution !== "latest" && ref.resolution !== "snapshot") fieldError("referenceBindings.resolution", "未知解析策略");
|
||||
ids.add(ref.id); orders.add(ref.order);
|
||||
return ref as unknown as ReferenceBinding;
|
||||
});
|
||||
return { version: GENERATION_CONTRACT_VERSION, mode, prompt: raw.prompt, options, modelSelection, referenceBindings, textInputMode: raw.textInputMode } as GenerationSpec;
|
||||
}
|
||||
|
||||
/** The single compatibility boundary for the existing flat canvas wire format. */
|
||||
export function readNodeGenerationSpec(node: Pick<CanvasNodeData, "type" | "metadata">): GenerationSpec | undefined {
|
||||
const mode = canvasGenerationMode(node.type);
|
||||
if (!mode) return undefined;
|
||||
const metadata = (node.metadata || {}) as Record<string, unknown>;
|
||||
const stored = metadata.generationSpec ? validateGenerationSpec(metadata.generationSpec) : undefined;
|
||||
const options: Record<string, unknown> = { ...stored?.options };
|
||||
// generationSpec is the canonical contract once present. Legacy node fields are only
|
||||
// read for migration, otherwise a stale compatibility mirror can silently overwrite
|
||||
// an explicitly stored false/zero value.
|
||||
if (!stored) {
|
||||
for (const field of GENERATION_OPTION_FIELDS) {
|
||||
if (!(field.modes as readonly string[]).includes(mode)) continue;
|
||||
if (!(field.node in metadata)) continue;
|
||||
const value = metadata[field.node];
|
||||
if (value === undefined || value === null || value === "") delete options[field.name];
|
||||
else options[field.name] = optionValue(value, field.kind, field.node);
|
||||
}
|
||||
}
|
||||
const modelSelection = stored?.modelSelection
|
||||
|| (typeof metadata.logicalModelId === "string" && metadata.logicalModelId ? { kind: "logical", logicalModelId: metadata.logicalModelId } as const : undefined)
|
||||
|| (typeof metadata.channelId === "string" && typeof metadata.channelModelKey === "string" ? { kind: "channel", channelId: metadata.channelId, modelKey: metadata.channelModelKey } as const : undefined)
|
||||
|| (typeof metadata.model === "string" ? (() => {
|
||||
const model = decodeChannelModel(metadata.model);
|
||||
return model ? { kind: "channel", channelId: model.channelId, modelKey: model.model } as const : undefined;
|
||||
})() : undefined);
|
||||
const prompt = stored?.prompt
|
||||
?? (typeof metadata.composerContent === "string" ? metadata.composerContent : typeof metadata.prompt === "string" ? metadata.prompt : "");
|
||||
return validateGenerationSpec({ version: GENERATION_CONTRACT_VERSION, mode, prompt, options, ...(modelSelection ? { modelSelection } : {}), referenceBindings: stored?.referenceBindings || [], textInputMode: stored?.textInputMode || (mode === "video" ? "prompt-only" : "append-sources") });
|
||||
}
|
||||
|
||||
|
||||
export function canonicalGenerationMetadata(node: CanvasNodeData, mode: string): CanvasNodeMetadata {
|
||||
if (!canvasGenerationMode(mode)) return { ...node.metadata };
|
||||
const spec = readNodeGenerationSpec(node);
|
||||
return spec?.mode === mode ? { ...node.metadata, ...generationSpecMetadata(spec) } : { ...node.metadata };
|
||||
}
|
||||
|
||||
export function resolveGenerationSelection(config: AiConfig, selection: ModelSelection | undefined): string {
|
||||
if (!selection) return "";
|
||||
if (selection.kind === "channel") {
|
||||
const channel = config.channels.find((item) => item.id === selection.channelId && item.enabled !== false);
|
||||
return channel?.models.includes(selection.modelKey) ? encodeChannelModel(channel.id, selection.modelKey) : "";
|
||||
}
|
||||
for (const channel of config.channels) {
|
||||
if (channel.enabled === false) continue;
|
||||
const model = channel.modelCosts?.find((item) => item.logicalModelId === selection.logicalModelId && channel.models.includes(item.model));
|
||||
if (model) return encodeChannelModel(channel.id, model.model);
|
||||
}
|
||||
return "";
|
||||
}
|
||||
|
||||
export function selectionForConfig(config: AiConfig): ModelSelection | undefined {
|
||||
const selected = decodeChannelModel(config.model);
|
||||
if (!selected) return undefined;
|
||||
const logicalModelId = config.channels.find((channel) => channel.id === selected.channelId)?.modelCosts?.find((item) => item.model === selected.model)?.logicalModelId;
|
||||
return logicalModelId ? { kind: "logical", logicalModelId } : { kind: "channel", channelId: selected.channelId, modelKey: selected.model };
|
||||
}
|
||||
|
||||
export function specFromConfig(mode: GenerationSpec["mode"], prompt: string, config: AiConfig, referenceBindings: ReferenceBinding[] = [], textInputMode: GenerationSpec["textInputMode"] = "prompt-only"): GenerationSpec {
|
||||
const options: Record<string, unknown> = {};
|
||||
for (const field of GENERATION_OPTION_FIELDS) {
|
||||
if (!(field.modes as readonly string[]).includes(mode)) continue;
|
||||
const value = config[field.task as keyof AiConfig];
|
||||
if (value !== undefined && value !== null && value !== "") options[field.name] = optionValue(value, field.kind, field.task);
|
||||
}
|
||||
return validateGenerationSpec({ version: GENERATION_CONTRACT_VERSION, mode, prompt, modelSelection: selectionForConfig(config), options, referenceBindings, textInputMode });
|
||||
}
|
||||
|
||||
export function generationSpecMetadata(spec: GenerationSpec): CanvasNodeMetadata {
|
||||
// model is always projected, including undefined. This clears a stale
|
||||
// physical-channel mirror when the canonical contract selects a logical model.
|
||||
const result: Record<string, unknown> = { generationSpec: spec, composerContent: spec.prompt, model: undefined };
|
||||
for (const field of GENERATION_OPTION_FIELDS) {
|
||||
if (!(field.modes as readonly string[]).includes(spec.mode)) continue;
|
||||
const value = spec.options[field.name as keyof Options];
|
||||
result[field.node] = value === undefined ? undefined : field.node === "count" ? value : String(value);
|
||||
}
|
||||
if (spec.modelSelection?.kind === "channel") result.model = encodeChannelModel(spec.modelSelection.channelId, spec.modelSelection.modelKey);
|
||||
return result as CanvasNodeMetadata;
|
||||
}
|
||||
|
||||
export function synchronizeGenerationSpec(node: CanvasNodeData, patch: Partial<CanvasNodeMetadata> = {}): CanvasNodeData {
|
||||
const metadata = { ...node.metadata, ...patch };
|
||||
if (!canvasGenerationMode(node.type)) return { ...node, metadata };
|
||||
const current = readNodeGenerationSpec(node);
|
||||
if (!current) return { ...node, metadata };
|
||||
const next: GenerationSpec = { ...current, options: { ...current.options } };
|
||||
for (const field of GENERATION_OPTION_FIELDS) {
|
||||
if (!(field.modes as readonly string[]).includes(current.mode) || !Object.prototype.hasOwnProperty.call(patch, field.node)) continue;
|
||||
const value = patch[field.node as keyof CanvasNodeMetadata];
|
||||
if (value === undefined || value === null || value === "") delete next.options[field.name as keyof Options];
|
||||
else next.options[field.name as keyof Options] = optionValue(value, field.kind, field.node) as never;
|
||||
}
|
||||
if (Object.prototype.hasOwnProperty.call(patch, "composerContent") && typeof patch.composerContent === "string") next.prompt = patch.composerContent;
|
||||
else if (Object.prototype.hasOwnProperty.call(patch, "prompt") && typeof patch.prompt === "string") next.prompt = patch.prompt;
|
||||
if (Object.prototype.hasOwnProperty.call(patch, "model")) {
|
||||
const model = patch.model ? decodeChannelModel(patch.model) : null;
|
||||
next.modelSelection = model ? { kind: "channel", channelId: model.channelId, modelKey: model.model } : undefined;
|
||||
delete (metadata as Record<string, unknown>).logicalModelId;
|
||||
delete (metadata as Record<string, unknown>).channelId;
|
||||
delete (metadata as Record<string, unknown>).channelModelKey;
|
||||
}
|
||||
return { ...node, metadata: { ...metadata, ...generationSpecMetadata(validateGenerationSpec(next)) } };
|
||||
}
|
||||
|
||||
export function bindingForNode(node: CanvasNodeData, order: number, previous?: ReferenceBinding): ReferenceBinding | undefined {
|
||||
const mediaType = node.type === "text" || node.type === "markdown" ? "text" : canvasGenerationMode(node.type);
|
||||
if (!mediaType) return undefined;
|
||||
return { id: previous?.id || `node:${node.id}`, nodeId: node.id, mediaType, role: previous?.role || (mediaType === "text" ? "source-text" : "reference"), order, resolution: "latest" };
|
||||
}
|
||||
@@ -13,6 +13,10 @@ export type TextCapabilityConfig = {
|
||||
streaming?: boolean;
|
||||
/** Whether the model exposes a user-selectable reasoning/thinking mode. */
|
||||
thinking?: boolean;
|
||||
/** Total provider input plus output context window, in tokens. */
|
||||
contextWindowTokens: number;
|
||||
/** Provider completion/reasoning output ceiling, in tokens. */
|
||||
maxOutputTokens: number;
|
||||
references: {
|
||||
promptMaxChars: number;
|
||||
maxImages: number;
|
||||
@@ -117,7 +121,14 @@ function normalizeCapabilityStrings(values: string[]) {
|
||||
export function normalizeModelCapabilityConfig(config: ModelCapabilityConfig): ModelCapabilityConfig {
|
||||
return {
|
||||
...config,
|
||||
text: config.text ? { ...config.text, streaming: config.text.streaming !== false } : config.text,
|
||||
text: config.text
|
||||
? {
|
||||
...config.text,
|
||||
streaming: config.text.streaming !== false,
|
||||
contextWindowTokens: config.text.contextWindowTokens || 128_000,
|
||||
maxOutputTokens: config.text.maxOutputTokens || 16_384,
|
||||
}
|
||||
: config.text,
|
||||
image: config.image
|
||||
? {
|
||||
...config.image,
|
||||
@@ -286,6 +297,8 @@ export function defaultImageCapabilityConfig(protocol?: ModelProtocol, model = "
|
||||
export function defaultModelCapabilityConfig(protocol?: ModelProtocol, model = ""): ModelCapabilityConfig {
|
||||
const text: TextCapabilityConfig = {
|
||||
streaming: true,
|
||||
contextWindowTokens: 128_000,
|
||||
maxOutputTokens: 16_384,
|
||||
// 文本模型的视觉能力必须由管理员明确开启，不能根据模型名猜测。
|
||||
references: { promptMaxChars: 32000, maxImages: 0, maxImageBytes: 0, maxVideos: 0, maxVideoBytes: 0 },
|
||||
};
|
||||
|
||||
@@ -6,6 +6,7 @@ import type { StyleExecutionPlan } from "@/lib/canvas/style-profile";
|
||||
import type { ArtCritiqueNodeState } from "@/lib/art-critique/contracts";
|
||||
import type { CameraControlOptions } from "@/lib/canvas/camera-prompt-library";
|
||||
import type { SrtEntry, SubtitleHighlight, SubtitleStyle } from "@/types/timeline";
|
||||
import type { GenerationSpec } from "@/lib/canvas/generation-contract.generated";
|
||||
|
||||
export type Position = {
|
||||
x: number;
|
||||
@@ -200,6 +201,8 @@ export type CanvasSkillSnapshot = {
|
||||
};
|
||||
|
||||
export type CanvasNodeMetadata = {
|
||||
/** Credential-free editable generation contract; submitted recipes live with tasks. */
|
||||
generationSpec?: GenerationSpec;
|
||||
/** Namespaced extension ownership for nodes contributed by a unified plugin. */
|
||||
pluginId?: string;
|
||||
pluginNodeId?: string;
|
||||
|
||||
Reference in New Issue
Block a user