From c488c1a2e63119ed5a1dfacec920f1c633dfeb08 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Tue, 19 Aug 2025 22:57:48 -0400 Subject: [PATCH] cleanup model details --- .../app/src/pages/PageDraw/PageDraw.tsx | 13 ++---- .../app/src/pages/PageEnigma/PageEditor.tsx | 11 ++--- .../app/src/pages/PageVideo/ImageToVideo.tsx | 8 ++-- .../model-selector/src/lib/model-lists.tsx | 40 +++++++++---------- .../libs/model-list/src/lib/ModelsByPage.ts | 20 ++++++++-- 5 files changed, 47 insertions(+), 45 deletions(-) diff --git a/frontend/apps/editor3d/app/src/pages/PageDraw/PageDraw.tsx b/frontend/apps/editor3d/app/src/pages/PageDraw/PageDraw.tsx index 4f7b088b5f..1ea74d84d5 100644 --- a/frontend/apps/editor3d/app/src/pages/PageDraw/PageDraw.tsx +++ b/frontend/apps/editor3d/app/src/pages/PageDraw/PageDraw.tsx @@ -7,18 +7,13 @@ import { AspectRatioType, useSceneStore } from "./stores/SceneState"; import { useUndoRedoHotkeys } from "./hooks/useUndoRedoHotkeys"; import { useDeleteHotkeys } from "./hooks/useDeleteHotkeys"; import { useCopyPasteHotkeys } from "./hooks/useCopyPasteHotkeys"; -import { PopoverItem, PopoverMenu } from "@storyteller/ui-popover"; -import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; -import { faClock, faImage } from "@fortawesome/pro-solid-svg-icons"; import Konva from "konva"; import { setCanvasRenderBitmap } from "../../signals/canvasRenderBitmap"; import { captureStageImageBitmap } from "./hooks/useUpdateSnapshot"; import { ContextMenuContainer } from "./components/ui/ContextMenu"; -import { FalBackgroundRemoval } from "@storyteller/tauri-api"; -import { EnqueueImageBgRemoval } from "@storyteller/tauri-api"; import { ModelInfo } from "@storyteller/model-list"; import { - instructiveImageEditModels, + CANVAS_2D_PAGE_MODEL_LIST, ModelCategory, ModelSelector, useModelSelectorStore, @@ -61,10 +56,10 @@ const PageDraw = () => { const selectedModel = selectedModels[ModelCategory.Canvas2D] || - instructiveImageEditModels[0]?.label; + CANVAS_2D_PAGE_MODEL_LIST[0]?.label; const selectedModelInfo: ModelInfo | undefined = - instructiveImageEditModels.find( + CANVAS_2D_PAGE_MODEL_LIST.find( (m) => m.label === selectedModel, )?.modelInfo; @@ -450,7 +445,7 @@ const PageDraw = () => {
{ const selectedModel = selectedModels[ModelCategory.Editor3D] || - instructiveImageEditModels[0]?.label; + STAGE_3D_PAGE_MODEL_LIST[0]?.label; const selectedModelInfo: ModelInfo | undefined = - instructiveImageEditModels.find( + STAGE_3D_PAGE_MODEL_LIST.find( (m) => m.label === selectedModel, )?.modelInfo; @@ -550,7 +547,7 @@ export const PageEditor = () => {
{ const selectedModel = selectedModels[ModelCategory.ImageToVideo] || - videoGenerationModels[0]?.label; + IMAGE_TO_VIDEO_PAGE_MODEL_LIST[0]?.label; - const selectedModelInfo: ModelInfo | undefined = videoGenerationModels.find( + const selectedModelInfo: ModelInfo | undefined = IMAGE_TO_VIDEO_PAGE_MODEL_LIST.find( (m) => m.label === selectedModel, )?.modelInfo; @@ -67,7 +67,7 @@ const ImageToVideo = ({ imageMediaId, imageUrl }: ImageToVideoProps) => {
[]; @@ -33,29 +34,26 @@ const buildItems = ( modelInfo: (m as any).info, })); -const videoModels = getModelsByCategory("video"); -const instructiveModels = getInstructiveImageEditModels(); - -export const allModels = { - video: buildItems( - videoModels as any, - - ), - instructiveImageEdits: buildItems( - instructiveModels as any, - - ), -}; - -export const videoGenerationModels: ModelList = allModels.video; -export const instructiveImageEditModels: ModelList = - allModels.instructiveImageEdits; - export const TEXT_TO_IMAGE_PAGE_MODEL_LIST : ModelList = buildItems( TEXT_TO_IMAGE_PAGE_MODELS as any, ); +export const IMAGE_TO_VIDEO_PAGE_MODEL_LIST : ModelList = buildItems( + IMAGE_TO_VIDEO_PAGE_MODELS as any, + +); + +export const CANVAS_2D_PAGE_MODEL_LIST : ModelList = buildItems( + CANVAS_2D_PAGE_MODELS as any, + +); + +export const STAGE_3D_PAGE_MODEL_LIST : ModelList = buildItems( + STAGE_3D_PAGE_MODELS as any, + +); + export const IMAGE_EDITOR_PAGE_MODEL_LIST : ModelList = buildItems( IMAGE_EDITOR_PAGE_MODELS as any, diff --git a/frontend/libs/model-list/src/lib/ModelsByPage.ts b/frontend/libs/model-list/src/lib/ModelsByPage.ts index ba76a707a8..0cd2a5b469 100644 --- a/frontend/libs/model-list/src/lib/ModelsByPage.ts +++ b/frontend/libs/model-list/src/lib/ModelsByPage.ts @@ -1,5 +1,6 @@ import { getModelsByCategory, ModelConfig } from "./Models.js"; import { ALL_MODELS_BY_ID } from "./Models.js"; +import { ModelTag } from "./ModelTag.js"; /** * We might not want to always programatically build the list of models, because @@ -7,16 +8,27 @@ import { ALL_MODELS_BY_ID } from "./Models.js"; * more popular models. We may also want to selectively prune non-useful models. */ -export const CANVAS_2D_PAGE_MODELS : ModelConfig[] = getModelsByCategory("image"); - -export const TEXT_TO_IMAGE_PAGE_MODELS : ModelConfig[] = getModelsByCategory("image") +export const TEXT_TO_IMAGE_PAGE_MODELS : ModelConfig[] = + getModelsByCategory("image") // Remove inpainting and editing models. .filter((m) => m.id !== "flux_pro_inpaint") .filter((m) => m.id !== "flux_pro_kontext_max"); +export const IMAGE_TO_VIDEO_PAGE_MODELS : ModelConfig[] = + getModelsByCategory("video"); + +export const CANVAS_2D_PAGE_MODELS : ModelConfig[] = + getModelsByCategory("image") + // Remove non-instructive models. + .filter((m) => m.tags?.includes(ModelTag.InstructiveEdit)) + +export const STAGE_3D_PAGE_MODELS : ModelConfig[] = + getModelsByCategory("image") + // Remove non-instructive models. + .filter((m) => m.tags?.includes(ModelTag.InstructiveEdit)) + export const IMAGE_EDITOR_PAGE_MODELS : ModelConfig[] = [ // Explicit list for now. ALL_MODELS_BY_ID.get("flux_pro_inpaint")!, ALL_MODELS_BY_ID.get("flux_pro_kontext_max")!, ]; -