From 9b6b0175ea3f1f65ba8a759174647d940db70a40 Mon Sep 17 00:00:00 2001 From: BFlat Date: Wed, 6 May 2026 22:51:39 +0700 Subject: [PATCH] desktop app: unblock object generations, styling cleanup, model selector (#1478) --- .../experiences/ImageTo3DExperience.tsx | 198 +++++++++--------- .../model-selector/src/lib/model-pages.ts | 1 + .../src/lib/model-selectors-for-pages.tsx | 7 + frontend/libs/model-list/src/index.ts | 2 + .../libs/model-list/src/lib/classes/Model.ts | 7 +- .../src/lib/classes/Object3DModel.ts | 26 +++ .../model-list/src/lib/legacy/ModelConfig.ts | 2 +- .../model-list/src/lib/lists/AllModels.ts | 8 +- .../src/lib/lists/Object3DModels.ts | 38 ++++ 9 files changed, 189 insertions(+), 100 deletions(-) create mode 100644 frontend/libs/model-list/src/lib/classes/Object3DModel.ts create mode 100644 frontend/libs/model-list/src/lib/lists/Object3DModels.ts diff --git a/frontend/apps/artcraft/app/src/components/experiences/ImageTo3DExperience.tsx b/frontend/apps/artcraft/app/src/components/experiences/ImageTo3DExperience.tsx index 8fd1c12335..d6afe06184 100644 --- a/frontend/apps/artcraft/app/src/components/experiences/ImageTo3DExperience.tsx +++ b/frontend/apps/artcraft/app/src/components/experiences/ImageTo3DExperience.tsx @@ -32,6 +32,7 @@ import type { MediaItem } from "../../pages/PageEnigma/models"; import { SPLAT_MODELS } from "@storyteller/model-list"; import { ClassyModelSelector, + IMAGE_TO_3D_OBJECT_PAGE_MODEL_LIST, IMAGE_TO_3D_WORLD_PAGE_MODEL_LIST, ModelPage, useSelectedModel, @@ -78,12 +79,9 @@ const generateId = () => ? crypto.randomUUID() : Math.random().toString(36).slice(2, 10); -const MODEL_OPTIONS = [ - { id: EnqueueImageTo3dObjectModel.Hunyuan3d3, label: "Hunyuan 3.0" }, - { id: EnqueueImageTo3dObjectModel.Hunyuan3d2_0, label: "Hunyuan 2.0" }, -]; - const WORLD_MODEL_PAGE = ModelPage.ImageTo3DWorld; +const OBJECT_MODEL_PAGE = ModelPage.ImageTo3DObject; +const DEFAULT_OBJECT_MODEL_ID = EnqueueImageTo3dObjectModel.Hunyuan3d3; export const ImageTo3DExperience = ({ title, @@ -92,18 +90,21 @@ export const ImageTo3DExperience = ({ backgroundImage, }: ImageTo3DExperienceProps) => { const [activeMode, setActiveMode] = useState("image"); - const [selectedModel, setSelectedModel] = - useState( - EnqueueImageTo3dObjectModel.Hunyuan3d3, - ); const selectedWorldModel = useSelectedModel(WORLD_MODEL_PAGE); const selectedWorldProvider = useSelectedProviderForModel( WORLD_MODEL_PAGE, selectedWorldModel?.id, ); + const selectedObjectModel = useSelectedModel(OBJECT_MODEL_PAGE); + const selectedObjectModelId = + (selectedObjectModel?.id as EnqueueImageTo3dObjectModel | undefined) ?? + DEFAULT_OBJECT_MODEL_ID; const worldCredits = useCostBreakdownModalStore( (s) => s.estimatedCreditsByPage[WORLD_MODEL_PAGE], ); + const objectCredits = useCostBreakdownModalStore( + (s) => s.estimatedCreditsByPage[OBJECT_MODEL_PAGE], + ); const [uploadedPreview, setUploadedPreview] = useState(null); const [uploadedName, setUploadedName] = useState(null); const [prompt, setPrompt] = useState(""); @@ -140,9 +141,7 @@ export const ImageTo3DExperience = ({ const clearPendingExternalImage = useImageTo3DWorldStore( (s) => s.clearPendingExternalImage, ); - const pendingObjectImage = useImageTo3DStore( - (s) => s.pendingExternalImage, - ); + const pendingObjectImage = useImageTo3DStore((s) => s.pendingExternalImage); const clearPendingObjectImage = useImageTo3DStore( (s) => s.clearPendingExternalImage, ); @@ -186,7 +185,13 @@ export const ImageTo3DExperience = ({ clearPendingObjectImage(); } } - }, [variant, pendingExternalImage, clearPendingExternalImage, pendingObjectImage, clearPendingObjectImage]); + }, [ + variant, + pendingExternalImage, + clearPendingExternalImage, + pendingObjectImage, + clearPendingObjectImage, + ]); useEffect(() => { const onResize = () => setVh(window.innerHeight); @@ -451,14 +456,13 @@ export const ImageTo3DExperience = ({ window.__storeTaskEnqueueMeta?.({ prompt: snapshotPrompt || undefined, refImageUrls: snapshotPreview ? [snapshotPreview] : undefined, - modelType: - (selectedModel as any)?.tauriId || String(selectedModel), + modelType: selectedObjectModel?.tauriId || selectedObjectModelId, timestamp: Date.now(), }); const result = await EnqueueImageTo3dObject({ image_media_token: uploadedMediaToken || undefined, - model: selectedModel, + model: selectedObjectModelId, frontend_caller: "mini_app", frontend_subscriber_id: subscriberId, }); @@ -469,10 +473,6 @@ export const ImageTo3DExperience = ({ if (activeMode === "text") { setPrompt(""); - } else { - setUploadedPreview(null); - setUploadedName(null); - setUploadedMediaToken(null); } } } catch (error) { @@ -922,10 +922,6 @@ export const ImageTo3DExperience = ({ const activeResult = results.find((r) => r.id === selectedResultId) || results[0]; - useEffect(() => { - console.log("[ImageTo3D] Active result changed:", activeResult); - }, [activeResult]); - return (
{backgroundImage && !hasResults && ( @@ -959,13 +955,14 @@ export const ImageTo3DExperience = ({
{/* Left: Viewer */}
-
+

History

{results.length > 0 && (
-
-
- {result.note || "Generated Model"} -
-
- {result.status === "pending" ? ( - - - Generating... - + > +
+ {result.previewUrl ? ( + thumb ) : ( - {formatTime(result.timestamp)} +
+ +
+ )} + {isPending && ( +
+
+
)}
-
- - ))} +
+
+ {result.note || "Generated Model"} +
+
+ {isPending ? ( + + Generating… + + ) : ( + + {formatTime(result.timestamp)} + + )} +
+
+ + ); + })}
@@ -1107,27 +1120,13 @@ export const ImageTo3DExperience = ({ hasResults ? "mt-3" : "mt-3", )} > - {variant === "object" && ( -
- - setSelectedModel(id as EnqueueImageTo3dObjectModel) - } - className="w-fit" - indicatorClassName="bg-primary/25" - /> -
- )} - {`Generate ${variant === "object" ? "Object" : "World"}`} @@ -1148,25 +1147,30 @@ export const ImageTo3DExperience = ({
- {variant === "world" && ( - <> -
- -
-
- - -
- - )} +
+ +
+ +
+ + +
); + +export const IMAGE_TO_3D_OBJECT_PAGE_MODEL_LIST: ModelList = + buildItems( + OBJECT_3D_MODELS as Model[], + + ); diff --git a/frontend/libs/model-list/src/index.ts b/frontend/libs/model-list/src/index.ts index 0968f883ca..3113a4a6ed 100644 --- a/frontend/libs/model-list/src/index.ts +++ b/frontend/libs/model-list/src/index.ts @@ -18,5 +18,7 @@ export * from "./lib/lists/ImageModels.js"; export * from "./lib/lists/VideoModels.js"; export * from "./lib/classes/SplatModel.js"; export * from "./lib/lists/SplatModels.js"; +export * from "./lib/classes/Object3DModel.js"; +export * from "./lib/lists/Object3DModels.js"; diff --git a/frontend/libs/model-list/src/lib/classes/Model.ts b/frontend/libs/model-list/src/lib/classes/Model.ts index c3a24e5620..feba62d582 100644 --- a/frontend/libs/model-list/src/lib/classes/Model.ts +++ b/frontend/libs/model-list/src/lib/classes/Model.ts @@ -3,7 +3,12 @@ import { ModelCategory, ModelConfig } from "../legacy/ModelConfig.js"; import { ModelTag } from "./metadata/ModelTag.js"; import { GenerationProvider } from "@storyteller/api-enums"; -export type ModelKind = "model" | "image_model" | "video_model" | "gaussian_model"; +export type ModelKind = + | "model" + | "image_model" + | "video_model" + | "gaussian_model" + | "3d_object_model"; // NB: Do not create instances of this class directly, use subclasses. export class Model { diff --git a/frontend/libs/model-list/src/lib/classes/Object3DModel.ts b/frontend/libs/model-list/src/lib/classes/Object3DModel.ts new file mode 100644 index 0000000000..0cc88a7c2a --- /dev/null +++ b/frontend/libs/model-list/src/lib/classes/Object3DModel.ts @@ -0,0 +1,26 @@ +import { ModelCreator } from "src/index.js"; +import { Model, ModelKind } from "./Model.js"; +import { ModelCategory } from "../legacy/ModelConfig.js"; +import { ModelTag } from "./metadata/ModelTag.js"; +import { GenerationProvider } from "@storyteller/api-enums"; + +export class Object3DModel extends Model { + override readonly kind: ModelKind = "3d_object_model"; + + constructor(args: { + id: string; + tauriId: string; + fullName: string; + category: ModelCategory; + creator: ModelCreator; + selectorName: string; + selectorDescription: string; + selectorBadges: string[]; + tags?: ModelTag[]; + providers?: GenerationProvider[]; + progressBarTime?: number; + maxPromptLength?: number; + }) { + super(args); + } +} diff --git a/frontend/libs/model-list/src/lib/legacy/ModelConfig.ts b/frontend/libs/model-list/src/lib/legacy/ModelConfig.ts index 79ab90ea3f..d85b12b838 100644 --- a/frontend/libs/model-list/src/lib/legacy/ModelConfig.ts +++ b/frontend/libs/model-list/src/lib/legacy/ModelConfig.ts @@ -1,7 +1,7 @@ import { ModelInfo } from "./ModelInfo.js"; import { ModelTag } from "../classes/metadata/ModelTag.js"; -export type ModelCategory = "image" | "video" | "gaussian"; +export type ModelCategory = "image" | "video" | "gaussian" | "3d_object"; // Centralized model capability definition // For setting options for the model diff --git a/frontend/libs/model-list/src/lib/lists/AllModels.ts b/frontend/libs/model-list/src/lib/lists/AllModels.ts index df6f69471b..432627a105 100644 --- a/frontend/libs/model-list/src/lib/lists/AllModels.ts +++ b/frontend/libs/model-list/src/lib/lists/AllModels.ts @@ -2,5 +2,11 @@ import { IMAGE_MODELS } from "./ImageModels.js"; import { VIDEO_MODELS } from "./VideoModels.js"; import { Model } from "../classes/Model.js"; import { SPLAT_MODELS } from "./SplatModels.js"; +import { OBJECT_3D_MODELS } from "./Object3DModels.js"; -export const ALL_MODELS_LIST: Model[] = [...IMAGE_MODELS, ...VIDEO_MODELS, ...SPLAT_MODELS]; +export const ALL_MODELS_LIST: Model[] = [ + ...IMAGE_MODELS, + ...VIDEO_MODELS, + ...SPLAT_MODELS, + ...OBJECT_3D_MODELS, +]; diff --git a/frontend/libs/model-list/src/lib/lists/Object3DModels.ts b/frontend/libs/model-list/src/lib/lists/Object3DModels.ts new file mode 100644 index 0000000000..51191445db --- /dev/null +++ b/frontend/libs/model-list/src/lib/lists/Object3DModels.ts @@ -0,0 +1,38 @@ +import { Object3DModel } from "../classes/Object3DModel.js"; +import { ModelCreator } from "../classes/metadata/ModelCreator.js"; +import { GenerationProvider } from "@storyteller/api-enums"; + +export const OBJECT_3D_MODELS: Object3DModel[] = [ + new Object3DModel({ + id: "hunyuan_3d_3", + tauriId: "hunyuan_3d_3", + fullName: "Hunyuan 3D 3.0", + category: "3d_object", + creator: ModelCreator.Tencent, + selectorName: "Hunyuan 3.0", + selectorDescription: "Highest quality 3D mesh generation", + selectorBadges: ["~2 min."], + providers: [GenerationProvider.Artcraft], + progressBarTime: 120000, + }), + new Object3DModel({ + id: "hunyuan_3d_2_0", + tauriId: "hunyuan_3d_2_0", + fullName: "Hunyuan 3D 2.0", + category: "3d_object", + creator: ModelCreator.Tencent, + selectorName: "Hunyuan 2.0", + selectorDescription: "Faster, lower fidelity 3D mesh", + selectorBadges: ["~45 sec."], + providers: [GenerationProvider.Artcraft], + progressBarTime: 60000, + }), +]; + +export const OBJECT_3D_MODELS_BY_ID: Map = new Map( + OBJECT_3D_MODELS.map((model) => [model.id, model]), +); + +if (OBJECT_3D_MODELS_BY_ID.size !== OBJECT_3D_MODELS.length) { + throw new Error("All 3D object models must have unique IDs"); +}