From f8eb40d8b44e54386bcf3c5197c48f0f71daf6df Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 21 Sep 2026 03:45:54 +0000 Subject: [PATCH] fix: preserve loader state and migrate audio/video workflow inputs Refs #23. Keep Image Enable, delegate Core mode accessors, and remove widget-array mutation. Use Core Audio and Core Video with an Enable-free FPS adapter. Legacy loader IDs remain compatible. Focused CPU tests pass; Windows/browser acceptance remains pending. --- .comfyignore | 3 + AGENTS.md | 6 + CHANGELOG.md | 8 + MANIFEST.sha256 | 42 +++-- PROJECT_STATE.md | 7 + README.md | 20 ++- README_JA.md | 11 ++ REGISTRY_MANIFEST.sha256 | 28 +-- WORKLOG.md | 14 ++ docs/LOADER_PERSISTENCE_REPAIR.md | 21 +++ ...3_Continuum_V38X2+Decode_Cache_Helper.json | 96 +++++++--- ...H3_Continuum_V38X2+Decode_Cache_Helper.zip | Bin 7191 -> 7423 bytes .../workflows/MiniMax_H3_Continuum_V38X2.json | 96 +++++++--- .../workflows/MiniMax_H3_Continuum_V38X2.zip | Bin 7151 -> 7383 bytes nodes.py | 5 + tests/test_easy_load_audio.py | 4 +- tests/test_easy_load_image.py | 49 +---- tests/test_easy_load_video.py | 8 +- tests/test_loader_store_roundtrip.py | 116 ++++++++++++ tests/test_v38_public_surface_cleanup.py | 3 +- tests/test_v38_public_workflow.py | 34 +++- tests/test_video_adapter.py | 49 +++++ v3/easy_audio_nodes.py | 1 + v3/easy_video_nodes.py | 2 + v3/video_adapter_nodes.py | 56 ++++++ web/easy_bypass_toggle.js | 169 ++++-------------- web/easy_load_video.js | 44 +---- 27 files changed, 576 insertions(+), 316 deletions(-) create mode 100644 docs/LOADER_PERSISTENCE_REPAIR.md create mode 100644 tests/test_loader_store_roundtrip.py create mode 100644 tests/test_video_adapter.py create mode 100644 v3/video_adapter_nodes.py diff --git a/.comfyignore b/.comfyignore index 71d3089..3c64cef 100644 --- a/.comfyignore +++ b/.comfyignore @@ -41,3 +41,6 @@ examples/workflows/* !examples/workflows/MiniMax_H3_Continuum_V38X2.zip !examples/workflows/MiniMax_H3_Continuum_V38X2+Decode_Cache_Helper.json !examples/workflows/MiniMax_H3_Continuum_V38X2+Decode_Cache_Helper.zip + +# Current loader migration instructions. +!docs/LOADER_PERSISTENCE_REPAIR.md diff --git a/AGENTS.md b/AGENTS.md index 20d8cd2..d6d29a7 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -101,3 +101,9 @@ GPU checks must cover Sage only, Sage+Sol, Sage+Spectrum, and Sage+Sol+Spectrum - Read this file before each task. Record durable project decisions, paths, commands, failure causes, and validation methods here so later work reuses them instead of restarting from zero. - GitHub authentication for this repository is already configured. Do not request a new login or token unless an actual authentication command fails. - Commit and push only when the user explicitly requests publication. + +## User-approved loader migration (2026-09-21) + +- Keep H3EasyLoadImage and Enable Image; delegate inherited mode accessors and leave Core widget collections, drawing and serialization intact. +- New official workflows use Core LoadAudio and Core LoadVideo -> H3ContinuumVideoAdapter. The adapter has no Enable/file/upload UI and reuses the existing frame-rate conversion. Preserve the original Audio/Video IDs as deprecated compatibility nodes; never infer lost filenames or saved OFF states. +- The approved export exception adds H3ContinuumVideoAdapter to the existing nine-node mapping. Do not change Main Sampler, Sampling, external wrappers, Decode Cache or Run Storage semantics for this repair. diff --git a/CHANGELOG.md b/CHANGELOG.md index 816d0ad..fecde9a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## Unreleased — Loader persistence repair (2026-09-21) + +- Repair Issue #23 by delegating inherited native mode accessors; preserve Enable Image and remove draw/save-time widget collection replacement. +- Switch the two paired official V3.8X2 workflows to Core Load Audio and Core Load Video plus an Enable-free H3 Continuum Video Adapter using the existing FPS converter. +- Keep old Audio/Video IDs as deprecated compatibility nodes. Preserve other workflow nodes, settings and output contracts; regenerate matching ZIPs and integrity hashes. +- Add store-backed loader and converter regressions. Windows/browser acceptance remains a separate pending check; no Release/tag/Registry publication. + + ## 3.8.3 — V3.8X2 release preparation (2026-09-19) - Vendor the previously standalone Decode Cache Helper implementation into Continuum as a separate `H3DecodeCacheHelper` public node. Preserve its node ID, inputs, outputs, list behavior, native Core Decode delegation, and process-local cache behavior. diff --git a/MANIFEST.sha256 b/MANIFEST.sha256 index 1c1c381..3d01052 100644 --- a/MANIFEST.sha256 +++ b/MANIFEST.sha256 @@ -1,10 +1,10 @@ dca65fb1393e67f59c6f81f9411e3e745eb8f1097e9a2adf7ffc6f4e3901ca9f __init__.py -04900f7a7a89fc3c4f75dc4020c1e16ea353da2b24a959ae628e3f49ddae4ef3 .comfyignore +a9fd5a4c5624e17148656abed0ba41a72c72cac73e7f6f36d2816ad92962f867 .comfyignore 3d681ded5d4c50cc20c2382e29fdc98d8a48e76d552c41ad5a195d941e66e612 .gitattributes 8296f0afc7be47171e439c02fb2988cfeb0df904acbe3fc4f507f426d709157e .github/workflows/tests.yml 0a2f69d4cec89d440f5d5aa1ec68a7c9a741382d313f80dcddf96d13f70b3e68 .gitignore 3e7a1ec3380be2a222c8a3e9b8a6bb184d3a760478957f48186438f15235bdba branch_provenance.py -0daa15310d98160261e3ff1fe689cc7a6db9e453891cd73e2a392da643ab576a CHANGELOG.md +d70402478f19f6487eed08957a048a8c248a9291be8e62c0e7ade69da82fd393 CHANGELOG.md c1ed3a0342730450958fb62fd21854a876991f3a4aefb24e5383b0c73cd2312d compatibility.py 4d62508f900af9f93ec320afb900c27cc9a300d1e0c0a94714258498c5ede5fc conditioning.py 294251c40b1be2e296c5e5f627b68091d087bdb39179e3a0c3cebd2ee8a344f5 constants.py @@ -94,10 +94,10 @@ b8275c8cecde12aee0418cea456d1e7f4b875cbb1bce32f1f3d9e06a44dd0be1 examples/v2_pr 0e59ea821081cb93165aa3f88c6949736dd225837fe1cdcf1173aa5cd54c6d29 examples/v2_prompt_timeline_example.txt 26bbca92b5f7cac4cbde89290b3f801b7a895df76a07493ca6f65c18d5b1154a examples/workflows/MiniMax_H3_Continuum_V38x.json df4e0e355020d2e731932cff86a4b00932b4f193ec7ed513be0db994ec0e71bb examples/workflows/MiniMax_H3_Continuum_V38x.zip -6c445d62979632bc1a801b1c28dbd639c23b51cc156ebae18837baaa757e592b examples/workflows/MiniMax_H3_Continuum_V38X2.json -29e8ea19cf7c7e8a8a5e98577905d8fd01fc800bb8edb4f4218a638fe39e69d0 examples/workflows/MiniMax_H3_Continuum_V38X2.zip -6c445d62979632bc1a801b1c28dbd639c23b51cc156ebae18837baaa757e592b examples/workflows/MiniMax_H3_Continuum_V38X2+Decode_Cache_Helper.json -f770bcc7de63851ab32f8d8fea23e5df9f7c44b8e3c0115a555b57ea82a28550 examples/workflows/MiniMax_H3_Continuum_V38X2+Decode_Cache_Helper.zip +1b2212b7511fac0b63dfa6e9f006cd8644c72d08c6945ab0e4ed0e722c97a730 examples/workflows/MiniMax_H3_Continuum_V38X2.json +8f839a955859bffa0d9cf0b15e91ee484dd911aca5ae31f1787debd56afdc7da examples/workflows/MiniMax_H3_Continuum_V38X2.zip +1b2212b7511fac0b63dfa6e9f006cd8644c72d08c6945ab0e4ed0e722c97a730 examples/workflows/MiniMax_H3_Continuum_V38X2+Decode_Cache_Helper.json +4fa8680037595f55f97715f9a2f63d28f11328a87f5c33c316cc4b0ae817e668 examples/workflows/MiniMax_H3_Continuum_V38X2+Decode_Cache_Helper.zip 7861fac4c8fe82372c5459aa574d35ea003bdb4fd846d567bd891c2e38571b3d graph_contract.py bf0556b076dbaca67c3405a7d86c333ca7fdf3d4381529b0a9edc906519943e9 guide_timeline.py 6e889c42490ccb5f376694b5944c693a84e7febedf38e631d687e96bc1e76376 H3-Continuum-LLM-System-Prompt-v1.zip @@ -112,18 +112,18 @@ d3e213005670e94dee33a240349a4d245cf9a3b6602099f11ed30cf5a32e2c21 media.py 1970342c93f0189ade437cbfc278900713f043882933789cb8c54f35cf2ec96b metadata.ini fd23c7f32810788aaaf1709c4959c40ec72303aecc6f6afa5fa68d824cca97a8 minimax-h3-continuum-dance-director.zip 2d611f7201889851eac6459f8aa2b37baf342b345241979ca6042b61b252dff9 model_patch.py -11ea3942e460d8b4ec729611371b52ec5ad202c894c5e9ec7b151b906559bfd8 nodes.py +e2b72149b0433e95c13659cc9e742fe38523e67d4f4a2fdb08aed1943fecf653 nodes.py 2b8c19f9474beabfebe1802cdf4a89780dce3c351c48d65e1ce8bb77d2fb9ba9 PACKAGE_INFO_JA.txt 4852ad216f85c22f008abe18464eab2c913bd88baa7db35764df2de9cf401d6d PACKAGE_VALIDATION.txt b470819f16fc179654dc1600721a63f0a5a14e777f4c004d574b499da6886ba5 public_api.py 15a3925218e0c5f968795d7d11e4783c3c6868917447274bc700328851b3fbfb pyproject.toml 94fdc2d545b2d4077a4d70229fd22ba3ccac21d49d1097d2873f76d04e9a3c7a pytest.ini -8f06f56597185fcb24331b038b20e921c02557da42f5ef5ba79fb7e768766974 README_JA.md -4e44ff1e28f2f408c41631eb76922bfbe31147bb6d36846a1b73e05279f5dda3 README.md +4a0507ce6183e099265d5a34a38e43da89515af8eb680f5a48abc8aecc724d63 README_JA.md +9d4eefcc97e74d4c1c8ab1be612b50eb99a8a4f8db7c2134ca85a9e67bf2568a README.md 44127adcfa30ee84bff9cd4b2d0c695355209550e76982d374122008728aa5bc reference_audio.py 5cb9bfd6810d3a93a637451980a4cc5c1436e5b84cfd1c7a111cd192e876351b reference_video.py c7b14ed6f8cfc2a1f0a21db4fe56fba75a93ffcb0be0c22bbd2e691c45cd0e2d reference.py -6f4e873fd1b25141b0d0b4bd2bbb83dca1591d753609c7f0ccbb2106828ef3bf REGISTRY_MANIFEST.sha256 +e7b767eeda996529035f2615c846349983ce18b46269b6511e5ddfa0c299eb25 REGISTRY_MANIFEST.sha256 467edb2c188d024c2392aafe7423b3f835e16b10f570da76e2f7dda8a962c1c5 requirements.txt 8bfa113a2ec11325619be300b4d2b53a157b1d2c1ef7855057a4b3bbd05aeef3 run_storage.py 6056de6c0a5322a8a51ba5a114538dca2ef67788cd1afba10fedd483b95f6afa state_io.py @@ -145,9 +145,9 @@ fe23752312d62ddc8c23a3c598ed2f92f2d46e2e4460f06aea91921659092451 tests/test_aud 041289556cc621ea1857cbb8931ae41d817f69e084b2e8a7622e184a3197b61b tests/test_compatibility.py 875ac33b5458ec5e8d845850ed495707c394436aaadb668a44f36f6a1b73764d tests/test_conditioning_modes.py 2be669b6d21ec40a8b0e172b8ab431f82681f3c97c7de0935d87ad43b0ae8b4e tests/test_context_diagnostics.py -61484ca0552e8341301a481a87e12e44279dbeed68d4b841f4301a4f87ce4a29 tests/test_easy_load_audio.py -4405c94cf190534fdabf5af3fd2ae9cc7cd1b2af6eb8b0d4ab73327cbcd455b9 tests/test_easy_load_image.py -8ba1b07a4d2cdb21aba16a6c05791ec3e35ec7f4f3651e6de5e961be464b7074 tests/test_easy_load_video.py +0b06a5af3420a7157eebcca369521c8146ad546e54f85719b49562555f8f17fb tests/test_easy_load_audio.py +7a46da28616cc9fc355ae9b6a9753dadb3201932d759c086df7513ea790f3f6d tests/test_easy_load_image.py +bfcfd77e70711830d087878d78021b754cd7e1ea324d50af0caa72f041b298fc tests/test_easy_load_video.py 326a97499ffe51935dd3259dbab4ed71fb02955cd3ddb5a52b5c6558a7efc872 tests/test_gpu_diagnostic_runner.py 4926706cb171e4e36e8d7ed46b592b0ed6c9c2e100072feeba497b651e52653b tests/test_issue13_r2_tools.py aaed0385281e1782edc96f1d084fa84bc4e7ec9e0055ec35aaf9a9f8b6e5bfce tests/test_issue13_r25_tools.py @@ -231,8 +231,8 @@ bb5a1530c890d357dc48ea74039340d746e876e8f85e06d4d9a19369f8ff5961 tests/test_v38 4338c932fc8a00328c3145b276e0f58a783c721a683b43aa6c24337b05a878ab tests/test_v38_multi_reference_audio.py 623d528a02b6712cba28c374ba3ad979bc84e2ac5318640692589a04ba6ab15f tests/test_v38_open_integration_contract.py 12337a491fa67b38b32aaeb16e0b209393960dbc46db2a8bf968b8c3902855ef tests/test_v38_packed_row_planner.py -8968588b0a999c6443f60da999be99db59ca3b6cf321bfc45c0a5b754d3ee954 tests/test_v38_public_surface_cleanup.py -ac59e1c021dd2b4e617fd87eb5de3e199d31136884754556ba46e6a1a0c5e03d tests/test_v38_public_workflow.py +abece11f7efa1f09a4ba4ab729708f460277128ac590c1e16485dd601b1c499c tests/test_v38_public_surface_cleanup.py +927348e89480b2f3b2fc2dcffa1398931d20e8812d94374ad05b374b453b7814 tests/test_v38_public_workflow.py 14ff6561a127287d0a20887790a978612ef9d291f1d3be7d5e85b37b2c74760e tests/test_v38_ref_encode_cache.py 8b376f45261d045b584f02b4d14cd70c2d6269b9c814d4e62b5c612f6e30e36f tests/test_v38_refine_target.py a67a52da8828bdff5d349c40d48c102271d7c9e388120565f50e76941b01f91c tests/test_v38_reliability.py @@ -322,10 +322,10 @@ b3dc61503d35d9ef0a0dc7fed1c9b2fdc00fcb2072d4e39f64ae0826f9ec7dca v3/assembly_v3 7815230e0a9540bc2edeaf818e940b7a1fdd817fd217ba8a4f9cb21aaf6a308e v3/assembly.py 3f62fdb35e804f42d7cbf0828b4e87e69a2b99246c3f7467fe4fa698f1d803c9 v3/conditioning_bridge_nodes.py aa044669259df440a384b5e839f75fa9665790da0c210a427375fdd5c76af779 v3/driving_nodes.py -2f395da6a41981713f99ba40b73d14f2274b8ca34a73cf2b275a444993765b99 v3/easy_audio_nodes.py +147a1d3fc5e09b323a4c3d13d30e432410389bae52b58330462375b9f307b791 v3/easy_audio_nodes.py 64b3e54b42e5156642f9957ccc374fd190d9fc7145637984e702534fb1bf80b4 v3/easy_image_nodes.py ac859cb1a6e23b8ceae300d818c24fe1346b649a0d663017a9b3ac64aa96fca3 v3/easy_nodes.py -bf6bae0c9e14883728860470af86e14395dba40a7377cd874d4dc4548ae53c65 v3/easy_video_nodes.py +11e9daa45237392ac84ac1b54b3e8d5e980e77102779831824794a2a6675500b v3/easy_video_nodes.py fe03ae0aa0dbbbe5f950bb7da34c18a078d841547992c374ea8beda5e3ad4715 v3/execution_planner.py 6cc7ed74666084c55beb9075304e92a9defafd81b9c6678239ca3859a08cddd7 v3/file_backed_buffer.py cb53e1b104415032ec79b7e7aa1c99848e63da3eedaa251eeba102970e4172b5 v3/hires_fix_nodes.py @@ -360,11 +360,15 @@ d0a004aa3030c8adaa5ea788f9acc758fcb4a556f203f9a3f63fa4e4b5772063 v3/sampling_en 2f07ace1462644f0bee553827b3571535de4d0c2d9ef847bd9e0ca73a4eed5cb v3/video_seam.py 453c98485ec55cca959aa5863ac35ae3b86c4781ae95c9e52ac9f1d9115c9eed version.py 685df8e0fa23e3663ab31da1e4470cd19bdaa0dc16362cb606e874d9d6153c2c web/decode_cache_helper.js -c2883272b05a9a9146b5c6cf614ddae8a3e6893cd910902023aae61360195289 web/easy_bypass_toggle.js +fefafd4550511d80bd85ade46a0476f0cf3de13ddb94a908dff6b175f2a0e199 web/easy_bypass_toggle.js 092088096307d33ac016b82b4774ca38845a2ff2f63b97ac6da8c5aca4fea413 web/easy_load_audio.js 9db0aa94f634578a962d5db49e5c70356040a59df968e3a2e531b327a623081f web/easy_load_image.js -873efcbd15c2d9fa10c9d5fc51a796ad3a18c0c6acceecf499c4b956aa845c6c web/easy_load_video.js +35090816ba7470a7255eb85d003b7e79f8a0065982dacf98a18f41c8ebff655d web/easy_load_video.js 0c68d13a1f8beb7431a32b471f8b0612c42fcc4bf72dd97611a025d158008662 web/easy_v38.js ec591d1b8f7587594397b995b9584809435f10fa3de6bf8f8df204c34809aa43 web/project_id.js ecdcd27528f6f1e80f758c608cbc42f747163ea4c39abd77576b91c627423d12 web/reference_audio_ui.js 46c9f75c9462bf26300332448f4431cca801f38964ca0a49bc2c50a88a7cc40f web/reference_image_ui.js +26b13614ba0a5fd8b192a106c9503b2f4b6fe7f9268a0fcb0f544979a49cab34 v3/video_adapter_nodes.py +a9da2d25e9fc9b87b249274d7bf2ab061d14f5d1e9c482b69d795ba511cdace1 tests/test_loader_store_roundtrip.py +0e02f7db41458fab91e6c3395bdb864d1c033923a3874ff4082d5f85b8230d98 tests/test_video_adapter.py +9876c21624aad1a9fd5b31408e7484995bb42b94c697bb8e26206cbd698b4779 docs/LOADER_PERSISTENCE_REPAIR.md diff --git a/PROJECT_STATE.md b/PROJECT_STATE.md index 6d0707b..c1cebc2 100644 --- a/PROJECT_STATE.md +++ b/PROJECT_STATE.md @@ -1,5 +1,12 @@ # Project State +## Loader persistence repair (2026-09-21) + +- User approved Image Enable repair, Core Audio workflow replacement, and Core Video plus Enable-free 24fps adapter, including commit/push. Legacy Audio/Video IDs remain deprecated/loadable. Main Sampler, Sampling and stored generation contracts are unchanged. +- Source baseline 3d7c2fd6928a545b12b84968b09dc455e7f9da65. Real source was snapshotted using tools/snapshot.ps1 before edits on an isolated Actions runner. Original-code regression exposed 3 failures; focused CPU/Node suite 46 PASS. See docs/LOADER_PERSISTENCE_REPAIR.md. +- Windows worktree/runtime/browser and GPU were not accessed. Live frontend 1.53.6 tab switching/save/reopen and fixed H3情報チェック handoff remain PENDING. No Release/tag/Registry publication. + + ## Issue #20 workflow persistence hotfix (2026-09-10) - User authorized repair and publication to main from pinned 6b453fe. The only runtime change is `serialize: false` on the read-only Render History widget in `web/project_id.js`; existing `options.serialize: false` is retained. Backend widget order, Sampling, Audio, Run Storage, public workflow/ZIP bytes, and Easy Loader Bypass behavior are unchanged. diff --git a/README.md b/README.md index a6c6ce9..29832c1 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,15 @@ # ComfyUI-H3-Continuum 3.8.3 — V3.8X2 + +## Loader persistence repair on main (2026-09-21, after 3.8.3) + +The current paired V3.8X2 workflows now use **Core Load Audio** and **Core Load Video -> H3 Continuum Video Adapter**. The adapter has Force Rate (default 24) and IMAGE/AUDIO outputs, but **no Enable switch or file selector**. Core owns video selection/upload/save; the established duration-preserving frame selection is reused and audio is passed unchanged. To disable Video Guide, bypass the adapter or the whole video-input group; do not bypass only Load Video while leaving its required-input adapter active. + +**H3 Continuum Load Image remains**, including Enable Image. Its mode observer now delegates to inherited Core setters (Issue #23), and no longer replaces the widget collection while drawing or saving. Enable is appended after Core's widgets; Core handles the filename and native Bypass persistence. The older Audio/Video node IDs remain loadable as deprecated compatibility nodes, not as the recommended new-workflow loaders. Ten node IDs are registered including these two legacy nodes. Sampler inputs, generation parameters, Decode Cache, Finalize and existing latent/storage contracts are unchanged. + +After updating, restart ComfyUI and reload/refresh the frontend. A workflow that already omitted its filename or saved an incorrect mode cannot recover those missing values: reselect the intended file and Bypass state, then save once. Existing user workflows and saved Takes are not automatically rewritten. Changing upstream node types can legitimately create a new Run Storage revision; preserve the original workflow when resuming accepted runs. + +Validation details and limits: [Loader repair record](docs/LOADER_PERSISTENCE_REPAIR.md). CPU/store-model regression tests are not a substitute for the pending Windows Core 0.36.0 / frontend 1.53.6 browser tab-switch acceptance. No Release/tag or Registry publication is implied by this main-branch repair. Older loader screenshots below describe the retained legacy nodes. + > **V3.8X2** is the product and workflow label for package `3.8.3`. It keeps the V3.8 production sampler and adds optional Reference Images 4–9 plus the built-in Decode Cache Helper. The older V3.8.0 package remains available from tag [`v3.8.0`](https://github.com/ukr8b3g-cmyk/ComfyUI-H3-Continuum/tree/v3.8.0). exec-9cfa73b4-c1d3-4416-8950-fa661b946638_2 @@ -39,7 +50,7 @@ The action names themselves do not enable reuse. **Each Video/Audio entry must m Cache reuse is process-local and does not survive Python restarts. Eviction and VAE identity changes can also cause MISS. Changing mode, RAM/Disk budgets, or `reset_token` clears this implementation's Helper cache. Keeping `reset_token = 0` does not reset it on every Queue. -V3.8X2 ships `H3DecodeCacheHelper` inside this Continuum package. It remains a separate public node under `MiniMax H3/Continuum/Helpers`; no second custom-node addon is needed. The nine public node IDs are the seven V3.8X IDs plus Reference Images and this helper. Sampler, Finalize, Assembly Plan, Core Decode, and saved Sampler widget/socket contracts are unchanged. +V3.8X2 ships `H3DecodeCacheHelper` inside this Continuum package. It remains a separate public node under `MiniMax H3/Continuum/Helpers`; no second custom-node addon is needed. The original nine IDs remain registered for compatibility; the loader migration adds H3ContinuumVideoAdapter. Sampler, Finalize, Assembly Plan, Core Decode, and saved Sampler widget/socket contracts are unchanged. Connect Sampler `video_latents` and `audio_latents` plus their native Video/Audio VAE inputs to the Helper, then connect Helper `images` and `audio` to Finalize. Keep the Sampler `assembly_plan` directly connected to Finalize. The [official V3.8X2 workflow](examples/workflows/MiniMax_H3_Continuum_V38X2.json) preserves its saved graph and settings. It contains no Core VAE Decode nodes, so returning to Core direct Decode requires adding those two Core nodes and reconnecting Finalize, or loading a prior Core-direct V3.8X workflow. Do not simply remove the Helper and expect automatic rewiring. @@ -108,13 +119,14 @@ AI products, plans, and repository-reading behavior change frequently. If a URL ## V3.8 supported surface -This local package exposes nine searchable nodes: the original seven V3.8 nodes plus Decode Cache Helper and Reference Images. +The package registers ten node IDs, including two deprecated loader compatibility IDs. Current workflows use Core Load Audio and Core Load Video plus the Video Adapter. - **H3 Continuum Sampler V3.8** — the Main sampler - **H3 Continuum Finalize** — decoded Video/Audio assembly with optional seam handling - **H3 Continuum Load Image** -- **H3 Continuum Load Audio** -- **H3 Continuum Load Video** +- **H3 Continuum Load Audio** (legacy compatibility; new workflows use Core Load Audio) +- **H3 Continuum Load Video** (legacy compatibility; new workflows use Core Load Video + Video Adapter) +- **H3 Continuum Video Adapter** — Core VIDEO to H3 IMAGE/AUDIO, default 24fps, no Enable - **H3 Continuum Second Pass** — the Advanced bridge for external latent processing or upscaling - **H3 Continuum Reference Audios** — an ordered Reference Audio 1/2/3 bundle helper - **H3 Continuum Reference Images** — optional additional Reference Images 4–9 diff --git a/README_JA.md b/README_JA.md index e5b8f6d..8e945a8 100644 --- a/README_JA.md +++ b/README_JA.md @@ -1,5 +1,16 @@ # ComfyUI-H3-Continuum 3.8.3 — V3.8X2 +## mainのLoader保存・復元修正(2026-09-21、3.8.3以降) + +現行V3.8X2ワークフローは、音声を **Core Load Audio**、動画を **Core Load Video → H3 Continuum Video Adapter** に変更しました。Video Adapterは24fpsへの変換(Force Rate初期値24)とIMAGE/AUDIO出力だけを担当し、**Enableやファイル選択UIはありません**。動画を使わない場合はAdapter、または動画入力グループ全体をBypassしてください。Load VideoだけをBypassして必須入力のAdapterをONに残す構成は避けてください。 + +画像は **H3 Continuum Load ImageとEnable Imageを維持**します。Issue #23の継承されたmode setterへの委譲と、描画・保存中のwidget配列差し替え廃止を適用します。EnableはCoreの欄の後ろに配置し、画像ファイルとBypassの保存はCoreに委ねます。旧Audio/VideoノードIDは既存workflow用の非推奨互換ノードとして残します。登録IDは互換用2個を含め10個で、Sampler設定・Sampling・Decode Cache・Finalize・既存Run Storage契約は変更しません。 + +更新後はComfyUI再起動と画面の再読み込みが必要です。既に保存JSONから消えたファイル名やOFF状態は推測で復元できないため、一度選び直して保存してください。既存ユーザーworkflowや保存済みTakeは自動変更しません。上流ノードの種類変更でRun Storageが新revisionになることはあるため、過去Runの再開には元workflowを保管してください。 + +検証範囲は[Loader修正記録](docs/LOADER_PERSISTENCE_REPAIR.md)を参照してください。CPU回帰テストと実ブラウザ確認は別です。Windows Core 0.36.0 / frontend 1.53.6のタブ切替確認は未実施で、Release/tag・Registry公開も別作業です。以下の旧Loader画像は互換ノードの説明です。 + + > **V3.8X2**はpackage `3.8.3`の製品名・Workflow名です。V3.8 Production Samplerを維持し、任意のReference Image 4~9と内蔵Decode Cache Helperを追加しています。旧V3.8.0は[`v3.8.0`タグ](https://github.com/ukr8b3g-cmyk/ComfyUI-H3-Continuum/tree/v3.8.0)から導入できます。 ## V3.8X2 公式Workflow diff --git a/REGISTRY_MANIFEST.sha256 b/REGISTRY_MANIFEST.sha256 index 21ac9b0..2578b9d 100644 --- a/REGISTRY_MANIFEST.sha256 +++ b/REGISTRY_MANIFEST.sha256 @@ -1,7 +1,7 @@ dca65fb1393e67f59c6f81f9411e3e745eb8f1097e9a2adf7ffc6f4e3901ca9f __init__.py -04900f7a7a89fc3c4f75dc4020c1e16ea353da2b24a959ae628e3f49ddae4ef3 .comfyignore +a9fd5a4c5624e17148656abed0ba41a72c72cac73e7f6f36d2816ad92962f867 .comfyignore 3e7a1ec3380be2a222c8a3e9b8a6bb184d3a760478957f48186438f15235bdba branch_provenance.py -0daa15310d98160261e3ff1fe689cc7a6db9e453891cd73e2a392da643ab576a CHANGELOG.md +d70402478f19f6487eed08957a048a8c248a9291be8e62c0e7ade69da82fd393 CHANGELOG.md c1ed3a0342730450958fb62fd21854a876991f3a4aefb24e5383b0c73cd2312d compatibility.py 4d62508f900af9f93ec320afb900c27cc9a300d1e0c0a94714258498c5ede5fc conditioning.py 294251c40b1be2e296c5e5f627b68091d087bdb39179e3a0c3cebd2ee8a344f5 constants.py @@ -15,10 +15,10 @@ b30fe4640359bebfcdeeb94dbeec94cb346c8e3646509e1dcdb87d7021ba04ff docs/N2B_BRANC 717577efdec5e61600504b77bc2a099ef022c4fe2333e936c3310c7182d8f2a0 docs/V38_OPEN_INTEGRATION_CONTRACT.md b08159178c999c4c97df6aed67c6cf48b5032548a1d370dc4a0cf7e293ab8031 docs/V38_RELEASE_AND_MIGRATION.md cedd7b07901d6065079ef37380f0062d535a39c98c8f614e1b26582f549d7183 driving_audio.py -6c445d62979632bc1a801b1c28dbd639c23b51cc156ebae18837baaa757e592b examples/workflows/MiniMax_H3_Continuum_V38X2.json -29e8ea19cf7c7e8a8a5e98577905d8fd01fc800bb8edb4f4218a638fe39e69d0 examples/workflows/MiniMax_H3_Continuum_V38X2.zip -6c445d62979632bc1a801b1c28dbd639c23b51cc156ebae18837baaa757e592b examples/workflows/MiniMax_H3_Continuum_V38X2+Decode_Cache_Helper.json -f770bcc7de63851ab32f8d8fea23e5df9f7c44b8e3c0115a555b57ea82a28550 examples/workflows/MiniMax_H3_Continuum_V38X2+Decode_Cache_Helper.zip +1b2212b7511fac0b63dfa6e9f006cd8644c72d08c6945ab0e4ed0e722c97a730 examples/workflows/MiniMax_H3_Continuum_V38X2.json +8f839a955859bffa0d9cf0b15e91ee484dd911aca5ae31f1787debd56afdc7da examples/workflows/MiniMax_H3_Continuum_V38X2.zip +1b2212b7511fac0b63dfa6e9f006cd8644c72d08c6945ab0e4ed0e722c97a730 examples/workflows/MiniMax_H3_Continuum_V38X2+Decode_Cache_Helper.json +4fa8680037595f55f97715f9a2f63d28f11328a87f5c33c316cc4b0ae817e668 examples/workflows/MiniMax_H3_Continuum_V38X2+Decode_Cache_Helper.zip 7861fac4c8fe82372c5459aa574d35ea003bdb4fd846d567bd891c2e38571b3d graph_contract.py bf0556b076dbaca67c3405a7d86c333ca7fdf3d4381529b0a9edc906519943e9 guide_timeline.py 1473c384082700f422f2cf9141e0d012d87d2b43ac8a8a433edc7172e6ca7bf6 hardening.py @@ -30,13 +30,13 @@ c44abbd789091bbead01250dbd5453e60539d2665c69f162335fdbd2936019c2 LICENSE d3e213005670e94dee33a240349a4d245cf9a3b6602099f11ed30cf5a32e2c21 media.py 1970342c93f0189ade437cbfc278900713f043882933789cb8c54f35cf2ec96b metadata.ini 2d611f7201889851eac6459f8aa2b37baf342b345241979ca6042b61b252dff9 model_patch.py -11ea3942e460d8b4ec729611371b52ec5ad202c894c5e9ec7b151b906559bfd8 nodes.py +e2b72149b0433e95c13659cc9e742fe38523e67d4f4a2fdb08aed1943fecf653 nodes.py 2b8c19f9474beabfebe1802cdf4a89780dce3c351c48d65e1ce8bb77d2fb9ba9 PACKAGE_INFO_JA.txt 4852ad216f85c22f008abe18464eab2c913bd88baa7db35764df2de9cf401d6d PACKAGE_VALIDATION.txt b470819f16fc179654dc1600721a63f0a5a14e777f4c004d574b499da6886ba5 public_api.py 15a3925218e0c5f968795d7d11e4783c3c6868917447274bc700328851b3fbfb pyproject.toml -8f06f56597185fcb24331b038b20e921c02557da42f5ef5ba79fb7e768766974 README_JA.md -4e44ff1e28f2f408c41631eb76922bfbe31147bb6d36846a1b73e05279f5dda3 README.md +4a0507ce6183e099265d5a34a38e43da89515af8eb680f5a48abc8aecc724d63 README_JA.md +9d4eefcc97e74d4c1c8ab1be612b50eb99a8a4f8db7c2134ca85a9e67bf2568a README.md 44127adcfa30ee84bff9cd4b2d0c695355209550e76982d374122008728aa5bc reference_audio.py 5cb9bfd6810d3a93a637451980a4cc5c1436e5b84cfd1c7a111cd192e876351b reference_video.py c7b14ed6f8cfc2a1f0a21db4fe56fba75a93ffcb0be0c22bbd2e691c45cd0e2d reference.py @@ -71,10 +71,10 @@ b3dc61503d35d9ef0a0dc7fed1c9b2fdc00fcb2072d4e39f64ae0826f9ec7dca v3/assembly_v3 7815230e0a9540bc2edeaf818e940b7a1fdd817fd217ba8a4f9cb21aaf6a308e v3/assembly.py 3f62fdb35e804f42d7cbf0828b4e87e69a2b99246c3f7467fe4fa698f1d803c9 v3/conditioning_bridge_nodes.py aa044669259df440a384b5e839f75fa9665790da0c210a427375fdd5c76af779 v3/driving_nodes.py -2f395da6a41981713f99ba40b73d14f2274b8ca34a73cf2b275a444993765b99 v3/easy_audio_nodes.py +147a1d3fc5e09b323a4c3d13d30e432410389bae52b58330462375b9f307b791 v3/easy_audio_nodes.py 64b3e54b42e5156642f9957ccc374fd190d9fc7145637984e702534fb1bf80b4 v3/easy_image_nodes.py ac859cb1a6e23b8ceae300d818c24fe1346b649a0d663017a9b3ac64aa96fca3 v3/easy_nodes.py -bf6bae0c9e14883728860470af86e14395dba40a7377cd874d4dc4548ae53c65 v3/easy_video_nodes.py +11e9daa45237392ac84ac1b54b3e8d5e980e77102779831824794a2a6675500b v3/easy_video_nodes.py fe03ae0aa0dbbbe5f950bb7da34c18a078d841547992c374ea8beda5e3ad4715 v3/execution_planner.py 6cc7ed74666084c55beb9075304e92a9defafd81b9c6678239ca3859a08cddd7 v3/file_backed_buffer.py cb53e1b104415032ec79b7e7aa1c99848e63da3eedaa251eeba102970e4172b5 v3/hires_fix_nodes.py @@ -109,11 +109,13 @@ d0a004aa3030c8adaa5ea788f9acc758fcb4a556f203f9a3f63fa4e4b5772063 v3/sampling_en 2f07ace1462644f0bee553827b3571535de4d0c2d9ef847bd9e0ca73a4eed5cb v3/video_seam.py 453c98485ec55cca959aa5863ac35ae3b86c4781ae95c9e52ac9f1d9115c9eed version.py 685df8e0fa23e3663ab31da1e4470cd19bdaa0dc16362cb606e874d9d6153c2c web/decode_cache_helper.js -c2883272b05a9a9146b5c6cf614ddae8a3e6893cd910902023aae61360195289 web/easy_bypass_toggle.js +fefafd4550511d80bd85ade46a0476f0cf3de13ddb94a908dff6b175f2a0e199 web/easy_bypass_toggle.js 092088096307d33ac016b82b4774ca38845a2ff2f63b97ac6da8c5aca4fea413 web/easy_load_audio.js 9db0aa94f634578a962d5db49e5c70356040a59df968e3a2e531b327a623081f web/easy_load_image.js -873efcbd15c2d9fa10c9d5fc51a796ad3a18c0c6acceecf499c4b956aa845c6c web/easy_load_video.js +35090816ba7470a7255eb85d003b7e79f8a0065982dacf98a18f41c8ebff655d web/easy_load_video.js 0c68d13a1f8beb7431a32b471f8b0612c42fcc4bf72dd97611a025d158008662 web/easy_v38.js ec591d1b8f7587594397b995b9584809435f10fa3de6bf8f8df204c34809aa43 web/project_id.js ecdcd27528f6f1e80f758c608cbc42f747163ea4c39abd77576b91c627423d12 web/reference_audio_ui.js 46c9f75c9462bf26300332448f4431cca801f38964ca0a49bc2c50a88a7cc40f web/reference_image_ui.js +26b13614ba0a5fd8b192a106c9503b2f4b6fe7f9268a0fcb0f544979a49cab34 v3/video_adapter_nodes.py +9876c21624aad1a9fd5b31408e7484995bb42b94c697bb8e26206cbd698b4779 docs/LOADER_PERSISTENCE_REPAIR.md diff --git a/WORKLOG.md b/WORKLOG.md index e3ffdca..8d96799 100644 --- a/WORKLOG.md +++ b/WORKLOG.md @@ -1853,3 +1853,17 @@ D:\Codex\_snapshots\ComfyUI-H3-Continuum\pre-rollback-after-00038-fail-20260821_ - Updated repository-root `H3-Continuum-Skill-v1.zip` without changing runtime code or workflows. Promoted the standalone Timeline-header rule into `SKILL.md`, refreshed `references/continuum-contract.md` to the current V3.8 parser baseline `bd12073c4322a88ce666fe062b7bb265f5de131a`, added simple `3x5`, `3x10`, and `2x15` Timeline examples plus inline-input normalization to `references/examples.md`, and added the same critical syntax note to `README_JA.md`. - Validation: `tools/snapshot.ps1` completed before modification; ZIP retained exactly seven entries and passed ZIP integrity validation; targeted `tests/test_v2_prompts.py` passed 52/52. New ZIP SHA-256: `144324850D4BA086938DA5F4ED7B02FF0668DEC554F092695328240E43FEC3EC`. This is documentation/prompt-skill only; Sampling, Run Storage, public node schema, workflows, and runtime tensors are unchanged. H3情報チェック handoff remains pending because that cross-task destination is unavailable from this GitHub Actions job. + +## Loader persistence repair (2026-09-21) + +- User approved Image Enable repair, Core Audio workflow replacement, and Core Video plus Enable-free 24fps adapter, including commit/push. Legacy Audio/Video IDs remain deprecated/loadable. Main Sampler, Sampling and stored generation contracts are unchanged. +- Source baseline 3d7c2fd6928a545b12b84968b09dc455e7f9da65. Real source was snapshotted using tools/snapshot.ps1 before edits on an isolated Actions runner. Original-code regression exposed 3 failures; focused CPU/Node suite 46 PASS. See docs/LOADER_PERSISTENCE_REPAIR.md. +- Windows worktree/runtime/browser and GPU were not accessed. Live frontend 1.53.6 tab switching/save/reopen and fixed H3情報チェック handoff remain PENDING. No Release/tag/Registry publication. + +## Validation result + +- Original-code regression: 6 cases; 3 expected failures and 0 collection/runtime errors. +- Focused CPU/Node suite: 46 passed, zero failures/errors/skips. +- JavaScript module syntax, changed Python compilation, workflow JSON/ZIP parity, endpoint consistency and git diff whitespace checks passed. +- Official workflow structural guard preserved every non-loader node, each original link, and non-layout workflow metadata. +- Scope: isolated GitHub Actions CPU runner, not Windows deployment or a real-browser/GPU test. diff --git a/docs/LOADER_PERSISTENCE_REPAIR.md b/docs/LOADER_PERSISTENCE_REPAIR.md new file mode 100644 index 0000000..deb5b54 --- /dev/null +++ b/docs/LOADER_PERSISTENCE_REPAIR.md @@ -0,0 +1,21 @@ +# Loader persistence repair — 2026-09-21 + +Base: `3d7c2fd6928a545b12b84968b09dc455e7f9da65`. + +Image keeps its Core-backed implementation and Enable convenience toggle. The mode descriptor lookup walks the prototype chain; a tracked Core accessor is called rather than shadowed by a detached closure. Draw/serialize/configure functions and widget collections are not replaced. The former drawing swap could truncate a stable Core widget view, separately from Issue #23's mode-store divergence. New regression models both failures. + +The current paired official V3.8X2 workflows replace H3EasyLoadAudio with Core LoadAudio and H3ContinuumLoadVideo with Core LoadVideo + H3ContinuumVideoAdapter. Core titles, original media names, disabled input branches, video 24fps setting, and all unrelated node values and original links are preserved. Video/audio outputs remain wired through the old output node ID. Core LoadVideo and the converter are kept in the video input group. Disable the converter or entire group, not only the Core input while its adapter remains active. + +Legacy H3EasyLoadAudio/H3ContinuumLoadVideo remain registered/deprecated. Their old backend input contracts remain intact. The new converter has no Enable, file selector, upload handler or custom JavaScript. It uses the established _resample_video_frames() and passes existing audio through without resampling. Source rate 24 is a frame-object no-op; 30/29.97 to 24 uses the existing duration-preserving selection. This does not claim VFR timestamp-aware conversion or motion interpolation. + +No user Windows worktree, installed runtime, GPU, queue, saved workflow, Run Storage or Takes were accessed. A Core 0.36.0/frontend 1.53.6 live-browser save/reopen, A->B->A, direct/right-click Bypass and upload check remains pending. The fixed H3情報チェック handoff is PENDING: cross-task transport is unavailable in this session. No Release/tag or Registry publication. + +Files already saved without their selection/OFF state require one explicit user reselection; never reconstruct them from defaults. Upstream graph replacement may correctly create a new Run Storage revision, so retain an old workflow for resuming its saved run. + +## Validation result + +- Original-code regression: 6 cases; 3 expected failures and 0 collection/runtime errors. +- Focused CPU/Node suite: 46 passed, zero failures/errors/skips. +- JavaScript module syntax, changed Python compilation, workflow JSON/ZIP parity, endpoint consistency and git diff whitespace checks passed. +- Official workflow structural guard preserved every non-loader node, each original link, and non-layout workflow metadata. +- Scope: isolated GitHub Actions CPU runner, not Windows deployment or a real-browser/GPU test. diff --git a/examples/workflows/MiniMax_H3_Continuum_V38X2+Decode_Cache_Helper.json b/examples/workflows/MiniMax_H3_Continuum_V38X2+Decode_Cache_Helper.json index fadc6ea..ca84ae8 100644 --- a/examples/workflows/MiniMax_H3_Continuum_V38X2+Decode_Cache_Helper.json +++ b/examples/workflows/MiniMax_H3_Continuum_V38X2+Decode_Cache_Helper.json @@ -1,8 +1,8 @@ { "id": "735ad332-ca97-474f-b53f-7c44f6b6c383", "revision": 0, - "last_node_id": 354, - "last_link_id": 398, + "last_node_id": 355, + "last_link_id": 399, "nodes": [ { "id": 142, @@ -81,7 +81,7 @@ }, { "id": 315, - "type": "H3EasyLoadAudio", + "type": "LoadAudio", "pos": [ 990, 2360 @@ -104,18 +104,15 @@ } ], "properties": { - "aux_id": "ukr8b3g-cmyk/ComfyUI-H3-Continuum", - "Node name for S&R": "H3EasyLoadAudio", - "ver": "ddaedfd401b171651b48059285a44897e84fce70" + "cnr_id": "comfy-core", + "Node name for S&R": "LoadAudio", + "ver": "0.30.0" }, "widgets_values": [ - "prnas_.mp3", - null, - null + "prnas_.mp3" ], "widgets_values_named": { - "audio": "prnas_.mp3", - "upload": null + "audio": "prnas_.mp3" }, "color": "#232", "bgcolor": "#353" @@ -174,19 +171,25 @@ }, { "id": 320, - "type": "H3ContinuumLoadVideo", + "type": "H3ContinuumVideoAdapter", "pos": [ 440, - 2350 + 2590 ], "size": [ - 480, - 630 + 480.0, + 115 ], "flags": {}, "order": 3, "mode": 4, - "inputs": [], + "inputs": [ + { + "name": "video", + "type": "VIDEO", + "link": 399 + } + ], "outputs": [ { "name": "images", @@ -204,21 +207,13 @@ } ], "properties": { - "aux_id": "ukr8b3g-cmyk/ComfyUI-H3-Continuum", - "Node name for S&R": "H3ContinuumLoadVideo", - "ver": "ddaedfd401b171651b48059285a44897e84fce70" + "Node name for S&R": "H3ContinuumVideoAdapter" }, "widgets_values": [ - false, - "MiniMax_H3_00001_.mp4", - 24, - "image" + 24 ], "widgets_values_named": { - "enable_video": false, - "file": "MiniMax_H3_00001_.mp4", - "force_rate": 24, - "upload": "image" + "force_rate": 24 }, "color": "#232", "bgcolor": "#353" @@ -1829,6 +1824,43 @@ "widgets_values_named": { "value": "" } + }, + { + "id": 355, + "type": "LoadVideo", + "pos": [ + 440, + 2350 + ], + "size": [ + 480.0, + 210 + ], + "flags": {}, + "order": 3, + "mode": 4, + "inputs": [], + "outputs": [ + { + "name": "VIDEO", + "type": "VIDEO", + "slot_index": 0, + "links": [ + 399 + ] + } + ], + "properties": { + "cnr_id": "comfy-core", + "Node name for S&R": "LoadVideo", + "ver": "0.30.0" + }, + "widgets_values": [ + "MiniMax_H3_00001_.mp4" + ], + "widgets_values_named": { + "file": "MiniMax_H3_00001_.mp4" + } } ], "links": [ @@ -2135,6 +2167,14 @@ 348, 2, "IMAGE" + ], + [ + 399, + 355, + 0, + 320, + 0, + "VIDEO" ] ], "groups": [ @@ -2276,4 +2316,4 @@ "k2cf_state_id": "k2cf_1788454341712_tkpfmvwyg3b" }, "version": 0.4 -} \ No newline at end of file +} diff --git a/examples/workflows/MiniMax_H3_Continuum_V38X2+Decode_Cache_Helper.zip b/examples/workflows/MiniMax_H3_Continuum_V38X2+Decode_Cache_Helper.zip index c15bb498d63be7d94a6bb34a5b246e3820100f1f..7601843070f197cd04a293b7bf16a3924d82a0ef 100644 GIT binary patch delta 7363 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 delta 7133 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�>|0~>e! zO>r7|K{TsxNGlo8mHVbDzZ6~K))h-ho0cu?e9Jv)iwkITC_FBmRg~CZtXg}Zcs?kT^%I2+W!C#+Ok$#D$z<O928D02BZK00;nEe=}XtAGDiK8vp>A!~g&@000000000000000 T005C2Hk0Wb5C)(d00000`=pRz diff --git a/examples/workflows/MiniMax_H3_Continuum_V38X2.json b/examples/workflows/MiniMax_H3_Continuum_V38X2.json index fadc6ea..ca84ae8 100644 --- a/examples/workflows/MiniMax_H3_Continuum_V38X2.json +++ b/examples/workflows/MiniMax_H3_Continuum_V38X2.json @@ -1,8 +1,8 @@ { "id": "735ad332-ca97-474f-b53f-7c44f6b6c383", "revision": 0, - "last_node_id": 354, - "last_link_id": 398, + "last_node_id": 355, + "last_link_id": 399, "nodes": [ { "id": 142, @@ -81,7 +81,7 @@ }, { "id": 315, - "type": "H3EasyLoadAudio", + "type": "LoadAudio", "pos": [ 990, 2360 @@ -104,18 +104,15 @@ } ], "properties": { - "aux_id": "ukr8b3g-cmyk/ComfyUI-H3-Continuum", - "Node name for S&R": "H3EasyLoadAudio", - "ver": "ddaedfd401b171651b48059285a44897e84fce70" + "cnr_id": "comfy-core", + "Node name for S&R": "LoadAudio", + "ver": "0.30.0" }, "widgets_values": [ - "prnas_.mp3", - null, - null + "prnas_.mp3" ], "widgets_values_named": { - "audio": "prnas_.mp3", - "upload": null + "audio": "prnas_.mp3" }, "color": "#232", "bgcolor": "#353" @@ -174,19 +171,25 @@ }, { "id": 320, - "type": "H3ContinuumLoadVideo", + "type": "H3ContinuumVideoAdapter", "pos": [ 440, - 2350 + 2590 ], "size": [ - 480, - 630 + 480.0, + 115 ], "flags": {}, "order": 3, "mode": 4, - "inputs": [], + "inputs": [ + { + "name": "video", + "type": "VIDEO", + "link": 399 + } + ], "outputs": [ { "name": "images", @@ -204,21 +207,13 @@ } ], "properties": { - "aux_id": "ukr8b3g-cmyk/ComfyUI-H3-Continuum", - "Node name for S&R": "H3ContinuumLoadVideo", - "ver": "ddaedfd401b171651b48059285a44897e84fce70" + "Node name for S&R": "H3ContinuumVideoAdapter" }, "widgets_values": [ - false, - "MiniMax_H3_00001_.mp4", - 24, - "image" + 24 ], "widgets_values_named": { - "enable_video": false, - "file": "MiniMax_H3_00001_.mp4", - "force_rate": 24, - "upload": "image" + "force_rate": 24 }, "color": "#232", "bgcolor": "#353" @@ -1829,6 +1824,43 @@ "widgets_values_named": { "value": "" } + }, + { + "id": 355, + "type": "LoadVideo", + "pos": [ + 440, + 2350 + ], + "size": [ + 480.0, + 210 + ], + "flags": {}, + "order": 3, + "mode": 4, + "inputs": [], + "outputs": [ + { + "name": "VIDEO", + "type": "VIDEO", + "slot_index": 0, + "links": [ + 399 + ] + } + ], + "properties": { + "cnr_id": "comfy-core", + "Node name for S&R": "LoadVideo", + "ver": "0.30.0" + }, + "widgets_values": [ + "MiniMax_H3_00001_.mp4" + ], + "widgets_values_named": { + "file": "MiniMax_H3_00001_.mp4" + } } ], "links": [ @@ -2135,6 +2167,14 @@ 348, 2, "IMAGE" + ], + [ + 399, + 355, + 0, + 320, + 0, + "VIDEO" ] ], "groups": [ @@ -2276,4 +2316,4 @@ "k2cf_state_id": "k2cf_1788454341712_tkpfmvwyg3b" }, "version": 0.4 -} \ No newline at end of file +} diff --git a/examples/workflows/MiniMax_H3_Continuum_V38X2.zip b/examples/workflows/MiniMax_H3_Continuum_V38X2.zip index bd68cda316a4a0ba9b3c45221f93108ff09694ad..4a37a7a67ddd58daaac17efe5e2d1a89b3139a2e 100644 GIT binary patch literal 7383 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 RHvE55{IACThxOp#{twTbiH`sP diff --git a/nodes.py b/nodes.py index bfac1e3..b0fcc50 100644 --- a/nodes.py +++ b/nodes.py @@ -448,6 +448,10 @@ from .v3.hires_fix_nodes import ( NODE_CLASS_MAPPINGS.update(V35_HIRES_FIX_NODE_CLASS_MAPPINGS) NODE_DISPLAY_NAME_MAPPINGS.update(V35_HIRES_FIX_NODE_DISPLAY_NAME_MAPPINGS) +from .v3.video_adapter_nodes import H3ContinuumVideoAdapter + +NODE_CLASS_MAPPINGS["H3ContinuumVideoAdapter"] = H3ContinuumVideoAdapter + from .decode_cache.nodes import H3DecodeCacheHelper NODE_CLASS_MAPPINGS["H3DecodeCacheHelper"] = H3DecodeCacheHelper @@ -464,6 +468,7 @@ _PUBLIC_NODE_DISPLAY_NAMES = { "H3EasyLoadImage": "H3 Continuum Load Image", "H3EasyLoadAudio": "H3 Continuum Load Audio", "H3ContinuumLoadVideo": "H3 Continuum Load Video", + "H3ContinuumVideoAdapter": "H3 Continuum Video Adapter", "H3ContinuumSecondPassV35": "H3 Continuum Second Pass", "H3DecodeCacheHelper": "Decode Cache Helper", } diff --git a/tests/test_easy_load_audio.py b/tests/test_easy_load_audio.py index fa0177d..86f5105 100644 --- a/tests/test_easy_load_audio.py +++ b/tests/test_easy_load_audio.py @@ -164,7 +164,7 @@ console.log(JSON.stringify({{ initial, off, onAgain, externalBypass, reloaded }} observed = json.loads(result.stdout) assert observed == { "initial": { - "names": ["Enable Audio", "audio", "audioUI"], + "names": ["audio", "audioUI", "Enable Audio"], "saved": { "mode": 0, "widgets_values": [ @@ -201,7 +201,7 @@ console.log(JSON.stringify({{ initial, off, onAgain, externalBypass, reloaded }} "toggle": False, "audio": "reloaded.wav", "player": {"position": 2.5, "volume": 0.6}, - "names": ["Enable Audio", "audio", "audioUI"], + "names": ["audio", "audioUI", "Enable Audio"], }, } diff --git a/tests/test_easy_load_image.py b/tests/test_easy_load_image.py index c8530c2..fe3255d 100644 --- a/tests/test_easy_load_image.py +++ b/tests/test_easy_load_image.py @@ -150,7 +150,7 @@ console.log(JSON.stringify({{ initial, toggledOff, externalUnbypass, externalByp observed = json.loads(result.stdout) assert observed == { "initial": { - "names": ["Enable Image", "image", "upload"], + "names": ["image", "upload", "Enable Image"], "toggle": True, "saved": {"mode": 0, "widgets_values": ["first.png", "image"]}, }, @@ -166,12 +166,12 @@ console.log(JSON.stringify({{ initial, toggledOff, externalUnbypass, externalByp "toggle": False, "image": "reloaded.png", "upload": "image", - "names": ["Enable Image", "image", "upload"], + "names": ["image", "upload", "Enable Image"], }, } -def test_shared_bypass_helper_redraws_only_enable_row_at_full_opacity(tmp_path): +def test_shared_bypass_helper_preserves_core_widget_collection_when_drawing(tmp_path): node_executable = shutil.which("node") if node_executable is None: pytest.skip("Node.js is required for the frontend drawing regression") @@ -246,47 +246,16 @@ console.log(JSON.stringify({{ text=True, ) observed = json.loads(result.stdout) - assert observed == { - "image": { - "bypassCalls": [ - {"names": ["Enable Image", "file"], "alpha": 0.2}, - {"names": ["Enable Image"], "alpha": 1}, - ], - "enabledCalls": [ - {"names": ["Enable Image", "file"], "alpha": 1} - ], + for kind, result in observed.items(): + names = ["enable_video", "file"] if kind == "video" else ["file", f"Enable {kind.title()}"] + assert result == { + "bypassCalls": [{"names": names, "alpha": 0.2}], + "enabledCalls": [{"names": names, "alpha": 1}], "mode": 0, "toggle": True, "clickable": True, "visible": True, - }, - "audio": { - "bypassCalls": [ - {"names": ["Enable Audio", "file"], "alpha": 0.2}, - {"names": ["Enable Audio"], "alpha": 1}, - ], - "enabledCalls": [ - {"names": ["Enable Audio", "file"], "alpha": 1} - ], - "mode": 0, - "toggle": True, - "clickable": True, - "visible": True, - }, - "video": { - "bypassCalls": [ - {"names": ["enable_video", "file"], "alpha": 0.2}, - {"names": ["enable_video"], "alpha": 1}, - ], - "enabledCalls": [ - {"names": ["enable_video", "file"], "alpha": 1} - ], - "mode": 0, - "toggle": True, - "clickable": True, - "visible": True, - }, - } + } def test_easy_load_image_frontend_has_no_backend_boolean_or_polling(): diff --git a/tests/test_easy_load_video.py b/tests/test_easy_load_video.py index 6982610..4b14170 100644 --- a/tests/test_easy_load_video.py +++ b/tests/test_easy_load_video.py @@ -332,12 +332,12 @@ console.log(JSON.stringify({{ initial, enabled, externalBypass, externalUnbypass } -def test_video_bypass_appearance_uses_native_mode_without_hardcoded_color(): +def test_legacy_video_has_no_frontend_enable_bridge(): source = FRONTEND_PATH.read_text(encoding="utf-8") common = COMMON_FRONTEND_PATH.read_text(encoding="utf-8") - assert 'from "./easy_bypass_toggle.js"' in source - assert "configureExistingEasyBypassWidgetNode" in source - assert 'widgetNames: ["enable_video", "Enable Video"]' in source + assert 'from "./easy_bypass_toggle.js"' not in source + assert "configureExistingEasyBypassWidgetNode" not in source + assert 'widgetNames: ["enable_video", "Enable Video"]' not in source assert "NODE_MODE_BYPASS" in common assert "node.color" not in source assert "node.bgcolor" not in source diff --git a/tests/test_loader_store_roundtrip.py b/tests/test_loader_store_roundtrip.py new file mode 100644 index 0000000..869dfae --- /dev/null +++ b/tests/test_loader_store_roundtrip.py @@ -0,0 +1,116 @@ +"""Regressions for Core's prototype mode accessor and stable widgets view. + +This models the persistence boundary; it is not a real-browser acceptance test. +""" +from __future__ import annotations + +import json +from pathlib import Path +import shutil +import subprocess + +import pytest + +ROOT = Path(__file__).resolve().parents[1] + + +@pytest.mark.parametrize("store_backed", [False, True], ids=["legacy", "store"]) +@pytest.mark.parametrize("kind", ["image", "audio", "video"]) +def test_loader_state_survives_draw_save_and_workflow_roundtrip(tmp_path, kind, store_backed): + node = shutil.which("node") + if node is None: + pytest.skip("Node.js is required for frontend regression tests") + source = (ROOT / "web/easy_bypass_toggle.js").read_text(encoding="utf-8").replace("export ", "") + script = source + "\n" + r''' +const storeBacked = STORE_BACKED; +const kind = KIND; +const nodeClass = {image: "H3EasyLoadImage", audio: "H3EasyLoadAudio", video: "H3ContinuumLoadVideo"}[kind]; +const enableName = {image: "Enable Image", audio: "Enable Audio", video: "enable_video"}[kind]; +const fileName = {image: "image", audio: "audio", video: "file"}[kind]; +const selectedFile = {image: "selected-b.png", audio: "selected-b.wav", video: "selected-b.mp4"}[kind]; +function plainWidget(name, value) { return {name, value, options: {}, serialize: true}; } +class StoreNode { + constructor() { + this.comfyClass = nodeClass; + this._state = {mode: 0}; + this.drawCalls = 0; + const widgets = []; + // Like Core widgetsView: assignment mutates the same array/view. + Object.defineProperty(this, "widgets", { + configurable: true, + get() { return widgets; }, + set(value) { widgets.splice(0, widgets.length, ...value); }, + }); + if (!storeBacked) { + Object.defineProperty(this, "mode", {value: 0, writable: true, configurable: true}); + Object.defineProperty(this, "widgets", {value: [], writable: true, configurable: true}); + } + if (kind === "video") this.widgets.push(plainWidget(enableName, true)); + this.widgets.push(plainWidget(fileName, "default-file")); + if (kind === "video") this.widgets.push(plainWidget("force_rate", 30)); + } + get mode() { return this._state.mode; } + set mode(value) { this._state.mode = value; } + setDirtyCanvas() {} + addWidget(type, name, value, callback, options) { + const w = {type, name, value, callback, options}; this.widgets.push(w); return w; + } + drawWidgets() { this.drawCalls++; } + serializeFromStoreState(state) { + const ws = this.widgets.filter(w => w.serialize !== false); + return {mode: state.mode, widgets_values: ws.map(w => w.value), + widgets_values_named: Object.fromEntries(ws.map(w => [w.name, w.value]))}; + } + serialize() { return this.serializeFromStoreState(storeBacked ? this._state : {mode:this.mode}); } + configure(info) { + this.mode = info.mode; + for (const w of this.widgets) { + if (w.serialize !== false && Object.hasOwn(info.widgets_values_named, w.name)) + w.value = info.widgets_values_named[w.name]; + } + } +} +function configure(n) { + if (kind === "video") configureExistingEasyBypassWidgetNode(n, {nodeClass, widgetNames:[enableName]}); + else configureEasyBypassToggleNode(n, {nodeClass, widgetName:enableName, tooltip:"test"}); +} +function saveGraph(n) { + // Core 1.53 may bypass node.serialize() and use the store directly. + return storeBacked ? n.serializeFromStoreState(n._state) : n.serialize(); +} +const a = new StoreNode(); configure(a); configure(a); +a.widgets.find(w => w.name === fileName).value = selectedFile; +findEasyBypassWidget(a).callback(false); +const beforeDraw = a.widgets.map(w => w.name); +for (let i=0; i<4; i++) a.drawWidgets({}, {editorAlpha:0.2}); +const afterDraw = a.widgets.map(w => w.name); +const saved = saveGraph(a); +const b = new StoreNode(); configure(b); b.configure(saved); configure(b); +const reopened = saveGraph(b); +b.mode = 0; +const externalOn = findEasyBypassWidget(b).value; +b.mode = 4; +const externalOff = findEasyBypassWidget(b).value; +console.log(JSON.stringify({beforeDraw, afterDraw, liveMode:a.mode, storeMode:a._state.mode, + saved, reopened, reopenedEnable:findEasyBypassWidget(b).value, externalOn, externalOff, + selectedFile, fileName, kind, drawCalls:a.drawCalls})); +''' + script = script.replace("STORE_BACKED", str(store_backed).lower()).replace("KIND", json.dumps(kind)) + file = tmp_path / "loader-store.js" + file.write_text(script, encoding="utf-8") + result = subprocess.run([node, str(file)], capture_output=True, text=True, check=True) + observed = json.loads(result.stdout) + assert observed["beforeDraw"] == observed["afterDraw"], observed + assert observed["liveMode"] == observed["saved"]["mode"] == 4, observed + if store_backed: + assert observed["storeMode"] == 4, observed + assert observed["saved"]["widgets_values_named"][observed["fileName"]] == observed["selectedFile"] + if kind == "video": + assert observed["saved"]["widgets_values_named"]["force_rate"] == 30 + assert observed["saved"]["widgets_values_named"]["enable_video"] is False + else: + assert not any(name.startswith("Enable") for name in observed["saved"]["widgets_values_named"]) + assert observed["reopened"] == observed["saved"] + assert observed["reopenedEnable"] is False + assert observed["externalOn"] is True + assert observed["externalOff"] is False diff --git a/tests/test_v38_public_surface_cleanup.py b/tests/test_v38_public_surface_cleanup.py index 294458a..38d2fea 100644 --- a/tests/test_v38_public_surface_cleanup.py +++ b/tests/test_v38_public_surface_cleanup.py @@ -22,13 +22,14 @@ PUBLIC_DISPLAY_NAMES = { "H3EasyLoadImage": "H3 Continuum Load Image", "H3EasyLoadAudio": "H3 Continuum Load Audio", "H3ContinuumLoadVideo": "H3 Continuum Load Video", + "H3ContinuumVideoAdapter": "H3 Continuum Video Adapter", "H3ContinuumSecondPassV35": "H3 Continuum Second Pass", "H3ContinuumReferenceImages": "H3 Continuum Reference Images", "H3DecodeCacheHelper": "Decode Cache Helper", } -def test_public_export_is_exactly_the_v38x2_nine_node_allowlist(): +def test_public_export_keeps_legacy_loaders_and_adds_video_adapter(): assert set(root_nodes.NODE_CLASS_MAPPINGS) == set(PUBLIC_DISPLAY_NAMES) assert root_nodes.NODE_DISPLAY_NAME_MAPPINGS == PUBLIC_DISPLAY_NAMES diff --git a/tests/test_v38_public_workflow.py b/tests/test_v38_public_workflow.py index be2d5e3..0dc7302 100644 --- a/tests/test_v38_public_workflow.py +++ b/tests/test_v38_public_workflow.py @@ -9,9 +9,9 @@ from zipfile import ZipFile ROOT = Path(__file__).resolve().parents[1] WORKFLOW_PATH = ROOT / "examples" / "workflows" / "MiniMax_H3_Continuum_V38X2.json" -# User-approved final distribution. Do not sanitize or reserialize this graph. -WORKFLOW_SHA256 = "6c445d62979632bc1a801b1c28dbd639c23b51cc156ebae18837baaa757e592b" -ZIP_SHA256 = "29e8ea19cf7c7e8a8a5e98577905d8fd01fc800bb8edb4f4218a638fe39e69d0" +# User-approved loader migration (2026-09-21); non-loader graph values are protected. +WORKFLOW_SHA256 = "1b2212b7511fac0b63dfa6e9f006cd8644c72d08c6945ab0e4ed0e722c97a730" +ZIP_SHA256 = "8f839a955859bffa0d9cf0b15e91ee484dd911aca5ae31f1787debd56afdc7da" ZIP_WORKFLOW_NAME = "MiniMax_H3_Continuum_V38X2.json" EXTERNAL_PACKAGES = { "comfyui-spectrum-minimax-h3", @@ -53,8 +53,8 @@ def _graph(workflow: dict) -> tuple[dict[int, dict], dict[int, list]]: def test_v38_public_workflow_declares_external_dependencies_and_is_reloadable(): workflow = _workflow() - assert len(workflow["nodes"]) == 32 - assert len(workflow["links"]) == 38 + assert len(workflow["nodes"]) == 33 + assert len(workflow["links"]) == 39 packages = { node.get("properties", {}).get("cnr_id") for node in workflow["nodes"] } - {None, "", "comfy-core"} @@ -243,3 +243,27 @@ def test_v38x2_public_workflow_keeps_helper_finalize_create_save_chain(): "audio_samples": "H3ContinuumSamplerV38", "audio_vae": "VAELoader", } + + +def test_current_workflow_uses_core_audio_and_enable_free_video_adapter(): + workflow = _workflow() + nodes, links = _graph(workflow) + types = {node["type"] for node in workflow["nodes"]} + assert "H3EasyLoadAudio" not in types + assert "H3ContinuumLoadVideo" not in types + audio = _one_node(workflow, "LoadAudio") + video = _one_node(workflow, "LoadVideo") + adapter = _one_node(workflow, "H3ContinuumVideoAdapter") + for core, title in ((audio, "Load Audio"), (video, "Load Video")): + assert core.get("title", title) == title + assert core["properties"]["cnr_id"] == "comfy-core" + assert core["mode"] == 4 + assert audio["widgets_values_named"]["audio"] == "prnas_.mp3" + assert video["widgets_values_named"]["file"] == "MiniMax_H3_00001_.mp4" + assert adapter["widgets_values_named"] == {"force_rate": 24} + assert adapter["widgets_values"] == [24] + assert adapter["mode"] == 4 + assert links[adapter["inputs"][0]["link"]][1:3] == [video["id"], 0] + sampler = _one_node(workflow, "H3ContinuumSamplerV38") + guide = next(x for x in sampler["inputs"] if x["name"] == "reference_video_1") + assert nodes[links[guide["link"]][1]]["type"] == "H3ContinuumVideoAdapter" diff --git a/tests/test_video_adapter.py b/tests/test_video_adapter.py new file mode 100644 index 0000000..d8dbeb9 --- /dev/null +++ b/tests/test_video_adapter.py @@ -0,0 +1,49 @@ +from __future__ import annotations + +from fractions import Fraction +from types import SimpleNamespace + +import pytest +import torch + +from ComfyUI_H3_Continuum_Join import nodes as root_nodes +from ComfyUI_H3_Continuum_Join.v3.easy_video_nodes import ExecutionBlocker, _resample_video_frames +from ComfyUI_H3_Continuum_Join.v3.video_adapter_nodes import H3ContinuumVideoAdapter + + +def _outputs(output): + return output.args if hasattr(output, "args") else output.result + + +def test_video_adapter_is_registered_without_file_upload_or_enable(): + assert root_nodes.NODE_CLASS_MAPPINGS["H3ContinuumVideoAdapter"] is H3ContinuumVideoAdapter + schema = H3ContinuumVideoAdapter.define_schema() + assert [x.id for x in schema.inputs] == ["video", "force_rate"] + assert schema.inputs[1].default == 24.0 + assert len(schema.outputs) == 2 + + +@pytest.mark.parametrize("source_rate,count", [(Fraction(24),240), (Fraction(30),300), (Fraction(30000,1001),300)]) +def test_adapter_keeps_existing_resampling_and_exact_audio(source_rate, count): + images = torch.arange(count, dtype=torch.float32).view(count, 1, 1, 1).expand(-1, 2, 2, 3).clone() + audio = {"waveform": torch.arange(64, dtype=torch.float32).reshape(1, 1, 64), "sample_rate":32000} + calls = [] + class Video: + def get_components(self): + calls.append(True) + return SimpleNamespace(images=images, audio=audio, frame_rate=source_rate) + output_images, output_audio = _outputs(H3ContinuumVideoAdapter.execute(Video(), 24.0)) + assert len(calls) == 1 + assert torch.equal(output_images, _resample_video_frames(images, source_rate, 24.0)) + assert output_images.shape[0] == 240 + assert output_audio is audio + if source_rate == 24: + assert output_images is images + + +def test_adapter_source_rate_and_silent_video_contract(): + images = torch.zeros(30, 2, 2, 3) + video = SimpleNamespace(get_components=lambda: SimpleNamespace(images=images, audio=None, frame_rate=Fraction(30))) + out_images, audio = _outputs(H3ContinuumVideoAdapter.execute(video, 0)) + assert out_images is images + assert isinstance(audio, ExecutionBlocker) diff --git a/v3/easy_audio_nodes.py b/v3/easy_audio_nodes.py index baf2bc5..f88d4da 100644 --- a/v3/easy_audio_nodes.py +++ b/v3/easy_audio_nodes.py @@ -37,6 +37,7 @@ class H3EasyLoadAudio(CoreLoadAudio): def define_schema(cls): schema = super().define_schema() schema.node_id = "H3EasyLoadAudio" + schema.is_deprecated = True # Kept for saved workflows; new graphs use Core LoadAudio. schema.display_name = "H3 Continuum Load Audio" schema.category = "MiniMax H3/Continuum" schema.description = ( diff --git a/v3/easy_video_nodes.py b/v3/easy_video_nodes.py index 3645e80..d19feaa 100644 --- a/v3/easy_video_nodes.py +++ b/v3/easy_video_nodes.py @@ -74,6 +74,7 @@ except ImportError: # pragma: no cover - standalone unit tests Boolean = _InputFactory Combo = _InputFactory Float = _InputFactory + Video = _InputFactory Image = _OutputFactory Audio = _OutputFactory UploadType = _UploadType @@ -191,6 +192,7 @@ class H3ContinuumLoadVideo(io.ComfyNode): files = folder_paths.filter_files_content_types(files, ["video"]) return io.Schema( node_id="H3ContinuumLoadVideo", + is_deprecated=True, display_name="H3 Continuum Load Video", category=CATEGORY, description=( diff --git a/v3/video_adapter_nodes.py b/v3/video_adapter_nodes.py new file mode 100644 index 0000000..e633a63 --- /dev/null +++ b/v3/video_adapter_nodes.py @@ -0,0 +1,56 @@ +"""Core VIDEO to H3 frame batches, with no file/upload/Enable frontend.""" +from __future__ import annotations + +from fractions import Fraction + +from .easy_video_nodes import ExecutionBlocker, _resample_video_frames, io + + +class H3ContinuumVideoAdapter(io.ComfyNode): + """Reuse the established frame-rate conversion; audio is passed unchanged.""" + + @classmethod + def define_schema(cls): + return io.Schema( + node_id="H3ContinuumVideoAdapter", + display_name="H3 Continuum Video Adapter", + category="MiniMax H3/Continuum/Input", + description=( + "Converts Core Load Video's VIDEO to IMAGE frames and AUDIO. " + "Use Force Rate 24 for H3 Video Guide. No file selector or Enable. " + "Disable the whole video-input group, or bypass this adapter, " + "to disconnect its optional Sampler inputs." + ), + inputs=[ + io.Video.Input("video"), + io.Float.Input( + "force_rate", default=24.0, min=0.0, max=120.0, step=0.01, + display_name="Force Rate", + tooltip=( + "24 resamples to H3's expected FPS without changing nominal " + "duration or audio. 0 keeps source frames (not normally for H3)." + ), + ), + ], + outputs=[ + io.Image.Output(display_name="images"), + io.Audio.Output(display_name="audio"), + ], + ) + + @classmethod + def execute(cls, video, force_rate: float = 24.0): + components = video.get_components() + images = _resample_video_frames( + components.images, Fraction(components.frame_rate), float(force_rate) + ) + audio = components.audio + if audio is None: + audio = ExecutionBlocker(None) + return io.NodeOutput(images, audio) + + +NODE_CLASS_MAPPINGS = {"H3ContinuumVideoAdapter": H3ContinuumVideoAdapter} +NODE_DISPLAY_NAME_MAPPINGS = { + "H3ContinuumVideoAdapter": "H3 Continuum Video Adapter", +} diff --git a/web/easy_bypass_toggle.js b/web/easy_bypass_toggle.js index a1a9c5b..8cb85ca 100644 --- a/web/easy_bypass_toggle.js +++ b/web/easy_bypass_toggle.js @@ -1,16 +1,10 @@ -// Shared native-Bypass control for Easy workflow loader nodes. - -// ComfyUI Frontend 1.49.6 defines LGraphEventMode.ALWAYS=0 and BYPASS=4. -// Prefer exported LiteGraph constants when available and keep the audited -// numeric values only as compatibility fallbacks. +// Convenience toggles delegate to Core node.mode; Core owns persistence/drawing. const NODE_MODE_ALWAYS = typeof LiteGraph !== "undefined" && Number.isInteger(LiteGraph.ALWAYS) - ? LiteGraph.ALWAYS - : 0; + ? LiteGraph.ALWAYS : 0; const NODE_MODE_BYPASS = typeof LiteGraph !== "undefined" && Number.isInteger(LiteGraph.BYPASS) - ? LiteGraph.BYPASS - : 4; + ? LiteGraph.BYPASS : 4; function isConfiguredNode(node, nodeClass) { return node?.comfyClass === nodeClass || node?.type === nodeClass; @@ -23,28 +17,36 @@ export function findEasyBypassWidget(node) { function syncWidgetFromMode(node) { const widget = findEasyBypassWidget(node); - if (!widget) return; - widget.value = node.mode === NODE_MODE_ALWAYS; + if (widget) widget.value = node.mode === NODE_MODE_ALWAYS; +} + +function findModeDescriptor(node) { + for (let owner = node; owner; owner = Object.getPrototypeOf(owner)) { + const descriptor = Object.getOwnPropertyDescriptor(owner, "mode"); + if (descriptor) return descriptor; + } + return undefined; } function installModeSourceOfTruth(node) { if (node.__h3EasyBypassModeObserved) return true; - const descriptor = Object.getOwnPropertyDescriptor(node, "mode"); - if (descriptor && descriptor.configurable === false) return false; - + const own = Object.getOwnPropertyDescriptor(node, "mode"); + if (own?.configurable === false) return false; + const descriptor = findModeDescriptor(node); + const accessor = descriptor && ("get" in descriptor || "set" in descriptor); + // Never replace a read-only property or manufacture a second store value. + if (accessor && (!descriptor.get || !descriptor.set)) return false; + if (descriptor && !accessor && descriptor.writable === false) return false; let currentMode = Number(node.mode ?? NODE_MODE_ALWAYS); Object.defineProperty(node, "mode", { configurable: true, - enumerable: descriptor?.enumerable ?? true, + enumerable: own?.enumerable ?? descriptor?.enumerable ?? true, get() { - return descriptor?.get ? descriptor.get.call(this) : currentMode; + return accessor ? descriptor.get.call(this) : currentMode; }, set(value) { - if (descriptor?.set) { - descriptor.set.call(this, value); - } else { - currentMode = Number(value); - } + if (accessor) descriptor.set.call(this, value); + else currentMode = Number(value); syncWidgetFromMode(this); }, }); @@ -52,132 +54,48 @@ function installModeSourceOfTruth(node) { return true; } -function installWidgetSerializationGuard(node, widget) { - if (node.__h3EasyBypassSerializationGuard) return; - - const originalSerialize = node.serialize; - if (typeof originalSerialize === "function") { - node.serialize = function (...args) { - const index = this.widgets?.indexOf(widget) ?? -1; - if (index >= 0) this.widgets.splice(index, 1); - try { - return originalSerialize.apply(this, args); - } finally { - if (index >= 0) this.widgets.splice(index, 0, widget); - } - }; - } - - const originalConfigure = node.configure; - if (typeof originalConfigure === "function") { - node.configure = function (...args) { - const index = this.widgets?.indexOf(widget) ?? -1; - if (index >= 0) this.widgets.splice(index, 1); - try { - return originalConfigure.apply(this, args); - } finally { - if (index >= 0) this.widgets.splice(index, 0, widget); - syncWidgetFromMode(this); - } - }; - } - - node.__h3EasyBypassSerializationGuard = true; -} - -function installBypassToggleForeground(node) { - if (node.__h3EasyBypassForegroundInstalled) return; - const originalDrawWidgets = node.drawWidgets; - if (typeof originalDrawWidgets !== "function") return; - - node.drawWidgets = function (ctx, options = {}) { - const result = originalDrawWidgets.call(this, ctx, options); - if (this.mode !== NODE_MODE_BYPASS) return result; - - const widget = findEasyBypassWidget(this); - const widgets = this.widgets; - if (!widget || widget.hidden || !Array.isArray(widgets)) return result; - if (!widgets.includes(widget)) return result; - - // ComfyUI draws every widget at the node's Bypass alpha. Redraw only - // the Enable row afterwards at full opacity so it remains readable and - // uses the unchanged native widget hit area/click handling. - this.widgets = [widget]; - try { - originalDrawWidgets.call(this, ctx, { - ...(options ?? {}), - editorAlpha: 1, - }); - } finally { - this.widgets = widgets; - } - return result; - }; - node.__h3EasyBypassForegroundInstalled = true; -} - function setModeFromToggle(node, enabled) { node.mode = enabled ? NODE_MODE_ALWAYS : NODE_MODE_BYPASS; syncWidgetFromMode(node); + node.graph?.change?.(); node.setDirtyCanvas?.(true, true); } export function configureEasyBypassToggleNode( - node, - { nodeClass, widgetName, tooltip }, + node, { nodeClass, widgetName, tooltip }, ) { if (!isConfiguredNode(node, nodeClass)) return; node.__h3EasyBypassToggle = { nodeClass, widgetName }; - let widget = findEasyBypassWidget(node); if (!widget) { widget = node.addWidget( - "toggle", - widgetName, - node.mode === NODE_MODE_ALWAYS, + "toggle", widgetName, node.mode === NODE_MODE_ALWAYS, (value) => setModeFromToggle(node, Boolean(value)), - { - on: "ON", - off: "OFF", - serialize: false, - }, + { on: "ON", off: "OFF", serialize: false }, ); - widget.serialize = false; + widget.serialize = false; // Workflow persistence. widget.options ||= {}; - widget.options.serialize = false; + widget.options.serialize = false; // API prompt serialization. widget.tooltip = tooltip; - const currentIndex = node.widgets?.indexOf(widget) ?? -1; - if (currentIndex > 0) { - node.widgets.splice(currentIndex, 1); - node.widgets.unshift(widget); - } - installWidgetSerializationGuard(node, widget); + // Append only. Never splice/reassign widgets in draw/serialize/configure: + // newer Core uses a stable mutation view backed by its widget store. } - if (!installModeSourceOfTruth(node)) { - console.warn( - `${nodeClass} could not observe node.mode; external Bypass changes may require a workflow reload.`, - ); + console.warn(`${nodeClass}: native mode could not be observed; use Core Bypass.`); } - installBypassToggleForeground(node); syncWidgetFromMode(node); node.setDirtyCanvas?.(true, true); } +// Retained for existing callers; new Video Adapter has no Enable widget. export function configureExistingEasyBypassWidgetNode( - node, - { nodeClass, widgetNames }, + node, { nodeClass, widgetNames }, ) { if (!isConfiguredNode(node, nodeClass)) return; const names = Array.isArray(widgetNames) ? widgetNames : [widgetNames]; const widget = node.widgets?.find((item) => names.includes(item.name)); if (!widget) return; - - node.__h3EasyBypassToggle = { - nodeClass, - widgetName: widget.name, - }; - + node.__h3EasyBypassToggle = { nodeClass, widgetName: widget.name }; if (!widget.__h3EasyBypassCallbackObserved) { const originalCallback = widget.callback; widget.callback = function (value, ...args) { @@ -187,18 +105,7 @@ export function configureExistingEasyBypassWidgetNode( }; widget.__h3EasyBypassCallbackObserved = true; } - - if (!installModeSourceOfTruth(node)) { - console.warn( - `${nodeClass} could not observe node.mode; external Bypass changes may require a workflow reload.`, - ); - } - installBypassToggleForeground(node); - - if (node.mode === NODE_MODE_BYPASS) { - syncWidgetFromMode(node); - } else { - setModeFromToggle(node, Boolean(widget.value)); - } - node.setDirtyCanvas?.(true, true); + installModeSourceOfTruth(node); + if (node.mode === NODE_MODE_BYPASS) syncWidgetFromMode(node); + else setModeFromToggle(node, Boolean(widget.value)); } diff --git a/web/easy_load_video.js b/web/easy_load_video.js index 071b2a9..140c010 100644 --- a/web/easy_load_video.js +++ b/web/easy_load_video.js @@ -1,41 +1,3 @@ -import { app } from "../../scripts/app.js"; -import { configureExistingEasyBypassWidgetNode } from "./easy_bypass_toggle.js"; - -const EASY_LOAD_VIDEO_CLASS = "H3ContinuumLoadVideo"; - -function configureEasyLoadVideoNode(node) { - if ( - node?.comfyClass !== EASY_LOAD_VIDEO_CLASS && - node?.type !== EASY_LOAD_VIDEO_CLASS - ) { - return; - } - - try { - configureExistingEasyBypassWidgetNode(node, { - nodeClass: EASY_LOAD_VIDEO_CLASS, - widgetNames: ["enable_video", "Enable Video"], - }); - } catch (error) { - console.warn( - "H3 Continuum Load Video bypass appearance synchronization was skipped; backend blocking remains available.", - error, - ); - } -} - -app.registerExtension({ - name: "H3Continuum.EasyLoadVideo", - - nodeCreated(node) { - configureEasyLoadVideoNode(node); - }, - - loadedGraphNode(node) { - configureEasyLoadVideoNode(node); - }, - - afterConfigureGraph() { - for (const node of app.graph?._nodes || []) configureEasyLoadVideoNode(node); - }, -}); +// Legacy H3ContinuumLoadVideo keeps its saved backend enable_video input. +// Do not mirror it into node.mode or alter Core widget arrays/drawing. +// New workflows use Core LoadVideo -> H3ContinuumVideoAdapter (no Enable).