Commit Graph
43 Commits
Author SHA1 Message Date
Austin Mroz 7565290d2b Fix old workflows, Custom Size on refresh
Further migrations to video parameters had broken display of output
videos when an old workflow is loaded. This is fixed.

When the refresh button was clicked in ui, the custom size options of
Load Video were overwritten and lost. When the refresh button is
clicked, the custom size options are now readded properly.
2023-12-06 15:05:30 -06:00
Austin Mroz 76c8971c94 Rename save_image to save_output on Video Combine
This includes migration code to preserve old workflows
2023-12-04 14:08:32 -06:00
Austin Mroz 8ce1682187 Several js fixes
Fix params being uninitialized on migrated workflows

Fix null filename when performing a right click -> save on a video

Fix edge case in paths of a specific length causing console spam
2023-12-04 00:45:29 -06:00
Austin Mroz 9193868907 Revert metadata toggle, logging, round ints
The toggle for saving metadata has been changed back to a boolean
instead of a combo. While I wished to provide for future compatibility,
the change broke existing workflows and there was no accommodating
implementation to load metadata saved under a different tag.

The log level for ffmpeg preview processes has been raised to fatal.
There's a good chance this will make debugging harder for users when
errors arise, but aborted requests were too common for the error
messages produced by them to be acceptable.

Format widgets for ints are now properly rounded.
2023-12-03 12:36:41 -06:00
Austin Mroz ad1baf1fa8 Load Image, custom size, extension passing fixes
Load Images had a typo prevent it's extension filter (of nothing) from
applying

Audio inputs and outputs now consistently use lowercase audio as a
description and have a format name of VHS_AUDIO. While other extensions
could share the audio type name, they would not pass functions.

Previously when using ffmpeg to load a video, care was needed to ensure
that the first frame was index 0, but the frame at 1s was the first to
appear after 1s. This should now be fixed.

The js code for load video nodes now passes the extension as part of the
format so that gifs and webps can be properly distinguished between when
deciding if an advanced preview should be loaded.

Fixed a mistake in serialization of custom height on load video nodes
2023-12-02 11:59:05 -06:00
Austin Mroz 19a84ddf72 Yet further fixes
Add "-b:v" flag to webm format, resolves #78

Fixes Video Combine to provide an output usable outside the ui,
a list of files produced, resolves #57

Fix error in file path safety checks across drives on windows

Fixes for preview generation when backing file has audio

Don't scale video previews above their base resolution

Implement select_every_nth for advanced previews

Fix regression with improper callback checking on Load Audio

Reorder Load Audio in node mappings to not be grouped with image nodes
2023-12-01 14:43:20 -06:00
Austin Mroz 70f010f7ea Support previews for Load Video (Path), cleanup
Video Combine now returns a list of output files:
Partial fix for #57

Move safety checks to single shared function, added opt out by
environment variable. Easier methods are being considered

Modifications to viewvideo endpoint to work with paths instead of
standard methodology

Return an empty list of options instead of an error status for path
suggestions in an attempt to further reduce console spam.

Substantial js refactoring to simplify preview logic and
compartmentalize code that is shared between upload and path nodes
2023-12-01 10:04:59 -06:00
Austin Mroz 0ee635d2b0 Improve Load Images masks, further cleanup
Enable path suggestions for Load Images

Add masks equal to image size if any image has masks
This causes images with masks to function as expected and those
without to remain fully opaque.
Special thanks to @miaoerduo

Fix counter regex to work with audio outputs

Fix extension not being set for animated image outputs

Reductions to extraneous preview loads

Prevent new preview code from applying to webp files
2023-11-30 21:54:25 -06:00
Austin Mroz a1ee051238 Further cleanup
save_metadata is now a format flag
- This allows saving to different tag and hides for image formats

Implement high bit depth support
- Disabled by default, but works for images and has shown in testing to
  produce objectively higher quality output than base Save Image

Fix target_size from load video not applying when 2 dimensions are set
When an input video is scaled to a new aspect ratio, it is now cropped
Removed try wrapping of load video nodes. This creates more confusion
now a system of fallbacks isn't used

A fix for parsing format_widgets when applied outside a '_pass'

Fixed missing import of logger in utils

Animated images are now included in the animated preview code
- This improves performance and allows for pausing

Cleaned up injection of code to load metadata
2023-11-30 17:40:57 -06:00
Austin Mroz f63a0f789d Feature branch cleanup
Switch to new path widget code on remaining nodes

Performance tuning on video preview code
Surround preview code in try block in case request is closed
- May warrant a future pass, but ffmpeg errors will still log to console

Swap lack of common path in get_path to status=403
- This was mostly made to ease future changes to common path behaviour

Simplify the value field of preview widget.
- Reduces complexity and lessens duplicate requests on first loa

Introduce ui setting for advanced previews
- Reliability is shakey, so it's better kept as opt-in for now

Previews are properly integrated and apply to Video Combine nodes

More advanced formatting code when a path is too long to display

Reduced console spam from path suggestions
2023-11-30 14:29:03 -06:00
Austin Mroz e8e6971eaf Merge branch 'format_widgets' into develop 2023-11-29 20:43:25 -06:00
Austin Mroz 417332840c Merge audio, videopreview, path_completion branche 2023-11-29 20:39:52 -06:00
Austin Mroz 6218fe5342 Implement path completion
A number of nodes take a path as input.
This commit gives a search box with a list of valid files and folders
It also provides support for quickly selecting from valid options by
clicking or pressing tab.

Completion options are currently only suggested for subfolders of
comfyui, but this is easily changeable.
2023-11-29 16:31:32 -06:00
Austin Mroz 7773c61ef7 Functional previews in browser
Current js implementation is rough, but results are promising
2023-11-23 14:20:44 -06:00
Austin Mroz 9fd996ead3 Fix server-side prompt parsing, debugging.
While having the optional arguments passed is non-trivial, there's an
easy fix to get retrieve all params sent from the client.

Substantial changes to how formats are stored on the backend to ensure
that the extra data isn't displayed in the dropdown list or upon
clicking the "Refresh" button in the ui.

Update most existing existing formats to expose options as widgets
2023-11-22 00:04:58 -06:00
Austin Mroz cb6d1ae2c7 wip format_widgets implementation
Likely impossible to implement
Widgets which are not defined in original node function definition are
not passed
2023-11-09 13:39:34 -06:00
Austin Mroz c4b36a0555 State migration: combo and IOB
Combo widgets which use the first item instead of a default field are
now successfully reloaded if not defined.

Fixed a minor IOB from combo inputs having only a single element in
their definition
2023-11-02 17:07:02 -05:00
Austin Mroz 08ab4d371e Attempt to unclobber widget state during migration 2023-11-01 16:31:45 -05:00
Austin Mroz 7aa6d195e1 Improved node state migration code 2023-11-01 15:12:44 -05:00
Austin Mroz fd646a3594 Account for browser zoom in preview elements 2023-10-31 12:18:23 -05:00
Austin Mroz 3c27b297c7 Prevent display of null preview 2023-10-31 10:36:14 -05:00
Austin Mroz df8fae06dd Dedicated state migration code for Load Images 2023-10-30 16:30:49 -05:00
Austin Mroz d4eb68dd56 Discard legacy preview information
The old preview method stored the url instead of the params.
This makes it non trivial to parse whether it was to an image or video.
For safety, this information is instead discarded.
2023-10-30 15:36:14 -05:00
Austin Mroz 12f3471d0d Fxi no preview on old Video Combine node 2023-10-30 14:22:46 -05:00
Austin Mroz d87f1ab473 Show correct output preview on history load
Minor fix to not try and load a non-existent preview

Reduce obtrusiveness of likely resolved error path
2023-10-30 12:24:08 -05:00
Austin Mroz 5bcf3ee3b3 computeSize fix, improve pause/hide state.
computeSize now calculates directly from the nodes width instead of
saving the width from the last draw operation. This fixes a race
condition when a video loads before the draw frame occurs.

the paused and hidden state of a preview widget are now serialized as
part of the vlaue. This means they survive reload or restoring a
workflow. Addionally, videos are paused before being hidden to improve
performance on some browsers.
2023-10-29 23:17:48 -05:00
Austin Mroz 0447a5a9b0 Fix mouse stuck down on file upload
A frustrating amount of digging with an awfully simple solution.
The current selected widget for mouse events is held in
app.canvas.node_widget.and clearing it prevents the continued
propagation of move events to parent widgets.

Also provides a minor fix for canceled file uploads
2023-10-29 21:55:58 -05:00
Austin Mroz 553167e86b Ensure height is always a number greater than 0 2023-10-29 15:40:27 -05:00
Austin Mroz a99173e545 Fix attempts to serialize nodes with no widgets 2023-10-28 16:23:25 -05:00
Austin Mroz bc1e70d3b2 Store preview params in value
This allows for previews to be restored for Video Combine on reload
setPreviewsrc is left as a convenience function
2023-10-28 15:49:19 -05:00
Austin Mroz 2fb3787cc3 Fix migration when preview exists on Video Combine 2023-10-28 15:37:00 -05:00
Austin Mroz d51cb7c7a9 Fix preview on node-add, consistent naming
When a Load Video node is added, the default video selection is now
properly displayed with a preview.

Context menu options now consistently use preview instead of video as
the actions apply to animated images as well.
2023-10-28 15:24:59 -05:00
Austin Mroz 68b66e7e3e Add missing formatDate code
Disable code for non-existent VHS_SaveImageSequence
2023-10-28 15:13:13 -05:00
Austin Mroz 633351c64f Fix file uploads 2023-10-28 14:46:26 -05:00
Austin Mroz 4db66a807d Properly clear previews of nodes moved off screen.
With the preview element no longer named as inputEl, the pertinent code
that would hide the element when off screen no longer applied.

This is fixed and has the added benefit of preventing dangling
video elements even when a multiline widget has not yet injected it's
own fix.
2023-10-26 20:01:06 -05:00
Austin Mroz b8d629248e Add migratory code to prevent need for remove/add
While the new KV state storage should prevent the need for this in the
future and there's a degree of error checking, it would be particularly
poor optics for the system to break all existing workflows on release.

This adds a couple of migratory functions that carefully check and
manage the transitions for the two nodes that break.
2023-10-26 19:29:59 -05:00
Austin Mroz 3a6b9fb5c7 Fix node removal cleanup, hide unsupported preview
The onRemoved code for the preview widget wasn't actually firing, so the
callback has been moved to the node.onRemoved.

The file-input's created for nodes that support uploading were never
removed and have been corrected by the same method.

When a video is generated that can not be displayed in browser
(those using the h265 codec), the preview is now hidden

The 'video' field of Load Video (Upload) is now properly initialized
2023-10-26 18:20:48 -05:00
Austin Mroz f80d6a2dde Preview options at top, comfy error dialogs
Context menu options for video previews have been moved to the top of
the list.

When a node fails to load the nicer comfy error dialog is used.
Errors on file upload still use alert, but this is equivalent to the
native comfy code.

Video previews are muted.

The image preview element is hidden by default.
2023-10-25 15:24:08 -05:00
Austin Mroz 121da143c5 Merge branch 'main' into js_cleanup
Mostly trivial. Just a minor change to resolve the
selected video to a url in Load Video (Upload)
2023-10-24 17:09:10 -05:00
Austin Mroz 0b3b482d66 Add Open/Save Video, mark dirty on resize
Open and Save Video buttons have been added to the context menu.
This brings parity with the functionality of the Save Image node,
and restores functionality that was removed with passing through clicks
on the video preview element.

When a resize is done on a node, it is marked dirty.
This fixes a minor delay between preview content displaying
and the underlying node performing it's resize
2023-10-24 12:20:41 -05:00
Austin Mroz b609407849 Improved preview support
Implement animated image previews
add control options to context menu:
- Hide/Show
- Pause/Resume
- Sync
2023-10-23 23:19:07 -05:00
Austin Mroz 44674091e5 Reimplement video previews, kv state serialization
The reimplementation for video previews is functional and adds base
support for previews in load video (upload)

State serialization for nodes (what's used when a workflow is loaded or
the webpage is refreshed) now uses a map with widget names as keys for
all VHS nodes.
2023-10-23 00:04:19 -05:00
Austin Mroz c3ae8f2ec9 Work in progress rewrite of JS code
Includes code for uploads, customsize, dateformatting,
forcing timestamps, and hiding the useless GIF output of the combine
video node, but lacks the video preview code and testing.
2023-10-20 12:50:32 -05:00