first extension

This commit is contained in:
Weixuan Fu
2023-12-01 21:04:04 +08:00
commit d52bf26573
18 changed files with 7411 additions and 0 deletions
+5
View File
@@ -0,0 +1,5 @@
# ComfyUI Workspace Manager
## Features
- One click install missing custom nodes
+73
View File
@@ -0,0 +1,73 @@
import server
from aiohttp import web
import aiohttp
import shutil
import folder_paths
import os
import sys
import threading
import datetime
import re
import locale
import subprocess # don't remove this
from tqdm.auto import tqdm
import concurrent
import ssl
from urllib.parse import urlparse
import http.client
import re
import signal
WEB_DIRECTORY = "ui/dist"
NODE_CLASS_MAPPINGS = {}
__all__ = ['NODE_CLASS_MAPPINGS']
version = "V1.0.0"
print(f"### Loading: Workspace Manager ({version})")
comfy_path = os.path.dirname(folder_paths.__file__)
js_path = os.path.join(comfy_path, "web", "extensions")
def setup_js():
import nodes
js_dest_path = os.path.join(js_path, WEB_DIRECTORY)
print('wspace manager js_dest_path', js_dest_path)
# if hasattr(nodes, "EXTENSION_WEB_DIRS"):
# if os.path.exists(js_dest_path):
# shutil.rmtree(js_dest_path)
# else:
# # setup js
# if not os.path.exists(js_dest_path):
# os.makedirs(js_dest_path)
# js_src_path = os.path.join(comfyui_manager_path, "js", "comfyui-manager.js")
# print(f"### Workspace-Manager: Copy .js from '{js_src_path}' to '{js_dest_path}'")
# shutil.copy(js_src_path, js_dest_path)
setup_js()
def search_github(node_name):
url = f"https://api.github.com/search/repositories"
params = {
'q': query,
'per_page': per_page,
'page': page
}
headers = {
'Accept': 'application/vnd.github.v3+json'
}
response = requests.get(url, params=params, headers=headers)
if response.status_code == 200:
return response.json()
else:
return response.json()
@server.PromptServer.instance.routes.get("/workspace/install_nodes")
async def install_nodes(request):
nodes_to_install = request.rel_url.query["nodes"]
+18
View File
@@ -0,0 +1,18 @@
module.exports = {
root: true,
env: { browser: true, es2020: true },
extends: [
'eslint:recommended',
'plugin:@typescript-eslint/recommended',
'plugin:react-hooks/recommended',
],
ignorePatterns: ['dist', '.eslintrc.cjs'],
parser: '@typescript-eslint/parser',
plugins: ['react-refresh'],
rules: {
'react-refresh/only-export-components': [
'warn',
{ allowConstantExport: true },
],
},
}
+25
View File
@@ -0,0 +1,25 @@
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*
lerna-debug.log*
node_modules
dist
dist-ssr
*.local
# Editor directories and files
.vscode/*
!.vscode/extensions.json
.idea
.DS_Store
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?
.cache
+30
View File
@@ -0,0 +1,30 @@
# React + TypeScript + Vite
This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.
Currently, two official plugins are available:
- [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react/README.md) uses [Babel](https://babeljs.io/) for Fast Refresh
- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react-swc) uses [SWC](https://swc.rs/) for Fast Refresh
## Expanding the ESLint configuration
If you are developing a production application, we recommend updating the configuration to enable type aware lint rules:
- Configure the top-level `parserOptions` property like this:
```js
export default {
// other rules...
parserOptions: {
ecmaVersion: 'latest',
sourceType: 'module',
project: ['./tsconfig.json', './tsconfig.node.json'],
tsconfigRootDir: __dirname,
},
}
```
- Replace `plugin:@typescript-eslint/recommended` to `plugin:@typescript-eslint/recommended-type-checked` or `plugin:@typescript-eslint/strict-type-checked`
- Optionally add `plugin:@typescript-eslint/stylistic-type-checked`
- Install [eslint-plugin-react](https://github.com/jsx-eslint/eslint-plugin-react) and add `plugin:react/recommended` & `plugin:react/jsx-runtime` to the `extends` list
+4
View File
@@ -0,0 +1,4 @@
// @ts-ignore
import { app } from "/scripts/app.js";
// @ts-ignore
import App from "./src/main.tsx";
+5237
View File
File diff suppressed because it is too large Load Diff
+29
View File
@@ -0,0 +1,29 @@
{
"name": "comfyui-workspace-manager",
"private": true,
"version": "0.0.0",
"type": "module",
"scripts": {
"dev": "vite && vite build --watch",
"build": "tsc && vite build",
"lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
"preview": "vite preview"
},
"dependencies": {
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
"@types/react": "^18.2.37",
"@types/react-dom": "^18.2.15",
"@typescript-eslint/eslint-plugin": "^6.10.0",
"@typescript-eslint/parser": "^6.10.0",
"@vitejs/plugin-react": "^4.2.0",
"eslint": "^8.53.0",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-react-refresh": "^0.4.4",
"rollup-plugin-watch": "^1.0.4",
"typescript": "^5.2.2",
"vite": "^5.0.0"
}
}
+238
View File
@@ -0,0 +1,238 @@
import { Tabs, TabList, HStack, Tab, Input, Box } from "@chakra-ui/react";
import { useEffect, useRef, useState } from "react";
// @ts-ignore
import { app } from "/scripts/app.js";
import { LGraphNode } from "./types/litegraph";
import { ComfyExtension, ComfyObjectInfo } from "./types/comfy";
import {
Drawer,
DrawerBody,
Button,
DrawerHeader,
DrawerOverlay,
Checkbox,
DrawerContent,
DrawerCloseButton,
} from "@chakra-ui/react";
type Route = "root" | "customNodes" | "recentFlows";
// import app from "app";
// type Workflow = {
// json: string;
// name: string;
// img: string;
// };
// type RecentFlows = {
// [key: string]: Workflow;
// };
// copied from scripts/app.js
function sanitizeNodeName(string: string): string {
let entityMap: Record<string, string> = {
"&": "",
"<": "",
">": "",
'"': "",
"'": "",
"`": "",
"=": "",
};
return String(string).replace(/[&<>"'`=]/g, function fromEntityMap(s) {
return entityMap[s];
});
}
function App() {
const selectStyle = {
color: "white",
bg: "#333",
};
// const [activeFlows, setActiveFlows] = useState<Workflow[]>([]);
// const [allFlows, setAllFlows] = useState<Set<string>>();
const [missingNodeTypes, setMissingNodeTypes] = useState<string[]>([]);
const nodeDefs = useRef<Record<string, ComfyObjectInfo>>({});
const [flowName, setFlowName] = useState<string>(
"workflow-" + new Date().getTime()
);
const [route, setRoute] = useState<Route>("root");
const findMissingNodes = () => {
const missing = new Set<string>();
for (let n of app.graph._nodes) {
// Patch T2IAdapterLoader to ControlNetLoader since they are the same node now
if (n.type == "T2IAdapterLoader") n.type = "ControlNetLoader";
if (n.type == "ConditioningAverage ") n.type = "ConditioningAverage"; //typo fix
if (n.type == "SDV_img2vid_Conditioning")
n.type = "SVD_img2vid_Conditioning"; //typo fix
// Find missing node types
if (!(n.type in nodeDefs.current)) {
n.type = sanitizeNodeName(n.type);
missing.add(n.type);
}
}
console.log("missing", missing);
setMissingNodeTypes(Array.from(missing));
};
const graphAppSetup = () => {
const ext: ComfyExtension = {
// Unique name for the extension
name: "WorkspaceManager",
async setup(app) {
// Any setup to run after the app is createdjj
console.log("ext.setup", app);
},
async addCustomNodeDefs(defs) {
console.log("addCustomNodeDefs in workspace manager", defs);
nodeDefs.current = defs;
},
// async loadedGraphNode(node: LGraphNode, app: ComfyApp) {},
};
app.registerExtension(ext);
// const flow = localStorage.getItem("allFlows") ?? "[]";
// setAllFlows(new Set(JSON.parse(flow)));
// hacky fetch missing nodes defer until i find a way to get callback when graph fully loaded
setTimeout(() => {
findMissingNodes();
}, 500);
};
useEffect(() => {
graphAppSetup();
setInterval(() => {
const graphJson = localStorage.getItem("workflow");
localStorage.setItem("wf-" + flowName, graphJson ?? "");
localStorage.setItem("latestWorkflow", flowName);
// console.log("cur app", app);
}, 3000);
}, []);
return (
<Box
style={{
width: "100%",
position: "absolute",
top: 0,
left: 0,
right: 0,
}}
>
<Tabs
variant="unstyled"
style={{
backgroundColor: "white",
}}
>
<TabList
defaultValue={"ComfyUI"}
style={{ padding: 8, marginLeft: 16 }}
justifyContent={"space-between"}
gap={4}
>
<HStack>
<Input
variant="unstyled"
placeholder="Workflow name"
value={flowName}
onChange={(e) => {
setFlowName(e.target.value);
}}
/>
</HStack>
<HStack>
{/* <Tab _selected={selectStyle}>Template</Tab>
<Tab _selected={selectStyle}>Outline</Tab> */}
<Tab _selected={selectStyle}>111</Tab>
<Button
onClick={() => {
setRoute("customNodes");
}}
>
{missingNodeTypes.length === 0
? "Custom Nodes"
: "Install Missing Nodes " + missingNodeTypes.length}
</Button>
</HStack>
</TabList>
</Tabs>
<CustomNodesDrawer
missingNodes={missingNodeTypes}
isOpen={route === "customNodes"}
onclose={() => {
setRoute("root");
console.log("close");
}}
/>
{/* <CustomNodesDrawer missingNodes={missingNodeTypes} /> */}
</Box>
);
}
export default App;
type CustomNodesDrawerProps = {
missingNodes: string[];
onclose: () => void;
isOpen: boolean;
};
function CustomNodesDrawer({
missingNodes,
isOpen,
onclose,
}: CustomNodesDrawerProps) {
const [toInstall, setToInstall] = useState<string[]>(missingNodes);
useEffect(() => {
setToInstall(missingNodes);
}, [missingNodes]);
const handleInstall = (toInstall: string[]) => {
fetch("/workspace/install_nodes", {
// method: "POST",
body: JSON.stringify({ nodes: toInstall }),
})
.then((res) => res.json())
.then((res) => {
console.log("install res", res);
});
};
return (
<div style={{ position: "absolute", top: 0, left: 0, right: 0 }}>
<Drawer
isOpen={isOpen}
placement="right"
onClose={() => onclose()}
size={"sm"}
>
<DrawerOverlay />
<DrawerContent>
<DrawerCloseButton />
<DrawerHeader>Custom Nodes</DrawerHeader>
<DrawerBody>
<HStack mb={6}>
<Button
onClick={() => {
handleInstall(toInstall);
}}
>
Install Missing Nodes {toInstall.length}
</Button>
</HStack>
{missingNodes.map((n) => {
return (
<HStack>
<Checkbox
isChecked={toInstall.includes(n)}
onChange={(e) => {
if (e.target.checked) {
setToInstall([...toInstall, n]);
} else {
setToInstall(toInstall.filter((i) => i !== n));
}
}}
></Checkbox>
<span>{n}</span>
</HStack>
);
})}
</DrawerBody>
</DrawerContent>
</Drawer>
</div>
);
}
+1
View File
@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="35.93" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 228"><path fill="#00D8FF" d="M210.483 73.824a171.49 171.49 0 0 0-8.24-2.597c.465-1.9.893-3.777 1.273-5.621c6.238-30.281 2.16-54.676-11.769-62.708c-13.355-7.7-35.196.329-57.254 19.526a171.23 171.23 0 0 0-6.375 5.848a155.866 155.866 0 0 0-4.241-3.917C100.759 3.829 77.587-4.822 63.673 3.233C50.33 10.957 46.379 33.89 51.995 62.588a170.974 170.974 0 0 0 1.892 8.48c-3.28.932-6.445 1.924-9.474 2.98C17.309 83.498 0 98.307 0 113.668c0 15.865 18.582 31.778 46.812 41.427a145.52 145.52 0 0 0 6.921 2.165a167.467 167.467 0 0 0-2.01 9.138c-5.354 28.2-1.173 50.591 12.134 58.266c13.744 7.926 36.812-.22 59.273-19.855a145.567 145.567 0 0 0 5.342-4.923a168.064 168.064 0 0 0 6.92 6.314c21.758 18.722 43.246 26.282 56.54 18.586c13.731-7.949 18.194-32.003 12.4-61.268a145.016 145.016 0 0 0-1.535-6.842c1.62-.48 3.21-.974 4.76-1.488c29.348-9.723 48.443-25.443 48.443-41.52c0-15.417-17.868-30.326-45.517-39.844Zm-6.365 70.984c-1.4.463-2.836.91-4.3 1.345c-3.24-10.257-7.612-21.163-12.963-32.432c5.106-11 9.31-21.767 12.459-31.957c2.619.758 5.16 1.557 7.61 2.4c23.69 8.156 38.14 20.213 38.14 29.504c0 9.896-15.606 22.743-40.946 31.14Zm-10.514 20.834c2.562 12.94 2.927 24.64 1.23 33.787c-1.524 8.219-4.59 13.698-8.382 15.893c-8.067 4.67-25.32-1.4-43.927-17.412a156.726 156.726 0 0 1-6.437-5.87c7.214-7.889 14.423-17.06 21.459-27.246c12.376-1.098 24.068-2.894 34.671-5.345a134.17 134.17 0 0 1 1.386 6.193ZM87.276 214.515c-7.882 2.783-14.16 2.863-17.955.675c-8.075-4.657-11.432-22.636-6.853-46.752a156.923 156.923 0 0 1 1.869-8.499c10.486 2.32 22.093 3.988 34.498 4.994c7.084 9.967 14.501 19.128 21.976 27.15a134.668 134.668 0 0 1-4.877 4.492c-9.933 8.682-19.886 14.842-28.658 17.94ZM50.35 144.747c-12.483-4.267-22.792-9.812-29.858-15.863c-6.35-5.437-9.555-10.836-9.555-15.216c0-9.322 13.897-21.212 37.076-29.293c2.813-.98 5.757-1.905 8.812-2.773c3.204 10.42 7.406 21.315 12.477 32.332c-5.137 11.18-9.399 22.249-12.634 32.792a134.718 134.718 0 0 1-6.318-1.979Zm12.378-84.26c-4.811-24.587-1.616-43.134 6.425-47.789c8.564-4.958 27.502 2.111 47.463 19.835a144.318 144.318 0 0 1 3.841 3.545c-7.438 7.987-14.787 17.08-21.808 26.988c-12.04 1.116-23.565 2.908-34.161 5.309a160.342 160.342 0 0 1-1.76-7.887Zm110.427 27.268a347.8 347.8 0 0 0-7.785-12.803c8.168 1.033 15.994 2.404 23.343 4.08c-2.206 7.072-4.956 14.465-8.193 22.045a381.151 381.151 0 0 0-7.365-13.322Zm-45.032-43.861c5.044 5.465 10.096 11.566 15.065 18.186a322.04 322.04 0 0 0-30.257-.006c4.974-6.559 10.069-12.652 15.192-18.18ZM82.802 87.83a323.167 323.167 0 0 0-7.227 13.238c-3.184-7.553-5.909-14.98-8.134-22.152c7.304-1.634 15.093-2.97 23.209-3.984a321.524 321.524 0 0 0-7.848 12.897Zm8.081 65.352c-8.385-.936-16.291-2.203-23.593-3.793c2.26-7.3 5.045-14.885 8.298-22.6a321.187 321.187 0 0 0 7.257 13.246c2.594 4.48 5.28 8.868 8.038 13.147Zm37.542 31.03c-5.184-5.592-10.354-11.779-15.403-18.433c4.902.192 9.899.29 14.978.29c5.218 0 10.376-.117 15.453-.343c-4.985 6.774-10.018 12.97-15.028 18.486Zm52.198-57.817c3.422 7.8 6.306 15.345 8.596 22.52c-7.422 1.694-15.436 3.058-23.88 4.071a382.417 382.417 0 0 0 7.859-13.026a347.403 347.403 0 0 0 7.425-13.565Zm-16.898 8.101a358.557 358.557 0 0 1-12.281 19.815a329.4 329.4 0 0 1-23.444.823c-7.967 0-15.716-.248-23.178-.732a310.202 310.202 0 0 1-12.513-19.846h.001a307.41 307.41 0 0 1-10.923-20.627a310.278 310.278 0 0 1 10.89-20.637l-.001.001a307.318 307.318 0 0 1 12.413-19.761c7.613-.576 15.42-.876 23.31-.876H128c7.926 0 15.743.303 23.354.883a329.357 329.357 0 0 1 12.335 19.695a358.489 358.489 0 0 1 11.036 20.54a329.472 329.472 0 0 1-11 20.722Zm22.56-122.124c8.572 4.944 11.906 24.881 6.52 51.026c-.344 1.668-.73 3.367-1.15 5.09c-10.622-2.452-22.155-4.275-34.23-5.408c-7.034-10.017-14.323-19.124-21.64-27.008a160.789 160.789 0 0 1 5.888-5.4c18.9-16.447 36.564-22.941 44.612-18.3ZM128 90.808c12.625 0 22.86 10.235 22.86 22.86s-10.235 22.86-22.86 22.86s-22.86-10.235-22.86-22.86s10.235-22.86 22.86-22.86Z"></path></svg>

After

Width:  |  Height:  |  Size: 4.0 KiB

+65
View File
@@ -0,0 +1,65 @@
:root {
font-family: Inter, system-ui, Avenir, Helvetica, Arial, sans-serif;
line-height: 1.5;
font-weight: 400;
color-scheme: light dark;
color: rgba(255, 255, 255, 0.87);
background-color: #242424;
font-synthesis: none;
text-rendering: optimizeLegibility;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
a {
font-weight: 500;
color: #646cff;
text-decoration: inherit;
}
a:hover {
color: #535bf2;
}
body {
margin: 0;
height: 100%;
}
h1 {
font-size: 3.2em;
line-height: 1.1;
}
button {
border-radius: 8px;
border: 1px solid transparent;
padding: 0.6em 1.2em;
font-size: 1em;
font-weight: 500;
font-family: inherit;
background-color: #1a1a1a;
cursor: pointer;
transition: border-color 0.25s;
}
button:hover {
border-color: #646cff;
}
button:focus,
button:focus-visible {
outline: 4px auto -webkit-focus-ring-color;
}
@media (prefers-color-scheme: light) {
:root {
color: #213547;
background-color: #ffffff;
}
a:hover {
color: #747bff;
}
button {
background-color: #f9f9f9;
}
}
+16
View File
@@ -0,0 +1,16 @@
import React from "react";
import ReactDOM from "react-dom/client";
import App from "./App.tsx";
import "./index.css";
import { ChakraProvider } from "@chakra-ui/react";
const topbar = document.createElement("div");
document.body.prepend(topbar);
ReactDOM.createRoot(topbar).render(
<React.StrictMode>
<ChakraProvider>
<App />
</ChakraProvider>
</React.StrictMode>
);
+91
View File
@@ -0,0 +1,91 @@
import { LGraphNode, IWidget } from "./litegraph";
import { ComfyApp } from "../../scripts/app";
export interface ComfyExtension {
/**
* The name of the extension
*/
name: string;
/**
* Allows any initialisation, e.g. loading resources. Called after the canvas is created but before nodes are added
* @param app The ComfyUI app instance
*/
init?(app: ComfyApp): Promise<void>;
/**
* Allows any additonal setup, called after the application is fully set up and running
* @param app The ComfyUI app instance
*/
setup?(app: ComfyApp): Promise<void>;
/**
* Called before nodes are registered with the graph
* @param defs The collection of node definitions, add custom ones or edit existing ones
* @param app The ComfyUI app instance
*/
addCustomNodeDefs?(
defs: Record<string, ComfyObjectInfo>,
app: ComfyApp
): Promise<void>;
/**
* Allows the extension to add custom widgets
* @param app The ComfyUI app instance
* @returns An array of {[widget name]: widget data}
*/
getCustomWidgets?(
app: ComfyApp
): Promise<
Record<
string,
(
node,
inputName,
inputData,
app
) => { widget?: IWidget; minWidth?: number; minHeight?: number }
>
>;
/**
* Allows the extension to add additional handling to the node before it is registered with LGraph
* @param nodeType The node class (not an instance)
* @param nodeData The original node object info config object
* @param app The ComfyUI app instance
*/
beforeRegisterNodeDef?(
nodeType: typeof LGraphNode,
nodeData: ComfyObjectInfo,
app: ComfyApp
): Promise<void>;
/**
* Allows the extension to register additional nodes with LGraph after standard nodes are added
* @param app The ComfyUI app instance
*/
registerCustomNodes?(app: ComfyApp): Promise<void>;
/**
* Allows the extension to modify a node that has been reloaded onto the graph.
* If you break something in the backend and want to patch workflows in the frontend
* This is the place to do this
* @param node The node that has been loaded
* @param app The ComfyUI app instance
*/
loadedGraphNode?(node: LGraphNode, app: ComfyApp);
/**
* Allows the extension to run code after the constructor of the node
* @param node The node that has been created
* @param app The ComfyUI app instance
*/
nodeCreated?(node: LGraphNode, app: ComfyApp);
}
export type ComfyObjectInfo = {
name: string;
display_name?: string;
description?: string;
category: string;
input?: {
required?: Record<string, ComfyObjectInfoConfig>;
optional?: Record<string, ComfyObjectInfoConfig>;
};
output?: string[];
output_name: string[];
};
export type ComfyObjectInfoConfig = [string | any[]] | [string | any[], any];
+1506
View File
File diff suppressed because it is too large Load Diff
+1
View File
@@ -0,0 +1 @@
/// <reference types="vite/client" />
+25
View File
@@ -0,0 +1,25 @@
{
"compilerOptions": {
"target": "ES2020",
"useDefineForClassFields": true,
"lib": ["ES2020", "DOM", "DOM.Iterable"],
"module": "ESNext",
"skipLibCheck": true,
/* Bundler mode */
"moduleResolution": "bundler",
"allowImportingTsExtensions": true,
"resolveJsonModule": true,
"isolatedModules": true,
"noEmit": true,
"jsx": "react-jsx",
/* Linting */
"strict": true,
"noUnusedLocals": true,
"noUnusedParameters": true,
"noFallthroughCasesInSwitch": true
},
"include": ["src", "public/comfyui", "entry.js", "public/entry.js"],
"references": [{ "path": "./tsconfig.node.json" }]
}
+10
View File
@@ -0,0 +1,10 @@
{
"compilerOptions": {
"composite": true,
"skipLibCheck": true,
"module": "ESNext",
"moduleResolution": "bundler",
"allowSyntheticDefaultImports": true
},
"include": ["vite.config.ts"]
}
+37
View File
@@ -0,0 +1,37 @@
import { defineConfig } from "vite";
import react from "@vitejs/plugin-react";
// https://vitejs.dev/config/
export default defineConfig({
define: {
// a hacky resolution for reactDOM process is not defined error
"process.env.NODE_ENV": '"production"',
},
build: {
lib: {
// Could also be a dictionary or array of multiple entry points
entry: "entry.js",
name: "WorkspaceManager",
// the proper extensions will be added
fileName: "workspace-manager",
},
watch: {
include: ["src/**"],
},
rollupOptions: {
// make sure to externalize deps that shouldn't be bundled
// into your library
external: ["/scripts/app.js"],
output: {
// Provide global variables to use in the UMD build
// for externalized deps
globals: {
app: "app",
},
},
},
},
// plugins: [react(), watch({ dir: "public" })],
plugins: [react()],
});