neuro_llc/ComfyBox
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Commentz

Browse Source
This commit is contained in:
space-nuko
2023-05-18 15:14:18 -05:00
parent e0a81a0569
commit c7ad04b69a
5 changed files with 85 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/lib/stores/layoutState.ts
View File

@@ -39,8 +39,10 @@ export type LayoutAttributes = {
queuePromptButtonName: string,
/*
* If true, clicking the "Queue Prompt" button will run the default subgraph.
* Set this to false if you need special behavior before running any subgraphs.
* If true, clicking the "Queue Prompt" button will run the default
* subgraph. Set this to false if you need special behavior before running
* any subgraphs, and instead use the `onDefaultQueueAction` event of the
* Comfy.QueueEvents node.
*/
queuePromptButtonRunWorkflow: boolean,
}
@@ -84,6 +86,9 @@ export type LayoutState = {
*/
attrs: LayoutAttributes
/*
* Increment to force Svelte to re-render the props panel
*/
refreshPropsPanel: Writable<number>
}
@@ -102,7 +107,7 @@ export type Attributes = {
title: string,
/*
* List of classes to apply to the component.
* List of CSS classes to apply to the component.
*/
classes: string,
@@ -204,22 +209,22 @@ export type AttributesSpec = {
values?: string[],
/*
* If `type` is "number", step for the slider
* If `type` is "number", step for the slider that edits this attribute
*/
step?: number,
/*
* If `type` is "number", min for the slider
* If `type` is "number", min for the slider that edits this attribute
*/
min?: number,
/*
* If `type` is "number", max for the slider
* If `type` is "number", max for the slider that edits this attribute
*/
max?: number,
/*
* If `type` is "string", display as a textarea.
* If `type` is "string", display as a textarea instead of an input.
*/
multiline?: boolean,
@@ -863,8 +868,9 @@ function nodeAdded(node: LGraphNode, options: LGraphAddNodeOptions) {
let prevWidget = state.allItemsByNode[node.id]
if (prevWidget == null) {
// If a subgraph was cloned, try looking for the original widget node corresponding to the new widget node being added.
// `node` is the new ComfyWidgetNode instance to copy attrs to.
// `options.cloneData` should contain the results of Subgraph.clone(), called "subgraphNewIDMapping".
// `node` is the new ComfyWidgetNode instance to copy layout attrs to.
// `options.cloneData` should contain the results of Subgraph.clone(), which is named "subgraphNewIDMapping" in an
// entry of the `forNode` Record.
// `options.cloneData` is attached to the onNodeAdded options if a node is added to a graph after being
// selection-cloned or pasted, as they both call clone() internally.
const cloneData = options.cloneData.forNode[options.prevNodeID]
@@ -879,7 +885,7 @@ function nodeAdded(node: LGraphNode, options: LGraphAddNodeOptions) {
if (nodeIDInLayoutState) {
// Gottem.
prevWidget = state.allItemsByNode[nodeIDInLayoutState]
console.warn("FOUND CLONED SUBGRAPH NODE", node.id, "=>", nodeIDInLayoutState, prevWidget)
// console.warn("FOUND CLONED SUBGRAPH NODE", node.id, "=>", nodeIDInLayoutState, prevWidget)
}
}
}

34
src/lib/stores/queueState.ts
View File

@@ -4,10 +4,6 @@ import type { ComfyExecutionResult } from "$lib/nodes/ComfyWidgetNodes";
import notify from "$lib/notify";
import { get, writable, type Writable } from "svelte/store";
export type QueueItem = {
name: string
}
export type QueueEntryStatus = "success" | "error" | "interrupted" | "all_cached" | "unknown";
type QueueStateOps = {
@@ -23,8 +19,13 @@ type QueueStateOps = {
onExecuted: (promptID: PromptID, nodeID: ComfyNodeID, output: ComfyExecutionResult) => void
}
/*
* Single job that the backend keeps track of.
*/
export type QueueEntry = {
/* Data preserved on page refresh */
/*** Data preserved on page refresh ***/
/** Priority of the prompt. -1 means to queue at the front. */
number: number,
queuedAt?: Date,
finishedAt?: Date,
@@ -33,23 +34,34 @@ export type QueueEntry = {
extraData: ComfyBoxPromptExtraData,
goodOutputs: ComfyNodeID[],
/* Data not sent by ComfyUI's API, lost on page refresh */
/*** Data not sent by ComfyUI's API, lost on page refresh ***/
/* Prompt outputs, collected while the prompt is still executing */
outputs: SerializedPromptOutputs,
/* Nodes in of the workflow that have finished running so far. */
/* Nodes of the workflow that have finished running so far. */
nodesRan: Set<ComfyNodeID>,
/* Nodes of the workflow the backend reported as cached. */
cachedNodes: Set<ComfyNodeID>
}
/*
* Represents a queue entry that has finished executing (suceeded or failed) and
* has been moved to the history.
*/
export type CompletedQueueEntry = {
/** Corresponding entry in the queue, for the prompt/extra data */
entry: QueueEntry,
/** The result of this prompt, success/failed/cached */
status: QueueEntryStatus,
/** Message to display in the frontend */
message?: string,
/** Detailed error/stacktrace, perhaps inspectible with a popup */
error?: string,
}
/*
* Keeps track of queued and completed (history) prompts.
*/
export type QueueState = {
queueRunning: Writable<QueueEntry[]>,
queuePending: Writable<QueueEntry[]>,
@@ -57,6 +69,11 @@ export type QueueState = {
queueRemaining: number | "X" | null;
runningNodeID: ComfyNodeID | null;
progress: Progress | null,
/**
* If true, user pressed the "Interrupt" button in the frontend. Disable the
* button and wait until the next prompt starts running to re-enable it
* again
*/
isInterrupting: boolean
}
type WritableQueueStateStore = Writable<QueueState> & QueueStateOps;
@@ -159,6 +176,7 @@ function moveToCompleted(index: number, queue: Writable<QueueEntry[]>, status: Q
return qc
})
state.isInterrupting = false;
store.set(state)
}