Skip to content

AI media harness for planning, generating, and editing locally

TypeScript

Add MOSS generators and model capabilities

Bitti2583b158d780
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 7f989e8..0112c7f 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -4,6 +4,7 @@ This alpha update adds Prompt video scenes, agent image drafts, Sol attention an
## What's new
+- **MOSS image generation.** Generator settings group templates by model and include MOSS Image with its model weights and tokenizer downloads. MOSS is available for new images on CUDA; video, image editing, Zoom, and reference-based character sheets are disabled through shared model capabilities.
- **Prompt video scenes.** New ordinary video scenes default to Prompt, with text and reference guidance but no start- or last-frame selectors. First & last frame remains available for frame conditioning.
- **Agent image drafts and generation.** Ask the agent to prepare multiple images in the image bar for later, edit a selected draft, or generate it with a chosen generator. Preparation is saved before rendering, and the agent resumes after generation with the saved result.
- **Sol attention in Settings.** Choose Sol attention under a generator's Performance settings for generation on CUDA GPUs. The selection is saved per generator and included in shared generator files.
diff --git a/docs/generator-weights.md b/docs/generator-weights.md
index f29703b..69dcaee 100644
--- a/docs/generator-weights.md
+++ b/docs/generator-weights.md
@@ -133,6 +133,22 @@ are injected into runtime requests and are not saved into portable project files
## Model weights
+Generator templates are grouped by model in Settings. The **Model** selector in
+each template chooses its model family independently of its name.
+
+**MOSS Image** generates new images from text on CUDA with Flash attention and
+defaults to 50 steps. Its download includes the MOSS SFT INT8 transformer,
+Qwen3.5 9B INT8 text encoder, FLUX.2 small image VAE, and Qwen3.5 tokenizer JSON.
+It needs no audio VAE. Downloaded MOSS templates appear in the image generator
+picker and are excluded from video generation. Image editing, Zoom, reference
+images, character sheets, LoRAs, and MotionCache are unavailable for this model.
+
+The internal capability switches live in `src/lib/generatorModels.json`, shared
+by the UI and native request validation. Each model declares `imageGeneration`,
+`videoGeneration`, `imageEditing`, `imageReferences`, `loras`, and `motionCache`.
+Change these switches when a model gains support, or add a model entry to define
+its available operations. Legacy templates without a model family remain MiniMax H3.
+
Generator templates also offer **Enable MotionCache**, off by default. It uses
SlopFab's default motion-aware denoising reuse settings on CUDA and Vulkan.
Reuse can reduce transformer calls but may change detail and motion; short
diff --git a/src-tauri/core/src/models.rs b/src-tauri/core/src/models.rs
index 7abef78..4278412 100644
--- a/src-tauri/core/src/models.rs
+++ b/src-tauri/core/src/models.rs
@@ -1,6 +1,24 @@
//! What each generation model can do. The desktop app adds authoring rules
//! (shot vocabulary, agent instructions) on top of these limits.
+#[derive(Debug, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct GeneratorFeatures {
+ pub label: String,
+ pub image_generation: bool,
+ pub video_generation: bool,
+ pub image_editing: bool,
+ pub image_references: bool,
+ pub loras: bool,
+ pub motion_cache: bool,
+}
+
+pub fn generator_features(model_type: &str) -> &'static GeneratorFeatures {
+ static MODELS: std::sync::OnceLock<std::collections::BTreeMap<String, GeneratorFeatures>> = std::sync::OnceLock::new();
+ let models = MODELS.get_or_init(|| serde_json::from_str(include_str!("../../../src/lib/generatorModels.json")).expect("valid generator model catalog"));
+ models.get(model_type).unwrap_or(&models["minimax-h3"])
+}
+
#[derive(Debug, Clone, Copy)]
pub struct ModelCapabilities {
pub max_scene_seconds: f64,
diff --git a/src-tauri/core/src/slopfab/config.rs b/src-tauri/core/src/slopfab/config.rs
index 9a10eb7..5543e7e 100644
--- a/src-tauri/core/src/slopfab/config.rs
+++ b/src-tauri/core/src/slopfab/config.rs
@@ -24,6 +24,7 @@ pub(super) struct SigmaShifts {
#[derive(Clone)]
pub(super) struct Configuration {
+ pub(super) model_type: String,
pub(super) dll_path: PathBuf,
pub(super) vulkan: bool,
pub(super) attention: &'static str,
@@ -63,6 +64,7 @@ impl Configuration {
}
};
Self {
+ model_type: string_option("modelType").unwrap_or("minimax-h3").to_owned(),
sigma_shifts: (|| Ok(SigmaShifts { video: shift("videoSigmaShift")?, audio: shift("audioSigmaShift")?,
video_override: shift("videoSigmaShiftOverride")?, audio_override: shift("audioSigmaShiftOverride")? }))(),
// `dllPath` is no longer written by the app and has no settings UI.
@@ -119,6 +121,26 @@ impl Configuration {
}
pub(super) fn validate_inputs(&self, request: &GenerationRequest) -> Result<(), String> {
+ let features = crate::models::generator_features(&self.model_type);
+ if request.still_image && !features.image_generation || !request.still_image && !features.video_generation {
+ return Err(format!("{} does not support {} generation.", features.label, if request.still_image { "image" } else { "video" }));
+ }
+ if !features.image_editing && request.image_edit.is_some() {
+ return Err(format!("{} does not support image editing.", features.label));
+ }
+ if !features.image_references && (!request.reference_paths.is_empty() || !request.refmods.is_empty()) {
+ return Err(format!("{} does not support image references or refmods.", features.label));
+ }
+ if !features.loras && self.loras.as_ref().map_err(Clone::clone)?.iter().any(|lora| lora.strength != 0.0) {
+ return Err(format!("{} does not support LoRAs.", features.label));
+ }
+ if !features.motion_cache && self.motion_cache {
+ return Err(format!("{} does not support MotionCache.", features.label));
+ }
+ if self.model_type == "moss" && (self.animate || request.latent_upscale || request.latent_bridge.is_some()
+ || request.continuation_path.is_some() || request.continuation_relative_path.is_some()) {
+ return Err("MOSS supports text-to-image generation only.".into());
+ }
if let Some(mode) = request.video_transition.as_deref() {
let expected = match mode {
"extend" => 1,
diff --git a/src-tauri/core/src/slopfab/ffi/mod.rs b/src-tauri/core/src/slopfab/ffi/mod.rs
index f239930..32d9bd8 100644
--- a/src-tauri/core/src/slopfab/ffi/mod.rs
+++ b/src-tauri/core/src/slopfab/ffi/mod.rs
@@ -209,6 +209,10 @@ impl Api {
self.check(r)?;
self.inner.set_model(r.pointer.as_ptr(), id, path)
}
+ pub fn set_model_family(&self, r: &RequestHandle, family: &str) -> Result<(), String> {
+ self.check(r)?;
+ self.inner.set_model_family(r.pointer.as_ptr(), family)
+ }
pub fn add_reference(&self, r: &RequestHandle, path: &Path) -> Result<(), String> {
self.check(r)?;
self.inner.add_reference(r.pointer.as_ptr(), path)
diff --git a/src-tauri/core/src/slopfab/ffi/raw/mod.rs b/src-tauri/core/src/slopfab/ffi/raw/mod.rs
index 55fff3f..151ef21 100644
--- a/src-tauri/core/src/slopfab/ffi/raw/mod.rs
+++ b/src-tauri/core/src/slopfab/ffi/raw/mod.rs
@@ -108,6 +108,7 @@ pub struct Api {
set_sampling_settings: Option<unsafe extern "C" fn(*mut Request, *const c_char) -> i32>,
set_seed: unsafe extern "C" fn(*mut Request, u64) -> i32,
set_model: unsafe extern "C" fn(*mut Request, i32, *const c_char) -> i32,
+ set_model_family: Option<unsafe extern "C" fn(*mut Request, *const c_char) -> i32>,
add_lora: Option<unsafe extern "C" fn(*mut Request, *const c_char, f32) -> i32>,
prepare_lora_grid: Option<unsafe extern "C" fn(*const c_char, i32, i32) -> i32>,
add_refmod: Option<unsafe extern "C" fn(*mut Request, *const c_char, f32, i32) -> i32>,
@@ -239,6 +240,9 @@ impl Api {
"slopfab_request_set_seed",
unsafe extern "C" fn(*mut Request, u64) -> i32
),
+ set_model_family: library
+ .get::<unsafe extern "C" fn(*mut Request, *const c_char) -> i32>(b"slopfab_request_set_model_family\0")
+ .ok().map(|symbol| *symbol),
set_model: symbol!(
"slopfab_request_set_model_path",
unsafe extern "C" fn(*mut Request, i32, *const c_char) -> i32
@@ -572,6 +576,11 @@ impl Api {
let v = path_cstring(path)?;
self.error(unsafe { (self.set_model)(r, id, v.as_ptr()) })
}
+ pub fn set_model_family(&self, r: *mut Request, family: &str) -> Result<(), String> {
+ let set = self.set_model_family.ok_or("MOSS requires SlopFab API 1.30 or newer. Update the runtime on the machine running generation.")?;
+ let value = CString::new(family).map_err(|_| "Invalid model family.")?;
+ self.error(unsafe { set(r, value.as_ptr()) })
+ }
pub fn add_reference(&self, r: *mut Request, path: &Path) -> Result<(), String> {
let v = path_cstring(path)?;
self.error(unsafe { (self.add_reference)(r, v.as_ptr()) })
diff --git a/src-tauri/core/src/slopfab/h3.rs b/src-tauri/core/src/slopfab/h3.rs
index f02bb2e..241caa3 100644
--- a/src-tauri/core/src/slopfab/h3.rs
+++ b/src-tauri/core/src/slopfab/h3.rs
@@ -18,6 +18,12 @@ pub(super) fn configure_request(
references: &ReferenceVideos,
) -> Result<(), String> {
configuration.validate_inputs(request)?;
+ if configuration.model_type == "moss" {
+ if platform == ComputePlatform::Vulkan {
+ return Err("MOSS requires CUDA. Select a CUDA backend or worker.".into());
+ }
+ api.set_model_family(handle, "moss")?;
+ }
if configuration.attention == "sol" && platform == ComputePlatform::Vulkan {
return Err("Sol attention requires CUDA. Select a CUDA GPU or worker, or choose another attention mode in Settings.".into());
}
@@ -52,7 +58,7 @@ pub(super) fn configure_request(
request.frames
};
api.set_frames(handle, frames)?;
- if request.still_image {
+ if request.still_image && configuration.model_type != "moss" {
api.set_still_image(handle)?;
}
let video_steps = configuration.generation_steps(request.steps)?;
diff --git a/src-tauri/core/src/slopfab/icons.rs b/src-tauri/core/src/slopfab/icons.rs
index fef6160..1dca332 100644
--- a/src-tauri/core/src/slopfab/icons.rs
+++ b/src-tauri/core/src/slopfab/icons.rs
@@ -109,6 +109,7 @@ pub fn generate_reference_icon_batch(
value => return Err(format!("Unsupported icon generation backend '{value}'.")),
};
let configuration = Configuration {
+ model_type: "minimax-h3".into(),
dll_path: batch.dll_path.clone(),
loras: Ok(Vec::new()),
step_override: Ok(None),
diff --git a/src-tauri/core/src/slopfab/status.rs b/src-tauri/core/src/slopfab/status.rs
index 5f937de..a5efe6b 100644
--- a/src-tauri/core/src/slopfab/status.rs
+++ b/src-tauri/core/src/slopfab/status.rs
@@ -6,6 +6,7 @@ fn model_statuses(configuration: &Configuration, available: impl Fn(&Path) -> bo
let mut models = configuration
.models
.iter()
+ .filter(|(id, _, _)| configuration.model_type != "moss" || *id != 4)
.filter(|(id, _, _)| !configuration.animate || (*id != 1 && *id != 2))
.map(|(_, id, path)| ModelStatus {
id,
@@ -44,7 +45,7 @@ pub fn status(settings: &BTreeMap<String, ProviderSetting>) -> SlopfabStatus {
let platform = configuration.platform(detected);
let missing = models
.iter()
- .filter(|model| !model.available && model.id != "tokenizer")
+ .filter(|model| !model.available && (model.id != "tokenizer" || configuration.model_type == "moss"))
.count();
SlopfabStatus {
state: if missing == 0 {
@@ -102,7 +103,7 @@ pub fn worker_status(
let value = path.to_string_lossy();
value.starts_with("https://") || value.starts_with("http://") || path.exists()
});
- let missing = models.iter().filter(|model| !model.available && model.id != "tokenizer").count();
+ let missing = models.iter().filter(|model| !model.available && (model.id != "tokenizer" || configuration.model_type == "moss")).count();
let state = match runtime.state.as_str() {
"ready" if missing == 0 => "ready",
"ready" => "modelsMissing",
diff --git a/src-tauri/core/src/slopfab/tests.rs b/src-tauri/core/src/slopfab/tests.rs
index 2f904a8..3adce8e 100644
--- a/src-tauri/core/src/slopfab/tests.rs
+++ b/src-tauri/core/src/slopfab/tests.rs
@@ -5,6 +5,60 @@ use super::{
use crate::settings::{ProviderOption, ProviderSetting};
use std::collections::BTreeMap;
+#[test]
+fn moss_capabilities_reject_video_edits_and_references() {
+ let mut configuration = Configuration::from_settings(&BTreeMap::new());
+ configuration.model_type = "moss".into();
+ let mut request = GenerationRequest { still_image: true, frames: 1, steps: 50, prompt: "A red apple".into(), canvas_width: 512, canvas_height: 512, ..Default::default() };
+ configuration.validate_inputs(&request).unwrap();
+ request.still_image = false;
+ assert!(configuration.validate_inputs(&request).unwrap_err().contains("video generation"));
+ request.still_image = true;
+ request.image_edit = Some(serde_json::from_value(serde_json::json!({"sourceRelativePath":"media/apple.png", "edits":[]})).unwrap());
+ assert!(configuration.validate_inputs(&request).unwrap_err().contains("image editing"));
+ request.image_edit = None;
+ request.reference_paths.push("apple.png".into());
+ assert!(configuration.validate_inputs(&request).unwrap_err().contains("image references"));
+}
+
+#[test]
+fn moss_status_requires_tokenizer_but_no_audio_vae() {
+ let folder = tempfile::tempdir().unwrap();
+ let weights = folder.path().join("weights");
+ std::fs::write(&weights, b"status only").unwrap();
+ let dll = std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("../../lib/slopfab").join(super::DLL_FILE_NAME);
+ let mut settings = BTreeMap::from([("slopfab".into(), ProviderSetting {
+ enabled: true, model: None, options: BTreeMap::from([
+ ("modelType".into(), ProviderOption::String("moss".into())),
+ ("dllPath".into(), ProviderOption::String(dll.to_string_lossy().into_owned())),
+ ]),
+ })]);
+ for id in ["transformer", "textEncoder", "videoVae"] {
+ settings.get_mut("slopfab").unwrap().options.insert(id.into(), ProviderOption::String(weights.to_string_lossy().into_owned()));
+ }
+ let missing = status(&settings);
+ assert_eq!(missing.state, "modelsMissing");
+ assert!(!missing.models.iter().any(|model| model.id == "audioVae"));
+ settings.get_mut("slopfab").unwrap().options.insert("tokenizer".into(), ProviderOption::String(weights.to_string_lossy().into_owned()));
+ assert_eq!(status(&settings).state, "ready");
+}
+
+#[test]
+fn moss_planning_uses_image_family_and_shared_request_pipeline() {
+ let path = std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("../../lib/slopfab").join(super::DLL_FILE_NAME);
+ let api = ffi::Api::load(&path).unwrap();
+ let mut configuration = Configuration::from_settings(&BTreeMap::new());
+ configuration.model_type = "moss".into();
+ configuration.attention = "flash2";
+ let request = GenerationRequest { still_image: true, frames: 1, steps: 50, prompt: "A red apple".into(), canvas_width: 512, canvas_height: 512, ..Default::default() };
+ let handle = RequestHandle::new(&api).unwrap();
+ configure_request(&api, &handle, &request, &configuration, ComputePlatform::Cuda13, RequestPurpose::Plan, &ReferenceVideos::default()).unwrap();
+ let plan = api.resolve(&handle).unwrap();
+ assert_eq!((plan.canvas_width, plan.canvas_height, plan.aligned_frames), (512, 512, 1));
+ assert!(api.describe(&handle).unwrap().contains("MOSS"));
+ assert!(configure_request(&api, &handle, &request, &configuration, ComputePlatform::Vulkan, RequestPurpose::Plan, &ReferenceVideos::default()).unwrap_err().contains("requires CUDA"));
+}
+
#[test]
fn audio_steps_override_and_reset_reach_planning_and_execution() {
let mut configuration = Configuration::from_settings(&BTreeMap::new());
diff --git a/src-tauri/core/src/worker/protocol.rs b/src-tauri/core/src/worker/protocol.rs
index ddd084b..5626136 100644
--- a/src-tauri/core/src/worker/protocol.rs
+++ b/src-tauri/core/src/worker/protocol.rs
@@ -183,9 +183,12 @@ pub fn visit_paths(
}
}
}
+ let tokenizer_kind = if matches!(slopfab.options.get("modelType"), Some(ProviderOption::String(model)) if model == "moss") {
+ PathKind::Model
+ } else { PathKind::Folder };
if let Some(ProviderOption::String(value)) = slopfab.options.get_mut("tokenizer") {
if !value.trim().is_empty() {
- visit(PathKind::Folder, value)?;
+ visit(tokenizer_kind, value)?;
}
}
if let Some(ProviderOption::String(value)) = slopfab.options.get_mut("loras") {
@@ -308,6 +311,19 @@ mod tests {
}
}
+ #[test]
+ fn moss_tokenizer_is_transferred_as_a_file_instead_of_a_folder() {
+ let mut settings = settings(&[("modelType", "moss"), ("tokenizer", "C:/weights/tokenizer.json")]);
+ let mut request = GenerationRequest::default();
+ visit_paths(&mut request, &mut settings, |kind, path| {
+ assert_eq!(kind, PathKind::Model);
+ assert_eq!(path, "C:/weights/tokenizer.json");
+ *path = file_token(0);
+ Ok(())
+ }).unwrap();
+ assert_eq!(settings["slopfab"].options["modelType"], ProviderOption::String("moss".into()));
+ }
+
#[test]
fn upload_paths_cannot_leave_their_folder() {
assert_eq!(safe_relative_path("tokenizer/vocab.json").unwrap(), std::path::Path::new("tokenizer").join("vocab.json"));
diff --git a/src-tauri/src/agent/generation.rs b/src-tauri/src/agent/generation.rs
index 8228316..c9b3cdf 100644
--- a/src-tauri/src/agent/generation.rs
+++ b/src-tauri/src/agent/generation.rs
@@ -21,6 +21,10 @@ pub(super) fn validate(
if !config.generation_jobs.iter().any(|job| &job.id == scene) {
return Err(format!("Unknown scene '{scene}'. Create the scene before generating it."));
}
+ if generators.settings["templates"].as_array().is_some_and(|templates| templates.iter().any(|item|
+ item["id"].as_str() == Some(template) && !slopus_core::models::generator_features(item["modelType"].as_str().unwrap_or("minimax-h3")).video_generation)) {
+ return Err("Choose a generator that supports video generation.".into());
+ }
template
}
GenerationCommand::Image { image, template } => {
diff --git a/src-tauri/src/agent/generators.rs b/src-tauri/src/agent/generators.rs
index bcb7c6c..f9b83f9 100644
--- a/src-tauri/src/agent/generators.rs
+++ b/src-tauri/src/agent/generators.rs
@@ -342,7 +342,9 @@ pub(crate) fn prepare(
{
return Err("Download the generator's weights and additional files before making it the default.".into());
}
- for role in ["transformer", "textEncoder", "videoVae", "audioVae"] {
+ for role in ["transformer", "textEncoder", "videoVae", "audioVae", "tokenizer"] {
+ let moss = template["modelType"] == "moss";
+ if (moss && role == "audioVae") || (!moss && role == "tokenizer") { continue; }
if role == "textEncoder" && template["mode"] == "animate" {
continue;
}
diff --git a/src/components/SettingsView.test.tsx b/src/components/SettingsView.test.tsx
index d807ad9..67d1975 100644
--- a/src/components/SettingsView.test.tsx
+++ b/src/components/SettingsView.test.tsx
@@ -4,7 +4,7 @@ import { cleanup, fireEvent, render, screen, waitFor, within } from "@testing-li
import { invoke } from "@tauri-apps/api/core";
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
import { middleEllipsis, SettingsView } from "./SettingsView";
-import { createGeneratorTemplate, loadGeneratorTemplateSettings, saveGeneratorTemplateSettings } from "../lib/settings";
+import { createGeneratorTemplate, mossImageTemplate, loadGeneratorTemplateSettings, saveGeneratorTemplateSettings } from "../lib/settings";
import { loadReferenceIconGeneratorId } from "../lib/referenceIconSettings";
import { loadLoras } from "../lib/loras";
@@ -69,6 +69,22 @@ describe("the settings page", () => {
});
describe("the settings screen", () => {
+ it("groups MOSS under its model and edits its image-only weight setup", () => {
+ open();
+ expect(screen.getByRole("group", { name: "MOSS Image" })).toBeTruthy();
+ fireEvent.click(screen.getByRole("button", { name: "Edit MOSS Image generator" }));
+ expect(combo("Generator model").getAttribute("data-value")).toBe("moss");
+ expect(screen.queryByRole("combobox", { name: "Generator mode" })).toBeNull();
+ expect(screen.getByRole("button", { name: "More options for Image VAE weights" })).toBeTruthy();
+ expect(screen.queryByRole("button", { name: "More options for Audio VAE weights" })).toBeNull();
+ expect(combo("Generator attention").getAttribute("data-value")).toBe("flash2");
+ expect(screen.queryByRole("switch", { name: "Enable MotionCache" })).toBeNull();
+ expect(loadGeneratorTemplateSettings().templates.find(({ id }) => id === "moss-image")).toEqual(mossImageTemplate());
+ fireEvent.click(combo("Generator model"));
+ fireEvent.click(screen.getByRole("option", { name: /^MiniMax H3/ }));
+ expect(screen.getByRole("combobox", { name: "Generator mode" })).toBeTruthy();
+ expect(loadGeneratorTemplateSettings().templates.find(({ id }) => id === "moss-image")?.modelType).toBe("minimax-h3");
+ });
it("remembers MotionCache per generator and disables it in Animate mode", () => {
const view = open();
editDefaultGenerator();
diff --git a/src/components/SettingsView.tsx b/src/components/SettingsView.tsx
index 240c654..a720791 100644
--- a/src/components/SettingsView.tsx
+++ b/src/components/SettingsView.tsx
@@ -25,7 +25,7 @@ import { retryWeightDownload } from "../lib/weightDownloads";
import { getQueuedWeightDownloads, cancelWeightDownload, downloadTemplateWeights, getWeightDownloadState, refreshDownloadedWeights, removeTemplateWeights, subscribeWeightDownloads, updateWeightPath, weightDownloadProgress, type DownloadState } from "../lib/weightDownloads";
import { CHECKING_PROVIDERS, chooseEnginePath, getAgentModels, getEngineStatus, type ProviderStatus, type ModelStatus, type SlopfabStatus } from "../lib/runtime";
import {
- EMPTY_ENGINE_SETTINGS, generatorPathFields,
+ EMPTY_ENGINE_SETTINGS, generatorPathFields, generatorModel, GENERATOR_MODELS, MOSS_MODEL_TYPE,
createGeneratorTemplate, defaultGeneratorTemplate,
isEndpointProviderConfigured, loadAgentEndpointSettings,
loadGeneratorTemplateSettings, saveAgentEndpointSettings, saveGeneratorTemplateSettings,
@@ -359,12 +359,12 @@ export function SettingsView({ onClose, updates, initialTab = "engine", titleBar
const probe = useCallback((paths?: EngineSettings) => {
const revision = ++probeRevision.current;
- void getEngineStatus(paths, selectedTemplate.attention, selectedTemplate.loras ?? [], selectedTemplate.mode ?? "prompt", selectedTemplate.additionalSafetensors ?? [], selectedTemplate.motionCache ?? false, selectedTemplate.sources).then((next) => {
+ void getEngineStatus(paths, selectedTemplate.attention, selectedTemplate.loras ?? [], selectedTemplate.mode ?? "prompt", selectedTemplate.additionalSafetensors ?? [], selectedTemplate.motionCache ?? false, selectedTemplate.sources, selectedTemplate.modelType).then((next) => {
if (revision === probeRevision.current) setStatus(next);
}).catch(() => {
if (revision === probeRevision.current) setStatus(null);
});
- }, [selectedTemplate.attention, selectedTemplate.loras, selectedTemplate.mode, selectedTemplate.additionalSafetensors, selectedTemplate.motionCache]);
+ }, [selectedTemplate.modelType, selectedTemplate.attention, selectedTemplate.loras, selectedTemplate.mode, selectedTemplate.additionalSafetensors, selectedTemplate.motionCache]);
/* Saved on every keystroke — there is no Save button here, so a half-typed
path must never be the reason generation is still broken after a restart.
@@ -441,7 +441,7 @@ export function SettingsView({ onClose, updates, initialTab = "engine", titleBar
probe({ ...EMPTY_ENGINE_SETTINGS });
};
- const updateTemplate = (updates: Partial<Pick<typeof selectedTemplate, "name" | "defaultSteps" | "videoSigmaShift" | "audioSigmaShift" | "attention" | "motionCache" | "loras" | "mode" | "additionalSafetensors">>) => {
+ const updateTemplate = (updates: Partial<Pick<typeof selectedTemplate, "modelType" | "name" | "defaultSteps" | "videoSigmaShift" | "audioSigmaShift" | "attention" | "motionCache" | "loras" | "mode" | "additionalSafetensors">>) => {
setTemplateSettings((current) => {
const next = {
...current,
@@ -565,10 +565,16 @@ export function SettingsView({ onClose, updates, initialTab = "engine", titleBar
<SettingsCard icon={<Rename20 />} header="Name">
<input ref={nameField} className="text-field settings-field" aria-label="Generator name" value={selectedTemplate.name} onChange={(event) => updateTemplate({ name: event.target.value })} onBlur={() => { if (!selectedTemplate.name.trim()) updateTemplate({ name: "Untitled generator" }); }} />
</SettingsCard>
- <SettingsCard icon={<Video20 />} header="Mode">
+ <SettingsCard icon={<Video20 />} header="Model" description={generatorModel(selectedTemplate.modelType).description}>
+ <ComboBox aria-label="Generator model" value={selectedTemplate.modelType} options={[
+ ...GENERATOR_MODELS,
+ ...(!GENERATOR_MODELS.some(({ value }) => value === selectedTemplate.modelType) ? [{ value: selectedTemplate.modelType, label: selectedTemplate.modelType }] : []),
+ ]} onChange={(modelType) => updateTemplate({ modelType, ...(modelType === MOSS_MODEL_TYPE ? { mode: "prompt", attention: "flash2", defaultSteps: 50, motionCache: false, loras: [], audioSigmaShift: undefined } : {}) })} />
+ </SettingsCard>
+ {generatorModel(selectedTemplate.modelType).videoGeneration && <SettingsCard icon={<Video20 />} header="Mode">
<ComboBox aria-label="Generator mode" value={selectedTemplate.mode ?? "prompt"} onChange={(value) => updateTemplate({ mode: value === "animate" ? "animate" : "prompt" })}
options={[{ value: "prompt", label: "Text prompt" }, { value: "animate", label: "Animate (reference video)" }]} />
- </SettingsCard>
+ </SettingsCard>}
<SettingsCard icon={<Steps20 />} header="Default steps">
<input className="text-field settings-field settings-field--number" aria-label="Generator default steps" type="number" min={2} max={MAX_GENERATION_STEPS} step={1} value={selectedTemplate.defaultSteps} onChange={(event) => {
const value = Number(event.target.value);
@@ -578,9 +584,9 @@ export function SettingsView({ onClose, updates, initialTab = "engine", titleBar
</SettingsGroup>
<SettingsGroup heading="Sampling">
- {(["videoSigmaShift", "audioSigmaShift"] as const).map((key) => {
- const label = `${key === "videoSigmaShift" ? "Video" : "Audio"} sigma shift`;
- const fallback = key === "audioSigmaShift" ? DEFAULT_AUDIO_SIGMA_SHIFT : selectedTemplate.mode === "animate" ? 3 : DEFAULT_VIDEO_SIGMA_SHIFT;
+ {(["videoSigmaShift", "audioSigmaShift"] as const).filter((key) => selectedTemplate.modelType !== MOSS_MODEL_TYPE || key !== "audioSigmaShift").map((key) => {
+ const label = `${key === "videoSigmaShift" ? selectedTemplate.modelType === MOSS_MODEL_TYPE ? "Image" : "Video" : "Audio"} sigma shift`;
+ const fallback = selectedTemplate.modelType === MOSS_MODEL_TYPE ? 5 : key === "audioSigmaShift" ? DEFAULT_AUDIO_SIGMA_SHIFT : selectedTemplate.mode === "animate" ? 3 : DEFAULT_VIDEO_SIGMA_SHIFT;
return <SettingsCard key={key} icon={<Steps20 />} header={label} description="Default for this generator. Scene values and active LoRA overrides take priority. Leave blank for the model default.">
<input className="text-field settings-field settings-field--number" aria-label={`Generator ${label.toLowerCase()}`} type="number" min={MIN_SIGMA_SHIFT} max={MAX_SIGMA_SHIFT} step={0.1}
placeholder={String(fallback)} value={selectedTemplate[key] ?? ""} onChange={(event) => {
@@ -594,13 +600,13 @@ export function SettingsView({ onClose, updates, initialTab = "engine", titleBar
<SettingsGroup heading="Performance">
<SettingsCard icon={<Gauge20 />} header="Attention" description={selectedTemplate.attention === "sol" ? "Sol attention requires a CUDA GPU on the machine running generation." : undefined}>
<ComboBox aria-label="Generator attention" value={selectedTemplate.attention} onChange={(value) => updateTemplate({ attention: value as AttentionMode })}
- options={[{ value: "exact", label: "Exact attention" }, { value: "flash2", label: "Flash attention" }, { value: "sage2", label: "Sage attention" }, { value: "sol", label: "Sol attention" }]} />
+ options={selectedTemplate.modelType === MOSS_MODEL_TYPE ? [{ value: "flash2", label: "Flash attention" }] : [{ value: "exact", label: "Exact attention" }, { value: "flash2", label: "Flash attention" }, { value: "sage2", label: "Sage attention" }, { value: "sol", label: "Sol attention" }]} />
</SettingsCard>
- <SettingsCard icon={<Flash20 />} header="Enable MotionCache" description={<span id="motion-cache-help">{selectedTemplate.mode === "animate" ? "Unavailable in Animate mode" : "Reuses similar denoising results to reduce computation. May affect detail and motion."}</span>}>
+ {generatorModel(selectedTemplate.modelType).motionCache && <SettingsCard icon={<Flash20 />} header="Enable MotionCache" description={<span id="motion-cache-help">{selectedTemplate.mode === "animate" ? "Unavailable in Animate mode" : "Reuses similar denoising results to reduce computation. May affect detail and motion."}</span>}>
<ToggleSwitch aria-label="Enable MotionCache" aria-describedby="motion-cache-help"
checked={selectedTemplate.mode !== "animate" && Boolean(selectedTemplate.motionCache)} disabled={selectedTemplate.mode === "animate"}
onChange={(on) => updateTemplate({ motionCache: on })} />
- </SettingsCard>
+ </SettingsCard>}
</SettingsGroup>
<SettingsGroup heading="Model files">
@@ -608,7 +614,7 @@ export function SettingsView({ onClose, updates, initialTab = "engine", titleBar
</SettingsGroup>
<AdditionalSafetensorsEditor key={selectedTemplate.id} value={selectedTemplate.additionalSafetensors ?? []} disabled={Boolean(downloading)} animate={selectedTemplate.mode === "animate"} onChange={(additionalSafetensors) => updateTemplate({ additionalSafetensors })} />
- <TemplateLorasEditor value={selectedTemplate.loras ?? []} onChange={(loras) => updateTemplate({ loras })} />
+ {generatorModel(selectedTemplate.modelType).loras && <TemplateLorasEditor value={selectedTemplate.loras ?? []} onChange={(loras) => updateTemplate({ loras })} />}
<SettingsGroup heading="Advanced">
<SettingsCard icon={<Options20 />} header="Show advanced options" description="Per-GPU download sources for each model file">
@@ -630,7 +636,9 @@ export function SettingsView({ onClose, updates, initialTab = "engine", titleBar
<button type="button" className="secondary-button" onClick={addTemplate}>New generator</button>
</SettingsCard>}</GeneratorSharing>}
<div className="settings-card-list" role="list" aria-label={section.title}>
- {section.templates.map((template) => {
+ {[...new Set(section.templates.map((template) => template.modelType))].map((modelType) => <div key={modelType} className="settings-card-list" role="group" aria-label={GENERATOR_MODELS.find((model) => model.value === modelType)?.label ?? modelType}>
+ <h3 className="settings-caption">{GENERATOR_MODELS.find((model) => model.value === modelType)?.label ?? modelType}</h3>
+ {section.templates.filter((template) => template.modelType === modelType).map((template) => {
const needsDownload = templateNeedsDownload(template);
const isDefault = template.id === templateSettings.defaultTemplateId;
const active = downloadState?.active && downloadState.templateId === template.id;
@@ -651,7 +659,7 @@ export function SettingsView({ onClose, updates, initialTab = "engine", titleBar
aria-label={weights ? `Remove downloaded weights for ${template.name}` : `Remove generator ${template.name}`}
data-tooltip={weights ? "Remove weights and keep the template" : "Remove generator"}><Delete16 /></button>
</>} />;
- })}
+ })}</div>)}
</div>
</SettingsGroup>)}
<LoraLibrary onAdd={() => setEditingLoraId(`lora-${crypto.randomUUID()}`)} onEdit={setEditingLoraId} />
diff --git a/src/components/workspace/GeneratorView.test.tsx b/src/components/workspace/GeneratorView.test.tsx
index 83df998..30e532f 100644
--- a/src/components/workspace/GeneratorView.test.tsx
+++ b/src/components/workspace/GeneratorView.test.tsx
@@ -12,7 +12,7 @@ import { ReferencesView } from "./ReferencesView";
import { choose, chooseOption, comboValue, optionNames } from "./comboTestUtils";
import { chooseReference, changePromptChip, insertPromptReference, placePromptCaret, typePrompt } from "./promptTestUtils";
import { saveLoras } from "../../lib/loras";
-import { createGeneratorTemplate, saveGeneratorTemplateSettings, minimaxOriginalTemplate, viggleAnimateTemplate, saveDebugOptionsEnabled } from "../../lib/settings";
+import { createGeneratorTemplate, mossImageTemplate, saveGeneratorTemplateSettings, minimaxOriginalTemplate, viggleAnimateTemplate, saveDebugOptionsEnabled } from "../../lib/settings";
vi.mock("../../lib/nativeShell", async (importOriginal) => ({
...await importOriginal<typeof import("../../lib/nativeShell")>(),
@@ -32,6 +32,18 @@ beforeEach(() => {
});
afterEach(cleanup);
+it("excludes MOSS from the video picker even when it is the saved default", () => {
+ const moss = { ...mossImageTemplate(), sources: {}, paths: { transformer: "moss", textEncoder: "qwen", videoVae: "flux", tokenizer: "tokenizer.json", audioVae: "" } };
+ const video = createGeneratorTemplate("Video model");
+ saveGeneratorTemplateSettings({ templates: [moss, video], defaultTemplateId: moss.id, catalogVersion: 10 });
+ setup();
+ const picker = screen.getByRole("combobox", { name: /Video generator template/ });
+ expect(picker).toHaveTextContent("Video model");
+ fireEvent.click(picker);
+ expect(screen.queryByRole("option", { name: "MOSS Image" })).toBeNull();
+ expect(templateSceneBlocker("prompt", moss)).toMatch(/image generation only/);
+});
+
it.each(["scene", "shot"])("generates only the selected scene from the %s inspector", (view) => {
const state = setup();
fireEvent.click(screen.getByRole("button", { name: view === "shot" ? "Shot 1 of Second scene" : "Select scene Second scene" }));
@@ -931,7 +943,7 @@ describe("Generator scene controls", () => {
fireEvent.click(screen.getByRole("option", { name: "Fast draft" }));
await waitFor(() => expect(document.querySelector(".generator-runtime--modelsMissing > i")).not.toBeNull());
- expect(getEngineStatus).toHaveBeenCalledWith(expect.objectContaining({ transformer: "draft.safetensors" }), "sage2", [], "prompt", [], true, expect.anything());
+ expect(getEngineStatus).toHaveBeenCalledWith(expect.objectContaining({ transformer: "draft.safetensors" }), "sage2", [], "prompt", [], true, expect.anything(), "minimax-h3");
expect(JSON.parse(localStorage.getItem("slopus.generator-templates.v1")!).defaultTemplateId).toBe("draft");
expect(within(screen.getByRole("region", { name: "Generator status" })).getByText("Video model files missing")).toBeInTheDocument();
expect(template.closest(".generator-runtime--modelsMissing")).not.toBeNull();
diff --git a/src/components/workspace/GeneratorView.tsx b/src/components/workspace/GeneratorView.tsx
index 21adb6d..7ce84cb 100644
--- a/src/components/workspace/GeneratorView.tsx
+++ b/src/components/workspace/GeneratorView.tsx
@@ -21,7 +21,7 @@ import { SceneInspector, ShotInspector, STEP_SECONDS, writeShots } from "./Scene
import { STATUS_BADGE, type SceneIndicatorStatus } from "./sceneStatus";
import { forgetShotPosters } from "./ShotThumbnail";
import { purgeTimelineThumbnails } from "../../lib/timelineThumbnails";
-import { defaultGeneratorTemplate, generationStepsForTemplate, loadDebugOptionsEnabled, loadGeneratorTemplateSettings, saveGeneratorTemplateSettings, subscribeDebugOptions, subscribeGeneratorTemplates, templateUsable } from "../../lib/settings";
+import { defaultGeneratorTemplate, generationStepsForTemplate, loadDebugOptionsEnabled, loadGeneratorTemplateSettings, saveGeneratorTemplateSettings, subscribeDebugOptions, subscribeGeneratorTemplates, templateSupportsVideo, templateUsable } from "../../lib/settings";
import { refreshDownloadedWeights } from "../../lib/weightDownloads";
import { DebugPromptDialog } from "./DebugPromptDialog";
@@ -62,14 +62,14 @@ const readDensity = (): BoardDensity => {
export function GeneratorView({ config, folderPath, runtime = null, generationCompletionTimes = {}, onChange, selectedJobId, onSelectedJobChange, onRuntimeChange, onGenerate, onCancelGeneration, cancellingJobIds = new Set() }: GeneratorViewProps) {
const jobs = config.generationJobs;
const [templateSettings, setTemplateSettings] = useState(loadGeneratorTemplateSettings);
- const selectedTemplate = defaultGeneratorTemplate(templateSettings);
+ const selectedTemplate = defaultGeneratorTemplate(templateSettings, "video");
const defaultGenerationSteps = selectedTemplate.defaultSteps;
const [generatorRuntime, setGeneratorRuntime] = useState<SlopfabStatus | null>(runtime);
const [runtimeError, setRuntimeError] = useState<string | null>(null);
const runtimeProbe = useRef(0);
const [loraLibrary, setLoraLibrary] = useState(loadLoras);
useEffect(() => subscribeLoras(() => setLoraLibrary(loadLoras())), []);
- const templateKey = JSON.stringify([selectedTemplate.id, selectedTemplate.mode, selectedTemplate.paths, selectedTemplate.attention, selectedTemplate.motionCache, selectedTemplate.loras, selectedTemplate.additionalSafetensors, loraLibrary, selectedWorker()?.id ?? null]);
+ const templateKey = JSON.stringify([selectedTemplate.id, selectedTemplate.modelType, selectedTemplate.mode, selectedTemplate.paths, selectedTemplate.attention, selectedTemplate.motionCache, selectedTemplate.loras, selectedTemplate.additionalSafetensors, loraLibrary, selectedWorker()?.id ?? null]);
const probedTemplate = useRef(templateKey);
const configRef = useRef(config);
configRef.current = config;
@@ -111,7 +111,7 @@ export function GeneratorView({ config, folderPath, runtime = null, generationCo
const chooseGeneratorTemplate = (templateId: string) => {
const template = templateSettings.templates.find((candidate) => candidate.id === templateId);
- if (!template || !templateUsable(template) || template.id === templateSettings.defaultTemplateId) return;
+ if (!template || !(templateSupportsVideo(template) && templateUsable(template)) || template.id === templateSettings.defaultTemplateId) return;
const next = { ...templateSettings, defaultTemplateId: template.id };
saveGeneratorTemplateSettings(next);
setTemplateSettings(next);
@@ -124,7 +124,7 @@ export function GeneratorView({ config, folderPath, runtime = null, generationCo
setRuntimeError(null);
const probe = ++runtimeProbe.current;
if (!selectedTemplate.id) return;
- void getEngineStatus(selectedTemplate.paths, selectedTemplate.attention, selectedTemplate.loras ?? [], selectedTemplate.mode ?? "prompt", selectedTemplate.additionalSafetensors ?? [], selectedTemplate.motionCache ?? false, selectedTemplate.sources).then((status) => {
+ void getEngineStatus(selectedTemplate.paths, selectedTemplate.attention, selectedTemplate.loras ?? [], selectedTemplate.mode ?? "prompt", selectedTemplate.additionalSafetensors ?? [], selectedTemplate.motionCache ?? false, selectedTemplate.sources, selectedTemplate.modelType).then((status) => {
if (probe !== runtimeProbe.current) return;
setGeneratorRuntime(status);
onRuntimeChange?.(status);
@@ -189,7 +189,7 @@ export function GeneratorView({ config, folderPath, runtime = null, generationCo
const changeSceneSettings = (job: GenerationJob, updates: Partial<GenerationJob>) => {
updateScene(job, updates);
if (updates.sceneType && templateSceneBlocker(updates.sceneType, selectedTemplate)) {
- const candidates = templateSettings.templates.filter((template) => templateUsable(template)
+ const candidates = templateSettings.templates.filter((template) => (templateSupportsVideo(template) && templateUsable(template))
&& !templateSceneBlocker(updates.sceneType!, template));
const compatible = (updates.sceneType === "character-replace" || updates.sceneType === "pose" || isVideoTransition(updates)
? candidates.find((template) => /ref2v/i.test(template.paths.transformer)) : undefined) ?? candidates[0];
@@ -484,7 +484,7 @@ export function GeneratorView({ config, folderPath, runtime = null, generationCo
? "Every fixed-seed scene is already up to date."
: `Generate ${batchScenesReady.length} ${batchScenesReady.length === 1 ? "scene" : "scenes"}`;
const runtimeLabel = runtimeError ? "Video generator unavailable" : runtimeHeadline(generatorRuntime);
- const availableTemplates = templateSettings.templates.filter((template) => templateUsable(template));
+ const availableTemplates = templateSettings.templates.filter((template) => (templateSupportsVideo(template) && templateUsable(template)));
return <div ref={root} className={`generator-view ${selected ? "" : "generator-view--empty"}`} style={inspectorPane.style}>
<main className="generator-main">
diff --git a/src/components/workspace/ImageEditor.test.tsx b/src/components/workspace/ImageEditor.test.tsx
index 06bdb7e..cd0e610 100644
--- a/src/components/workspace/ImageEditor.test.tsx
+++ b/src/components/workspace/ImageEditor.test.tsx
@@ -8,7 +8,7 @@ import { ImageEditor } from "./ImageEditor";
import { choose, comboValue } from "./comboTestUtils";
import { imageGenerationSnapshotSchema, parseProjectConfig, referenceImages, sceneFrameInputs, type ProjectConfig } from "../../lib/project";
import { completeImageDraft, createTemplateImageDraft, imageGenerationSnapshot, restoreGeneratedImage } from "../../lib/imageHistory";
-import { createGeneratorTemplate, defaultGeneratorTemplate, saveGeneratorTemplateSettings } from "../../lib/settings";
+import { createGeneratorTemplate, mossImageTemplate, defaultGeneratorTemplate, saveGeneratorTemplateSettings } from "../../lib/settings";
import { createImageEditScene, createImageScene, imageScenePrompt } from "../../lib/imageScene";
import type { WorkItem } from "../../lib/workQueue";
import { compileImageEdits } from "../../lib/imageEditing";
@@ -30,6 +30,28 @@ function setup(initial = parseProjectConfig(fixture), workItems: WorkItem[] = []
return () => latest;
}
+it("offers MOSS for new images and disables editing and reference templates", () => {
+ vi.spyOn(persistence, "isTauri").mockReturnValue(true);
+ const moss = { ...mossImageTemplate(), sources: {}, paths: { transformer: "moss", textEncoder: "qwen", videoVae: "flux", tokenizer: "tokenizer.json", audioVae: "" } };
+ saveGeneratorTemplateSettings({ templates: [moss], defaultTemplateId: moss.id, catalogVersion: 10 });
+ const initial = parseProjectConfig(fixture);
+ initial.imageScene = createImageScene("A red apple");
+ setup(initial);
+ expect(screen.getByRole("combobox", { name: "Generator" })).toHaveTextContent("MOSS Image");
+ expect(screen.getByRole("button", { name: "Generate" })).toBeEnabled();
+ cleanup();
+ const source = { id: "source", kind: "image" as const, name: "Apple", mimeType: "image/png", relativePath: "media/apple.png", width: 512, height: 512, createdAt: initial.createdAt };
+ initial.assets = [source];
+ initial.imageScene = { ...createImageEditScene(source, initial.imageScene), outputAssetId: source.id };
+ setup(initial);
+ expect(screen.getByRole("button", { name: "Generate" })).toBeDisabled();
+ expect(screen.getByRole("radio", { name: "Draw edit" })).toBeDisabled();
+ expect(screen.getByRole("status")).toHaveTextContent("MOSS Image does not support image editing");
+ fireEvent.click(screen.getByRole("button", { name: "Template" }));
+ expect(screen.getByRole("menuitem", { name: "Zoom" })).toBeDisabled();
+ expect(screen.getByRole("menuitem", { name: "Character sheet" })).toBeDisabled();
+});
+
it.each([
["extend", true], ["extend", false], ["character-sheet", true], ["character-sheet", false],
] as const)("shows the existing %s panel only while the selected entry is generating (pending: %s)", (kind, pending) => {
diff --git a/src/components/workspace/ImageEditor.tsx b/src/components/workspace/ImageEditor.tsx
index a23f603..e78dfb9 100644
--- a/src/components/workspace/ImageEditor.tsx
+++ b/src/components/workspace/ImageEditor.tsx
@@ -9,7 +9,7 @@ import { compileImagePrompt } from "../../lib/imagePrompt";
import { createEmptyImage, imageEditingSnapshot, imageFamily, imageFamilyRoot, makeImagePrimary, removeImageAsset, restoreGeneratedImage, saveImageDraft } from "../../lib/imageHistory";
import { isTauri } from "../../lib/persistence";
import { createDraftGenerationJob, isVideoReference, PROJECT_RESOLUTIONS, referenceTypeLabel, type ProjectConfig, type ProjectReference } from "../../lib/project";
-import { defaultGeneratorTemplate, generationStepsForTemplate, loadDebugOptionsEnabled, loadGeneratorTemplateSettings, MINIMAX_H3_MODEL_TYPE, subscribeDebugOptions, subscribeGeneratorTemplates, templateUsable, type GeneratorTemplate } from "../../lib/settings";
+import { defaultGeneratorTemplate, generationStepsForTemplate, loadDebugOptionsEnabled, loadGeneratorTemplateSettings, MINIMAX_H3_MODEL_TYPE, generatorModel, templateSupportsImages, subscribeDebugOptions, subscribeGeneratorTemplates, templateUsable, type GeneratorTemplate } from "../../lib/settings";
import { isWorkActive, type WorkItem } from "../../lib/workQueue";
import type { ConfigUpdate } from "./TimelineView";
import { ReferenceImage } from "./ReferenceImage";
@@ -98,8 +98,11 @@ export function ImageEditor({ config, folderPath, onChange: changeConfig, onGene
const clipboard = useSyncExternalStore(subscribeImageNodeClipboard, getImageNodeClipboard);
const [templates, setTemplates] = useState(loadGeneratorTemplateSettings);
const [templateId, setTemplateId] = useState(() => localStorage.getItem("slopus.image-generator-template.v1") ?? defaultGeneratorTemplate().id);
- const imageTemplates = templates.templates.filter((template) => template.mode !== "animate");
+ const imageTemplates = templates.templates.filter(templateSupportsImages);
const template = imageTemplates.find((candidate) => candidate.id === templateId) ?? imageTemplates.find(templateUsable) ?? imageTemplates[0];
+ const model = generatorModel(template?.modelType);
+ const editingBlocked = !model.imageEditing ? `${model.label} does not support image editing. Choose an editing generator.` : null;
+ const referencesBlocked = !model.imageReferences ? `${model.label} does not support reference images. Choose a reference generator.` : null;
const isMiniMaxH3 = !template || template.modelType === MINIMAX_H3_MODEL_TYPE;
const onChange = (update: ConfigUpdate) => changeConfig((current) => {
const next = typeof update === "function" ? update(current) : update;
@@ -197,6 +200,7 @@ export function ImageEditor({ config, folderPath, onChange: changeConfig, onGene
const patchNode = (patch: Partial<ImageNode>) => commit({ ...scene, nodes: scene.nodes.map((node) => node.id === selected.id ? { ...node, ...patch } : node) });
const insertParent = selected.kind === "object" || selected.kind === "text" ? selected.parentId ?? root.id : selected.id;
const add = (kind: Exclude<ImageNode["kind"], "root">, box?: ImageBox) => {
+ if (imageRoot && editingBlocked) return;
const parent = imageRoot ? root.id : insertParent;
const next = addImageNode(scene, parent, imageRoot ? "object" : kind, box);
if (imageRoot) Object.assign(next.nodes.at(-1)!, { name: "Edit" });
@@ -337,7 +341,7 @@ export function ImageEditor({ config, folderPath, onChange: changeConfig, onGene
return { x: Math.round(Math.max(0, Math.min(1000, (event.clientX - bounds.left) / bounds.width * 1000))), y: Math.round(Math.max(0, Math.min(1000, (event.clientY - bounds.top) / bounds.height * 1000))) };
};
const pointerDown = (event: PointerEvent<SVGSVGElement>) => {
- if (event.button !== 0 || !boxes) return;
+ if (event.button !== 0 || !boxes || (imageRoot && editingBlocked)) return;
viewport.current?.focus({ preventScroll: true });
const target = event.target as SVGElement;
const id = drawKind ? undefined : target.dataset.node;
@@ -439,9 +443,9 @@ export function ImageEditor({ config, folderPath, onChange: changeConfig, onGene
{ id: "group", label: "Draw group", key: "G", icon: <Group16 />, onIcon: <Group16Filled /> },
] as const),
] as const;
- const chooseTool = (id: typeof drawKind) => { if (extendMode) return; setDrawKind(id); if (id) setBoxes(true); };
+ const chooseTool = (id: typeof drawKind) => { if (extendMode || (imageRoot && editingBlocked && id)) return; setDrawKind(id); if (id) setBoxes(true); };
useShortcut("V", () => chooseTool(null), { scope: editorRoot });
- useShortcut("E", () => chooseTool("object"), { scope: editorRoot, enabled: imageRoot });
+ useShortcut("E", () => chooseTool("object"), { scope: editorRoot, enabled: imageRoot && !editingBlocked });
useShortcut("O", () => chooseTool("object"), { scope: editorRoot, enabled: !imageRoot });
useShortcut("T", () => chooseTool("text"), { scope: editorRoot, enabled: !imageRoot });
useShortcut("G", () => chooseTool("group"), { scope: editorRoot, enabled: !imageRoot });
@@ -533,7 +537,7 @@ export function ImageEditor({ config, folderPath, onChange: changeConfig, onGene
// A chip for a video or audio reference names it; one deleted says so.
const missingReference = (id: string) => config.references.find((reference) => reference.id === id)?.name ?? "Deleted reference";
const templateInspector = Boolean((extendMode && output && extendOptions) || (output && templateSourceId === output.id) || (runningTemplate && templateSource));
- const generateButton = <button type="button" className="primary-button image-generate-button" data-tooltip={editPlan?.error ?? undefined} disabled={active ? work.cancelling || work.status === "encoding" : Boolean(templateSnapshot && output?.imageDraft) || !isTauri() || !template || !templateUsable(template) || (imageRoot ? Boolean(editPlan?.error) : !imageScenePrompt(scene))} onClick={() => attempt(() => active ? onCancel(work.id) : onGenerate(template!))}>{active ? <Stop14 aria-hidden="true" /> : <Sparkle16 aria-hidden="true" />}{active ? work.cancelling ? "Cancelling…" : "Cancel" : "Generate"}</button>;
+ const generateButton = <button type="button" className="primary-button image-generate-button" data-tooltip={(imageRoot ? editingBlocked : null) ?? editPlan?.error ?? undefined} disabled={active ? work.cancelling || work.status === "encoding" : Boolean(templateSnapshot && output?.imageDraft) || !isTauri() || !template || !templateUsable(template) || (imageRoot ? Boolean(editingBlocked || editPlan?.error) : !imageScenePrompt(scene))} onClick={() => attempt(() => active ? onCancel(work.id) : onGenerate(template!))}>{active ? <Stop14 aria-hidden="true" /> : <Sparkle16 aria-hidden="true" />}{active ? work.cancelling ? "Cancelling…" : "Cancel" : "Generate"}</button>;
return <div ref={editorRoot} className="image-editor" style={{ ...treePane.style, ...inspectorPane.style }}>
<div className="image-canvas-tools" role="toolbar" aria-label="Image tools">
@@ -548,8 +552,8 @@ export function ImageEditor({ config, folderPath, onChange: changeConfig, onGene
data-tooltip={template?.name ?? "Generator"}
value={template?.id ?? ""}
disabled={Boolean(active) || !imageTemplates.length}
- placeholder="No MiniMax H3 templates"
- options={imageTemplates.map((item) => ({ value: item.id, label: item.name, disabled: !templateUsable(item), description: !templateUsable(item) ? "Download in Settings" : undefined }))}
+ placeholder="No image generators"
+ options={imageTemplates.map((item) => ({ value: item.id, label: item.name, disabled: !templateUsable(item) || (imageRoot && !generatorModel(item.modelType).imageEditing), description: imageRoot && !generatorModel(item.modelType).imageEditing ? "Does not support editing" : !templateUsable(item) ? "Download in Settings" : undefined }))}
onChange={(id) => { setTemplateId(id); localStorage.setItem("slopus.image-generator-template.v1", id); const next = imageTemplates.find((candidate) => candidate.id === id); if (next) commit({ ...scene, steps: next.defaultSteps }); }}
/>
</span>
@@ -565,7 +569,7 @@ export function ImageEditor({ config, folderPath, onChange: changeConfig, onGene
requestAnimationFrame(() => event.currentTarget.querySelector<HTMLButtonElement>('[aria-checked="true"]')?.focus());
}}>
{TOOLS.map((tool) => <button
- key={tool.label}
+ key={tool.label} disabled={imageRoot && Boolean(editingBlocked) && tool.id !== null}
type="button"
role="radio"
aria-checked={drawKind === tool.id}
@@ -595,9 +599,9 @@ export function ImageEditor({ config, folderPath, onChange: changeConfig, onGene
<div className="image-tools__end">
<button type="button" className="secondary-button" aria-haspopup="menu" aria-expanded={templateMenu.isOpen}
disabled={!output || (!output.relativePath && !output.sourcePath)}
- onClick={(event) => templateMenu.open(event.currentTarget, [{ label: "Character sheet", icon: <Image16 />,
+ onClick={(event) => templateMenu.open(event.currentTarget, [{ label: "Character sheet", icon: <Image16 />, disabled: Boolean(referencesBlocked),
onSelect: () => { setExtendSourceId(null); setTemplateSourceId(output!.id); },
- }, { label: "Zoom", icon: <Boxes16 />, disabled: !output?.width || !output?.height || Boolean(active),
+ }, { label: "Zoom", icon: <Boxes16 />, disabled: Boolean(editingBlocked) || !output?.width || !output?.height || Boolean(active),
onSelect: () => {
setTemplateSourceId(null); setExtendSourceId(output!.id);
setExtendOptions({ bounds: initialExtendBounds(output!.width!, output!.height!), prompt: "", steps: template?.defaultSteps ?? 20, seed: -1 });
@@ -616,7 +620,7 @@ export function ImageEditor({ config, folderPath, onChange: changeConfig, onGene
</aside>
<Splitter {...treePane.splitterProps} aria-label="Resize hierarchy" />
{contextMenu && <HierarchyContextMenu {...contextMenu} onClose={closeContextMenu} items={[
- ...(imageRoot ? [{ label: "New Edit", icon: <Edit16 />, action: () => attempt(() => add("object")) }] : [
+ ...(imageRoot ? [{ label: "New Edit", icon: <Edit16 />, disabled: Boolean(editingBlocked), action: () => attempt(() => add("object")) }] : [
{ label: "New Object", icon: <Cube16 />, action: () => attempt(() => add("object")) },
{ label: "New Text", icon: <Text16 />, action: () => attempt(() => add("text")) },
{ label: "New Group", icon: <FolderAdd16 />, action: () => attempt(() => add("group")) },
@@ -642,7 +646,7 @@ export function ImageEditor({ config, folderPath, onChange: changeConfig, onGene
...(imageMenu.id ? [
...(imageMenu.inFamily ? [{ label: "Make Primary", icon: <Image16 />, disabled: !canUseMenuImage || imageFamilyRoot(images, imageMenu.id) === imageMenu.id,
action: () => onChange((current) => ({ ...current, assets: makeImagePrimary(current.assets, imageMenu.id!) })) }] : []),
- { label: "Edit", icon: <Edit16 />, separator: true, action: () => attempt(() => menuImage?.imageDraft || !menuImage?.width || !menuImage?.height ? selectImage(imageMenu.id!) : replaceScene(editGeneratedImage(config, imageMenu.id!).imageScene!)) },
+ { label: "Edit", icon: <Edit16 />, separator: true, disabled: Boolean(editingBlocked), action: () => attempt(() => menuImage?.imageDraft || !menuImage?.width || !menuImage?.height ? selectImage(imageMenu.id!) : replaceScene(editGeneratedImage(config, imageMenu.id!).imageScene!)) },
{ label: "Create Scene", icon: <Film16 />, separator: true, disabled: !canUseMenuImage, action: () => attempt(() => createFromImage(imageMenu.id!, true)) },
{ label: "Create Reference", icon: <References16 />, disabled: !canUseMenuImage, action: () => attempt(() => createFromImage(imageMenu.id!, false)) },
{ label: "Remove", icon: <Delete16 />, danger: true,
@@ -691,7 +695,7 @@ export function ImageEditor({ config, folderPath, onChange: changeConfig, onGene
{boxes && scene.nodes.filter((node) => node.box).map((node) => { const box = pointer.current?.id === node.id && draftBox ? draftBox : node.box!; return <span key={node.id} className="image-box-label" style={{ left: `${box.x / 10}%`, top: `${box.y / 10}%` }}>{node.name}</span>; })}
</div></div>}
{(error || work?.error) && <InfoBar className="image-error" severity="error" title="Couldn’t update the image" message={error ?? work?.error ?? ""} onClose={error ? () => setError(null) : undefined} />}
- <div className="image-status" role="status">{active && <ProgressBar value={work.progress * 100} aria-label="Image generation progress" />}<span>{active ? work.detail : extendMode && extendOptions ? `Zoom: ${extendSize?.width ?? "-"} \u00d7 ${extendSize?.height ?? "-"} px` : templateSnapshot ? `${templateSnapshot.kind === "extend" ? "Zoom" : "Character sheet"} · ${width} × ${height} px` : imageRoot ? editPlan?.error ?? `${width} × ${height} · ${editPlan?.edits.length} edits in hierarchy order` : !isTauri() ? "Image generation is available in the desktop app." : `${width} × ${height}${isMiniMaxH3 ? "" : " · Placement boxes guide the prompt"}`}</span></div>
+ <div className="image-status" role="status">{active && <ProgressBar value={work.progress * 100} aria-label="Image generation progress" />}<span>{active ? work.detail : extendMode && extendOptions ? `Zoom: ${extendSize?.width ?? "-"} \u00d7 ${extendSize?.height ?? "-"} px` : templateSnapshot ? `${templateSnapshot.kind === "extend" ? "Zoom" : "Character sheet"} · ${width} × ${height} px` : imageRoot ? editingBlocked ?? editPlan?.error ?? `${width} × ${height} · ${editPlan?.edits.length} edits in hierarchy order` : !isTauri() ? "Image generation is available in the desktop app." : `${width} × ${height}${isMiniMaxH3 ? "" : " · Placement boxes guide the prompt"}`}</span></div>
<ImageBar ref={imageResults} images={images} selectedId={scene.outputAssetId} folderPath={folderPath} onSelect={selectImage}
onMenu={(id, x, y, inFamily) => { setContextMenu(null); setImageMenu({ id, x, y, inFamily, source: "bar" }); }} />
</section>
@@ -699,11 +703,11 @@ export function ImageEditor({ config, folderPath, onChange: changeConfig, onGene
{extendMode && output && extendOptions ? <ExtendSettings config={config} source={output} options={extendOptions} onChange={setExtendOptions}
onResolutionChange={(resolution) => onChange((current) => ({ ...current, imageSettings: { ...imageSettings(current), resolution } }))}
references={promptReferences} missingLabel={missingReference} busy={Boolean(active)}
- disabledReason={!isTauri() ? "Template execution is available in the desktop app." : !onGenerateExtend || !template || !templateUsable(template) ? "Choose a downloaded generator to execute this template." : null}
+ disabledReason={editingBlocked ?? (!isTauri() ? "Template execution is available in the desktop app." : !onGenerateExtend || !template || !templateUsable(template) ? "Choose a downloaded generator to execute this template." : null)}
onExecute={() => attempt(() => onGenerateExtend?.(template!, output.id, extendOptions))} onClose={() => setExtendSourceId(null)}
/> : output && templateSourceId === output.id ? <CharacterSheetSettings
config={config} source={output} references={promptReferences} missingLabel={missingReference} defaultSteps={template?.defaultSteps ?? 20} busy={Boolean(active)}
- disabledReason={!isTauri() ? "Template execution is available in the desktop app." : !onGenerateCharacterSheet || !template || !templateUsable(template) ? "Choose a downloaded generator to execute this template." : null}
+ disabledReason={referencesBlocked ?? (!isTauri() ? "Template execution is available in the desktop app." : !onGenerateCharacterSheet || !template || !templateUsable(template) ? "Choose a downloaded generator to execute this template." : null)}
onExecute={(options) => onGenerateCharacterSheet?.(template!, output.id, options)} onClose={() => setTemplateSourceId(null)}
/> : runningTemplate && templateSource ? runningTemplate.kind === "extend" ? <ExtendSettings
config={config} source={templateSource} options={runningTemplate} onChange={() => {}}
@@ -764,7 +768,7 @@ export function ImageEditor({ config, folderPath, onChange: changeConfig, onGene
</PropSection>}
</div>
<div className="inspector-actions">
- {debugEnabled && <button type="button" className="secondary-button debug-prompt__toggle" aria-haspopup="dialog" onClick={() => attempt(() => setDebugPrompt(imageRoot ? imageEditDebugPrompt(compileImageEdits(config).edits) : compileImagePrompt(config).prompt))}>Debug prompt</button>}
+ {debugEnabled && <button type="button" className="secondary-button debug-prompt__toggle" aria-haspopup="dialog" onClick={() => attempt(() => setDebugPrompt(imageRoot ? imageEditDebugPrompt(compileImageEdits(config).edits) : compileImagePrompt(config, { modelType: template?.modelType }).prompt))}>Debug prompt</button>}
{(!extendMode || active) && generateButton}
</div>
</aside>}
diff --git a/src/lib/generatorModels.json b/src/lib/generatorModels.json
new file mode 100644
index 0000000..dbe5483
--- /dev/null
+++ b/src/lib/generatorModels.json
@@ -0,0 +1,22 @@
+{
+ "minimax-h3": {
+ "label": "MiniMax H3",
+ "description": "Image and video generation",
+ "imageGeneration": true,
+ "videoGeneration": true,
+ "imageEditing": true,
+ "imageReferences": true,
+ "loras": true,
+ "motionCache": true
+ },
+ "moss": {
+ "label": "MOSS Image",
+ "description": "Text-to-image generation on CUDA",
+ "imageGeneration": true,
+ "videoGeneration": false,
+ "imageEditing": false,
+ "imageReferences": false,
+ "loras": false,
+ "motionCache": false
+ }
+}
diff --git a/src/lib/generatorModels.ts b/src/lib/generatorModels.ts
new file mode 100644
index 0000000..925a13b
--- /dev/null
+++ b/src/lib/generatorModels.ts
@@ -0,0 +1,8 @@
+import models from "./generatorModels.json";
+
+export type GeneratorModel = typeof models["minimax-h3"];
+// Shared with native request validation; edit the JSON to enable capabilities.
+export const GENERATOR_MODELS = Object.entries(models).map(([value, model]) => ({ value, ...model }));
+export function generatorModel(modelType?: string): GeneratorModel {
+ return models[modelType as keyof typeof models] ?? models["minimax-h3"];
+}
diff --git a/src/lib/imagePrompt.test.ts b/src/lib/imagePrompt.test.ts
index 620b2ef..cacdf9b 100644
--- a/src/lib/imagePrompt.test.ts
+++ b/src/lib/imagePrompt.test.ts
@@ -6,6 +6,17 @@ import fixture from "../../fixtures/project-v1-image.json";
const photo = () => createProjectConfig({ name: "Portrait", generationType: "image", prompt: "A runner suspended mid-stride", aspectRatio: "1:1", resolution: "768p", targetDurationSeconds: 60 });
describe("MiniMax H3 still-image prompts", () => {
+ it("compiles MOSS as image text and rejects image-reference and editing inputs", () => {
+ const config = photo();
+ const compiled = compileImagePrompt(config, { modelType: "moss" });
+ expect(compiled.prompt).toContain("A runner suspended mid-stride");
+ expect(compiled.prompt).not.toMatch(/overall_soundscape|non_diegetic_music|Shot 1/);
+ config.references = [{ id: "runner", kind: "image", name: "Runner", description: "Blue uniform", relativePath: "references/runner.png", intendedUse: ["character"], createdAt: config.createdAt }];
+ config.imageScene!.nodes[0].description = "Show @[ref:runner].";
+ expect(() => compileImagePrompt(config, { modelType: "moss" })).toThrow(/does not support reference images/);
+ config.imageScene!.rootType = "image";
+ expect(() => compileImagePrompt(config, { modelType: "moss" })).toThrow(/does not support image editing/);
+ });
it("limits a pose transformation to its named reference and preserves ordinary retention by default", () => {
const config = photo();
config.references = [
diff --git a/src/lib/imagePrompt.ts b/src/lib/imagePrompt.ts
index 658e604..3c938ef 100644
--- a/src/lib/imagePrompt.ts
+++ b/src/lib/imagePrompt.ts
@@ -1,3 +1,4 @@
+import { MOSS_MODEL_TYPE, generatorModel } from "./settings";
import { imageSettings } from "./imageSettings";
import { createImageScene, imageScenePromptParts, imageScenePromptText } from "./imageScene";
import { actionReferenceIds, activeReferenceRefmods, isVideoReference, referenceDefinition, referenceImages, splitActionText, type ProjectConfig } from "./project";
@@ -5,7 +6,7 @@ import { SHOT_TAG_GROUPS } from "./shot-tags";
/** Shared by generation and Debug Prompt. H3's base three-field / reference
* six-section contracts still apply to a single silent image. */
-export function compileImagePrompt(config: ProjectConfig, options: { referenceTransformations?: Readonly<Record<string, string>>; sourceTreatment?: "outpaint" } = {}) {
+export function compileImagePrompt(config: ProjectConfig, options: { modelType?: string; referenceTransformations?: Readonly<Record<string, string>>; sourceTreatment?: "outpaint" } = {}) {
const scene = config.imageScene ?? createImageScene(config.brief.prompt);
// Only the references the prompt cites as @[ref:<id>] go to the generation.
const references = actionReferenceIds(imageScenePromptText(scene)).map((id) => {
@@ -14,6 +15,21 @@ export function compileImagePrompt(config: ProjectConfig, options: { referenceTr
if (isVideoReference(reference) || reference.kind === "audio") throw new Error(`Still images accept image and text references; the prompt cites the ${reference.kind} reference '${reference.name}'.`);
return reference;
});
+ const model = generatorModel(options.modelType);
+ if (!model.imageEditing && scene.rootType === "image") throw new Error(`${model.label} does not support image editing.`);
+ if (!model.imageReferences && references.some((reference) => referenceImages(reference).length || activeReferenceRefmods(reference).length)) {
+ throw new Error(`${model.label} does not support reference images or refmods. Choose a reference generator.`);
+ }
+ if (options.modelType === MOSS_MODEL_TYPE) {
+ const look = SHOT_TAG_GROUPS.find((group) => group.id === "visualStyle")?.options.find((option) => option.id === imageSettings(config).defaultLook)?.label;
+ const parts = imageScenePromptParts(scene, look);
+ const prompt = parts ? [parts.style, parts.composition].filter(Boolean).join("\n") : "";
+ return { prompt: splitActionText(prompt).map((part) => {
+ if (part.kind === "text") return part.value;
+ const reference = references.find((entry) => entry.id === part.value)!;
+ return `${reference.name}: ${referenceDefinition(reference) || reference.name}`;
+ }).join(""), references };
+ }
// Ordinary edits submit the source before the selected reference pictures.
// The runtime supplies the preserved outpaint crop to Qwen as "Source scene"
// and its positioned canvas to denoising; it does not consume a Picture slot.
diff --git a/src/lib/referenceIconSettings.ts b/src/lib/referenceIconSettings.ts
index 2b4a740..ae500e0 100644
--- a/src/lib/referenceIconSettings.ts
+++ b/src/lib/referenceIconSettings.ts
@@ -1,4 +1,4 @@
-import { loadGeneratorTemplateSettings, templateUsable, type GeneratorTemplateSettings } from "./settings";
+import { loadGeneratorTemplateSettings, templateUsable, templateSupportsImages, type GeneratorTemplateSettings } from "./settings";
export type ReferenceIconAutomation = "ask" | "enabled" | "disabled";
@@ -47,7 +47,7 @@ export function saveReferenceIconGeneratorId(id: string) {
}
export function availableReferenceIconGenerators(settings: GeneratorTemplateSettings) {
- return settings.templates.filter((template) => template.mode !== "animate" && templateUsable(template));
+ return settings.templates.filter((template) => templateSupportsImages(template) && templateUsable(template));
}
export function referenceIconGenerator(settings = loadGeneratorTemplateSettings(), id = loadReferenceIconGeneratorId()) {
diff --git a/src/lib/referenceIconWork.ts b/src/lib/referenceIconWork.ts
index 484fc8a..f04b4a6 100644
--- a/src/lib/referenceIconWork.ts
+++ b/src/lib/referenceIconWork.ts
@@ -253,14 +253,14 @@ export class ReferenceIconWork {
if (task.preset && !task.replaceIcon && hasPresetIcon(task.preset)) { task.status = "skipped"; return; }
const reference = this.referenceFor(task);
if (!reference || !this.shouldGenerate(reference, task)) { task.status = "skipped"; return; }
- task.prompt = referenceIconPrompt(reference);
task.refmodsSnapshot = JSON.stringify(activeReferenceRefmods(reference));
task.name = reference.name;
const template = referenceIconGenerator();
if (!template) throw new Error("Choose an available text-prompt generator for reference icons in Settings.");
+ task.prompt = referenceIconPrompt(reference, template.modelType);
const config = task.session.getSnapshot().config;
const runtimeConfig = { ...config, providerSettings: { ...config.providerSettings,
- slopfab: engineProviderSetting(template.paths, config.providerSettings.slopfab, template.attention, template.loras ?? [], "prompt", template.additionalSafetensors ?? [], template.motionCache ?? false, template.sources),
+ slopfab: engineProviderSetting(template.paths, config.providerSettings.slopfab, template.attention, template.loras ?? [], "prompt", template.additionalSafetensors ?? [], template.motionCache ?? false, template.sources, template),
} };
const steps = generationStepsWithLoras(template.defaultSteps, runtimeConfig);
if (this.item) { this.item = { ...this.item, settings: { ...this.item.settings, steps } }; this.publish(); }
diff --git a/src/lib/referenceIcons.ts b/src/lib/referenceIcons.ts
index e06e24f..a906df8 100644
--- a/src/lib/referenceIcons.ts
+++ b/src/lib/referenceIcons.ts
@@ -16,7 +16,7 @@ const COMPOSITIONS = {
custom: "A clear visual representation of the reference's defining subject, appearance, and atmosphere.",
};
-export function referenceIconPrompt(reference: ProjectReference): string {
+export function referenceIconPrompt(reference: ProjectReference, modelType?: string): string {
const description = reference.description.trim();
const visual = [
`${deriveH3Style(description)}, square composition.`,
@@ -27,6 +27,7 @@ export function referenceIconPrompt(reference: ProjectReference): string {
reference.subcategory ? `Subcategory: ${reference.subcategory}` : "",
`Reference description:\n${description}`,
].filter(Boolean).join("\n");
+ if (modelType === "moss") return visual;
// H3's base three-field format also applies to text-only still-image jobs.
// Icons have no audio, so both audio fields explicitly use N/A.
return [
diff --git a/src/lib/runtime.ts b/src/lib/runtime.ts
index 7b13a12..cba77cd 100644
--- a/src/lib/runtime.ts
+++ b/src/lib/runtime.ts
@@ -18,7 +18,7 @@ import {
type ProjectRecord, type SceneShot, type TimelineClip,
} from "./project";
import {
- agentEndpointProviderSettings, endpointProviderSetting, engineProviderSetting,
+ agentEndpointProviderSettings, endpointProviderSetting, engineProviderSetting, defaultGeneratorTemplate,
generationStepsWithLoras, loadDefaultGenerationSteps, loadEngineSettings, withAgentEndpointSettings,
type AttentionMode, type EndpointProviderId, type EndpointProviderSettings, type EnginePathField, type GeneratorTemplate,
} from "./settings";
@@ -173,16 +173,16 @@ export const CHECKING_PROVIDERS: ProviderStatus[] = [
/** Probes the engine paths on their own, with no project in hand — what the
* settings screen shows. */
-export async function getEngineStatus(settings = loadEngineSettings(), attention?: AttentionMode, loras?: TemplateLora[], mode?: GeneratorTemplate["mode"], additionalSafetensors?: GeneratorTemplate["additionalSafetensors"], motionCache?: boolean, sources?: GeneratorTemplate["sources"]): Promise<SlopfabStatus> {
+export async function getEngineStatus(settings = loadEngineSettings(), attention?: AttentionMode, loras?: TemplateLora[], mode?: GeneratorTemplate["mode"], additionalSafetensors?: GeneratorTemplate["additionalSafetensors"], motionCache?: boolean, sources?: GeneratorTemplate["sources"], modelType = defaultGeneratorTemplate().modelType): Promise<SlopfabStatus> {
if (!isTauri()) return DEMO_STATUS.slopfab;
let slopfab;
let adapterError: string | undefined;
try {
- slopfab = engineProviderSetting(settings, undefined, attention, loras, mode, additionalSafetensors, motionCache, sources);
+ slopfab = engineProviderSetting(settings, undefined, attention, loras, mode, additionalSafetensors, motionCache, sources, { modelType });
} catch (reason) {
// A missing adapter must not prevent checking the individual model files.
adapterError = reason instanceof Error ? reason.message : String(reason);
- slopfab = engineProviderSetting(settings, undefined, attention, [], mode, additionalSafetensors, motionCache, sources);
+ slopfab = engineProviderSetting(settings, undefined, attention, [], mode, additionalSafetensors, motionCache, sources, { modelType });
}
const status = await invoke<SlopfabStatus>("slopfab_status", { settings: { slopfab } });
return adapterError ? { ...status, state: status.state === "ready" ? "modelsMissing" : status.state,
diff --git a/src/lib/sceneGeneration.ts b/src/lib/sceneGeneration.ts
index 936866e..b3c84ba 100644
--- a/src/lib/sceneGeneration.ts
+++ b/src/lib/sceneGeneration.ts
@@ -8,7 +8,7 @@ import {
usableReferenceImages, type GenerationJob, type ProjectConfig, type ProjectReference, type SceneType,
} from "./project";
import type { SlopfabGenerationRequest } from "./runtime";
-import { generationSigmaShifts, type GeneratorTemplate } from "./settings";
+import { generationSigmaShifts, templateSupportsVideo, type GeneratorTemplate } from "./settings";
export function sceneGenerationRequest(job: GenerationJob, config: ProjectConfig, folderPath: string, defaultGenerationSteps: number, template?: GeneratorTemplate): SlopfabGenerationRequest {
// Only the references actually bound to this scene, in list order. The same
@@ -103,6 +103,7 @@ export function sendBlocker(job: GenerationJob, references: ProjectReference[]):
}
export function templateSceneBlocker(type: SceneType, template: GeneratorTemplate): string | null {
+ if (!templateSupportsVideo(template)) return "This model supports image generation only. Select a video generator.";
if (type === "animate" && template.mode !== "animate") return "Select an Animate generator for this scene.";
if (type !== "animate" && template.mode === "animate") return "Select a MiniMax prompt generator for this scene.";
if ((type === "pose" || type === "character-replace" || type === "extend" || type === "bridge") && /fl2v/i.test(template.paths.transformer)) return `Select a References or Singularity generator for ${type === "pose" ? "Pose" : type === "character-replace" ? "Character Replace" : type === "extend" ? "Extend" : "Bridge"}.`;
diff --git a/src/lib/settings.test.ts b/src/lib/settings.test.ts
index 495d676..f09dae4 100644
--- a/src/lib/settings.test.ts
+++ b/src/lib/settings.test.ts
@@ -4,7 +4,7 @@ import { beforeEach, describe, expect, it } from "vitest";
import { TURBO_LORA, VIGGLE_ANIMATE_LORA, loadLoras, saveLoras } from "./loras";
import {
agentEndpointProviderSettings,
- createGeneratorTemplate,
+ createGeneratorTemplate, mossImageTemplate, defaultGeneratorTemplate, generatorPathFields, templateSupportsVideo,
engineProviderSetting,
loadInferenceBackend,
saveInferenceBackend,
@@ -25,9 +25,35 @@ import {
describe("generator templates", () => {
beforeEach(() => localStorage.clear());
+ it("adds MOSS once, preserving local templates, defaults and catalog removal", () => {
+ const custom = createGeneratorTemplate("Custom");
+ saveGeneratorTemplateSettings({ templates: [custom], defaultTemplateId: custom.id, catalogVersion: 9 });
+ const migrated = loadGeneratorTemplateSettings();
+ expect(migrated.templates).toEqual([expect.objectContaining(custom), mossImageTemplate()]);
+ expect(migrated.defaultTemplateId).toBe(custom.id);
+ expect(loadGeneratorTemplateSettings()).toEqual(migrated);
+ saveGeneratorTemplateSettings({ ...migrated, templates: [custom] });
+ expect(loadGeneratorTemplateSettings().templates).toHaveLength(1);
+ });
+
+ it("uses MOSS image weights and tokenizer without audio and excludes it from video defaults", () => {
+ const moss = mossImageTemplate();
+ expect(generatorPathFields(moss).filter((field) => field.required).map((field) => field.id)).toEqual(["transformer", "textEncoder", "videoVae", "tokenizer"]);
+ expect(generatorPathFields(moss).find((field) => field.id === "tokenizer")?.directory).toBe(false);
+ expect(templateSupportsVideo(moss)).toBe(false);
+ moss.paths = Object.fromEntries(Object.entries(moss.paths).map(([key, value]) => [key, value ? `D:/weights/${key}` : ""])) as typeof moss.paths;
+ const h3 = createGeneratorTemplate("Video");
+ const settings = { templates: [moss, h3], defaultTemplateId: moss.id, catalogVersion: 10 };
+ expect(defaultGeneratorTemplate(settings).id).toBe(moss.id);
+ expect(defaultGeneratorTemplate(settings, "video").id).toBe(h3.id);
+ const provider = engineProviderSetting(moss.paths, { enabled: true, model: null, options: { audioVae: "old-audio" } }, moss.attention, [], "prompt", [], false, moss.sources, moss);
+ expect(provider.options).toMatchObject({ modelType: "moss", attention: "flash2", tokenizer: "D:/weights/tokenizer", videoVae: "D:/weights/videoVae" });
+ expect(provider.options).not.toHaveProperty("audioVae");
+ });
+
it("assigns MiniMax H3 to current and legacy generators and preserves future model types", () => {
expect(createGeneratorTemplate().modelType).toBe("minimax-h3");
- expect(loadGeneratorTemplateSettings().templates.every((template) => template.modelType === "minimax-h3")).toBe(true);
+ expect(loadGeneratorTemplateSettings().templates.filter((template) => template.id !== "moss-image").every((template) => template.modelType === "minimax-h3")).toBe(true);
for (const modelType of [undefined, null, "", 123]) {
localStorage.setItem("slopus.generator-templates.v1", JSON.stringify({
templates: [{ id: "legacy", name: "Renamed generator", modelType }], defaultTemplateId: "legacy", catalogVersion: 9,
@@ -58,7 +84,7 @@ describe("generator templates", () => {
localStorage.setItem("slopus.engine-paths.v1", JSON.stringify({ transformer: "D:\\Models\\main.safetensors" }));
const settings = loadGeneratorTemplateSettings();
expect(settings.defaultTemplateId).toBe("default");
- expect(settings.templates).toHaveLength(6);
+ expect(settings.templates).toHaveLength(7);
expect(settings.templates[1].name).toBe("First/Last Frame");
expect(settings.templates[0]).toMatchObject({
id: "default",
@@ -126,7 +152,7 @@ describe("generator templates", () => {
paths: { ...original.paths, transformer },
sources: { ...original.sources, transformer: [{ ...original.sources!.transformer![0], url: transformer }, original.sources!.transformer![1]] },
});
- expect(loadGeneratorTemplateSettings().templates.map(({ name }) => name)).toEqual(["Default", "First/Last Frame", "References", "First/Last Frame Fast", "Singularity", "Animate"]);
+ expect(loadGeneratorTemplateSettings().templates.map(({ name }) => name)).toEqual(["Default", "First/Last Frame", "References", "First/Last Frame Fast", "Singularity", "Animate", "MOSS Image"]);
});
it.each(["Minimax H3 Original", "My custom generator"])("migrates the saved %s template without changing its configuration", (name) => {
@@ -143,7 +169,7 @@ describe("generator templates", () => {
expect(settings.templates[2]).toEqual(minimaxFastTemplate());
expect(settings.templates[3]).toEqual(minimaxSingularityTemplate());
expect(settings.defaultTemplateId).toBe(template.id);
- expect(settings.catalogVersion).toBe(9);
+ expect(settings.catalogVersion).toBe(10);
expect(loadGeneratorTemplateSettings()).toEqual(settings);
saveGeneratorTemplateSettings({ ...settings, templates: [settings.templates[0]] });
expect(loadGeneratorTemplateSettings().templates).toHaveLength(1);
@@ -153,7 +179,7 @@ describe("generator templates", () => {
const references = minimaxReferencesTemplate();
references.paths.transformer = "D:/Models/custom.safetensors";
localStorage.setItem("slopus.generator-templates.v1", JSON.stringify({ templates: [references], catalogVersion: 3 }));
- expect(loadGeneratorTemplateSettings().templates).toEqual([references, minimaxFastTemplate(), minimaxSingularityTemplate(), viggleAnimateTemplate()]);
+ expect(loadGeneratorTemplateSettings().templates).toEqual([references, minimaxFastTemplate(), minimaxSingularityTemplate(), viggleAnimateTemplate(), mossImageTemplate()]);
});
it("adds Singularity to the previous catalog once while preserving saved templates", () => {
@@ -162,9 +188,9 @@ describe("generator templates", () => {
custom.paths.transformer = "D:/Models/custom.safetensors";
localStorage.setItem("slopus.generator-templates.v1", JSON.stringify({ templates: [custom], defaultTemplateId: custom.id, catalogVersion: 4 }));
const settings = loadGeneratorTemplateSettings();
- expect(settings.templates).toEqual([expect.objectContaining(custom), minimaxSingularityTemplate(), viggleAnimateTemplate()]);
+ expect(settings.templates).toEqual([expect.objectContaining(custom), minimaxSingularityTemplate(), viggleAnimateTemplate(), mossImageTemplate()]);
expect(settings.defaultTemplateId).toBe(custom.id);
- expect(settings.catalogVersion).toBe(9);
+ expect(settings.catalogVersion).toBe(10);
expect(loadGeneratorTemplateSettings()).toEqual(settings);
saveGeneratorTemplateSettings({ ...settings, templates: [custom] });
expect(loadGeneratorTemplateSettings().templates).toEqual([expect.objectContaining(custom)]);
@@ -175,7 +201,7 @@ describe("generator templates", () => {
template.defaultSteps = 8;
template.paths.transformer = "D:/Models/singularity.safetensors";
localStorage.setItem("slopus.generator-templates.v1", JSON.stringify({ templates: [template], catalogVersion: 4 }));
- expect(loadGeneratorTemplateSettings().templates).toEqual([template, viggleAnimateTemplate()]);
+ expect(loadGeneratorTemplateSettings().templates).toEqual([template, viggleAnimateTemplate(), mossImageTemplate()]);
});
it("adds Turbo to saved Singularity once and preserves other adapters and settings", () => {
@@ -185,7 +211,7 @@ describe("generator templates", () => {
template.loras = [{ loraId: "custom", enabled: false, strength: 0.5 }];
localStorage.setItem("slopus.generator-templates.v1", JSON.stringify({ templates: [template], defaultTemplateId: template.id, catalogVersion: 5 }));
const settings = loadGeneratorTemplateSettings();
- expect(settings.templates).toEqual([{ ...template, loras: [...template.loras, { loraId: TURBO_LORA.id, enabled: true, strength: 1 }] }, viggleAnimateTemplate()]);
+ expect(settings.templates).toEqual([{ ...template, loras: [...template.loras, { loraId: TURBO_LORA.id, enabled: true, strength: 1 }] }, viggleAnimateTemplate(), mossImageTemplate()]);
expect(settings.defaultTemplateId).toBe("");
expect(loadGeneratorTemplateSettings()).toEqual(settings);
saveGeneratorTemplateSettings({ ...settings, templates: [template] });
@@ -196,7 +222,7 @@ describe("generator templates", () => {
const template = minimaxSingularityTemplate();
template.loras = [{ loraId: TURBO_LORA.id, enabled: false, strength: 0.3 }];
localStorage.setItem("slopus.generator-templates.v1", JSON.stringify({ templates: [template], catalogVersion: 5 }));
- expect(loadGeneratorTemplateSettings().templates).toEqual([template, viggleAnimateTemplate()]);
+ expect(loadGeneratorTemplateSettings().templates).toEqual([template, viggleAnimateTemplate(), mossImageTemplate()]);
});
it("adds First/Last Frame Fast with eight steps and its model URLs", () => {
@@ -228,8 +254,8 @@ describe("generator templates", () => {
}
localStorage.setItem("slopus.generator-templates.v1", JSON.stringify({ templates: [template], catalogVersion: 8 }));
const settings = loadGeneratorTemplateSettings();
- expect(settings.templates).toEqual([minimaxFastTemplate()]);
- expect(settings.catalogVersion).toBe(9);
+ expect(settings.templates).toEqual([minimaxFastTemplate(), mossImageTemplate()]);
+ expect(settings.catalogVersion).toBe(10);
expect(templateNeedsDownload(settings.templates[0])).toBe(true);
expect(loadGeneratorTemplateSettings()).toEqual(settings);
});
@@ -242,10 +268,10 @@ describe("generator templates", () => {
template.sources = { ...template.sources, videoVae: [{ url: template.paths.videoVae, gpuModel: "", minVramGb: 0 }] };
delete template.sources.transformer;
localStorage.setItem("slopus.generator-templates.v1", JSON.stringify({ templates: [template], catalogVersion: 8 }));
- expect(loadGeneratorTemplateSettings().templates).toEqual([template]);
+ expect(loadGeneratorTemplateSettings().templates).toEqual([template, mossImageTemplate()]);
const original = minimaxOriginalTemplate();
localStorage.setItem("slopus.generator-templates.v1", JSON.stringify({ templates: [original], catalogVersion: 8 }));
- expect(loadGeneratorTemplateSettings().templates).toEqual([original]);
+ expect(loadGeneratorTemplateSettings().templates).toEqual([original, mossImageTemplate()]);
});
it.each(["textEncoder", "transformer"] as const)("upgrades saved Minimax %s variants once and preserves downloaded weights", (field) => {
@@ -255,7 +281,7 @@ describe("generator templates", () => {
template.paths[field] = downloadedPath;
localStorage.setItem("slopus.generator-templates.v1", JSON.stringify({ templates: [template], catalogVersion: 1 }));
const settings = loadGeneratorTemplateSettings();
- expect(settings.catalogVersion).toBe(9);
+ expect(settings.catalogVersion).toBe(10);
expect(settings.templates[0].paths[field]).toBe(downloadedPath);
expect(settings.templates[0].sources![field]).toEqual(minimaxOriginalTemplate().sources![field]!.map((source, index) =>
index === 0 ? { ...source, downloadedPath } : source));
@@ -270,7 +296,7 @@ describe("generator templates", () => {
expect(loadGeneratorTemplateSettings().templates[0].sources![field]).toEqual(template.sources![field]);
const custom = createGeneratorTemplate();
localStorage.setItem("slopus.generator-templates.v1", JSON.stringify({ templates: [custom], catalogVersion: 1 }));
- expect(loadGeneratorTemplateSettings().templates.map(({ id }) => id)).toEqual([custom.id, "minimax-h3-references", "minimax-h3-fast", "minimax-h3-singularity", "viggle-animate"]);
+ expect(loadGeneratorTemplateSettings().templates.map(({ id }) => id)).toEqual([custom.id, "minimax-h3-references", "minimax-h3-fast", "minimax-h3-singularity", "viggle-animate", "moss-image"]);
});
it.each(["url", "downloaded", "original", "custom", "cached original"])("removes the incompatible encoder from saved templates using %s", (selection) => {
@@ -290,7 +316,7 @@ describe("generator templates", () => {
localStorage.setItem("slopus.generator-templates.v1", JSON.stringify({ templates: [template], defaultTemplateId: template.id, catalogVersion: 2 }));
const settings = loadGeneratorTemplateSettings();
const migrated = settings.templates[0];
- expect(settings.catalogVersion).toBe(9);
+ expect(settings.catalogVersion).toBe(10);
expect(migrated.sources!.textEncoder).toEqual([
{ url: originalUrl, gpuModel: "", minVramGb: 0, ...(selection === "cached original" ? { downloadedPath: cachedOriginal } : {}) },
custom,
diff --git a/src/lib/settings.ts b/src/lib/settings.ts
index c5c0dda..64c047f 100644
--- a/src/lib/settings.ts
+++ b/src/lib/settings.ts
@@ -13,6 +13,8 @@
* silently drops that path.
*/
import { isSigmaShift, type SigmaShifts } from "./sampling";
+import { generatorModel } from "./generatorModels";
+export { generatorModel, GENERATOR_MODELS } from "./generatorModels";
import { latentUpscalerPath } from "./upscalers";
import { DEFAULT_GENERATION_STEPS, MAX_GENERATION_STEPS, type ProjectConfig, type ProviderSetting } from "./project";
// Type-only: erased at build time, so this does not close a cycle with runtime.ts.
@@ -71,6 +73,9 @@ function migratedStorageItem(key: string, legacyKey: string): string | null {
}
export const MINIMAX_H3_MODEL_TYPE = "minimax-h3";
+export const MOSS_MODEL_TYPE = "moss";
+export const templateSupportsVideo = (template: Pick<GeneratorTemplate, "modelType">): boolean => generatorModel(template.modelType).videoGeneration;
+export const templateSupportsImages = (template: Pick<GeneratorTemplate, "modelType" | "mode">): boolean => generatorModel(template.modelType).imageGeneration && template.mode !== "animate";
export interface GeneratorTemplate extends SigmaShifts {
id: string;
@@ -105,7 +110,13 @@ export interface WeightSource {
downloadedPath?: string;
}
-export function generatorPathFields(template: Pick<GeneratorTemplate, "mode">): EnginePathField[] {
+export function generatorPathFields(template: Pick<GeneratorTemplate, "mode"> & { modelType?: string }): EnginePathField[] {
+ if (template.modelType === MOSS_MODEL_TYPE) return ENGINE_PATH_FIELDS.filter(({ id }) => id !== "audioVae").map((field) => {
+ if (field.id === "transformer") return { ...field, hint: "The main model that turns your description into an image." };
+ if (field.id === "videoVae") return { ...field, label: "Image VAE weights", hint: "Decodes the model's internal picture into an image." };
+ if (field.id === "tokenizer") return { ...field, required: true, directory: false, extensions: ["json"], hint: "The Qwen3.5 tokenizer JSON used by MOSS." };
+ return field;
+ });
return template.mode === "animate"
? ENGINE_PATH_FIELDS.filter(({ id }) => id !== "textEncoder" && id !== "tokenizer")
: ENGINE_PATH_FIELDS;
@@ -218,12 +229,25 @@ export function createGeneratorTemplate(name = "New template", modelType = MINIM
id: `generator-template-${crypto.randomUUID()}`,
name,
modelType,
- defaultSteps: DEFAULT_GENERATION_STEPS,
- attention: "sage2",
+ defaultSteps: modelType === MOSS_MODEL_TYPE ? 50 : DEFAULT_GENERATION_STEPS,
+ attention: modelType === MOSS_MODEL_TYPE ? "flash2" : "sage2",
paths: copyPaths(EMPTY_ENGINE_SETTINGS),
};
}
+export function mossImageTemplate(): GeneratorTemplate {
+ const root = "https://huggingface.co/Comfy-Org/MOSS-Image/resolve/main/";
+ const paths: EngineSettings = {
+ transformer: `${root}diffusion_models/moss_image_sft_int8_convrot.safetensors`,
+ textEncoder: `${root}text_encoders/qwen3.5_9b_int8_convrot.safetensors`,
+ videoVae: `${root}vae/flux2-vae_small.safetensors`,
+ tokenizer: "https://huggingface.co/OpenMOSS-Team/MOSS-Image-SFT/resolve/main/tokenizer/tokenizer.json",
+ audioVae: "",
+ };
+ const sources = Object.fromEntries(Object.entries(paths).filter(([, url]) => url).map(([id, url]) => [id, [{ url, gpuModel: "", minVramGb: 0 }]]));
+ return { id: "moss-image", name: "MOSS Image", modelType: MOSS_MODEL_TYPE, defaultSteps: 50, attention: "flash2", paths, sources };
+}
+
export function minimaxOriginalTemplate(): GeneratorTemplate {
const root = "https://huggingface.co/Comfy-Org/MiniMax-H3/blob/main/";
const paths = {
@@ -286,9 +310,9 @@ export function viggleAnimateTemplate(): GeneratorTemplate {
}
const initialTemplateSettings = (paths = EMPTY_ENGINE_SETTINGS): GeneratorTemplateSettings => ({
- templates: [{ id: "default", name: "Default", modelType: MINIMAX_H3_MODEL_TYPE, defaultSteps: DEFAULT_GENERATION_STEPS, attention: "sage2", paths: copyPaths(paths) }, minimaxOriginalTemplate(), minimaxReferencesTemplate(), minimaxFastTemplate(), minimaxSingularityTemplate(), viggleAnimateTemplate()],
+ templates: [{ id: "default", name: "Default", modelType: MINIMAX_H3_MODEL_TYPE, defaultSteps: DEFAULT_GENERATION_STEPS, attention: "sage2", paths: copyPaths(paths) }, minimaxOriginalTemplate(), minimaxReferencesTemplate(), minimaxFastTemplate(), minimaxSingularityTemplate(), viggleAnimateTemplate(), mossImageTemplate()],
defaultTemplateId: "default",
- catalogVersion: 9,
+ catalogVersion: 10,
});
const normalizeTemplateSettings = (value: unknown): GeneratorTemplateSettings | null => {
@@ -350,7 +374,7 @@ const normalizeTemplateSettings = (value: unknown): GeneratorTemplateSettings |
templates,
defaultTemplateId: templates.find((template) => template.id === requestedDefault && templateUsable(template))?.id
?? templates.find(templateUsable)?.id ?? "",
- catalogVersion: typeof record.catalogVersion === "number" && [1, 2, 3, 4, 5, 6, 7, 8, 9].includes(record.catalogVersion) ? record.catalogVersion : 0,
+ catalogVersion: typeof record.catalogVersion === "number" && [1, 2, 3, 4, 5, 6, 7, 8, 9, 10].includes(record.catalogVersion) ? record.catalogVersion : 0,
};
};
@@ -464,6 +488,12 @@ export function loadGeneratorTemplateSettings(): GeneratorTemplateSettings {
normalized = normalizeTemplateSettings({ ...normalized, catalogVersion: 9 })!;
localStorage.setItem(GENERATOR_TEMPLATES_KEY, JSON.stringify(normalized));
}
+ if ((normalized.catalogVersion ?? 0) < 10) {
+ const template = mossImageTemplate();
+ if (!normalized.templates.some(({ id }) => id === template.id)) normalized.templates.push(template);
+ normalized = normalizeTemplateSettings({ ...normalized, catalogVersion: 10 })!;
+ localStorage.setItem(GENERATOR_TEMPLATES_KEY, JSON.stringify(normalized));
+ }
return normalized;
}
}
@@ -485,9 +515,10 @@ export function saveGeneratorTemplateSettings(settings: GeneratorTemplateSetting
queueMicrotask(() => window.dispatchEvent(new Event(GENERATOR_TEMPLATES_EVENT)));
}
-export function defaultGeneratorTemplate(settings = loadGeneratorTemplateSettings()): GeneratorTemplate {
- return settings.templates.find((template) => template.id === settings.defaultTemplateId && templateUsable(template))
- ?? settings.templates.find(templateUsable)
+export function defaultGeneratorTemplate(settings = loadGeneratorTemplateSettings(), medium?: "video"): GeneratorTemplate {
+ const eligible = settings.templates.filter((template) => medium !== "video" || templateSupportsVideo(template));
+ return eligible.find((template) => template.id === settings.defaultTemplateId && templateUsable(template))
+ ?? eligible.find(templateUsable)
?? { id: "", name: "No downloaded generators", modelType: MINIMAX_H3_MODEL_TYPE, defaultSteps: DEFAULT_GENERATION_STEPS, attention: "sage2", paths: copyPaths(EMPTY_ENGINE_SETTINGS) };
}
@@ -514,10 +545,12 @@ export function saveEngineSettings(settings: EngineSettings): void {
/** The `slopfab` provider setting these paths describe, with blanks dropped so
* an unset field falls through to whatever the project (or the Rust default)
* already had rather than overwriting it with "". */
-export function engineProviderSetting(settings: EngineSettings, base?: ProviderSetting, attention = defaultGeneratorTemplate().attention, selection = defaultGeneratorTemplate().loras, mode = defaultGeneratorTemplate().mode, additionalSafetensors = defaultGeneratorTemplate().additionalSafetensors, motionCache = defaultGeneratorTemplate().motionCache ?? false, sources = defaultGeneratorTemplate().sources, shifts: SigmaShifts = defaultGeneratorTemplate()): ProviderSetting {
+export function engineProviderSetting(settings: EngineSettings, base?: ProviderSetting, attention = defaultGeneratorTemplate().attention, selection = defaultGeneratorTemplate().loras, mode = defaultGeneratorTemplate().mode, additionalSafetensors = defaultGeneratorTemplate().additionalSafetensors, motionCache = defaultGeneratorTemplate().motionCache ?? false, sources = defaultGeneratorTemplate().sources, shifts: SigmaShifts & { modelType?: string } = defaultGeneratorTemplate()): ProviderSetting {
// A LAN worker receives URLs for weights it should download itself.
const remote = remoteWorkerSelected();
const options: ProviderSetting["options"] = { ...(base?.options ?? {}), attention, inferenceBackend: loadInferenceBackend() };
+ const moss = shifts.modelType === MOSS_MODEL_TYPE;
+ options.modelType = shifts.modelType ?? MINIMAX_H3_MODEL_TYPE;
// Always replace project-carried adapter paths with this machine's selection.
delete options.loras;
delete options.schedule;
@@ -537,7 +570,7 @@ export function engineProviderSetting(settings: EngineSettings, base?: ProviderS
if (latentUpscaler) options.latentUpscaler = latentUpscaler;
if (remote && sources) {
options.workerWeightSources = JSON.stringify(Object.fromEntries(Object.entries(sources)
- .filter(([role, entries]) => entries?.length && !(mode === "animate" && (role === "textEncoder" || role === "tokenizer")))
+ .filter(([role, entries]) => entries?.length && !(moss && role === "audioVae") && !(mode === "animate" && (role === "textEncoder" || role === "tokenizer")))
.map(([role, entries]) => [role, entries!.map(({ url, gpuModel, minVramGb }) => ({ url, gpuModel, minVramGb }))])));
}
if (motionCache && mode !== "animate") options.motionCache = true;
@@ -560,7 +593,7 @@ export function engineProviderSetting(settings: EngineSettings, base?: ProviderS
delete options.motionCache;
}
for (const field of ENGINE_PATH_FIELDS) {
- if (mode === "animate" && (field.id === "textEncoder" || field.id === "tokenizer")) {
+ if ((moss && field.id === "audioVae") || (mode === "animate" && (field.id === "textEncoder" || field.id === "tokenizer"))) {
delete options[field.id];
continue;
}
diff --git a/src/lib/slop.test.ts b/src/lib/slop.test.ts
index 0587342..ca86fb4 100644
--- a/src/lib/slop.test.ts
+++ b/src/lib/slop.test.ts
@@ -1,12 +1,19 @@
// @vitest-environment jsdom
import { beforeEach, describe, expect, it, vi } from "vitest";
import { importGeneratorSlop, MAX_SLOP_BYTES, mergeGeneratorSlop, parseGeneratorSlop, portableGenerator, serializeGeneratorSlop } from "./slop";
-import { createGeneratorTemplate, loadGeneratorTemplateSettings, minimaxOriginalTemplate, minimaxSingularityTemplate, saveGeneratorTemplateSettings, viggleAnimateTemplate } from "./settings";
+import { createGeneratorTemplate, mossImageTemplate, loadGeneratorTemplateSettings, minimaxOriginalTemplate, minimaxSingularityTemplate, saveGeneratorTemplateSettings, viggleAnimateTemplate } from "./settings";
import { loadLoras, saveLoras, TURBO_LORA } from "./loras";
beforeEach(() => { localStorage.clear(); vi.restoreAllMocks(); });
describe("portable generator bundles", () => {
+ it("round trips MOSS with its three weights and required tokenizer, without audio", () => {
+ const data = parseGeneratorSlop(serializeGeneratorSlop([mossImageTemplate()])).items[0].data;
+ expect(data.modelType).toBe("moss");
+ expect(Object.keys(data.sources).sort()).toEqual(["textEncoder", "tokenizer", "transformer", "videoVae"]);
+ delete data.sources.tokenizer;
+ expect(() => parseGeneratorSlop(JSON.stringify({ format: "slop", version: 1, items: [{ type: "generator-template", version: 1, data }] }))).toThrow(/Tokenizer/);
+ });
it("exports downloaded weights as URL variants, keeping metadata and dropping all machine state", () => {
const template = minimaxOriginalTemplate();
template.paths.transformer = "C:/private/person/model.safetensors";
diff --git a/src/lib/weightDownloads.test.ts b/src/lib/weightDownloads.test.ts
index df51318..99ba611 100644
--- a/src/lib/weightDownloads.test.ts
+++ b/src/lib/weightDownloads.test.ts
@@ -4,7 +4,7 @@ import { cancelWeightDownload, downloadLora, prepareLora, removeLora, refreshDow
import { DMAD_LORA, LIGHTX2V_TURBO_LORA, loadLoras, saveLoras, TAOMATE_LORA, TURBO_LORA, VIGGLE_ANIMATE_LORA } from "./loras";
import { beforeEach, expect, it, vi } from "vitest";
import { chooseWeightSource, downloadTemplateWeights, getWeightDownloadState, refreshDownloadedWeights, removeTemplateWeights, updateWeightPath, weightDownloadProgress, type DownloadState } from "./weightDownloads";
-import { ANIMATE_CONDITIONING_URL, engineProviderSetting, createGeneratorTemplate, defaultGeneratorTemplate, isDownloadUrl, loadGeneratorTemplateSettings, minimaxOriginalTemplate, minimaxSingularityTemplate, saveGeneratorTemplateSettings, templateNeedsDownload, type WeightSource } from "./settings";
+import { ANIMATE_CONDITIONING_URL, mossImageTemplate, engineProviderSetting, createGeneratorTemplate, defaultGeneratorTemplate, isDownloadUrl, loadGeneratorTemplateSettings, minimaxOriginalTemplate, minimaxSingularityTemplate, saveGeneratorTemplateSettings, templateNeedsDownload, type WeightSource } from "./settings";
vi.mock("@tauri-apps/api/core", () => ({ invoke: vi.fn() }));
vi.mock("@tauri-apps/api/event", () => ({ listen: vi.fn(async () => () => undefined) }));
@@ -13,6 +13,17 @@ const files = new Set<string>();
const source = (url: string, gpuModel = "", minVramGb = 0): WeightSource => ({ url, gpuModel, minVramGb });
const saved = () => loadGeneratorTemplateSettings().templates.find((template) => template.id === "minimax-h3-original")!;
+it("downloads the MOSS weights and tokenizer without audio or adapters", async () => {
+ const moss = mossImageTemplate();
+ await downloadTemplateWeights(moss.id);
+ const urls = vi.mocked(invoke).mock.calls.filter(([command]) => command === "download_weight").map(([, args]) => (args as { url: string }).url);
+ expect(urls.sort()).toEqual(Object.values(moss.paths).filter(Boolean).sort());
+ const downloaded = loadGeneratorTemplateSettings().templates.find(({ id }) => id === moss.id)!;
+ expect(templateNeedsDownload(downloaded)).toBe(false);
+ expect(downloaded.paths.tokenizer).toBe("C:/Slopus/weights/tokenizer.json");
+ expect(downloaded.paths.audioVae).toBe("");
+});
+
it("prepares downloaded adapters before publishing them and does not offer fake cancellation", async () => {
const normal = vi.mocked(invoke).getMockImplementation()!;
let finish!: () => void;
diff --git a/src/lib/workQueue.test.ts b/src/lib/workQueue.test.ts
index 09785c4..f5f2c35 100644
--- a/src/lib/workQueue.test.ts
+++ b/src/lib/workQueue.test.ts
@@ -1,4 +1,5 @@
// @vitest-environment jsdom
+import { mossImageTemplate } from "./settings";
import { waitFor } from "@testing-library/react";
import { listen } from "@tauri-apps/api/event";
import { invoke } from "@tauri-apps/api/core";
@@ -353,6 +354,24 @@ describe("agent scene generation", () => {
describe("image generation work", () => {
const template: GeneratorTemplate = { id: "image-test", name: "MiniMax H3", modelType: "minimax-h3", defaultSteps: 20, attention: "sage2", paths: { ...EMPTY_ENGINE_SETTINGS, transformer: "C:/h3.safetensors" } };
const imageProject = (): ProjectRecord => ({ folderPath: "C:/Image", config: createProjectConfig({ name: "Poster", prompt: "An ocean poster", generationType: "image", aspectRatio: "1:1", resolution: "768p", targetDurationSeconds: 60 }) });
+ it("routes MOSS text-to-image requests and refuses video and editing work", async () => {
+ const { queue, first } = setup();
+ const moss = { ...mossImageTemplate(), sources: {}, paths: { transformer: "moss", textEncoder: "qwen", videoVae: "flux", tokenizer: "tokenizer.json", audioVae: "" } };
+ expect(() => queue.enqueue(first, [submission(first)], moss)).toThrow(/supports video/);
+ const session = queue.project(imageProject());
+ queue.enqueueImage(session, moss);
+ await waitFor(() => expect(enqueueSlopfabGeneration).toHaveBeenCalledOnce());
+ const [request, config] = vi.mocked(enqueueSlopfabGeneration).mock.calls[0];
+ expect(request).toMatchObject({ stillImage: true, frames: 1, referencePaths: [] });
+ expect(request.prompt).toContain("An ocean poster");
+ expect(request.prompt).not.toContain("overall_soundscape");
+ expect(config.providerSettings.slopfab.options).toMatchObject({ modelType: "moss", attention: "flash2", tokenizer: "tokenizer.json" });
+ expect(config.providerSettings.slopfab.options).not.toHaveProperty("audioVae");
+ await queue.cancel(queue.getSnapshot()[0].id);
+ session.update((current) => ({ ...current, imageScene: createImageEditScene({ name: "Source", relativePath: "media/source.png", width: 512, height: 512 }, current.imageScene!) }));
+ expect(() => queue.enqueueImage(session, moss)).toThrow(/does not support image editing/);
+ expect(() => queue.enqueueExtendImage(session, moss, "source", { bounds: { x: 0, y: 0, width: 512, height: 512 }, prompt: "", steps: 50, seed: 1 })).toThrow(/supports image editing/);
+ });
it("generates an image at its own resolution and preserves the video generation canvas after reopening", async () => {
const { queue, first } = setup();
const original = first.getSnapshot().config;
diff --git a/src/lib/workQueue.ts b/src/lib/workQueue.ts
index 27baa53..7bfa56f 100644
--- a/src/lib/workQueue.ts
+++ b/src/lib/workQueue.ts
@@ -10,7 +10,7 @@ import { completeImageDraft, createTemplateImageDraft, imageFamilyRoot, imageGen
import type { ImageGenerationSnapshot, ProjectAsset } from "./project";
import { outputDimensions } from "./export";
import { projectItemPath, referenceDefinition, referenceImages, referenceRefmodInputs } from "./project";
-import { generationSigmaShiftsWithLoras, engineProviderSetting, type GeneratorTemplate } from "./settings";
+import { generationSigmaShiftsWithLoras, engineProviderSetting, generatorModel, templateSupportsImages, templateSupportsVideo, type GeneratorTemplate } from "./settings";
import { describeDiagnosticError, writeDiagnostic } from "./diagnostics";
import { GenerationTimingEstimator, type CompletedGenerationTiming, type GenerationTimingProgress } from "./generationTiming";
import { releaseRendered, saveGeneratedScene } from "./generatedVideo";
@@ -210,6 +210,7 @@ export class WorkQueue {
};
enqueue(session: ProjectSession, submissions: GenerationSubmission[], template?: GeneratorTemplate): string[] {
+ if (template && !templateSupportsVideo(template)) throw new Error("Choose a generator that supports video generation.");
const projectKey = projectQueueKey(session.record);
// Take every setting before the first await, including the selected engine
// template. Planning and native submission consume this same private copy.
@@ -266,18 +267,19 @@ export class WorkQueue {
}
enqueueImage(session: ProjectSession, template: GeneratorTemplate) {
- if (!isTauri()) throw new Error("Image generation requires the desktop app and MiniMax H3 weights.");
- if (template.mode === "animate") throw new Error("Choose a MiniMax H3 prompt template for images.");
+ if (!isTauri()) throw new Error("Image generation requires the desktop app and downloaded model weights.");
+ if (!templateSupportsImages(template)) throw new Error("Choose a prompt generator for images.");
session.update((config) => saveImageDraft(config, template.id, true));
const current = session.getSnapshot().config;
const scene = current.imageScene ?? createImageScene(current.brief.prompt);
+ if (!generatorModel(template.modelType).imageEditing && scene.rootType === "image") throw new Error(`${generatorModel(template.modelType).label} does not support image editing. Choose an editing generator.`);
const edit = scene.rootType === "image" ? compileImageEdits(current) : null;
if (!imageScenePrompt(scene)) throw new Error("Describe the image or add an object before generating.");
const projectKey = projectQueueKey(session.record);
if (this.items.some((item) => item.projectKey === projectKey && item.kind === "image" && item.imageAssetId === scene.outputAssetId && isWorkActive(item))) return;
const config = structuredClone({ ...current, providerSettings: { ...current.providerSettings,
slopfab: engineProviderSetting(template.paths, current.providerSettings.slopfab, template.attention, template.loras, "prompt", template.additionalSafetensors, false, template.sources, template) } });
- const { prompt, references } = edit ? edit.edits[0] : compileImagePrompt(current);
+ const { prompt, references } = edit ? edit.edits[0] : compileImagePrompt(current, { modelType: template.modelType });
const referencePaths = (selected: typeof references) => [
...(edit ? [projectItemPath(session.record.folderPath, edit.source)!] : []),
...selected.flatMap((reference) => referenceImages(reference).map((image) => projectItemPath(session.record.folderPath, image)!)),
@@ -306,6 +308,7 @@ export class WorkQueue {
}
enqueueExtendImage(session: ProjectSession, template: GeneratorTemplate, sourceId: string, options: ExtendOptions) {
if (!isTauri()) throw new Error("Zoom requires the desktop app.");
+ if (!generatorModel(template.modelType).imageEditing) throw new Error("Choose a generator that supports image editing for Zoom.");
if (template.mode === "animate") throw new Error("Choose a prompt generator for Zoom.");
const current = session.getSnapshot().config;
const source = current.assets.find((asset) => asset.id === sourceId && asset.kind === "image" && !asset.imageDraft);
@@ -346,6 +349,7 @@ export class WorkQueue {
}
enqueueCharacterSheet(session: ProjectSession, template: GeneratorTemplate, sourceId: string, options?: CharacterSheetOptions) {
if (!isTauri()) throw new Error("Character sheet generation requires the desktop app.");
+ if (!generatorModel(template.modelType).imageReferences) throw new Error("Choose a generator that supports image references for character sheets.");
if (template.mode === "animate") throw new Error("Choose a prompt generator for the character sheet.");
const current = session.getSnapshot().config;
const source = current.assets.find((asset) => asset.id === sourceId && asset.kind === "image");