Namespace vendored H3 nodes under Dumas
This commit is contained in:
@@ -9,11 +9,19 @@ upstream packs used by the MiniMax H3 workflow:
|
|||||||
- `vendor/dumas_minimax_h3_refmod/`
|
- `vendor/dumas_minimax_h3_refmod/`
|
||||||
- `vendor/dumas_h3_refmod_picker/`
|
- `vendor/dumas_h3_refmod_picker/`
|
||||||
|
|
||||||
Their registrations and browser extensions are loaded by DUMAS, and their
|
Their registrations and browser extensions are loaded by DUMAS. Every vendored
|
||||||
display names are prefixed with `DUMAS`. The upstream node IDs are retained so
|
node is registered with a stable DUMAS-prefixed ID and under a DUMAS category:
|
||||||
the full upstream UI and saved workflows remain compatible. Do not install the
|
|
||||||
three original packs at the same time as this vendored copy, or ComfyUI will
|
- `DumasH3Continuum_*` → `Dumas/MiniMax H3/Continuum`
|
||||||
load duplicate node IDs and duplicate server routes.
|
- `DumasMiniMaxH3RefMod_*` → `Dumas/MiniMax H3/RefMod`
|
||||||
|
- `DumasH3RefModPicker_*` → `Dumas/MiniMax H3/RefMod Picker`
|
||||||
|
|
||||||
|
This prevents the vendored nodes from replacing or colliding with an upstream
|
||||||
|
node of the same name. Existing workflows that use the upstream IDs are not
|
||||||
|
silently rewritten; they must continue to use the upstream pack or be
|
||||||
|
reconnected to the DUMAS nodes. The original packs should still not be loaded
|
||||||
|
alongside this copy because their server routes can overlap even though the
|
||||||
|
node IDs are now isolated.
|
||||||
|
|
||||||
The upstream source is imported as git subtrees, making future reviews and
|
The upstream source is imported as git subtrees, making future reviews and
|
||||||
selective updates possible without losing provenance. DUMAS-specific changes
|
selective updates possible without losing provenance. DUMAS-specific changes
|
||||||
|
|||||||
+74
-9
@@ -10,12 +10,15 @@ from __future__ import annotations
|
|||||||
|
|
||||||
import importlib
|
import importlib
|
||||||
import logging
|
import logging
|
||||||
|
import copy
|
||||||
|
import dataclasses
|
||||||
|
import types
|
||||||
|
|
||||||
|
|
||||||
_PACKAGES = (
|
_PACKAGES = (
|
||||||
(".vendor.dumas_h3_continuum", "H3 Continuum"),
|
(".vendor.dumas_h3_continuum", "H3 Continuum", "DumasH3Continuum", "Dumas/MiniMax H3/Continuum"),
|
||||||
(".vendor.dumas_minimax_h3_refmod", "MiniMax H3 RefMod"),
|
(".vendor.dumas_minimax_h3_refmod", "MiniMax H3 RefMod", "DumasMiniMaxH3RefMod", "Dumas/MiniMax H3/RefMod"),
|
||||||
(".vendor.dumas_h3_refmod_picker", "H3 RefMod Picker"),
|
(".vendor.dumas_h3_refmod_picker", "H3 RefMod Picker", "DumasH3RefModPicker", "Dumas/MiniMax H3/RefMod Picker"),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@@ -29,10 +32,68 @@ def _load_pack(package_name):
|
|||||||
return None
|
return None
|
||||||
|
|
||||||
|
|
||||||
|
def _patch_schema(schema, *, node_id, category, display_name):
|
||||||
|
"""Return an upstream schema with DUMAS identity and category.
|
||||||
|
|
||||||
|
Comfy's modern schema objects have changed from mutable dataclasses to
|
||||||
|
immutable value objects across API revisions. Support both forms so the
|
||||||
|
vendored nodes remain usable on the same Comfy versions as their source
|
||||||
|
packs.
|
||||||
|
"""
|
||||||
|
changes = {"node_id": node_id, "category": category, "display_name": display_name}
|
||||||
|
if dataclasses.is_dataclass(schema):
|
||||||
|
try:
|
||||||
|
return dataclasses.replace(schema, **changes)
|
||||||
|
except (TypeError, ValueError):
|
||||||
|
pass
|
||||||
|
patched = copy.copy(schema)
|
||||||
|
for name, value in changes.items():
|
||||||
|
try:
|
||||||
|
setattr(patched, name, value)
|
||||||
|
except (AttributeError, TypeError):
|
||||||
|
try:
|
||||||
|
object.__setattr__(patched, name, value)
|
||||||
|
except (AttributeError, TypeError):
|
||||||
|
raise TypeError(
|
||||||
|
f"Cannot namespace Comfy schema {type(schema).__name__}.{name}"
|
||||||
|
) from None
|
||||||
|
return patched
|
||||||
|
|
||||||
|
|
||||||
|
def _namespace_class(node_class, *, node_id, category, display_name):
|
||||||
|
"""Wrap an upstream class without changing its execution implementation."""
|
||||||
|
define_schema = getattr(node_class, "define_schema", None)
|
||||||
|
if define_schema is None:
|
||||||
|
namespaced = types.new_class(node_class.__name__, (node_class,))
|
||||||
|
namespaced.CATEGORY = category
|
||||||
|
namespaced.NODE_CATEGORY = category
|
||||||
|
else:
|
||||||
|
def _define_schema(cls):
|
||||||
|
schema = node_class.define_schema()
|
||||||
|
return _patch_schema(
|
||||||
|
schema,
|
||||||
|
node_id=node_id,
|
||||||
|
category=category,
|
||||||
|
display_name=display_name,
|
||||||
|
)
|
||||||
|
|
||||||
|
namespaced = types.new_class(node_class.__name__, (node_class,))
|
||||||
|
namespaced.define_schema = classmethod(_define_schema)
|
||||||
|
# Older Comfy builds still inspect these class attributes while
|
||||||
|
# constructing the node search index.
|
||||||
|
namespaced.CATEGORY = category
|
||||||
|
namespaced.NODE_CATEGORY = category
|
||||||
|
namespaced.__module__ = __name__
|
||||||
|
namespaced.__qualname__ = node_class.__qualname__
|
||||||
|
namespaced.__name__ = node_class.__name__
|
||||||
|
namespaced.__dumas_upstream_id__ = node_id
|
||||||
|
return namespaced
|
||||||
|
|
||||||
|
|
||||||
def _namespaced_mappings():
|
def _namespaced_mappings():
|
||||||
mappings = {}
|
mappings = {}
|
||||||
display = {}
|
display = {}
|
||||||
for relative_name, label in _PACKAGES:
|
for relative_name, label, prefix, category in _PACKAGES:
|
||||||
package_name = (f"{__package__}{relative_name}" if __package__
|
package_name = (f"{__package__}{relative_name}" if __package__
|
||||||
else relative_name.lstrip("."))
|
else relative_name.lstrip("."))
|
||||||
pack = _load_pack(package_name)
|
pack = _load_pack(package_name)
|
||||||
@@ -41,12 +102,16 @@ def _namespaced_mappings():
|
|||||||
source_mappings = getattr(pack, "NODE_CLASS_MAPPINGS", {}) or {}
|
source_mappings = getattr(pack, "NODE_CLASS_MAPPINGS", {}) or {}
|
||||||
source_display = getattr(pack, "NODE_DISPLAY_NAME_MAPPINGS", {}) or {}
|
source_display = getattr(pack, "NODE_DISPLAY_NAME_MAPPINGS", {}) or {}
|
||||||
for node_id, node_class in source_mappings.items():
|
for node_id, node_class in source_mappings.items():
|
||||||
# Keep upstream IDs so the complete upstream web UI and saved
|
dumas_id = f"{prefix}_{node_id}"
|
||||||
# workflows remain functional. The original packs must not also be
|
|
||||||
# installed, otherwise ComfyUI will see duplicate node IDs.
|
|
||||||
mappings[node_id] = node_class
|
|
||||||
original_name = source_display.get(node_id, node_id)
|
original_name = source_display.get(node_id, node_id)
|
||||||
display[node_id] = f"DUMAS {label} · {original_name}"
|
dumas_name = f"DUMAS {label} · {original_name}"
|
||||||
|
mappings[dumas_id] = _namespace_class(
|
||||||
|
node_class,
|
||||||
|
node_id=dumas_id,
|
||||||
|
category=category,
|
||||||
|
display_name=dumas_name,
|
||||||
|
)
|
||||||
|
display[dumas_id] = dumas_name
|
||||||
return mappings, display
|
return mappings, display
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
import { app } from "../../scripts/app.js";
|
import { app } from "../../scripts/app.js";
|
||||||
|
|
||||||
const NODE_CLASS = "H3DecodeCacheHelper";
|
const NODE_CLASS = "DumasH3Continuum_H3DecodeCacheHelper";
|
||||||
const MAX_TOKEN = 2147483647;
|
const MAX_TOKEN = 2147483647;
|
||||||
|
|
||||||
function isJapanese() {
|
function isJapanese() {
|
||||||
|
|||||||
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
import { app } from "../../scripts/app.js";
|
import { app } from "../../scripts/app.js";
|
||||||
import { configureEasyBypassToggleNode } from "./easy_bypass_toggle.js";
|
import { configureEasyBypassToggleNode } from "./easy_bypass_toggle.js";
|
||||||
|
|
||||||
const EASY_LOAD_AUDIO_CLASS = "H3EasyLoadAudio";
|
const EASY_LOAD_AUDIO_CLASS = "DumasH3Continuum_H3EasyLoadAudio";
|
||||||
|
|
||||||
function configureEasyLoadAudioNode(node) {
|
function configureEasyLoadAudioNode(node) {
|
||||||
if (
|
if (
|
||||||
|
|||||||
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
import { app } from "../../scripts/app.js";
|
import { app } from "../../scripts/app.js";
|
||||||
import { configureEasyBypassToggleNode } from "./easy_bypass_toggle.js";
|
import { configureEasyBypassToggleNode } from "./easy_bypass_toggle.js";
|
||||||
|
|
||||||
const EASY_LOAD_IMAGE_CLASS = "H3EasyLoadImage";
|
const EASY_LOAD_IMAGE_CLASS = "DumasH3Continuum_H3EasyLoadImage";
|
||||||
|
|
||||||
function configureEasyLoadImageNode(node) {
|
function configureEasyLoadImageNode(node) {
|
||||||
configureEasyBypassToggleNode(node, {
|
configureEasyBypassToggleNode(node, {
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
import { app } from "../../scripts/app.js";
|
import { app } from "../../scripts/app.js";
|
||||||
|
|
||||||
const EASY_NODE_CLASS = "H3ContinuumEasyV38";
|
const EASY_NODE_CLASS = "DumasH3Continuum_H3ContinuumEasyV38";
|
||||||
const CUSTOM_PRESET = "Custom";
|
const CUSTOM_PRESET = "Custom";
|
||||||
const STORAGE_ENABLED = "Save + Auto Resume";
|
const STORAGE_ENABLED = "Save + Auto Resume";
|
||||||
|
|
||||||
|
|||||||
+13
-13
@@ -4,20 +4,20 @@ import { normalizeReferenceAudioLabels } from "./reference_audio_ui.js";
|
|||||||
import { configureV39ReferenceImages, connectedV39LegacyReferenceInputs, pruneV39LegacyReferenceInputs, refreshV39ReferenceImagesForSampler } from "./reference_images_v39.js";
|
import { configureV39ReferenceImages, connectedV39LegacyReferenceInputs, pruneV39LegacyReferenceInputs, refreshV39ReferenceImagesForSampler } from "./reference_images_v39.js";
|
||||||
import { migrateReferenceImageInputs } from "./reference_image_ui.js";
|
import { migrateReferenceImageInputs } from "./reference_image_ui.js";
|
||||||
|
|
||||||
const PRODUCTION_NODE_CLASS = "H3ContinuumSamplerProduction";
|
const PRODUCTION_NODE_CLASS = "DumasH3Continuum_H3ContinuumSamplerProduction";
|
||||||
const TIMELINE_NODE_CLASS = "H3ContinuumSamplerTimelineVideo";
|
const TIMELINE_NODE_CLASS = "DumasH3Continuum_H3ContinuumSamplerTimelineVideo";
|
||||||
const ASSEMBLE_SEAM_NODE_CLASS = "H3ContinuumAssembleSeamExperimental";
|
const ASSEMBLE_SEAM_NODE_CLASS = "DumasH3Continuum_H3ContinuumAssembleSeamExperimental";
|
||||||
const V34_NODE_CLASS = "H3ContinuumSamplerV34";
|
const V34_NODE_CLASS = "DumasH3Continuum_H3ContinuumSamplerV34";
|
||||||
const V34_ASSEMBLE_SEAM_NODE_CLASS = "H3ContinuumAssembleSeamV34";
|
const V34_ASSEMBLE_SEAM_NODE_CLASS = "DumasH3Continuum_H3ContinuumAssembleSeamV34";
|
||||||
const V35_NODE_CLASS = "H3ContinuumSamplerV35";
|
const V35_NODE_CLASS = "DumasH3Continuum_H3ContinuumSamplerV35";
|
||||||
const V36_NODE_CLASS = "H3ContinuumSamplerV36";
|
const V36_NODE_CLASS = "DumasH3Continuum_H3ContinuumSamplerV36";
|
||||||
const V37_NODE_CLASS = "H3ContinuumSamplerV37";
|
const V37_NODE_CLASS = "DumasH3Continuum_H3ContinuumSamplerV37";
|
||||||
const V38_NODE_CLASS = "H3ContinuumSamplerV38";
|
const V38_NODE_CLASS = "DumasH3Continuum_H3ContinuumSamplerV38";
|
||||||
const V39_NODE_CLASS = "H3ContinuumSamplerV39";
|
const V39_NODE_CLASS = "DumasH3Continuum_H3ContinuumSamplerV39";
|
||||||
const isModernSamplerClass = (name) => name === V38_NODE_CLASS || name === V39_NODE_CLASS;
|
const isModernSamplerClass = (name) => name === V38_NODE_CLASS || name === V39_NODE_CLASS;
|
||||||
const V39_PLAN_WIDGET = "Reference Plan Inspector";
|
const V39_PLAN_WIDGET = "Reference Plan Inspector";
|
||||||
const V39_UNVERIFIED_PLAN = "Configured only — Queue has not verified the effective Reference Plan.";
|
const V39_UNVERIFIED_PLAN = "Configured only — Queue has not verified the effective Reference Plan.";
|
||||||
const V35_ASSEMBLE_SEAM_NODE_CLASS = "H3ContinuumAssembleSeamV35";
|
const V35_ASSEMBLE_SEAM_NODE_CLASS = "DumasH3Continuum_H3ContinuumAssembleSeamV35";
|
||||||
const PROJECT_WIDGET = "project_id";
|
const PROJECT_WIDGET = "project_id";
|
||||||
const LEGACY_RUN_NAME_WIDGET = "run_name";
|
const LEGACY_RUN_NAME_WIDGET = "run_name";
|
||||||
const CHUNKS_WIDGET = "chunks";
|
const CHUNKS_WIDGET = "chunks";
|
||||||
@@ -365,7 +365,7 @@ function activeLinkedInput(node, names) {
|
|||||||
const source = app.graph?.getNodeById?.(link.origin_id);
|
const source = app.graph?.getNodeById?.(link.origin_id);
|
||||||
if (!source) return true;
|
if (!source) return true;
|
||||||
if ([2, 4].includes(Number(source.mode))) return false;
|
if ([2, 4].includes(Number(source.mode))) return false;
|
||||||
if (source.comfyClass === "H3ContinuumReferenceImages") {
|
if (source.comfyClass === "DumasH3Continuum_H3ContinuumReferenceImages") {
|
||||||
return activeLinkedInput(source, source.inputs.filter(
|
return activeLinkedInput(source, source.inputs.filter(
|
||||||
(item) => /^reference_image_[4-9]$/.test(item.name),
|
(item) => /^reference_image_[4-9]$/.test(item.name),
|
||||||
).map((item) => item.name));
|
).map((item) => item.name));
|
||||||
@@ -3332,7 +3332,7 @@ function configureNode(node) {
|
|||||||
if (node.comfyClass === V39_NODE_CLASS) pruneV39LegacyReferenceInputs(node);
|
if (node.comfyClass === V39_NODE_CLASS) pruneV39LegacyReferenceInputs(node);
|
||||||
if (!isProduction && !isTimeline && !isV34 && !isV35 && !isV36 && !isV37 && !isV38) {
|
if (!isProduction && !isTimeline && !isV34 && !isV35 && !isV36 && !isV37 && !isV38) {
|
||||||
configureV39ReferenceImages(node);
|
configureV39ReferenceImages(node);
|
||||||
if (node.comfyClass === "H3ContinuumReferenceAudios") {
|
if (node.comfyClass === "DumasH3Continuum_H3ContinuumReferenceAudios") {
|
||||||
normalizeReferenceAudioLabels(node);
|
normalizeReferenceAudioLabels(node);
|
||||||
}
|
}
|
||||||
configureAssembler(node);
|
configureAssembler(node);
|
||||||
|
|||||||
+2
-2
@@ -11,14 +11,14 @@ export function normalizeReferenceAudioLabels(node) {
|
|||||||
if (!node) {
|
if (!node) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (node.comfyClass === "H3ContinuumReferenceAudios") {
|
if (node.comfyClass === "DumasH3Continuum_H3ContinuumReferenceAudios") {
|
||||||
const output = node.outputs?.find((item) => item.name === "audio_references");
|
const output = node.outputs?.find((item) => item.name === "audio_references");
|
||||||
if (output) output.label = "Reference Audios";
|
if (output) output.label = "Reference Audios";
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
for (const input of node.inputs || []) {
|
for (const input of node.inputs || []) {
|
||||||
const label = input.name === "reference_video_1"
|
const label = input.name === "reference_video_1"
|
||||||
&& node.comfyClass === "H3ContinuumSamplerV38"
|
&& node.comfyClass === "DumasH3Continuum_H3ContinuumSamplerV38"
|
||||||
? "Timeline Video Frames"
|
? "Timeline Video Frames"
|
||||||
: NORMALIZED_INPUT_LABELS[input.name];
|
: NORMALIZED_INPUT_LABELS[input.name];
|
||||||
if (label) {
|
if (label) {
|
||||||
|
|||||||
+2
-2
@@ -1,11 +1,11 @@
|
|||||||
import { app } from "../../scripts/app.js";
|
import { app } from "../../scripts/app.js";
|
||||||
|
|
||||||
const BUNDLE_NODE = "H3ContinuumReferenceImages";
|
const BUNDLE_NODE = "DumasH3Continuum_H3ContinuumReferenceImages";
|
||||||
const BUNDLE_INPUT = "image_references";
|
const BUNDLE_INPUT = "image_references";
|
||||||
const BUNDLE_TYPE = "H3_CONTINUUM_IMAGE_REFERENCES";
|
const BUNDLE_TYPE = "H3_CONTINUUM_IMAGE_REFERENCES";
|
||||||
|
|
||||||
export function migrateReferenceImageInputs(node) {
|
export function migrateReferenceImageInputs(node) {
|
||||||
if (node.comfyClass !== "H3ContinuumSamplerV38") return;
|
if (node.comfyClass !== "DumasH3Continuum_H3ContinuumSamplerV38") return;
|
||||||
const graph = node.graph || app.graph;
|
const graph = node.graph || app.graph;
|
||||||
const legacy = (node.inputs || []).filter(
|
const legacy = (node.inputs || []).filter(
|
||||||
(input) => ["reference_image_4", "reference_image_5"].includes(input.name),
|
(input) => ["reference_image_4", "reference_image_5"].includes(input.name),
|
||||||
|
|||||||
+2
-2
@@ -1,5 +1,5 @@
|
|||||||
const CLASS = "H3ContinuumReferenceImagesV39";
|
const CLASS = "DumasH3Continuum_H3ContinuumReferenceImagesV39";
|
||||||
const SAMPLER = "H3ContinuumSamplerV39";
|
const SAMPLER = "DumasH3Continuum_H3ContinuumSamplerV39";
|
||||||
const MAX = 16;
|
const MAX = 16;
|
||||||
const LEGACY_SAMPLER_INPUTS = new Set([
|
const LEGACY_SAMPLER_INPUTS = new Set([
|
||||||
...Array.from({ length: 5 }, (_, index) => `reference_image_${index + 1}`),
|
...Array.from({ length: 5 }, (_, index) => `reference_image_${index + 1}`),
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
import { app } from "../../scripts/app.js";
|
import { app } from "../../scripts/app.js";
|
||||||
|
|
||||||
const NODE_CLASS = "H3ContinuumSamplerV38";
|
const NODE_CLASS = "DumasH3Continuum_H3ContinuumSamplerV38";
|
||||||
const MODE = "video_reference_mode";
|
const MODE = "video_reference_mode";
|
||||||
const REPEAT = "Repeat Reference";
|
const REPEAT = "Repeat Reference";
|
||||||
const FOLLOW = "Follow Timeline";
|
const FOLLOW = "Follow Timeline";
|
||||||
|
|||||||
+3
-3
@@ -1,7 +1,7 @@
|
|||||||
import { app } from "../../scripts/app.js";
|
import { app } from "../../scripts/app.js";
|
||||||
|
|
||||||
const TARGET_NODES = new Set([
|
const TARGET_NODES = new Set([
|
||||||
"H3RefModCreateFromFolder",
|
"DumasH3RefModPicker_H3RefModCreateFromFolder",
|
||||||
]);
|
]);
|
||||||
|
|
||||||
const MIN_NODE_WIDTH = 320;
|
const MIN_NODE_WIDTH = 320;
|
||||||
@@ -98,7 +98,7 @@ const COMMON_PRESET_FIELDS = [
|
|||||||
];
|
];
|
||||||
|
|
||||||
const PRESET_CONFIG = {
|
const PRESET_CONFIG = {
|
||||||
H3RefModCreateFromFolder: {
|
DumasH3RefModPicker_H3RefModCreateFromFolder: {
|
||||||
manual: {
|
manual: {
|
||||||
values: {
|
values: {
|
||||||
concept_type: "identity",
|
concept_type: "identity",
|
||||||
@@ -283,7 +283,7 @@ function syncPresetValues(node) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function applyFolderNamingVisibility(node) {
|
function applyFolderNamingVisibility(node) {
|
||||||
if (String(node.comfyClass || "") !== "H3RefModCreateFromFolder") return;
|
if (String(node.comfyClass || "") !== "DumasH3RefModPicker_H3RefModCreateFromFolder") return;
|
||||||
const useSubfoldersWidget = findWidget(node, "use_subfolders");
|
const useSubfoldersWidget = findWidget(node, "use_subfolders");
|
||||||
const useFolderAsNameWidget = findWidget(node, "use_folder_as_name");
|
const useFolderAsNameWidget = findWidget(node, "use_folder_as_name");
|
||||||
const nameWidget = findWidget(node, "name");
|
const nameWidget = findWidget(node, "name");
|
||||||
|
|||||||
+2
-2
@@ -65,7 +65,7 @@ async function refreshLoaderVisibility(node) {
|
|||||||
const data = await fetchLoaderCapabilities(mod);
|
const data = await fetchLoaderCapabilities(mod);
|
||||||
applyModalityVisibility(node, data.ok ? data : { has_visual: true, has_audio: true });
|
applyModalityVisibility(node, data.ok ? data : { has_visual: true, has_audio: true });
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.warn("[H3RefModLoader] Could not refresh capabilities:", error);
|
console.warn("[DumasH3RefModPicker_H3RefModLoader] Could not refresh capabilities:", error);
|
||||||
applyModalityVisibility(node, { has_visual: true, has_audio: true });
|
applyModalityVisibility(node, { has_visual: true, has_audio: true });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -74,7 +74,7 @@ app.registerExtension({
|
|||||||
name: "H3RefModPicker.RefModLoader",
|
name: "H3RefModPicker.RefModLoader",
|
||||||
|
|
||||||
async beforeRegisterNodeDef(nodeType, nodeData) {
|
async beforeRegisterNodeDef(nodeType, nodeData) {
|
||||||
if (nodeData?.name !== "H3RefModLoader") return;
|
if (nodeData?.name !== "DumasH3RefModPicker_H3RefModLoader") return;
|
||||||
|
|
||||||
const onNodeCreated = nodeType.prototype.onNodeCreated;
|
const onNodeCreated = nodeType.prototype.onNodeCreated;
|
||||||
nodeType.prototype.onNodeCreated = function () {
|
nodeType.prototype.onNodeCreated = function () {
|
||||||
|
|||||||
@@ -622,7 +622,7 @@ app.registerExtension({
|
|||||||
name: "H3RefModPicker.VisualRefModPicker",
|
name: "H3RefModPicker.VisualRefModPicker",
|
||||||
|
|
||||||
async beforeRegisterNodeDef(nodeType, nodeData) {
|
async beforeRegisterNodeDef(nodeType, nodeData) {
|
||||||
if (nodeData?.name !== "H3RefModVisualPicker") return;
|
if (nodeData?.name !== "DumasH3RefModPicker_H3RefModVisualPicker") return;
|
||||||
|
|
||||||
const onNodeCreated = nodeType.prototype.onNodeCreated;
|
const onNodeCreated = nodeType.prototype.onNodeCreated;
|
||||||
nodeType.prototype.onNodeCreated = function () {
|
nodeType.prototype.onNodeCreated = function () {
|
||||||
|
|||||||
+1
-1
@@ -29,6 +29,6 @@ export function installRefModApply(nodeType) {
|
|||||||
app.registerExtension({
|
app.registerExtension({
|
||||||
name: "MiniMaxH3.ApplyCanvasCompatibility",
|
name: "MiniMaxH3.ApplyCanvasCompatibility",
|
||||||
beforeRegisterNodeDef(nodeType, nodeData) {
|
beforeRegisterNodeDef(nodeType, nodeData) {
|
||||||
if (nodeData.name === "MiniMaxH3RefModApply") installRefModApply(nodeType);
|
if (nodeData.name === "DumasMiniMaxH3RefMod_MiniMaxH3RefModApply") installRefModApply(nodeType);
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ function updateLabels(node) {
|
|||||||
app.registerExtension({
|
app.registerExtension({
|
||||||
name: "MiniMaxH3.CreationLabels",
|
name: "MiniMaxH3.CreationLabels",
|
||||||
beforeRegisterNodeDef(nodeType, nodeData) {
|
beforeRegisterNodeDef(nodeType, nodeData) {
|
||||||
if (!["MiniMaxH3RefModExtract", "MiniMaxH3RefModMasterExtract"].includes(nodeData.name)) return;
|
if (!["DumasMiniMaxH3RefMod_MiniMaxH3RefModExtract", "DumasMiniMaxH3RefMod_MiniMaxH3RefModMasterExtract"].includes(nodeData.name)) return;
|
||||||
for (const hook of ["onNodeCreated", "onConfigure"]) {
|
for (const hook of ["onNodeCreated", "onConfigure"]) {
|
||||||
const previous = nodeType.prototype[hook];
|
const previous = nodeType.prototype[hook];
|
||||||
nodeType.prototype[hook] = function(...args) {
|
nodeType.prototype[hook] = function(...args) {
|
||||||
|
|||||||
+1
-1
@@ -17,7 +17,7 @@ export function updateRefModChoices(node, entries) {
|
|||||||
app.registerExtension({
|
app.registerExtension({
|
||||||
name: "MiniMaxH3.RefModLibrary",
|
name: "MiniMaxH3.RefModLibrary",
|
||||||
beforeRegisterNodeDef(nodeType, nodeData) {
|
beforeRegisterNodeDef(nodeType, nodeData) {
|
||||||
if (!["MiniMaxH3RefModsLoader", "MiniMaxH3RefModsAxis"].includes(nodeData.name)) return;
|
if (!["DumasMiniMaxH3RefMod_MiniMaxH3RefModsLoader", "DumasMiniMaxH3RefMod_MiniMaxH3RefModsAxis"].includes(nodeData.name)) return;
|
||||||
const removed = nodeType.prototype.onRemoved;
|
const removed = nodeType.prototype.onRemoved;
|
||||||
nodeType.prototype.onRemoved = function(...args) {
|
nodeType.prototype.onRemoved = function(...args) {
|
||||||
this._refmodRefresh?.abort();
|
this._refmodRefresh?.abort();
|
||||||
|
|||||||
+1
-1
@@ -151,7 +151,7 @@ function setupSlots(node) {
|
|||||||
app.registerExtension({
|
app.registerExtension({
|
||||||
name: "MiniMaxH3.AdditiveSlots",
|
name: "MiniMaxH3.AdditiveSlots",
|
||||||
beforeRegisterNodeDef(nodeType, nodeData) {
|
beforeRegisterNodeDef(nodeType, nodeData) {
|
||||||
if (["MiniMaxH3RefModsLoader", "MiniMaxH3RefModsAxis"].includes(nodeData.name)) {
|
if (["DumasMiniMaxH3RefMod_MiniMaxH3RefModsLoader", "DumasMiniMaxH3RefMod_MiniMaxH3RefModsAxis"].includes(nodeData.name)) {
|
||||||
installRefModSlots(nodeType);
|
installRefModSlots(nodeType);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -0,0 +1,62 @@
|
|||||||
|
import dataclasses
|
||||||
|
import unittest
|
||||||
|
|
||||||
|
import dumas_vendored_nodes as vendored
|
||||||
|
|
||||||
|
|
||||||
|
@dataclasses.dataclass(frozen=True)
|
||||||
|
class _Schema:
|
||||||
|
node_id: str
|
||||||
|
category: str
|
||||||
|
display_name: str
|
||||||
|
|
||||||
|
|
||||||
|
class _LegacyNode:
|
||||||
|
CATEGORY = "Upstream"
|
||||||
|
|
||||||
|
|
||||||
|
class _ModernNode:
|
||||||
|
@classmethod
|
||||||
|
def define_schema(cls):
|
||||||
|
return _Schema("UpstreamModern", "Upstream", "Modern")
|
||||||
|
|
||||||
|
|
||||||
|
class VendoredNamespaceTests(unittest.TestCase):
|
||||||
|
def test_legacy_and_modern_nodes_get_distinct_dumas_identity(self):
|
||||||
|
original_packages = vendored._PACKAGES
|
||||||
|
original_loader = vendored._load_pack
|
||||||
|
try:
|
||||||
|
vendored._PACKAGES = (
|
||||||
|
(".one", "One", "DumasOne", "Dumas/Test"),
|
||||||
|
)
|
||||||
|
vendored._load_pack = lambda _name: type(
|
||||||
|
"Pack",
|
||||||
|
(),
|
||||||
|
{
|
||||||
|
"NODE_CLASS_MAPPINGS": {
|
||||||
|
"UpstreamLegacy": _LegacyNode,
|
||||||
|
"UpstreamModern": _ModernNode,
|
||||||
|
},
|
||||||
|
"NODE_DISPLAY_NAME_MAPPINGS": {},
|
||||||
|
},
|
||||||
|
)
|
||||||
|
|
||||||
|
mappings, display = vendored._namespaced_mappings()
|
||||||
|
|
||||||
|
self.assertEqual(
|
||||||
|
set(mappings), {"DumasOne_UpstreamLegacy", "DumasOne_UpstreamModern"}
|
||||||
|
)
|
||||||
|
self.assertNotIn("UpstreamLegacy", mappings)
|
||||||
|
self.assertEqual(mappings["DumasOne_UpstreamLegacy"].CATEGORY, "Dumas/Test")
|
||||||
|
self.assertEqual(
|
||||||
|
mappings["DumasOne_UpstreamModern"].define_schema(),
|
||||||
|
_Schema("DumasOne_UpstreamModern", "Dumas/Test", "DUMAS One · UpstreamModern"),
|
||||||
|
)
|
||||||
|
self.assertTrue(all(name.startswith("DUMAS ") for name in display.values()))
|
||||||
|
finally:
|
||||||
|
vendored._PACKAGES = original_packages
|
||||||
|
vendored._load_pack = original_loader
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
unittest.main()
|
||||||
Reference in New Issue
Block a user