cleanup model details

This commit is contained in:
Brandon Thomas committed 2025-08-19 22:57:48 -04:00
1 parent d57f771bea
commit c488c1a2e6
5 files changed
+47 -45

No files matched your search

@@ -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 = () => {
</div>
<div className="absolute bottom-6 left-6 z-20 flex items-center gap-2">
<ModelSelector
items={instructiveImageEditModels}
items={CANVAS_2D_PAGE_MODEL_LIST}
category={ModelCategory.Canvas2D}
panelTitle="Select Model"
panelClassName="min-w-[280px]"
@@ -66,13 +66,10 @@ import {
removeImageDropListener,
} from "@storyteller/ui-gallery-modal";
import {
instructiveImageEditModels,
STAGE_3D_PAGE_MODEL_LIST,
ModelCategory,
// ModelCategory,
ModelSelector,
useModelSelectorStore,
// videoGenerationModels,
// useModelSelectorStore,
} from "@storyteller/ui-model-selector";
import { LoginModal, useLoginModalStore } from "@storyteller/ui-login-modal";
import PageDraw from "../PageDraw/PageDraw";
@@ -113,10 +110,10 @@ export const PageEditor = () => {
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 = () => {
<div className="absolute bottom-6 left-6 z-20 flex items-center gap-2">
<ModelSelector
items={instructiveImageEditModels}
items={STAGE_3D_PAGE_MODEL_LIST}
category={ModelCategory.Editor3D}
panelTitle="Select Model"
panelClassName="min-w-[280px]"
@@ -6,7 +6,7 @@ import {
ModelCategory,
ModelSelector,
useModelSelectorStore,
videoGenerationModels,
IMAGE_TO_VIDEO_PAGE_MODEL_LIST,
} from "@storyteller/ui-model-selector";
import { ModelInfo } from "@storyteller/model-list";
@@ -21,9 +21,9 @@ const ImageToVideo = ({ imageMediaId, imageUrl }: ImageToVideoProps) => {
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) => {
<div className="absolute bottom-6 left-6 z-20 flex items-center gap-2">
<ModelSelector
items={videoGenerationModels}
items={IMAGE_TO_VIDEO_PAGE_MODEL_LIST}
category={ModelCategory.ImageToVideo}
panelTitle="Select Model"
panelClassName="min-w-[280px]"
@@ -3,10 +3,11 @@ import { faClock, faFilm, faImage } from "@fortawesome/pro-solid-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import {
getCreatorIcon,
getModelsByCategory,
getInstructiveImageEditModels,
IMAGE_EDITOR_PAGE_MODELS,
TEXT_TO_IMAGE_PAGE_MODELS,
IMAGE_TO_VIDEO_PAGE_MODELS,
CANVAS_2D_PAGE_MODELS,
STAGE_3D_PAGE_MODELS,
IMAGE_EDITOR_PAGE_MODELS,
} from "@storyteller/model-list";
export type ModelList = Omit<PopoverItem, "selected">[];
@@ -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,
<FontAwesomeIcon icon={faFilm} className="h-4 w-4" />
),
instructiveImageEdits: buildItems(
instructiveModels as any,
<FontAwesomeIcon icon={faImage} className="h-4 w-4" />
),
};
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,
<FontAwesomeIcon icon={faImage} className="h-4 w-4" />
);
export const IMAGE_TO_VIDEO_PAGE_MODEL_LIST : ModelList = buildItems(
IMAGE_TO_VIDEO_PAGE_MODELS as any,
<FontAwesomeIcon icon={faFilm} className="h-4 w-4" />
);
export const CANVAS_2D_PAGE_MODEL_LIST : ModelList = buildItems(
CANVAS_2D_PAGE_MODELS as any,
<FontAwesomeIcon icon={faImage} className="h-4 w-4" />
);
export const STAGE_3D_PAGE_MODEL_LIST : ModelList = buildItems(
STAGE_3D_PAGE_MODELS as any,
<FontAwesomeIcon icon={faImage} className="h-4 w-4" />
);
export const IMAGE_EDITOR_PAGE_MODEL_LIST : ModelList = buildItems(
IMAGE_EDITOR_PAGE_MODELS as any,
<FontAwesomeIcon icon={faImage} className="h-4 w-4" />
@@ -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")!,
];