Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e319496044 | ||
|
|
b83b63c362 | ||
|
|
4d6b1675bb | ||
|
|
13110fab39 | ||
|
|
74ea509848 | ||
|
|
192bff9d2c | ||
|
|
44ed8812dc | ||
|
|
200696ba21 | ||
|
|
51cf3b0c04 | ||
|
|
6a4831c83b | ||
|
|
c5e7ed95a3 | ||
|
|
42a97fa4d9 | ||
|
|
45240d0012 | ||
|
|
8ed085febd | ||
|
|
37803ea61b | ||
|
|
acd416952c | ||
|
|
6ec46cbc44 | ||
|
|
a9d971e476 | ||
|
|
9fe064675d | ||
|
|
c84fa467d0 | ||
|
|
3d7a55f6d3 |
@@ -17,7 +17,9 @@
|
||||
- 支持多个web app 切换
|
||||
- 发布为app的workflow,可以在右键里再次编辑了
|
||||
- web app可以设置分类,在comfyui右键菜单可以编辑更新web app
|
||||
- 支持动态提示
|
||||
|
||||

|
||||
|
||||
- Support multiple web app switching.
|
||||
- Add the AppInfo node, which allows you to transform the workflow into a web app by simple configuration.
|
||||
|
||||
+2
-5
@@ -576,9 +576,6 @@ async def post_prompt_result(request):
|
||||
|
||||
return web.json_response({"result":res})
|
||||
|
||||
|
||||
|
||||
|
||||
# 扩展api接口
|
||||
# from server import PromptServer
|
||||
# from aiohttp import web
|
||||
@@ -722,7 +719,7 @@ NODE_DISPLAY_NAME_MAPPINGS = {
|
||||
"PromptGenerate_Mix":"Prompt Generate ♾️Mixlab",
|
||||
"ChinesePrompt_Mix":"Chinese Prompt ♾️Mixlab",
|
||||
"GamePal":"GamePal ♾️Mixlab",
|
||||
"RembgNode_Mix":"Remove Background",
|
||||
"RembgNode_Mix":"Remove Background ♾️Mixlab",
|
||||
"LoraNames_":"LoraName",
|
||||
"ApplyVisualStylePrompting_":"Apply VisualStyle Prompting",
|
||||
"StyleAlignedReferenceSampler_": "StyleAligned Reference Sampler",
|
||||
@@ -742,7 +739,7 @@ NODE_DISPLAY_NAME_MAPPINGS = {
|
||||
"GetImageSize_":"Get Image Size",
|
||||
"VAEEncodeForInpaint_Frames":"VAE Encode For Inpaint Frames",
|
||||
"IncrementingListNode_":"Create Incrementing Number List",
|
||||
"LoadImagesToBatch":"Load Images To Batch"
|
||||
"LoadImagesToBatch":"Load Images(base64) ♾️Mixlab"
|
||||
}
|
||||
|
||||
# web ui的节点功能
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 965 KiB |
+34
-3
@@ -4,8 +4,17 @@ import urllib.error
|
||||
import re,json,os,string,random
|
||||
import folder_paths
|
||||
import hashlib
|
||||
import codecs
|
||||
from zhipuai import ZhipuAI
|
||||
import codecs,sys
|
||||
import importlib.util
|
||||
|
||||
|
||||
def is_installed(package):
|
||||
try:
|
||||
spec = importlib.util.find_spec(package)
|
||||
except ModuleNotFoundError:
|
||||
return False
|
||||
return spec is not None
|
||||
|
||||
|
||||
def get_unique_hash(string):
|
||||
hash_object = hashlib.sha1(string.encode())
|
||||
@@ -48,14 +57,36 @@ def openai_client(key,url):
|
||||
base_url=url
|
||||
)
|
||||
return client
|
||||
|
||||
def ZhipuAI_client(key):
|
||||
|
||||
try:
|
||||
if is_installed('zhipuai')==False:
|
||||
import subprocess
|
||||
|
||||
# 安装
|
||||
print('#pip install zhipuai')
|
||||
|
||||
result = subprocess.run([sys.executable, '-s', '-m', 'pip', 'install', 'zhipuai'], capture_output=True, text=True)
|
||||
|
||||
#检查命令执行结果
|
||||
if result.returncode == 0:
|
||||
print("#install success")
|
||||
from zhipuai import ZhipuAI
|
||||
else:
|
||||
print("#install error")
|
||||
|
||||
else:
|
||||
from zhipuai import ZhipuAI
|
||||
except:
|
||||
print("#install zhipuai error")
|
||||
|
||||
client = ZhipuAI(
|
||||
api_key=key, # 填写您的 APIKey
|
||||
)
|
||||
return client
|
||||
|
||||
|
||||
|
||||
def chat(client, model_name,messages ):
|
||||
|
||||
try_count = 0
|
||||
|
||||
+27
-17
@@ -2752,35 +2752,45 @@ class ImageColorTransfer:
|
||||
CATEGORY = "♾️Mixlab/Color"
|
||||
|
||||
# 输入是否为列表
|
||||
INPUT_IS_LIST = True
|
||||
# INPUT_IS_LIST = True
|
||||
|
||||
# 输出是否为列表
|
||||
OUTPUT_IS_LIST = (True,)
|
||||
# OUTPUT_IS_LIST = (True,)
|
||||
|
||||
def run(self,source,target,weight):
|
||||
|
||||
res=[]
|
||||
|
||||
target=target[0][0]
|
||||
# print(target.shape)
|
||||
target=tensor2pil(target)
|
||||
#batch-list
|
||||
source_list = [source[i:i + 1, ...] for i in range(source.shape[0])]
|
||||
target_list = [target[i:i + 1, ...] for i in range(target.shape[0])]
|
||||
|
||||
for ims in source:
|
||||
for im in ims:
|
||||
image=tensor2pil(im)
|
||||
image_res=color_transfer(image,target)
|
||||
# 长度纠正为相等
|
||||
if len(target_list) != len(source_list):
|
||||
target_list = target_list * (len(source_list) // len(target_list)) + target_list[:len(source_list) % len(target_list)]
|
||||
|
||||
for i in range(len(source_list)):
|
||||
target=target_list[i]
|
||||
source=source_list[i]
|
||||
target=tensor2pil(target)
|
||||
|
||||
# weight Blend image # contributors:@ning
|
||||
blend_mask = Image.new(mode="L", size=image.size,
|
||||
color=(round(weight[0] * 255)))
|
||||
blend_mask = ImageOps.invert(blend_mask)
|
||||
img_result = Image.composite(image, image_res, blend_mask)
|
||||
image=tensor2pil(source)
|
||||
|
||||
del image, image_res, blend_mask
|
||||
image_res=color_transfer(image,target)
|
||||
|
||||
img_result=pil2tensor(img_result)
|
||||
res.append(img_result)
|
||||
# weight Blend image # contributors:@ning
|
||||
blend_mask = Image.new(mode="L", size=image.size,
|
||||
color=(round(weight * 255)))
|
||||
blend_mask = ImageOps.invert(blend_mask)
|
||||
img_result = Image.composite(image, image_res, blend_mask)
|
||||
del image, image_res, blend_mask
|
||||
|
||||
img_result=pil2tensor(img_result)
|
||||
|
||||
res.append(img_result)
|
||||
|
||||
# list - batch
|
||||
res=torch.cat(res, dim=0)
|
||||
|
||||
return (res,)
|
||||
|
||||
|
||||
+2
-2
@@ -7,6 +7,6 @@ openai
|
||||
simple-lama-inpainting
|
||||
clip-interrogator==0.6.0
|
||||
transformers>=4.36.0
|
||||
zhipuai
|
||||
lark-parser
|
||||
imageio-ffmpeg
|
||||
imageio-ffmpeg
|
||||
rembg[gpu]
|
||||
+119
-8
@@ -278,8 +278,11 @@
|
||||
}
|
||||
|
||||
button:hover {
|
||||
border-color: yellow !important;
|
||||
color: yellow !important;
|
||||
/* border-color: yellow !important; */
|
||||
color: #ffffff !important;
|
||||
/* font-weight: 400; */
|
||||
background: #232222;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.disabled {
|
||||
@@ -400,6 +403,46 @@
|
||||
.hidden-caption-content {
|
||||
display: none;
|
||||
}
|
||||
|
||||
/* 定义滚动条轨道的背景颜色 */
|
||||
|
||||
::-webkit-scrollbar-track {
|
||||
background-color: #f1f1f1;
|
||||
/* 轨道背景颜色 */
|
||||
}
|
||||
|
||||
/* 定义滚动条滑块的颜色 */
|
||||
|
||||
::-webkit-scrollbar-thumb {
|
||||
background-color: #888;
|
||||
/* 滑块颜色 */
|
||||
border-radius: 4px;
|
||||
/* 滑块圆角 */
|
||||
}
|
||||
|
||||
/* 鼠标悬停时滚动条滑块的颜色 */
|
||||
|
||||
::-webkit-scrollbar-thumb:hover {
|
||||
background-color: #555;
|
||||
/* 悬停时滑块颜色 */
|
||||
}
|
||||
|
||||
/* 定义滚动条角落的颜色 */
|
||||
|
||||
::-webkit-scrollbar-corner {
|
||||
background-color: transparent;
|
||||
/* 角落颜色 */
|
||||
}
|
||||
|
||||
|
||||
.dynamic_prompt::after {
|
||||
content: attr(title);
|
||||
position: absolute;
|
||||
color: black;
|
||||
padding: 4px;
|
||||
padding-left: 25px;
|
||||
border-radius: 4px;
|
||||
}
|
||||
</style>
|
||||
<!-- <script src="../../../scripts/api.js" type="module"></script> -->
|
||||
<link href="/extensions/comfyui-mixlab-nodes/lib/photoswipe.min.css" rel="stylesheet">
|
||||
@@ -440,8 +483,39 @@
|
||||
<script type="module">
|
||||
import PhotoSwipeLightbox from '/extensions/comfyui-mixlab-nodes/lib/photoswipe-lightbox.esm.min.js'
|
||||
// console.log(Lightbox)
|
||||
|
||||
import { api } from "../../../scripts/api.js";
|
||||
|
||||
|
||||
// ComfyUI\web\extensions\core\dynamicPrompts.js
|
||||
// 官方实现修改
|
||||
// Allows for simple dynamic prompt replacement
|
||||
// Inputs in the format {a|b} will have a random value of a or b chosen when the prompt is queued.
|
||||
|
||||
/*
|
||||
* Strips C-style line and block comments from a string
|
||||
*/
|
||||
function stripComments(str) {
|
||||
return str.replace(/\/\*[\s\S]*?\*\/|\/\/.*/g, '');
|
||||
}
|
||||
|
||||
function dynamicPrompts(prompt) {
|
||||
prompt = stripComments(prompt);
|
||||
while (prompt.replace("\\{", "").includes("{") && prompt.replace("\\}", "").includes("}")) {
|
||||
const startIndex = prompt.replace("\\{", "00").indexOf("{");
|
||||
const endIndex = prompt.replace("\\}", "00").indexOf("}");
|
||||
|
||||
const optionsString = prompt.substring(startIndex + 1, endIndex);
|
||||
const options = optionsString.split("|");
|
||||
|
||||
const randomIndex = Math.floor(Math.random() * options.length);
|
||||
const randomOption = options[randomIndex];
|
||||
|
||||
prompt = prompt.substring(0, startIndex) + randomOption + prompt.substring(endIndex + 1);
|
||||
}
|
||||
return prompt
|
||||
}
|
||||
|
||||
|
||||
// console.log('api', api)
|
||||
const base64Df =
|
||||
'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAYAAABWdVznAAAAAXNSR0IArs4c6QAAALZJREFUKFOFkLERwjAQBPdbgBkInECGaMLUQDsE0AkRVRAYWqAByxldPPOWHwnw4OBGye1p50UDSoA+W2ABLPN7i+C5dyC6R/uiAUXRQCs0bXoNIu4QPQzAxDKxHoALOrZcqtiyR/T6CXw7+3IGHhkYcy6BOR2izwT8LptG8rbMiCRAUb+CQ6WzQVb0SNOi5Z2/nX35DRyb/ENazhpWKoGwrpD6nICp5c2qogc4of+c7QcrhgF4Aa/aoAFHiL+RAAAAAElFTkSuQmCC'
|
||||
@@ -771,6 +845,21 @@
|
||||
// 随机seed
|
||||
promptWorkflow = randomSeed(seed, promptWorkflow);
|
||||
|
||||
// //动态提示,改为输入的时候,手动触发
|
||||
// for (const id in promptWorkflow) {
|
||||
// let node = promptWorkflow[id]
|
||||
// if (["TextInput_", "CLIPTextEncode", "PromptSimplification", "ChinesePrompt_Mix"].includes(
|
||||
// node.class_type
|
||||
// )) {
|
||||
// if (node.class_type == "PromptSimplification") {
|
||||
// promptWorkflow[id].inputs.prompt = dynamicPrompts(node.inputs.prompt);
|
||||
// } else {
|
||||
// promptWorkflow[id].inputs.text = dynamicPrompts(node.inputs.text);
|
||||
// }
|
||||
// console.log('#动态提示', promptWorkflow[id].inputs)
|
||||
// }
|
||||
// }
|
||||
|
||||
let url = get_url()
|
||||
const data = JSON.stringify({ prompt: promptWorkflow, client_id });
|
||||
fetch(`${url}/prompt`, {
|
||||
@@ -971,18 +1060,20 @@
|
||||
"PreviewImage",
|
||||
"PromptImage",
|
||||
"Image Save",
|
||||
"SaveImageAndMetadata_"].includes(node.class_type)) {
|
||||
|
||||
"SaveImageAndMetadata_",
|
||||
"TransparentImage"].includes(node.class_type)) {
|
||||
console.log('output#image', node)
|
||||
let a = document.createElement('a');
|
||||
a.id = `output_${node.id}`
|
||||
a.setAttribute('data-pswp-width', "200");
|
||||
a.setAttribute('data-pswp-height', "200");
|
||||
a.setAttribute('target', "_blank");
|
||||
a.setAttribute('href', base64Df);
|
||||
a.setAttribute('title', node.title);
|
||||
|
||||
let img = new Image();
|
||||
// img;
|
||||
img.src = base64Df;
|
||||
img.src = window._appData?.icon || base64Df;
|
||||
a.appendChild(img)
|
||||
output_card.appendChild(a);
|
||||
isShowImageFn = true;
|
||||
@@ -1532,7 +1623,7 @@
|
||||
textInput.value = data.inputs.prompt;
|
||||
} else {
|
||||
textInput.value = data.inputs.text;
|
||||
}
|
||||
};
|
||||
|
||||
// uploadImageInput.type = "text";
|
||||
let json = localStorage.getItem(`t_${data.id}`)
|
||||
@@ -1548,7 +1639,6 @@
|
||||
window._appData.data[data.id].inputs.text = textInput.value;
|
||||
}
|
||||
|
||||
|
||||
} catch (error) {
|
||||
|
||||
}
|
||||
@@ -1556,6 +1646,27 @@
|
||||
uploadContainer.appendChild(textInput);
|
||||
// autoResize(textInput);
|
||||
|
||||
|
||||
//动态提示功能
|
||||
const dynamicPromptsBtn = document.createElement('button');
|
||||
dynamicPromptsBtn.className = "dynamic_prompt"
|
||||
dynamicPromptsBtn.innerText = 'dynamic';
|
||||
dynamicPromptsBtn.style.width = '88px'
|
||||
uploadContainer.appendChild(dynamicPromptsBtn);
|
||||
dynamicPromptsBtn.addEventListener('click', e => {
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
let prompt = dynamicPrompts(textInput.value)
|
||||
textInput.setAttribute('title', prompt)
|
||||
dynamicPromptsBtn.setAttribute('title', prompt)
|
||||
if (data.class_type == "PromptSimplification") {
|
||||
window._appData.data[data.id].inputs.prompt = prompt;
|
||||
} else {
|
||||
window._appData.data[data.id].inputs.text = prompt;
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
function autoResize(textarea) {
|
||||
textarea.style.height = 'auto';
|
||||
textarea.style.height = textarea.scrollHeight + 'px';
|
||||
|
||||
@@ -2,6 +2,24 @@ import { app } from '../../../scripts/app.js'
|
||||
import { $el } from '../../../scripts/ui.js'
|
||||
import { api } from '../../../scripts/api.js'
|
||||
|
||||
//本机安装的插件节点全集
|
||||
window._nodesAll = null
|
||||
|
||||
//获取当前系统的插件,节点清单
|
||||
function getObjectInfo () {
|
||||
return new Promise(async (resolve, reject) => {
|
||||
let url = getUrl()
|
||||
|
||||
try {
|
||||
const response = await fetch(`${url}/object_info`)
|
||||
const data = await response.json()
|
||||
resolve(data)
|
||||
} catch (error) {
|
||||
reject(error)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
const base64Df =
|
||||
'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAYAAABWdVznAAAAAXNSR0IArs4c6QAAALZJREFUKFOFkLERwjAQBPdbgBkInECGaMLUQDsE0AkRVRAYWqAByxldPPOWHwnw4OBGye1p50UDSoA+W2ABLPN7i+C5dyC6R/uiAUXRQCs0bXoNIu4QPQzAxDKxHoALOrZcqtiyR/T6CXw7+3IGHhkYcy6BOR2izwT8LptG8rbMiCRAUb+CQ6WzQVb0SNOi5Z2/nX35DRyb/ENazhpWKoGwrpD6nICp5c2qogc4of+c7QcrhgF4Aa/aoAFHiL+RAAAAAElFTkSuQmCC'
|
||||
|
||||
@@ -267,7 +285,10 @@ function downloadJsonFile (jsonData, fileName = 'mix_app.json') {
|
||||
}
|
||||
|
||||
async function save (json, download = false, showInfo = true) {
|
||||
console.log('####SAVE', json[0])
|
||||
let nodesAll = window._nodesAll || (await getObjectInfo())
|
||||
|
||||
console.log('####SAVE', nodesAll, json[0])
|
||||
|
||||
const name = json[0],
|
||||
version = json[5],
|
||||
share_prefix = json[6], //用于分享的功能扩展
|
||||
@@ -288,6 +309,13 @@ async function save (json, download = false, showInfo = true) {
|
||||
try {
|
||||
let data = await app.graphToPrompt()
|
||||
|
||||
//从output数据里把工作流的节点,插件数据统计出来
|
||||
data.nodesMap = {}
|
||||
for (const id in data.output) {
|
||||
data.nodesMap[data.output[id].class_type] =
|
||||
nodesAll[data.output[id].class_type]
|
||||
}
|
||||
|
||||
let { input, output, seed, seedTitle } = await extractInputAndOutputData(
|
||||
data,
|
||||
inputIds,
|
||||
@@ -350,11 +378,11 @@ async function save (json, download = false, showInfo = true) {
|
||||
|
||||
function getInputsAndOutputs () {
|
||||
const inputs =
|
||||
`LoadImage ImagesPrompt_ VHS_LoadVideo CLIPTextEncode PromptSlide TextInput_ Color FloatSlider IntNumber CheckpointLoaderSimple LoraLoader`.split(
|
||||
`LoadImage LoadImagesToBatch ImagesPrompt_ VHS_LoadVideo CLIPTextEncode PromptSlide TextInput_ Color FloatSlider IntNumber CheckpointLoaderSimple LoraLoader`.split(
|
||||
' '
|
||||
),
|
||||
outputs =
|
||||
`PreviewImage,SaveImage,ShowTextForGPT,VHS_VideoCombine,Image Save,SaveImageAndMetadata_`.split(
|
||||
`SaveTripoSRMesh,PreviewImage,SaveImage,TransparentImage,ShowTextForGPT,VHS_VideoCombine,VideoCombine_Adv,Image Save,SaveImageAndMetadata_,ClipInterrogator`.split(
|
||||
','
|
||||
)
|
||||
|
||||
@@ -379,6 +407,11 @@ function getInputsAndOutputs () {
|
||||
|
||||
app.registerExtension({
|
||||
name: 'Mixlab.utils.AppInfo',
|
||||
init () {
|
||||
if (!window._nodesAll) {
|
||||
getObjectInfo().then(r => (window._nodesAll = r))
|
||||
}
|
||||
},
|
||||
async beforeRegisterNodeDef (nodeType, nodeData, app) {
|
||||
if (nodeType.comfyClass == 'AppInfo') {
|
||||
const orig_nodeCreated = nodeType.prototype.onNodeCreated
|
||||
|
||||
@@ -3,7 +3,7 @@ import { app } from '../../../scripts/app.js'
|
||||
const repoOwner = 'shadowcz007' // 替换为仓库的所有者
|
||||
const repoName = 'comfyui-mixlab-nodes' // 替换为仓库的名称
|
||||
|
||||
const version = 'v0.21.0'
|
||||
const version = 'v0.22.0'
|
||||
|
||||
fetch(`https://api.github.com/repos/${repoOwner}/${repoName}/releases/latest`)
|
||||
.then(response => response.json())
|
||||
|
||||
@@ -1,7 +1,39 @@
|
||||
import { app } from '../../../scripts/app.js'
|
||||
import { api } from '../../../scripts/api.js'
|
||||
import { ComfyWidgets } from '../../../scripts/widgets.js'
|
||||
// import { ComfyWidgets } from '../../../scripts/widgets.js'
|
||||
import { $el } from '../../../scripts/ui.js'
|
||||
import { applyTextReplacements } from '../../../scripts/utils.js'
|
||||
|
||||
function loadImageToCanvas (base64Image) {
|
||||
var img = new Image()
|
||||
var canvas = document.createElement('canvas')
|
||||
var ctx = canvas.getContext('2d')
|
||||
return new Promise((res, rej) => {
|
||||
img.onload = function () {
|
||||
// 等比例缩放图片
|
||||
var width = img.width
|
||||
var height = img.height
|
||||
var max_width = 1024
|
||||
if (width > max_width) {
|
||||
height *= max_width / width
|
||||
width = max_width
|
||||
}
|
||||
|
||||
// 设置canvas尺寸
|
||||
canvas.width = width
|
||||
canvas.height = height
|
||||
|
||||
// 在canvas上绘制图片
|
||||
ctx.drawImage(img, 0, 0, width, height)
|
||||
|
||||
// 将canvas转换为base64图片数据
|
||||
var canvasData = canvas.toDataURL()
|
||||
res(canvasData) // canvas转换后的base64图片数据
|
||||
}
|
||||
|
||||
img.src = base64Image
|
||||
})
|
||||
}
|
||||
|
||||
async function uploadImage (blob, fileType = '.svg', filename) {
|
||||
// const blob = await (await fetch(src)).blob();
|
||||
@@ -712,7 +744,9 @@ app.registerExtension({
|
||||
const file = e.target.files[0]
|
||||
const reader = new FileReader()
|
||||
reader.onload = async event => {
|
||||
const base64 = event.target.result
|
||||
let base64 = event.target.result
|
||||
//压缩图片,控制1024以内
|
||||
base64 = await loadImageToCanvas(base64)
|
||||
// console.log(base64)
|
||||
if (!imagesWidget.value) imagesWidget.value = { base64: [] }
|
||||
imagesWidget.value.base64.push(base64)
|
||||
@@ -765,6 +799,33 @@ app.registerExtension({
|
||||
this.serialize_widgets = true //需要保存参数
|
||||
}
|
||||
}
|
||||
|
||||
if (nodeData.name === 'SaveImageAndMetadata_') {
|
||||
const onNodeCreated = nodeType.prototype.onNodeCreated
|
||||
// /web/extensions/core/saveImageExtraOutput.js
|
||||
nodeType.prototype.onNodeCreated = function () {
|
||||
const r = onNodeCreated
|
||||
? onNodeCreated.apply(this, arguments)
|
||||
: undefined
|
||||
const widget = this.widgets.find(w => w.name === 'filename_prefix')
|
||||
widget.serializeValue = () => {
|
||||
return applyTextReplacements(app, widget.value)
|
||||
}
|
||||
|
||||
return r
|
||||
}
|
||||
|
||||
const onExecuted = nodeType.prototype.onExecuted
|
||||
nodeType.prototype.onExecuted = function (message) {
|
||||
onExecuted?.apply(this, arguments)
|
||||
console.log('##onExecuted', this, message)
|
||||
//TODO 是否 保存base64
|
||||
if (message.base64) {
|
||||
if (Array.isArray(message.base64)) {
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
async loadedGraphNode (node, app) {
|
||||
if (node.type === 'LoadImagesToBatch') {
|
||||
|
||||
@@ -46,6 +46,18 @@ const smart_connect_config_input = [
|
||||
node_widget_name: 'image',
|
||||
inputNodeName: 'LoadImage',
|
||||
inputNode_output_name: 'IMAGE'
|
||||
},
|
||||
{
|
||||
node_type: 'TripoSRSampler_',
|
||||
node_widget_name: 'image',
|
||||
inputNodeName: 'LoadImagesToBatch',
|
||||
inputNode_output_name: 'IMAGE'
|
||||
},
|
||||
{
|
||||
node_type: 'TripoSRSampler_',
|
||||
node_widget_name: 'mask',
|
||||
inputNodeName: 'RembgNode_Mix',
|
||||
inputNode_output_name: 'masks'
|
||||
}
|
||||
]
|
||||
|
||||
@@ -74,6 +86,18 @@ const smart_connect_config_output = [
|
||||
outputNodeName: 'SaveImage',
|
||||
outputNode_input_name: 'images'
|
||||
},
|
||||
{
|
||||
node_type: 'VAEDecode',
|
||||
node_output_name: 'IMAGE',
|
||||
outputNodeName: 'AppInfo',
|
||||
outputNode_input_name: 'IMAGE'
|
||||
},
|
||||
{
|
||||
node_type: 'VAEDecode',
|
||||
node_output_name: 'IMAGE',
|
||||
outputNodeName: 'SaveImageAndMetadata_',
|
||||
outputNode_input_name: 'images'
|
||||
},
|
||||
{
|
||||
node_type: 'Moondream',
|
||||
node_output_name: 'STRING',
|
||||
@@ -181,7 +205,10 @@ export function smart_init () {
|
||||
]
|
||||
let node_slotType = config[0]
|
||||
// 如果input没有,则创建
|
||||
if (!node.inputs?.filter(inp => inp.name === widget.name)[0]||!node.inputs)
|
||||
if (
|
||||
!node.inputs?.filter(inp => inp.name === widget.name)[0] ||
|
||||
!node.inputs
|
||||
)
|
||||
convertToInput(node, widget, config)
|
||||
input_node.connectByType(inputNode_slot, node, node_slotType)
|
||||
}
|
||||
|
||||
+106
-12
@@ -299,15 +299,16 @@ async function get_my_app (filename = null, category = '') {
|
||||
data = []
|
||||
|
||||
for (const res of result.data) {
|
||||
let { app, workflow } = res.data
|
||||
if (app.filename)
|
||||
data.push({
|
||||
let { app, workflow } = res.data;
|
||||
if (app?.filename) data.push({
|
||||
...app,
|
||||
data: workflow,
|
||||
date: res.date
|
||||
})
|
||||
}
|
||||
} catch (error) {}
|
||||
} catch (error) {
|
||||
console.log(error)
|
||||
}
|
||||
return data
|
||||
}
|
||||
|
||||
@@ -1137,6 +1138,57 @@ app.registerExtension({
|
||||
(this.canvas.height * 0.5) / (this.ds.scale * dpr) // 考虑设备像素比
|
||||
this.setDirty(true, true)
|
||||
}
|
||||
|
||||
// 支持app模式的json
|
||||
const loadAppJson = async data => {
|
||||
let workflow
|
||||
try {
|
||||
let w = JSON.parse(data)
|
||||
if (w.app && w.output) workflow = w.workflow
|
||||
} catch (err) {}
|
||||
|
||||
if (workflow && workflow.version && workflow.nodes && workflow.extra) {
|
||||
await app.loadGraphData(workflow)
|
||||
}
|
||||
}
|
||||
|
||||
if (!window._mixlab_app_paste_listener) {
|
||||
window._mixlab_app_paste_listener = true
|
||||
//粘贴json的事件
|
||||
document.addEventListener('paste', async e => {
|
||||
// ctrl+shift+v is used to paste nodes with connections
|
||||
// this is handled by litegraph
|
||||
if (this.shiftDown) return
|
||||
|
||||
let data = e.clipboardData || window.clipboardData
|
||||
|
||||
// No image found. Look for node data
|
||||
data = data.getData('text/plain')
|
||||
|
||||
loadAppJson(data)
|
||||
})
|
||||
|
||||
// 把json往里 拖
|
||||
document.addEventListener('drop', async event => {
|
||||
event.preventDefault()
|
||||
event.stopPropagation()
|
||||
|
||||
|
||||
|
||||
// Dragging from Chrome->Firefox there is a file but its a bmp, so ignore that
|
||||
if (
|
||||
event.dataTransfer.files.length &&
|
||||
event.dataTransfer.files[0].type == 'application/json'
|
||||
) {
|
||||
const reader = new FileReader()
|
||||
reader.onload = async () => {
|
||||
|
||||
loadAppJson(reader.result)
|
||||
}
|
||||
reader.readAsText(event.dataTransfer.files[0])
|
||||
}
|
||||
})
|
||||
}
|
||||
},
|
||||
setup () {
|
||||
setTimeout(async () => {
|
||||
@@ -1146,6 +1198,8 @@ app.registerExtension({
|
||||
const apps = await get_my_app()
|
||||
if (!apps) return
|
||||
|
||||
console.log('apps',apps)
|
||||
|
||||
let apps_map = { 0: [] }
|
||||
|
||||
for (const app of apps) {
|
||||
@@ -1511,14 +1565,16 @@ app.registerExtension({
|
||||
document.body.appendChild(div)
|
||||
}
|
||||
},
|
||||
apps_opts.length>0?{
|
||||
content: 'Workflow App ♾️Mixlab',
|
||||
has_submenu: true,
|
||||
disabled: false,
|
||||
submenu: {
|
||||
options: apps_opts
|
||||
}
|
||||
}:null
|
||||
apps_opts.length > 0
|
||||
? {
|
||||
content: 'Workflow App ♾️Mixlab',
|
||||
has_submenu: true,
|
||||
disabled: false,
|
||||
submenu: {
|
||||
options: apps_opts
|
||||
}
|
||||
}
|
||||
: null
|
||||
)
|
||||
|
||||
return options
|
||||
@@ -1587,3 +1643,41 @@ app.registerExtension({
|
||||
} catch (error) {}
|
||||
}
|
||||
})
|
||||
|
||||
//获取当前显存
|
||||
function fetchSystemStats () {
|
||||
return new Promise(async (resolve, reject) => {
|
||||
try {
|
||||
const response = await fetch('/system_stats')
|
||||
const data = await response.json()
|
||||
resolve(data)
|
||||
} catch (error) {
|
||||
reject(error)
|
||||
}
|
||||
})
|
||||
}
|
||||
//清理显存
|
||||
function postFreeData () {
|
||||
return new Promise(async (resolve, reject) => {
|
||||
try {
|
||||
const postData = {
|
||||
unload_models: true,
|
||||
free_memory: true
|
||||
}
|
||||
const response = await fetch('/free', {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
},
|
||||
body: JSON.stringify(postData)
|
||||
})
|
||||
if (response.ok) {
|
||||
resolve()
|
||||
} else {
|
||||
reject(new Error('Request failed'))
|
||||
}
|
||||
} catch (error) {
|
||||
reject(error)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user