diff --git a/frontend/apps/editor3d/app/public/resources/images/services/alibaba.svg b/frontend/apps/editor3d/app/public/resources/images/services/alibaba.svg
new file mode 100644
index 0000000000..a4bb382a63
--- /dev/null
+++ b/frontend/apps/editor3d/app/public/resources/images/services/alibaba.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/frontend/apps/editor3d/app/public/resources/images/services/fal.svg b/frontend/apps/editor3d/app/public/resources/images/services/fal.svg
new file mode 100644
index 0000000000..c41076f911
--- /dev/null
+++ b/frontend/apps/editor3d/app/public/resources/images/services/fal.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/frontend/apps/editor3d/app/public/resources/images/services/generic.svg b/frontend/apps/editor3d/app/public/resources/images/services/generic.svg
new file mode 100644
index 0000000000..1c8166697d
--- /dev/null
+++ b/frontend/apps/editor3d/app/public/resources/images/services/generic.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/frontend/apps/editor3d/app/public/resources/images/services/higgsfield.svg b/frontend/apps/editor3d/app/public/resources/images/services/higgsfield.svg
new file mode 100644
index 0000000000..de89784862
--- /dev/null
+++ b/frontend/apps/editor3d/app/public/resources/images/services/higgsfield.svg
@@ -0,0 +1,4 @@
+
+
\ No newline at end of file
diff --git a/frontend/apps/editor3d/app/public/resources/images/services/krea.svg b/frontend/apps/editor3d/app/public/resources/images/services/krea.svg
new file mode 100644
index 0000000000..d112dc3eab
--- /dev/null
+++ b/frontend/apps/editor3d/app/public/resources/images/services/krea.svg
@@ -0,0 +1,14 @@
+
+
\ No newline at end of file
diff --git a/frontend/apps/editor3d/app/public/resources/images/services/openart.svg b/frontend/apps/editor3d/app/public/resources/images/services/openart.svg
new file mode 100644
index 0000000000..f47a86e82d
--- /dev/null
+++ b/frontend/apps/editor3d/app/public/resources/images/services/openart.svg
@@ -0,0 +1,11 @@
+
+
\ No newline at end of file
diff --git a/frontend/apps/editor3d/app/public/resources/images/services/replicate.svg b/frontend/apps/editor3d/app/public/resources/images/services/replicate.svg
new file mode 100644
index 0000000000..48f148af26
--- /dev/null
+++ b/frontend/apps/editor3d/app/public/resources/images/services/replicate.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/frontend/apps/editor3d/app/public/resources/images/services/tencent.svg b/frontend/apps/editor3d/app/public/resources/images/services/tencent.svg
index 135a0c0f9d..724a815028 100644
--- a/frontend/apps/editor3d/app/public/resources/images/services/tencent.svg
+++ b/frontend/apps/editor3d/app/public/resources/images/services/tencent.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/frontend/apps/editor3d/app/public/resources/images/services/tensorart.svg b/frontend/apps/editor3d/app/public/resources/images/services/tensorart.svg
new file mode 100644
index 0000000000..d7e32012d4
--- /dev/null
+++ b/frontend/apps/editor3d/app/public/resources/images/services/tensorart.svg
@@ -0,0 +1,7 @@
+
+
\ No newline at end of file
diff --git a/frontend/apps/editor3d/app/public/resources/images/services/vidu.svg b/frontend/apps/editor3d/app/public/resources/images/services/vidu.svg
new file mode 100644
index 0000000000..0cb11823b4
--- /dev/null
+++ b/frontend/apps/editor3d/app/public/resources/images/services/vidu.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/frontend/apps/editor3d/app/src/pages/PageDraw/PageDraw.tsx b/frontend/apps/editor3d/app/src/pages/PageDraw/PageDraw.tsx
index 6f43208b3f..4f7b088b5f 100644
--- a/frontend/apps/editor3d/app/src/pages/PageDraw/PageDraw.tsx
+++ b/frontend/apps/editor3d/app/src/pages/PageDraw/PageDraw.tsx
@@ -16,11 +16,15 @@ import { captureStageImageBitmap } from "./hooks/useUpdateSnapshot";
import { ContextMenuContainer } from "./components/ui/ContextMenu";
import { FalBackgroundRemoval } from "@storyteller/tauri-api";
import { EnqueueImageBgRemoval } from "@storyteller/tauri-api";
-import { getCreatorIcon, IMAGE_MODELS_BY_LABEL, ModelCreator, ModelInfo } from "@storyteller/model-list";
-import { instructiveImageEditModels, ModelCategory, ModelSelector, useModelSelectorStore } from "@storyteller/ui-model-selector";
+import { ModelInfo } from "@storyteller/model-list";
+import {
+ instructiveImageEditModels,
+ ModelCategory,
+ ModelSelector,
+ useModelSelectorStore,
+} from "@storyteller/ui-model-selector";
import { useCanvasBgRemovedEvent } from "@storyteller/tauri-api";
-
export const DecodeBase64ToImage = async (
base64String: string,
): Promise => {
@@ -60,7 +64,9 @@ const PageDraw = () => {
instructiveImageEditModels[0]?.label;
const selectedModelInfo: ModelInfo | undefined =
- IMAGE_MODELS_BY_LABEL[selectedModel];
+ instructiveImageEditModels.find(
+ (m) => m.label === selectedModel,
+ )?.modelInfo;
useDeleteHotkeys({ onDelete: store.deleteSelectedItems });
useUndoRedoHotkeys({ undo: store.undo, redo: store.redo });
@@ -86,7 +92,7 @@ const PageDraw = () => {
store.finishRemoveBackground(
nodeId,
event.media_token,
- event.image_cdn_url
+ event.image_cdn_url,
);
});
diff --git a/frontend/apps/editor3d/app/src/pages/PageEnigma/PageEditor.tsx b/frontend/apps/editor3d/app/src/pages/PageEnigma/PageEditor.tsx
index 353b23e1e0..57926d595f 100644
--- a/frontend/apps/editor3d/app/src/pages/PageEnigma/PageEditor.tsx
+++ b/frontend/apps/editor3d/app/src/pages/PageEnigma/PageEditor.tsx
@@ -78,7 +78,6 @@ import { LoginModal, useLoginModalStore } from "@storyteller/ui-login-modal";
import PageDraw from "../PageDraw/PageDraw";
import { useTabStore } from "../Stores/TabState";
import PageEdit from "../PageEdit/PageEdit";
-import { IMAGE_MODELS_BY_LABEL } from "@storyteller/model-list";
import { ModelInfo } from "@storyteller/model-list";
export const PageEditor = () => {
@@ -117,7 +116,9 @@ export const PageEditor = () => {
instructiveImageEditModels[0]?.label;
const selectedModelInfo: ModelInfo | undefined =
- IMAGE_MODELS_BY_LABEL[selectedModel];
+ instructiveImageEditModels.find(
+ (m) => m.label === selectedModel,
+ )?.modelInfo;
const height =
dndTimelineHeight.value > -1
diff --git a/frontend/apps/editor3d/app/src/pages/PageImage/TextToImage.tsx b/frontend/apps/editor3d/app/src/pages/PageImage/TextToImage.tsx
index 45f1a4eb4a..406b6cd798 100644
--- a/frontend/apps/editor3d/app/src/pages/PageImage/TextToImage.tsx
+++ b/frontend/apps/editor3d/app/src/pages/PageImage/TextToImage.tsx
@@ -13,7 +13,6 @@ interface TextToImageProps {
imageMediaId?: string;
imageUrl?: string;
}
-import { IMAGE_MODELS_BY_LABEL } from "@storyteller/model-list";
import { ModelInfo } from "@storyteller/model-list";
const TextToImage = ({ imageMediaId, imageUrl }: TextToImageProps) => {
@@ -24,8 +23,9 @@ const TextToImage = ({ imageMediaId, imageUrl }: TextToImageProps) => {
selectedModels[ModelCategory.TextToImage] ||
imageGenerationModels[0]?.label;
- const selectedModelInfo: ModelInfo | undefined =
- IMAGE_MODELS_BY_LABEL[selectedModel];
+ const selectedModelInfo: ModelInfo | undefined = imageGenerationModels.find(
+ (m) => m.label === selectedModel,
+ )?.modelInfo;
const jobContext: JobContextType = {
jobTokens: [],
diff --git a/frontend/apps/editor3d/app/src/pages/PageVideo/ImageToVideo.tsx b/frontend/apps/editor3d/app/src/pages/PageVideo/ImageToVideo.tsx
index b2f07a3b10..7882567b1d 100644
--- a/frontend/apps/editor3d/app/src/pages/PageVideo/ImageToVideo.tsx
+++ b/frontend/apps/editor3d/app/src/pages/PageVideo/ImageToVideo.tsx
@@ -8,7 +8,6 @@ import {
useModelSelectorStore,
videoGenerationModels,
} from "@storyteller/ui-model-selector";
-import { VIDEO_MODELS_BY_LABEL } from "@storyteller/model-list";
import { ModelInfo } from "@storyteller/model-list";
interface ImageToVideoProps {
@@ -24,8 +23,9 @@ const ImageToVideo = ({ imageMediaId, imageUrl }: ImageToVideoProps) => {
selectedModels[ModelCategory.ImageToVideo] ||
videoGenerationModels[0]?.label;
- const selectedModelInfo: ModelInfo | undefined =
- VIDEO_MODELS_BY_LABEL[selectedModel];
+ const selectedModelInfo: ModelInfo | undefined = videoGenerationModels.find(
+ (m) => m.label === selectedModel,
+ )?.modelInfo;
const jobContext: JobContextType = {
jobTokens: [],
diff --git a/frontend/libs/model-list/src/lib/ImageModels.ts b/frontend/libs/model-list/src/lib/ImageModels.ts
index 09b7f33d60..40c8efd8e8 100644
--- a/frontend/libs/model-list/src/lib/ImageModels.ts
+++ b/frontend/libs/model-list/src/lib/ImageModels.ts
@@ -31,22 +31,5 @@ export const IMAGE_MODELS: Record = {
name: "Flux Pro Kontext Max",
tauri_id: "flux_pro_kontext_max",
creator: ModelCreator.BlackForestLabs,
- }
-};
-
-// TODO: This needs to be cleaned up. It's gross.
-// This is a hack to get the old model selector code to work since it's keyed off
-// of the human-readable label of the model. Long term, that should be fixed.
-export const IMAGE_MODELS_BY_LABEL: Record = {
- // NB: This list is for text-to-image PromptBox:
- "Flux Pro 1.1 Ultra": IMAGE_MODELS.flux_pro_1_1_ultra,
- "Flux Pro 1.1": IMAGE_MODELS.flux_pro_1_1,
- "Flux 1 Dev": IMAGE_MODELS.flux_1_dev,
- "Flux 1 Schnell": IMAGE_MODELS.flux_1_schnell,
- "GPT Image 1 (GPT-4o)": IMAGE_MODELS.gpt_image_1,
-
- // NB: This is for 2D and 3D PromptBox:
- "FLUX.1 Pro Kontext Max": IMAGE_MODELS.flux_pro_kontext_max,
- "GPT-4o": IMAGE_MODELS.gpt_image_1,
-
+ },
};
diff --git a/frontend/libs/model-list/src/lib/ModelCreator.ts b/frontend/libs/model-list/src/lib/ModelCreator.ts
index d7139e9fd9..11b235de56 100644
--- a/frontend/libs/model-list/src/lib/ModelCreator.ts
+++ b/frontend/libs/model-list/src/lib/ModelCreator.ts
@@ -8,6 +8,14 @@ export enum ModelCreator {
OpenAi = "OpenAi",
Runway = "Runway",
Stability = "Stability",
- Tencent = "Tencent",
+ Tencent = "Tencent", // hunyuan
Recraft = "Recraft",
+ Krea = "Krea",
+ Fal = "Fal",
+ Replicate = "Replicate",
+ TensorArt = "TensorArt",
+ OpenArt = "OpenArt",
+ Higgsfield = "Higgsfield",
+ Alibaba = "Alibaba", // qwen and wanvideo
+ Vidu = "Vidu",
}
diff --git a/frontend/libs/model-list/src/lib/ModelCreatorIcons.ts b/frontend/libs/model-list/src/lib/ModelCreatorIcons.ts
index 53738b40c2..6111ceba9a 100644
--- a/frontend/libs/model-list/src/lib/ModelCreatorIcons.ts
+++ b/frontend/libs/model-list/src/lib/ModelCreatorIcons.ts
@@ -11,8 +11,18 @@ export const CREATOR_ICON_PATHS: Partial> = {
[ModelCreator.Google]: "/resources/images/services/google.svg",
[ModelCreator.Recraft]: "/resources/images/services/recraft.svg",
[ModelCreator.Tencent]: "/resources/images/services/tencent.svg",
+ [ModelCreator.Krea]: "/resources/images/services/krea.svg",
+ [ModelCreator.Fal]: "/resources/images/services/fal.svg",
+ [ModelCreator.Replicate]: "/resources/images/services/replicate.svg",
+ [ModelCreator.TensorArt]: "/resources/images/services/tensorart.svg",
+ [ModelCreator.OpenArt]: "/resources/images/services/openart.svg",
+ [ModelCreator.Higgsfield]: "/resources/images/services/higgsfield.svg",
+ [ModelCreator.Alibaba]: "/resources/images/services/alibaba.svg",
+ [ModelCreator.Vidu]: "/resources/images/services/vidu.svg",
};
+const DEFAULT_ICON_PATH = "/resources/images/services/generic.svg";
+
export const getCreatorIconPath = (creator: ModelCreator): string | undefined =>
CREATOR_ICON_PATHS[creator];
@@ -20,8 +30,7 @@ export const getCreatorIcon = (
creator: ModelCreator,
className = "h-4 w-4 invert"
): ReactNode | null => {
- const path = getCreatorIconPath(creator);
- if (!path) return null;
+ const path = getCreatorIconPath(creator) ?? DEFAULT_ICON_PATH;
return React.createElement("img", {
src: path,
alt: `${creator} logo`,
diff --git a/frontend/libs/model-list/src/lib/ModelTypeMapping.ts b/frontend/libs/model-list/src/lib/ModelTypeMapping.ts
index a100bfcedc..4a7050a4dc 100644
--- a/frontend/libs/model-list/src/lib/ModelTypeMapping.ts
+++ b/frontend/libs/model-list/src/lib/ModelTypeMapping.ts
@@ -55,6 +55,22 @@ export const getModelCreatorName = (modelType: string): string | null => {
return "Recraft";
case ModelCreator.Tencent:
return "Tencent";
+ case ModelCreator.Alibaba:
+ return "Alibaba";
+ case ModelCreator.Vidu:
+ return "Vidu";
+ case ModelCreator.Fal:
+ return "Fal";
+ case ModelCreator.Replicate:
+ return "Replicate";
+ case ModelCreator.TensorArt:
+ return "TensorArt";
+ case ModelCreator.OpenArt:
+ return "OpenArt";
+ case ModelCreator.Higgsfield:
+ return "Higgsfield";
+ case ModelCreator.Krea:
+ return "Krea";
default:
return creator;
}
@@ -77,6 +93,7 @@ export const getModelDisplayName = (modelType: string): string => {
hunyuan_3d_2p0: "Hunyuan 3D 2.0",
hunyuan_3d_2p1: "Hunyuan 3D 2.1",
hunyuan_3d: "Hunyuan 3D",
+ flux_pro_kontext_max: "Flux Pro Kontext Max",
};
return displayNames[modelType] || modelType;
diff --git a/frontend/libs/model-list/src/lib/VideoModels.ts b/frontend/libs/model-list/src/lib/VideoModels.ts
index 04b2f9c73b..ee1a934c88 100644
--- a/frontend/libs/model-list/src/lib/VideoModels.ts
+++ b/frontend/libs/model-list/src/lib/VideoModels.ts
@@ -28,13 +28,3 @@ export const VIDEO_MODELS: Record = {
creator: ModelCreator.Google,
},
};
-
-// This is a hack to get the old model selector code to work since it's keyed off
-// of the human-readable label of the model. Long term, that should be fixed.
-export const VIDEO_MODELS_BY_LABEL: Record = {
- "Kling 1.6 Pro": VIDEO_MODELS.kling_1_6_pro,
- "Kling 2.1 Pro": VIDEO_MODELS.kling_2_1_pro,
- "Kling 2.1 Master": VIDEO_MODELS.kling_2_1_master,
- "Seedance 1.0 Lite": VIDEO_MODELS.seedance_1_0_lite,
- "Google Veo 2": VIDEO_MODELS.veo_2,
-};