mirror of
https://github.com/invoke-ai/InvokeAI.git
synced 2026-02-16 14:35:05 -05:00
* feat(ui): add axios client generator and simple example * fix(ui): update client & nodes test code w/ new Edge type * chore(ui): organize generated files * chore(ui): update .eslintignore, .prettierignore * chore(ui): update openapi.json * feat(backend): fixes for nodes/generator * feat(ui): generate object args for api client * feat(ui): more nodes api prototyping * feat(ui): nodes cancel * chore(ui): regenerate api client * fix(ui): disable OG web server socket connection * fix(ui): fix scrollbar styles typing and prop just noticed the typo, and made the types stronger. * feat(ui): add socketio types * feat(ui): wip nodes - extract api client method arg types instead of manually declaring them - update example to display images - general tidy up * start building out node translations from frontend state and add notes about missing features * use reference to sampler_name * use reference to sampler_name * add optional apiUrl prop * feat(ui): start hooking up dynamic txt2img node generation, create middleware for session invocation * feat(ui): write separate nodes socket layer, txt2img generating and rendering w single node * feat(ui): img2img implementation * feat(ui): get intermediate images working but types are stubbed out * chore(ui): add support for package mode * feat(ui): add nodes mode script * feat(ui): handle random seeds * fix(ui): fix middleware types * feat(ui): add rtk action type guard * feat(ui): disable NodeAPITest This was polluting the network/socket logs. * feat(ui): fix parameters panel border color This commit should be elsewhere but I don't want to break my flow * feat(ui): make thunk types more consistent * feat(ui): add type guards for outputs * feat(ui): load images on socket connect Rudimentary * chore(ui): bump redux-toolkit * docs(ui): update readme * chore(ui): regenerate api client * chore(ui): add typescript as dev dependency I am having trouble with TS versions after vscode updated and now uses TS 5. `madge` has installed 3.9.10 and for whatever reason my vscode wants to use that. Manually specifying 4.9.5 and then setting vscode to use that as the workspace TS fixes the issue. * feat(ui): begin migrating gallery to nodes Along the way, migrate to use RTK `createEntityAdapter` for gallery images, and separate `results` and `uploads` into separate slices. Much cleaner this way. * feat(ui): clean up & comment results slice * fix(ui): separate thunk for initial gallery load so it properly gets index 0 * feat(ui): POST upload working * fix(ui): restore removed type * feat(ui): patch api generation for headers access * chore(ui): regenerate api * feat(ui): wip gallery migration * feat(ui): wip gallery migration * chore(ui): regenerate api * feat(ui): wip refactor socket events * feat(ui): disable panels based on app props * feat(ui): invert logic to be disabled * disable panels when app mounts * feat(ui): add support to disableTabs * docs(ui): organise and update docs * lang(ui): add toast strings * feat(ui): wip events, comments, and general refactoring * feat(ui): add optional token for auth * feat(ui): export StatusIndicator and ModelSelect for header use * feat(ui) working on making socket URL dynamic * feat(ui): dynamic middleware loading * feat(ui): prep for socket jwt * feat(ui): migrate cancelation also updated action names to be event-like instead of declaration-like sorry, i was scattered and this commit has a lot of unrelated stuff in it. * fix(ui): fix img2img type * chore(ui): regenerate api client * feat(ui): improve InvocationCompleteEvent types * feat(ui): increase StatusIndicator font size * fix(ui): fix middleware order for multi-node graphs * feat(ui): add exampleGraphs object w/ iterations example * feat(ui): generate iterations graph * feat(ui): update ModelSelect for nodes API * feat(ui): add hi-res functionality for txt2img generations * feat(ui): "subscribe" to particular nodes feels like a dirty hack but oh well it works * feat(ui): first steps to node editor ui * fix(ui): disable event subscription it is not fully baked just yet * feat(ui): wip node editor * feat(ui): remove extraneous field types * feat(ui): nodes before deleting stuff * feat(ui): cleanup nodes ui stuff * feat(ui): hook up nodes to redux * fix(ui): fix handle * fix(ui): add basic node edges & connection validation * feat(ui): add connection validation styling * feat(ui): increase edge width * feat(ui): it blends * feat(ui): wip model handling and graph topology validation * feat(ui): validation connections w/ graphlib * docs(ui): update nodes doc * feat(ui): wip node editor * chore(ui): rebuild api, update types * add redux-dynamic-middlewares as a dependency * feat(ui): add url host transformation * feat(ui): handle already-connected fields * feat(ui): rewrite SqliteItemStore in sqlalchemy * fix(ui): fix sqlalchemy dynamic model instantiation * feat(ui, nodes): metadata wip * feat(ui, nodes): models * feat(ui, nodes): more metadata wip * feat(ui): wip range/iterate * fix(nodes): fix sqlite typing * feat(ui): export new type for invoke component * tests(nodes): fix test instantiation of ImageField * feat(nodes): fix LoadImageInvocation * feat(nodes): add `title` ui hint * feat(nodes): make ImageField attrs optional * feat(ui): wip nodes etc * feat(nodes): roll back sqlalchemy * fix(nodes): partially address feedback * fix(backend): roll back changes to pngwriter * feat(nodes): wip address metadata feedback * feat(nodes): add seeded rng to RandomRange * feat(nodes): address feedback * feat(nodes): move GET images error handling to DiskImageStorage * feat(nodes): move GET images error handling to DiskImageStorage * fix(nodes): fix image output schema customization * feat(ui): img2img/txt2img -> linear - remove txt2img and img2img tabs - add linear tab - add initial image selection to linear parameters accordion * feat(ui): tidy graph builders * feat(ui): tidy misc * feat(ui): improve invocation union types * feat(ui): wip metadata viewer recall * feat(ui): move fonts to normal deps * feat(nodes): fix broken upload * feat(nodes): add metadata module + tests, thumbnails - `MetadataModule` is stateless and needed in places where the `InvocationContext` is not available, so have not made it a `service` - Handles loading/parsing/building metadata, and creating png info objects - added tests for MetadataModule - Lifted thumbnail stuff to util * fix(nodes): revert change to RandomRangeInvocation * feat(nodes): address feedback - make metadata a service - rip out pydantic validation, implement metadata parsing as simple functions - update tests - address other minor feedback items * fix(nodes): fix other tests * fix(nodes): add metadata service to cli * fix(nodes): fix latents/image field parsing * feat(nodes): customise LatentsField schema * feat(nodes): move metadata parsing to frontend * fix(nodes): fix metadata test --------- Co-authored-by: maryhipp <maryhipp@gmail.com> Co-authored-by: Mary Hipp <maryhipp@Marys-MacBook-Air.local>
94 lines
2.9 KiB
TypeScript
94 lines
2.9 KiB
TypeScript
import { useCallback } from 'react';
|
|
import { Connection, Node, useReactFlow } from 'reactflow';
|
|
import graphlib from '@dagrejs/graphlib';
|
|
import { InvocationValue } from '../types/types';
|
|
|
|
export const useIsValidConnection = () => {
|
|
const flow = useReactFlow();
|
|
|
|
// Check if an in-progress connection is valid
|
|
const isValidConnection = useCallback(
|
|
({ source, sourceHandle, target, targetHandle }: Connection): boolean => {
|
|
const edges = flow.getEdges();
|
|
const nodes = flow.getNodes();
|
|
|
|
return true;
|
|
|
|
// Connection must have valid targets
|
|
if (!(source && sourceHandle && target && targetHandle)) {
|
|
return false;
|
|
}
|
|
|
|
// Connection is invalid if target already has a connection
|
|
if (
|
|
edges.find((edge) => {
|
|
return edge.target === target && edge.targetHandle === targetHandle;
|
|
})
|
|
) {
|
|
return false;
|
|
}
|
|
|
|
// Find the source and target nodes
|
|
const sourceNode = flow.getNode(source) as Node<InvocationValue>;
|
|
|
|
const targetNode = flow.getNode(target) as Node<InvocationValue>;
|
|
|
|
// Conditional guards against undefined nodes/handles
|
|
if (!(sourceNode && targetNode && sourceNode.data && targetNode.data)) {
|
|
return false;
|
|
}
|
|
|
|
// Connection types must be the same for a connection
|
|
if (
|
|
sourceNode.data.outputs[sourceHandle].type !==
|
|
targetNode.data.inputs[targetHandle].type
|
|
) {
|
|
return false;
|
|
}
|
|
|
|
// Graphs much be acyclic (no loops!)
|
|
|
|
/**
|
|
* TODO: use `graphlib.alg.findCycles()` to identify strong connections
|
|
*
|
|
* this validation func only runs when the cursor hits the second handle of the connection,
|
|
* and only on that second handle - so it cannot tell us exhaustively which connections
|
|
* are valid.
|
|
*
|
|
* ideally, we check when the connection starts to calculate all invalid handles at once.
|
|
*
|
|
* requires making a new graphlib graph - and calling `findCycles()` - for each potential
|
|
* handle. instead of using the `isValidConnection` prop, it would use the `onConnectStart`
|
|
* prop.
|
|
*
|
|
* the strong connections should be stored in global state.
|
|
*
|
|
* then, `isValidConnection` would simple loop through the strong connections and if the
|
|
* source and target are in a single strong connection, return false.
|
|
*
|
|
* and also, we can use this knowledge to style every handle when a connection starts,
|
|
* which is otherwise not possible.
|
|
*/
|
|
|
|
// build a graphlib graph
|
|
const g = new graphlib.Graph();
|
|
|
|
nodes.forEach((n) => {
|
|
g.setNode(n.id);
|
|
});
|
|
|
|
edges.forEach((e) => {
|
|
g.setEdge(e.source, e.target);
|
|
});
|
|
|
|
// Add the candidate edge to the graph
|
|
g.setEdge(source, target);
|
|
|
|
return graphlib.alg.isAcyclic(g);
|
|
},
|
|
[flow]
|
|
);
|
|
|
|
return isValidConnection;
|
|
};
|