admin/infinite-canvas
1
0
Fork 0
mirror of https://github.com/basketikun/infinite-canvas.git synced 2026-08-02 15:01:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:basketikun/infinite-canvas

Browse Source
This commit is contained in:
soldier
2026-06-16 18:46:34 +08:00
parent 73090da95a 973d14f4c3
commit 6300f5fb26
5 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/src/app/(user)/canvas/components/canvas-assistant-panel.tsx
+7 -2
View File
@@ -6,7 +6,7 @@ import { Bot, Copy, Cpu, History, PanelRightClose, Plus, Settings2, Trash2, X }
import { Button, Modal, Segmented, Switch, Tooltip } from "antd";
import { motion } from "motion/react";
import { modelOptionName, resolveModelChannel, selectableModelsByCapability, useConfigStore, useEffectiveConfig, type AiConfig } from "@/stores/use-config-store";
import { modelOptionName, normalizeModelOptionValue, resolveModelChannel, selectableModelsByCapability, useConfigStore, useEffectiveConfig, type AiConfig } from "@/stores/use-config-store";
import { canvasThemes } from "@/lib/canvas-theme";
import { nanoid } from "nanoid";
import { requestToolResponse, type ResponseFunctionTool, type ResponseInputMessage, type ResponseToolCall } from "@/services/api/image";
@@ -1021,7 +1021,7 @@ function configNodeOp(id: string, input: Record<string, unknown>, x: number, y:
composerContent: prompt,
prompt,
status: "idle",
model: stringOptional(input.model) || defaultGenerationModel(config, mode),
model: resolveGenerationModel(config, mode, stringOptional(input.model)),
size: stringOptional(input.size) || config.size,
quality: stringOptional(input.quality) || config.quality,
count: numberOptional(input.count) ?? generationCount(mode === "image" ? config.canvasImageCount || config.count : config.count),
@@ -1199,6 +1199,11 @@ function defaultGenerationModel(config: AiConfig, mode: "text" | "image" | "vide
return config.textModel || config.model;
}
function resolveGenerationModel(config: AiConfig, mode: "text" | "image" | "video" | "audio", model?: string) {
const normalized = normalizeModelOptionValue(model, config.channels);
return normalized && selectableModelsByCapability(config, mode).includes(normalized) ? normalized : defaultGenerationModel(config, mode);
}
function generationCount(value: string) {
return Math.max(1, Math.min(15, Math.floor(Math.abs(Number(value)) || 1)));
}