mirror of
https://github.com/ParisNeo/lollms.git
synced 2025-03-24 12:55:18 +00:00
added comfyui
This commit is contained in:
Saifeddine ALOUI
parent
2e7d775b90
commit
78f9eb0919
@ -1,5 +1,5 @@
|
||||
# =================== Lord Of Large Language Multimodal Systems Configuration file ===========================
|
||||
version: 75
|
||||
version: 76
|
||||
binding_name: null
|
||||
model_name: null
|
||||
model_variant: null
|
||||
@ -85,6 +85,10 @@ current_language: en
|
||||
enable_sd_service: false
|
||||
sd_base_url: http://localhost:7860
|
||||
|
||||
# Image generation service comfyui
|
||||
enable_comfyui_service: false
|
||||
comfyui_base_url: http://127.0.0.1:8188/
|
||||
|
||||
# Motion control service
|
||||
enable_motion_ctrl_service: false
|
||||
motion_ctrl_base_url: http://localhost:7861
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
# =================== Lord Of Large Language Multimodal Systems Configuration file ===========================
|
||||
version: 75
|
||||
version: 76
|
||||
binding_name: null
|
||||
model_name: null
|
||||
model_variant: null
|
||||
@ -85,6 +85,10 @@ current_language: en
|
||||
enable_sd_service: false
|
||||
sd_base_url: http://localhost:7860
|
||||
|
||||
# Image generation service comfyui
|
||||
enable_comfyui_service: false
|
||||
comfyui_base_url: http://127.0.0.1:8188/
|
||||
|
||||
# Motion control service
|
||||
enable_motion_ctrl_service: false
|
||||
motion_ctrl_base_url: http://localhost:7861
|
||||
|
||||
74
lollms/server/endpoints/lollms_comfyui.py
Normal file
74
lollms/server/endpoints/lollms_comfyui.py
Normal file
@ -0,0 +1,74 @@
|
||||
"""
|
||||
project: lollms_webui
|
||||
file: lollms_xtts.py
|
||||
author: ParisNeo
|
||||
description:
|
||||
This module contains a set of FastAPI routes that provide information about the Lord of Large Language and Multimodal Systems (LoLLMs) Web UI
|
||||
application. These routes allow users to
|
||||
|
||||
"""
|
||||
from fastapi import APIRouter, Request
|
||||
from lollms_webui import LOLLMSWebUI
|
||||
from pydantic import BaseModel
|
||||
from starlette.responses import StreamingResponse
|
||||
from lollms.types import MSG_TYPE
|
||||
from lollms.main_config import BaseConfig
|
||||
from lollms.utilities import detect_antiprompt, remove_text_from_string, trace_exception, find_first_available_file_index, add_period, PackageManager
|
||||
from pathlib import Path
|
||||
from ascii_colors import ASCIIColors
|
||||
import os
|
||||
import platform
|
||||
|
||||
# ----------------------- Defining router and main class ------------------------------
|
||||
|
||||
router = APIRouter()
|
||||
lollmsElfServer:LOLLMSWebUI = LOLLMSWebUI.get_instance()
|
||||
|
||||
|
||||
# ----------------------- voice ------------------------------
|
||||
|
||||
@router.get("/install_comfyui")
|
||||
def install_comfyui():
|
||||
try:
|
||||
if lollmsElfServer.config.headless_server_mode:
|
||||
return {"status":False,"error":"Service installation is blocked when in headless mode for obvious security reasons!"}
|
||||
|
||||
if lollmsElfServer.config.host!="localhost" and lollmsElfServer.config.host!="127.0.0.1":
|
||||
return {"status":False,"error":"Service installation is blocked when the server is exposed outside for very obvious reasons!"}
|
||||
|
||||
lollmsElfServer.ShowBlockingMessage("Installing comfyui server\nPlease stand by")
|
||||
from lollms.services.comfyui.lollms_comfyui import install_sd
|
||||
install_comfyui(lollmsElfServer)
|
||||
ASCIIColors.success("Done")
|
||||
lollmsElfServer.HideBlockingMessage()
|
||||
return {"status":True}
|
||||
except Exception as ex:
|
||||
lollmsElfServer.HideBlockingMessage()
|
||||
lollmsElfServer.InfoMessage(f"It looks like I could not install SD because of this error:\n{ex}\nThis is commonly caused by a previous version that I couldn't delete. PLease remove {lollmsElfServer.lollms_paths.personal_path}/shared/auto_comfyui manually then try again")
|
||||
return {"status":False, 'error':str(ex)}
|
||||
|
||||
@router.get("/start_comfyui")
|
||||
def start_comfyui():
|
||||
try:
|
||||
if lollmsElfServer.config.headless_server_mode:
|
||||
return {"status":False,"error":"Service installation is blocked when in headless mode for obvious security reasons!"}
|
||||
|
||||
if lollmsElfServer.config.host!="localhost" and lollmsElfServer.config.host!="127.0.0.1":
|
||||
return {"status":False,"error":"Service installation is blocked when the server is exposed outside for very obvious reasons!"}
|
||||
|
||||
lollmsElfServer.ShowBlockingMessage("Starting Comfyui\nPlease stand by")
|
||||
from lollms.services.comfyui.lollms_comfyui import get_comfyui
|
||||
lollmsElfServer.comfyui = get_comfyui(lollmsElfServer.lollms_paths)(lollmsElfServer, lollmsElfServer.personality.name if lollmsElfServer.personality is not None else "Artbot")
|
||||
ASCIIColors.success("Done")
|
||||
lollmsElfServer.HideBlockingMessage()
|
||||
return {"status":True}
|
||||
except Exception as ex:
|
||||
lollmsElfServer.HideBlockingMessage()
|
||||
lollmsElfServer.InfoMessage(f"It looks like I could not install SD because of this error:\n{ex}\nThis is commonly caused by a previous version that I couldn't delete. PLease remove {lollmsElfServer.lollms_paths.personal_path}/shared/auto_comfyui manually then try again")
|
||||
return {"status":False, 'error':str(ex)}
|
||||
|
||||
@router.get("/show_comfyui")
|
||||
def show_comfyui():
|
||||
import webbrowser
|
||||
webbrowser.open(lollmsElfServer.config.comfyui_base_url)
|
||||
return {"status":True}
|
||||
@ -66,3 +66,9 @@ def start_sd():
|
||||
lollmsElfServer.HideBlockingMessage()
|
||||
lollmsElfServer.InfoMessage(f"It looks like I could not install SD because of this error:\n{ex}\nThis is commonly caused by a previous version that I couldn't delete. PLease remove {lollmsElfServer.lollms_paths.personal_path}/shared/auto_sd manually then try again")
|
||||
return {"status":False, 'error':str(ex)}
|
||||
|
||||
@router.get("/show_comfyui")
|
||||
def show_comfyui():
|
||||
import webbrowser
|
||||
webbrowser.open(lollmsElfServer.config.sd_base_url)
|
||||
return {"status":True}
|
||||
190
lollms/services/comfyui/lollms_comfyui.py
Normal file
190
lollms/services/comfyui/lollms_comfyui.py
Normal file
@ -0,0 +1,190 @@
|
||||
# Title LollmsComfyUI
|
||||
# Licence: GPL-3.0
|
||||
# Author : Paris Neo
|
||||
# Forked from comfyanonymous's Comfyui nodes system
|
||||
# check it out : https://github.com/comfyanonymous/ComfyUI
|
||||
# Here is a copy of the LICENCE https://github.com/comfyanonymous/ComfyUI/blob/main/LICENSE
|
||||
# All rights are reserved
|
||||
|
||||
from pathlib import Path
|
||||
import sys
|
||||
from lollms.app import LollmsApplication
|
||||
from lollms.paths import LollmsPaths
|
||||
from lollms.config import TypedConfig, ConfigTemplate, BaseConfig
|
||||
import time
|
||||
import io
|
||||
import sys
|
||||
import requests
|
||||
import os
|
||||
import base64
|
||||
import subprocess
|
||||
import time
|
||||
import json
|
||||
import platform
|
||||
from dataclasses import dataclass
|
||||
from PIL import Image, PngImagePlugin
|
||||
from enum import Enum
|
||||
from typing import List, Dict, Any
|
||||
|
||||
from ascii_colors import ASCIIColors, trace_exception
|
||||
from lollms.paths import LollmsPaths
|
||||
from lollms.utilities import git_pull, show_yes_no_dialog, run_script_in_env, create_conda_env
|
||||
import subprocess
|
||||
import shutil
|
||||
from tqdm import tqdm
|
||||
|
||||
|
||||
def verify_comfyui(lollms_paths:LollmsPaths):
|
||||
# Clone repository
|
||||
root_dir = lollms_paths.personal_path
|
||||
shared_folder = root_dir/"shared"
|
||||
comfyui_folder = shared_folder / "comfyui"
|
||||
return comfyui_folder.exists()
|
||||
|
||||
def download_file(url, folder_path, local_filename):
|
||||
# Make sure 'folder_path' exists
|
||||
folder_path.mkdir(parents=True, exist_ok=True)
|
||||
|
||||
with requests.get(url, stream=True) as r:
|
||||
r.raise_for_status()
|
||||
total_size = int(r.headers.get('content-length', 0))
|
||||
progress_bar = tqdm(total=total_size, unit='B', unit_scale=True)
|
||||
with open(folder_path / local_filename, 'wb') as f:
|
||||
for chunk in r.iter_content(chunk_size=8192):
|
||||
f.write(chunk)
|
||||
progress_bar.update(len(chunk))
|
||||
progress_bar.close()
|
||||
|
||||
return local_filename
|
||||
|
||||
def install_comfyui(lollms_app:LollmsApplication):
|
||||
root_dir = lollms_app.lollms_paths.personal_path
|
||||
shared_folder = root_dir/"shared"
|
||||
comfyui_folder = shared_folder / "comfyui"
|
||||
if comfyui_folder.exists():
|
||||
if show_yes_no_dialog("warning!","I have detected that there is a previous installation of stable diffusion.\nShould I remove it and continue installing?"):
|
||||
shutil.rmtree(comfyui_folder)
|
||||
elif show_yes_no_dialog("warning!","Continue installation?"):
|
||||
ASCIIColors.cyan("Installing comfyui conda environment with python 3.10")
|
||||
create_conda_env("comfyui","3.10")
|
||||
ASCIIColors.cyan("Done")
|
||||
return
|
||||
else:
|
||||
return
|
||||
|
||||
subprocess.run(["git", "clone", "https://github.com/ParisNeo/ComfyUI.git", str(comfyui_folder)])
|
||||
subprocess.run(["git", "clone", "https://github.com/ParisNeo/ComfyUI-Manager.git", str(comfyui_folder/"custom_nodes")])
|
||||
if show_yes_no_dialog("warning!","Do you want to install a model from civitai?\nIsuggest dreamshaper xl."):
|
||||
download_file("https://civitai.com/api/download/models/351306", comfyui_folder/"models/checkpoints","dreamshaperXL_v21TurboDPMSDE.safetensors")
|
||||
create_conda_env("comfyui","3.10")
|
||||
|
||||
lollms_app.comfyui = LollmsComfyUI(lollms_app)
|
||||
ASCIIColors.green("Comfyui installed successfully")
|
||||
|
||||
|
||||
def get_comfyui(lollms_paths:LollmsPaths):
|
||||
root_dir = lollms_paths.personal_path
|
||||
shared_folder = root_dir/"shared"
|
||||
comfyui_folder = shared_folder / "comfyui"
|
||||
comfyui_script_path = comfyui_folder / "lollms_comfyui.py"
|
||||
git_pull(comfyui_folder)
|
||||
|
||||
if comfyui_script_path.exists():
|
||||
ASCIIColors.success("lollms_comfyui found.")
|
||||
ASCIIColors.success("Loading source file...",end="")
|
||||
# use importlib to load the module from the file path
|
||||
from lollms.services.comfyui.lollms_comfyui import LollmsComfyUI
|
||||
ASCIIColors.success("ok")
|
||||
return LollmsComfyUI
|
||||
|
||||
class LollmsComfyUI:
|
||||
has_controlnet = False
|
||||
def __init__(
|
||||
self,
|
||||
app:LollmsApplication,
|
||||
wm = "Artbot",
|
||||
max_retries=50,
|
||||
sampler="Euler a",
|
||||
steps=20,
|
||||
use_https=False,
|
||||
username=None,
|
||||
password=None,
|
||||
comfyui_base_url=None,
|
||||
share=False,
|
||||
wait_for_service=True
|
||||
):
|
||||
if comfyui_base_url=="" or comfyui_base_url=="http://127.0.0.1:8188/":
|
||||
comfyui_base_url = None
|
||||
# Get the current directory
|
||||
lollms_paths = app.lollms_paths
|
||||
self.app = app
|
||||
root_dir = lollms_paths.personal_path
|
||||
|
||||
self.wm = wm
|
||||
# Store the path to the script
|
||||
if comfyui_base_url is None:
|
||||
self.comfyui_base_url = "http://127.0.0.1:8188/"
|
||||
if not verify_comfyui(lollms_paths):
|
||||
install_comfyui(app.lollms_paths)
|
||||
else:
|
||||
self.comfyui_base_url = comfyui_base_url
|
||||
|
||||
self.comfyui_url = self.comfyui_base_url+"/comfyuiapi/v1"
|
||||
shared_folder = root_dir/"shared"
|
||||
self.comfyui_folder = shared_folder / "comfyui"
|
||||
self.output_dir = root_dir / "outputs/comfyui"
|
||||
self.output_dir.mkdir(parents=True, exist_ok=True)
|
||||
|
||||
ASCIIColors.red(" _ ____ _ _ __ __ _____ _____ __ _ ")
|
||||
ASCIIColors.red("| | / __ \| | | | | \/ |/ ____|/ ____| / _| (_)")
|
||||
ASCIIColors.red("| | | | | | | | | | \ / | (___ | | ___ _ __ ___ | |_ _ _ _ _ _ ")
|
||||
ASCIIColors.red("| | | | | | | | | | |\/| |\___ \| | / _ \| '_ ` _ \| _| | | | | | | |")
|
||||
ASCIIColors.red("| |___| |__| | |____| |____| | | |____) | |___| (_) | | | | | | | | |_| | |_| | |")
|
||||
ASCIIColors.red("|______\____/|______|______|_| |_|_____/ \_____\___/|_| |_| |_|_| \__, |\__,_|_|")
|
||||
ASCIIColors.red(" ______ __/ | ")
|
||||
ASCIIColors.red(" |______| |___/ ")
|
||||
|
||||
ASCIIColors.red(" Forked from comfyanonymous's Comfyui nodes system")
|
||||
ASCIIColors.red(" Integration in lollms by ParisNeo")
|
||||
|
||||
if not self.wait_for_service(1,False) and comfyui_base_url is None:
|
||||
ASCIIColors.info("Loading lollms_comfyui")
|
||||
if platform.system() == "Windows":
|
||||
ASCIIColors.info("Running on windows")
|
||||
script_path = self.comfyui_folder / "lollms_comfyui.bat"
|
||||
|
||||
if share:
|
||||
run_script_in_env("comfyui", str(script_path) +" --share", cwd=self.comfyui_folder)
|
||||
# subprocess.Popen("conda activate " + str(script_path) +" --share", cwd=self.comfyui_folder)
|
||||
else:
|
||||
run_script_in_env("comfyui", str(script_path), cwd=self.comfyui_folder)
|
||||
# subprocess.Popen(script_path, cwd=self.comfyui_folder)
|
||||
else:
|
||||
ASCIIColors.info("Running on linux/MacOs")
|
||||
script_path = str(self.comfyui_folder / "lollms_comfyui.sh")
|
||||
ASCIIColors.info(f"launcher path: {script_path}")
|
||||
ASCIIColors.info(f"comfyui path: {self.comfyui_folder}")
|
||||
|
||||
if share:
|
||||
run_script_in_env("comfyui","bash " + script_path +" --share", cwd=self.comfyui_folder)
|
||||
# subprocess.Popen("conda activate " + str(script_path) +" --share", cwd=self.comfyui_folder)
|
||||
else:
|
||||
run_script_in_env("comfyui","bash " + script_path, cwd=self.comfyui_folder)
|
||||
ASCIIColors.info("Process done")
|
||||
ASCIIColors.success("Launching Comfyui succeeded")
|
||||
|
||||
# Wait until the service is available at http://127.0.0.1:8188//
|
||||
if wait_for_service:
|
||||
self.wait_for_service(max_retries=max_retries)
|
||||
else:
|
||||
ASCIIColors.warning("We are not waiting for the SD service to be up.\nThis means that you may need to wait a bit before you can use it.")
|
||||
|
||||
self.default_sampler = sampler
|
||||
self.default_steps = steps
|
||||
|
||||
self.session = requests.Session()
|
||||
|
||||
if username and password:
|
||||
self.set_auth(username, password)
|
||||
else:
|
||||
self.check_controlnet()
|
||||
Loading…
x
Reference in New Issue
Block a user