daniel543x/artcraft
1
0 Fork 0
mirror of https://github.com/storytold/artcraft.git synced 2026-11-05 17:58:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

change model orders (#839)

Browse Source
This commit is contained in:
Brandon Thomas authored and GitHub committed 2025-09-23 14:39:36 -04:00
1 parent f6dfd02cfc
commit 59f5da1be3
2 files changed
+69 -30
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

frontend/libs/components/model-selector/src/lib/model-selectors-for-pages.tsx
+61 -30
View File
@@ -6,7 +6,7 @@ import {
Model,
VIDEO_MODELS,
IMAGE_MODELS,
ALL_MODELS_BY_ID,
IMAGE_MODELS_BY_ID,
} from "@storyteller/model-list";
import { ModelTag } from "@storyteller/model-list";
@@ -14,7 +14,7 @@ export type ModelList = Omit<PopoverItem, "selected">[];
const withIcon = (creatorIcon: any, fallback: any) => creatorIcon || fallback;
const buildItems2 = (
const buildItems = (
models: Model[],
fallbackIcon: any
) =>
@@ -37,35 +37,66 @@ const buildItems2 = (
* access to the object directly.
*/
export const CANVAS_2D_PAGE_MODEL_LIST : ModelList = buildItems2(
IMAGE_MODELS.filter((m) => m.tags?.includes(ModelTag.InstructiveEdit)),
<FontAwesomeIcon icon={faImage} className="h-4 w-4" />
);
export const TEXT_TO_IMAGE_PAGE_MODEL_LIST : ModelList =
buildItems(
(function() : Model[] {
const set : Set<Model> = new Set();
set.add(IMAGE_MODELS_BY_ID.get("flux_pro_1_1")!); // Don't put Midjourney first!
IMAGE_MODELS
.filter((model) => !model.usesInpaintingMask) // We can't use masked inpainting models here
.filter((model) => model.id !== "flux_pro_kontext_max") // NB: Flux Pro Kontext Max requires an input image
.forEach((m) => set.add(m));
return Array.from(set);
})(),
<FontAwesomeIcon icon={faImage} className="h-4 w-4" />
);
export const STAGE_3D_PAGE_MODEL_LIST : ModelList = buildItems2(
IMAGE_MODELS.filter((m) => m.tags?.includes(ModelTag.InstructiveEdit)),
<FontAwesomeIcon icon={faImage} className="h-4 w-4" />
);
export const CANVAS_2D_PAGE_MODEL_LIST : ModelList =
buildItems(
(function() : Model[] {
const set : Set<Model> = new Set();
set.add(IMAGE_MODELS_BY_ID.get("gpt_image_1")!); // Place gpt_image_1 first.
IMAGE_MODELS
.filter((m) => m.tags?.includes(ModelTag.InstructiveEdit))
.forEach((m) => set.add(m));
return Array.from(set);
})(),
<FontAwesomeIcon icon={faImage} className="h-4 w-4" />
);
export const IMAGE_EDITOR_PAGE_MODEL_LIST : ModelList = buildItems2(
//[
// ALL_MODELS_BY_ID.get("flux_pro_inpaint")!,
// ALL_MODELS_BY_ID.get("flux_dev_juggernaut_inpaint")!,
// ALL_MODELS_BY_ID.get("flux_pro_kontext_max")!,
//],
IMAGE_MODELS.filter((m) => m.canEditImages),
<FontAwesomeIcon icon={faImage} className="h-4 w-4" />
);
export const STAGE_3D_PAGE_MODEL_LIST : ModelList =
buildItems(
(function() : Model[] {
const set : Set<Model> = new Set();
set.add(IMAGE_MODELS_BY_ID.get("gpt_image_1")!); // Place gpt_image_1 first.
IMAGE_MODELS
.filter((m) => m.tags?.includes(ModelTag.InstructiveEdit))
.forEach((m) => set.add(m));
return Array.from(set);
})(),
<FontAwesomeIcon icon={faImage} className="h-4 w-4" />
);
export const IMAGE_TO_VIDEO_PAGE_MODEL_LIST : ModelList = buildItems2(
VIDEO_MODELS,
<FontAwesomeIcon icon={faFilm} className="h-4 w-4" />
);
export const IMAGE_EDITOR_PAGE_MODEL_LIST : ModelList =
buildItems(
//[
// ALL_MODELS_BY_ID.get("flux_pro_inpaint")!,
// ALL_MODELS_BY_ID.get("flux_dev_juggernaut_inpaint")!,
// ALL_MODELS_BY_ID.get("flux_pro_kontext_max")!,
//],
(function() : Model[] {
const set : Set<Model> = new Set();
//set.add(IMAGE_MODELS_BY_ID.get("gpt_image_1")!); // Place gpt_image_1 first.
IMAGE_MODELS
.filter((m) => m.canEditImages)
.forEach((m) => set.add(m));
return Array.from(set);
})(),
<FontAwesomeIcon icon={faImage} className="h-4 w-4" />
);
export const TEXT_TO_IMAGE_PAGE_MODEL_LIST : ModelList = buildItems2(
IMAGE_MODELS
.filter((model) => !model.usesInpaintingMask) // We can't use masked inpainting models here
.filter((model) => model.id !== "flux_pro_kontext_max") // NB: Flux Pro Kontext Max requires an input image
,
<FontAwesomeIcon icon={faImage} className="h-4 w-4" />
);
export const IMAGE_TO_VIDEO_PAGE_MODEL_LIST : ModelList =
buildItems(
VIDEO_MODELS,
<FontAwesomeIcon icon={faFilm} className="h-4 w-4" />
);
frontend/libs/model-list/src/lib/lists/ImageModels.ts
+8
View File
@@ -148,3 +148,11 @@ export const IMAGE_MODELS: ImageModel[] = [
usesInpaintingMask: true,
}),
];
export const IMAGE_MODELS_BY_ID : Map<string, ImageModel> = new Map(
IMAGE_MODELS.map((model) => [model.id, model])
);
if (IMAGE_MODELS_BY_ID.size !== IMAGE_MODELS.length) {
throw new Error("All image models must have unique IDs");
}