ComfyWorkflow -> ComfyBoxWorkflow

This commit is contained in:
space-nuko
2023-05-24 11:52:35 -05:00
parent 38ae728eef
commit b30ecd3166
17 changed files with 79 additions and 79 deletions

View File

@@ -10,7 +10,7 @@
import Sidebar from "./Sidebar.svelte";
import SidebarItem from "./SidebarItem.svelte";
import notify from "$lib/notify";
import ComfyWorkflowsView from "./ComfyWorkflowsView.svelte";
import ComfyBoxWorkflowsView from "./ComfyBoxWorkflowsView.svelte";
import GlobalModal from "./GlobalModal.svelte";
export let app: ComfyApp = undefined;
@@ -60,7 +60,7 @@
<div id="container">
<Sidebar selected="generate">
<SidebarItem id="generate" name="Generate" icon={Image}>
<ComfyWorkflowsView {app} {uiTheme} />
<ComfyBoxWorkflowsView {app} {uiTheme} />
</SidebarItem>
<SidebarItem id="settings" name="Settings" icon={Gear}>
</SidebarItem>

View File

@@ -27,7 +27,7 @@ import modalState from "$lib/stores/modalState";
import queueState from "$lib/stores/queueState";
import selectionState from "$lib/stores/selectionState";
import uiState from "$lib/stores/uiState";
import workflowState, { ComfyWorkflow, type WorkflowAttributes, type WorkflowInstID } from "$lib/stores/workflowState";
import workflowState, { ComfyBoxWorkflow, type WorkflowAttributes, type WorkflowInstID } from "$lib/stores/workflowState";
import type { SerializedPromptOutput } from "$lib/utils";
import { basename, capitalize, download, graphToGraphVis, jsonToJsObject, promptToGraphVis, range } from "$lib/utils";
import { tick } from "svelte";
@@ -55,7 +55,7 @@ export type OpenWorkflowOptions = {
type PromptQueueItem = {
num: number,
batchCount: number
workflow: ComfyWorkflow
workflow: ComfyBoxWorkflow
}
export type A1111PromptAndInfo = {
@@ -256,7 +256,7 @@ export default class ComfyApp {
this.lCanvas.draw(true, true);
}
serialize(workflow: ComfyWorkflow, canvas?: SerializedGraphCanvasState): SerializedAppState {
serialize(workflow: ComfyBoxWorkflow, canvas?: SerializedGraphCanvasState): SerializedAppState {
const layoutState = layoutStates.getLayout(workflow.id);
if (layoutState == null)
throw new Error("Workflow has no layout!")
@@ -631,7 +631,7 @@ export default class ComfyApp {
refreshCombos: true,
warnMissingNodeTypes: true
}
): Promise<ComfyWorkflow> {
): Promise<ComfyBoxWorkflow> {
if (data.version !== COMFYBOX_SERIAL_VERSION) {
const mes = `Invalid ComfyBox saved data format: ${data.version} `
notify(mes, { type: "error" })
@@ -640,7 +640,7 @@ export default class ComfyApp {
this.clean();
let workflow: ComfyWorkflow;
let workflow: ComfyBoxWorkflow;
try {
workflow = workflowState.openWorkflow(this.lCanvas, data, options.setActive);
}
@@ -831,7 +831,7 @@ export default class ComfyApp {
* Converts the current graph workflow for sending to the API
* @returns The workflow and node links
*/
graphToPrompt(workflow: ComfyWorkflow, tag: string | null = null): SerializedPrompt {
graphToPrompt(workflow: ComfyBoxWorkflow, tag: string | null = null): SerializedPrompt {
return this.promptSerializer.serialize(workflow.graph, tag)
}
@@ -853,7 +853,7 @@ export default class ComfyApp {
tag = null;
this.processingQueue = true;
let workflow: ComfyWorkflow;
let workflow: ComfyBoxWorkflow;
try {
while (this.queueItems.length) {
@@ -1017,7 +1017,7 @@ export default class ComfyApp {
/**
* Refresh combo list on whole nodes
*/
async refreshComboInNodes(workflow?: ComfyWorkflow, defs?: Record<string, ComfyNodeDef>, flashUI: boolean = false) {
async refreshComboInNodes(workflow?: ComfyBoxWorkflow, defs?: Record<string, ComfyNodeDef>, flashUI: boolean = false) {
workflow ||= workflowState.getActiveWorkflow();
if (workflow == null) {
notify("No active workflow!", { type: "error" })

View File

@@ -8,10 +8,10 @@
import Menu from './menu/Menu.svelte';
import MenuOption from './menu/MenuOption.svelte';
import MenuDivider from './menu/MenuDivider.svelte';
import type { ComfyWorkflow } from "$lib/stores/workflowState";
import type { ComfyBoxWorkflow } from "$lib/stores/workflowState";
export let app: ComfyApp;
export let workflow: ComfyWorkflow;
export let workflow: ComfyBoxWorkflow;
let layoutState: WritableLayoutStateStore | null;

View File

@@ -3,7 +3,7 @@
import { PlusSquareDotted } from 'svelte-bootstrap-icons';
import { Button } from "@gradio/button";
import { BlockTitle } from "@gradio/atoms";
import ComfyWorkflowView from "./ComfyWorkflowView.svelte";
import ComfyBoxWorkflowView from "./ComfyBoxWorkflowView.svelte";
import { Checkbox, TextBox } from "@gradio/form"
import ComfyQueue from "./ComfyQueue.svelte";
import ComfyUnlockUIButton from "./ComfyUnlockUIButton.svelte";
@@ -11,7 +11,7 @@
import { get, writable, type Writable } from "svelte/store";
import ComfyProperties from "./ComfyProperties.svelte";
import uiState from "$lib/stores/uiState";
import workflowState, { ComfyWorkflow } from "$lib/stores/workflowState";
import workflowState, { ComfyBoxWorkflow } from "$lib/stores/workflowState";
import selectionState from "$lib/stores/selectionState";
import type ComfyApp from './ComfyApp';
import { onMount } from "svelte";
@@ -23,7 +23,7 @@
export let app: ComfyApp;
export let uiTheme: string = "gradio-dark" // TODO config
let workflow: ComfyWorkflow | null = null;
let workflow: ComfyBoxWorkflow | null = null;
let openedWorkflows = []
let containerElem: HTMLDivElement;
@@ -160,7 +160,7 @@
app.createNewWorkflow();
}
function closeWorkflow(event: Event, workflow: ComfyWorkflow) {
function closeWorkflow(event: Event, workflow: ComfyBoxWorkflow) {
event.preventDefault();
event.stopImmediatePropagation()
@@ -202,7 +202,7 @@
<Splitpanes theme="comfy" on:resize={refreshView} horizontal="{true}">
<Pane>
{#if $workflowState.activeWorkflow != null}
<ComfyWorkflowView {app} workflow={$workflowState.activeWorkflow} />
<ComfyBoxWorkflowView {app} workflow={$workflowState.activeWorkflow} />
{:else}
<span style:color="var(--body-text-color)">No workflow loaded</span>
{/if}

View File

@@ -11,9 +11,9 @@
import ComfyNumberProperty from "./ComfyNumberProperty.svelte";
import ComfyComboProperty from "./ComfyComboProperty.svelte";
import type { ComfyWidgetNode } from "$lib/nodes/widgets";
import type { ComfyWorkflow } from "$lib/stores/workflowState";
import type { ComfyBoxWorkflow } from "$lib/stores/workflowState";
export let workflow: ComfyWorkflow | null;
export let workflow: ComfyBoxWorkflow | null;
let layoutState: WritableLayoutStateStore | null = null

View File

@@ -10,7 +10,7 @@
import type { Styles } from "@gradio/utils";
import { comfyFileToComfyBoxMetadata, comfyURLToComfyFile, countNewLines } from "$lib/utils";
import ReceiveOutputTargets from "./modal/ReceiveOutputTargets.svelte";
import workflowState, { type ComfyWorkflow, type WorkflowReceiveOutputTargets } from "$lib/stores/workflowState";
import workflowState, { type ComfyBoxWorkflow, type WorkflowReceiveOutputTargets } from "$lib/stores/workflowState";
import type { ComfyReceiveOutputNode } from "$lib/nodes/actions";
import type ComfyApp from "./ComfyApp";
@@ -100,7 +100,7 @@
// ImageViewer.instance.showLightbox(e.detail)
}
function sendOutput(workflow: ComfyWorkflow, targetNode: ComfyReceiveOutputNode) {
function sendOutput(workflow: ComfyBoxWorkflow, targetNode: ComfyReceiveOutputNode) {
if (workflow == null || targetNode == null)
return

View File

@@ -1,17 +1,17 @@
<script lang="ts">
import type { ComfyReceiveOutputNode } from "$lib/nodes/actions";
import type { ComfyWorkflow, WorkflowReceiveOutputTargets } from "$lib/stores/workflowState";
import type { ComfyBoxWorkflow, WorkflowReceiveOutputTargets } from "$lib/stores/workflowState";
import { Block, BlockTitle } from "@gradio/atoms";
import { Button } from "@gradio/button";
import { createEventDispatcher } from "svelte";
const dispatch = createEventDispatcher<{
select: { workflow: ComfyWorkflow, targetNode: ComfyReceiveOutputNode };
select: { workflow: ComfyBoxWorkflow, targetNode: ComfyReceiveOutputNode };
}>();
export let receiveTargets: WorkflowReceiveOutputTargets[] = [];
function onSelected( workflow: ComfyWorkflow, targetNode: ComfyReceiveOutputNode ) {
function onSelected( workflow: ComfyBoxWorkflow, targetNode: ComfyReceiveOutputNode ) {
dispatch("select", {
workflow,
targetNode

View File

@@ -1,6 +1,6 @@
<script lang="ts" context="module">
export type SendOutputModalResult = {
workflow?: ComfyWorkflow,
workflow?: ComfyBoxWorkflow,
targetNode?: ComfyReceiveOutputNode,
}
</script>
@@ -11,7 +11,7 @@
import type { SlotType } from "@litegraph-ts/core";
import type { Writable } from "svelte/store";
import { StaticImage } from "$lib/components/gradio/image";
import type { ComfyWorkflow, WorkflowReceiveOutputTargets } from "$lib/stores/workflowState";
import type { ComfyBoxWorkflow, WorkflowReceiveOutputTargets } from "$lib/stores/workflowState";
import { comfyBoxImageToComfyURL } from "$lib/utils";
import { Button } from "@gradio/button";
import type { ComfyReceiveOutputNode } from "$lib/nodes/actions";
@@ -29,7 +29,7 @@
images = [comfyBoxImageToComfyURL(value)];
}
function sendOutput(workflow: ComfyWorkflow, targetNode: ComfyReceiveOutputNode) {
function sendOutput(workflow: ComfyBoxWorkflow, targetNode: ComfyReceiveOutputNode) {
const result: SendOutputModalResult = {
workflow,
targetNode