Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Group nodes #1776

Merged
merged 80 commits into from
Nov 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
efe2108
setup ui unit tests
pythongosssss Oct 11, 2023
89579c0
Refactoring, adding connections
pythongosssss Oct 12, 2023
68ef595
Few tweaks
pythongosssss Oct 12, 2023
cd4059b
Fix type
pythongosssss Oct 12, 2023
be191b1
Add general test
pythongosssss Oct 12, 2023
a2fafda
Refactored and extended test
pythongosssss Oct 12, 2023
8040581
move to describe
pythongosssss Oct 13, 2023
c6df6d6
for groups
pythongosssss Oct 13, 2023
f40f910
wip group nodes
pythongosssss Oct 13, 2023
ede9216
Relink nodes
pythongosssss Oct 13, 2023
3cd503f
Reconnect on convert back
pythongosssss Oct 14, 2023
3c20922
add via node menu + canvas
pythongosssss Oct 14, 2023
6a95dfc
Add ws event handling
pythongosssss Oct 14, 2023
8415ef8
fix using wrong node on widget serialize
pythongosssss Oct 14, 2023
fbbaca0
allow reroute pipe
pythongosssss Oct 14, 2023
0764885
allow multiple images
pythongosssss Oct 14, 2023
8f13685
Add test for converted widgets on missing nodes + fix crash
pythongosssss Oct 15, 2023
9d17f78
tidy
pythongosssss Oct 15, 2023
efea06d
mores tests + refactor
pythongosssss Oct 15, 2023
b419cd2
throw earlier to get less confusing error
pythongosssss Oct 16, 2023
4a8c36b
support outputs
pythongosssss Oct 16, 2023
36534e0
more test
pythongosssss Oct 16, 2023
1a24b44
add ci action
pythongosssss Oct 16, 2023
caf454f
use lts node
pythongosssss Oct 16, 2023
bc3fa62
Fix?
pythongosssss Oct 16, 2023
017248f
Prevent connecting non matching combos
pythongosssss Oct 16, 2023
beb2a48
update
pythongosssss Oct 16, 2023
c8830e5
accidently removed npm i
pythongosssss Oct 16, 2023
9dfd61b
Disable logging extension
pythongosssss Oct 16, 2023
d32137f
Merge branch 'unit-tests' into group-nodes
pythongosssss Oct 16, 2023
323c310
Merge remote-tracking branch 'origin/master' into group-nodes
pythongosssss Oct 16, 2023
f17333c
fix naming
pythongosssss Oct 16, 2023
d941578
group node tests
pythongosssss Oct 16, 2023
8201868
Add executing info, custom node icon
pythongosssss Oct 17, 2023
34d0ae3
internal reroute just works
pythongosssss Oct 17, 2023
acad607
Fix crash on virtual nodes e.g. note
pythongosssss Oct 17, 2023
288a1c6
Merge remote-tracking branch 'origin/master' into group-nodes
pythongosssss Oct 21, 2023
bb4e65d
Save group nodes to templates
pythongosssss Oct 22, 2023
73cc92a
Merge remote-tracking branch 'origin/master' into group-nodes
pythongosssss Oct 22, 2023
c5eec07
Fix template nodes not being stored
pythongosssss Oct 22, 2023
32cdc71
Fix aborting convert
pythongosssss Oct 22, 2023
b440f86
tidy
pythongosssss Oct 22, 2023
a92409c
Merge remote-tracking branch 'origin/master' into group-nodes
pythongosssss Oct 23, 2023
4c928d2
Merge remote-tracking branch 'origin/master' into group-nodes
pythongosssss Nov 3, 2023
b6fb105
Fix reconnecting output links on convert to group
pythongosssss Nov 4, 2023
b3f759d
Fix links on convert to nodes
pythongosssss Nov 4, 2023
f9ff5d9
Handle missing internal nodes
pythongosssss Nov 4, 2023
4a31f46
Trigger callback on text change
pythongosssss Nov 4, 2023
49b97dc
Apply value on connect
pythongosssss Nov 4, 2023
c7eea7c
Fix converted widgets not reconnecting
pythongosssss Nov 4, 2023
2870b1c
Group node updates
pythongosssss Nov 8, 2023
d0514b8
Merge remote-tracking branch 'origin/master' into group-nodes
pythongosssss Nov 8, 2023
9d41993
Resolve issue with sanitized node name
pythongosssss Nov 8, 2023
da4feb6
Fix internal id
pythongosssss Nov 9, 2023
1a78c13
Merge remote-tracking branch 'origin/master' into group-nodes
pythongosssss Nov 9, 2023
444361d
Merge remote-tracking branch 'origin/master' into group-nodes
pythongosssss Nov 9, 2023
e530740
Merge remote-tracking branch 'origin/master' into group-nodes
pythongosssss Nov 11, 2023
71d7e63
allow outputs to be used internally and externally
pythongosssss Nov 13, 2023
19ff72d
Merge remote-tracking branch 'origin/master' into group-nodes
pythongosssss Nov 14, 2023
2e79919
order widgets on group node
pythongosssss Nov 14, 2023
31bc856
fix imageupload widget requiring a specific name
pythongosssss Nov 15, 2023
3ef9395
groupnode imageupload test
pythongosssss Nov 15, 2023
281e9b6
Merge remote-tracking branch 'origin/master' into group-nodes
pythongosssss Nov 16, 2023
08af9c6
Merge remote-tracking branch 'origin/master' into group-nodes
pythongosssss Nov 16, 2023
82de6b9
Merge remote-tracking branch 'origin/master' into group-nodes
pythongosssss Nov 17, 2023
8059fda
Fix issue with external node links
pythongosssss Nov 17, 2023
18cbab1
Add VAE model
pythongosssss Nov 17, 2023
34fd915
Fix internal node id check
pythongosssss Nov 17, 2023
07adf25
fix potential crash
pythongosssss Nov 17, 2023
95d1387
wip widget input support
pythongosssss Nov 19, 2023
823cac3
Merge remote-tracking branch 'origin/master' into group-nodes
pythongosssss Nov 19, 2023
f917e93
more wip group widget inputs
pythongosssss Nov 20, 2023
c44d8df
Merge remote-tracking branch 'origin/master' into group-nodes
pythongosssss Nov 25, 2023
abdff29
Group node refactor
pythongosssss Nov 26, 2023
f02cb2d
Merge remote-tracking branch 'origin/master' into group-nodes
pythongosssss Nov 26, 2023
e051b5b
Fix convert to nodes with internal reroutes
pythongosssss Nov 29, 2023
249fc92
Merge remote-tracking branch 'origin/master' into group-nodes
pythongosssss Nov 29, 2023
83e0314
fix applying primitive
pythongosssss Nov 29, 2023
50763d0
Fix control widget values
pythongosssss Nov 29, 2023
bc97d8a
fix test
pythongosssss Nov 30, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"path-intellisense.mappings": {
"../": "${workspaceFolder}/web/extensions/core"
},
"[python]": {
"editor.defaultFormatter": "ms-python.autopep8"
},
"python.formatting.provider": "none"
}
1 change: 1 addition & 0 deletions tests-ui/setup.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ async function setup() {
// Modify the response data to add some checkpoints
const objectInfo = JSON.parse(data);
objectInfo.CheckpointLoaderSimple.input.required.ckpt_name[0] = ["model1.safetensors", "model2.ckpt"];
objectInfo.VAELoader.input.required.vae_name[0] = ["vae1.safetensors", "vae2.ckpt"];

data = JSON.stringify(objectInfo, undefined, "\t");

Expand Down
Loading