mirror of
https://github.com/willmiao/ComfyUI-Lora-Manager.git
synced 2026-03-21 13:12:12 -03:00
Backend fixes: - Add missing API route for /api/lm/recipes/batch-import/progress (GET) - Add missing API route for /api/lm/recipes/batch-import/directory (POST) - Add missing API route for /api/lm/recipes/browse-directory (POST) - Register WebSocket endpoint for batch import progress - Fix skip_no_metadata default value (True -> False) to allow no-LoRA imports - Add items array to BatchImportProgress.to_dict() for detailed results Frontend implementation: - Create BatchImportManager.js with complete batch import workflow - Add directory browser UI for selecting folders - Add batch import modal with URL list and directory input modes - Implement real-time progress tracking (WebSocket + HTTP polling) - Add results summary with success/failed/skipped statistics - Add expandable details view showing individual item status - Auto-refresh recipe list after import completion UI improvements: - Add spinner animation for importing status - Simplify results summary UI to match progress stats styling - Fix current item text alignment - Fix dark theme styling for directory browser button - Fix batch import button styling consistency Translations: - Add batch import related i18n keys to all locale files - Run sync_translation_keys.py to sync all translations Fixes: - Batch import now allows images without LoRAs (matches single import behavior) - Progress endpoint now returns complete items array with status details - Results view correctly displays skipped items with error messages
422 lines
15 KiB
Python
422 lines
15 KiB
Python
import os
|
|
import sys
|
|
import json
|
|
from py.middleware.cache_middleware import cache_control
|
|
from py.utils.settings_paths import ensure_settings_file
|
|
|
|
# Set environment variable to indicate standalone mode
|
|
os.environ["LORA_MANAGER_STANDALONE"] = "1"
|
|
|
|
|
|
# Create mock modules for py/nodes directory - add this before any other imports
|
|
def mock_nodes_directory():
|
|
"""Create mock modules for all Python files in the py/nodes directory"""
|
|
nodes_dir = os.path.join(os.path.dirname(__file__), "py", "nodes")
|
|
if os.path.exists(nodes_dir):
|
|
# Create a mock module for the nodes package itself
|
|
sys.modules["py.nodes"] = type("MockNodesModule", (), {})
|
|
|
|
# Create mock modules for all Python files in the nodes directory
|
|
for file in os.listdir(nodes_dir):
|
|
if file.endswith(".py") and file != "__init__.py":
|
|
module_name = file[:-3] # Remove .py extension
|
|
full_module_name = f"py.nodes.{module_name}"
|
|
# Create empty module object
|
|
sys.modules[full_module_name] = type(
|
|
f"Mock{module_name.capitalize()}Module", (), {}
|
|
)
|
|
print(f"Created mock module for: {full_module_name}")
|
|
|
|
|
|
# Run the mocking function before any other imports
|
|
mock_nodes_directory()
|
|
|
|
|
|
# Create mock folder_paths module BEFORE any other imports
|
|
class MockFolderPaths:
|
|
@staticmethod
|
|
def get_folder_paths(folder_name):
|
|
# Load paths from settings.json
|
|
settings_path = ensure_settings_file()
|
|
try:
|
|
if os.path.exists(settings_path):
|
|
with open(settings_path, "r", encoding="utf-8") as f:
|
|
settings = json.load(f)
|
|
|
|
# For diffusion_models, combine unet and diffusers paths
|
|
if folder_name == "diffusion_models":
|
|
paths = []
|
|
if "folder_paths" in settings:
|
|
if "unet" in settings["folder_paths"]:
|
|
paths.extend(settings["folder_paths"]["unet"])
|
|
if "diffusers" in settings["folder_paths"]:
|
|
paths.extend(settings["folder_paths"]["diffusers"])
|
|
# Filter out paths that don't exist
|
|
valid_paths = [p for p in paths if os.path.exists(p)]
|
|
if valid_paths:
|
|
return valid_paths
|
|
else:
|
|
print(f"Warning: No valid paths found for {folder_name}")
|
|
# For other folder names, return their paths directly
|
|
elif (
|
|
"folder_paths" in settings
|
|
and folder_name in settings["folder_paths"]
|
|
):
|
|
paths = settings["folder_paths"][folder_name]
|
|
valid_paths = [p for p in paths if os.path.exists(p)]
|
|
if valid_paths:
|
|
return valid_paths
|
|
else:
|
|
print(f"Warning: No valid paths found for {folder_name}")
|
|
except Exception as e:
|
|
print(f"Error loading folder paths from settings: {e}")
|
|
|
|
# Fallback to empty list if no paths found
|
|
return []
|
|
|
|
@staticmethod
|
|
def get_temp_directory():
|
|
return os.path.join(os.path.dirname(__file__), "temp")
|
|
|
|
@staticmethod
|
|
def set_temp_directory(path):
|
|
os.makedirs(path, exist_ok=True)
|
|
return path
|
|
|
|
|
|
# Create mock server module with PromptServer
|
|
class MockPromptServer:
|
|
def __init__(self):
|
|
self.app = None
|
|
|
|
def send_sync(self, *args, **kwargs):
|
|
pass
|
|
|
|
|
|
# Create mock metadata_collector module
|
|
class MockMetadataCollector:
|
|
def init(self):
|
|
pass
|
|
|
|
def get_metadata(self, prompt_id=None):
|
|
return {}
|
|
|
|
|
|
# Initialize basic mocks before any imports
|
|
sys.modules["folder_paths"] = MockFolderPaths()
|
|
sys.modules["server"] = type("server", (), {"PromptServer": MockPromptServer()})
|
|
sys.modules["py.metadata_collector"] = MockMetadataCollector()
|
|
|
|
# Now we can safely import modules that depend on folder_paths and server
|
|
import argparse
|
|
import asyncio
|
|
import logging
|
|
from aiohttp import web
|
|
|
|
# Increase allowable header size to align with in-ComfyUI configuration.
|
|
HEADER_SIZE_LIMIT = 16384
|
|
|
|
# Setup logging
|
|
logging.basicConfig(
|
|
level=logging.INFO, format="%(asctime)s - %(name)s - %(levelname)s - %(message)s"
|
|
)
|
|
logger = logging.getLogger("lora-manager-standalone")
|
|
|
|
# Configure aiohttp access logger to be less verbose
|
|
logging.getLogger("aiohttp.access").setLevel(logging.WARNING)
|
|
|
|
|
|
# Add specific suppression for connection reset errors
|
|
class ConnectionResetFilter(logging.Filter):
|
|
def filter(self, record):
|
|
# Filter out connection reset errors that are not critical
|
|
if "ConnectionResetError" in str(record.getMessage()):
|
|
return False
|
|
if "_call_connection_lost" in str(record.getMessage()):
|
|
return False
|
|
if "WinError 10054" in str(record.getMessage()):
|
|
return False
|
|
return True
|
|
|
|
|
|
# Apply the filter to asyncio logger
|
|
asyncio_logger = logging.getLogger("asyncio")
|
|
asyncio_logger.addFilter(ConnectionResetFilter())
|
|
|
|
# Now we can import the global config from our local modules
|
|
from py.config import config
|
|
|
|
|
|
class StandaloneServer:
|
|
"""Server implementation for standalone mode"""
|
|
|
|
def __init__(self):
|
|
self.app = web.Application(
|
|
logger=logger,
|
|
middlewares=[cache_control],
|
|
client_max_size=256 * 1024 * 1024,
|
|
handler_args={
|
|
"max_field_size": HEADER_SIZE_LIMIT,
|
|
"max_line_size": HEADER_SIZE_LIMIT,
|
|
},
|
|
)
|
|
self.instance = self # Make it compatible with PromptServer.instance pattern
|
|
|
|
# Ensure the app's access logger is configured to reduce verbosity
|
|
self.app._subapps = [] # Ensure this exists to avoid AttributeError
|
|
|
|
async def setup(self):
|
|
"""Set up the standalone server"""
|
|
# Create placeholders for compatibility with ComfyUI's implementation
|
|
self.last_prompt_id = None
|
|
self.last_node_id = None
|
|
self.client_id = None
|
|
|
|
# Set up routes
|
|
self.setup_routes()
|
|
|
|
# Add startup and shutdown handlers
|
|
self.app.on_startup.append(self.on_startup)
|
|
self.app.on_shutdown.append(self.on_shutdown)
|
|
|
|
def setup_routes(self):
|
|
"""Set up basic routes"""
|
|
# Add a simple status endpoint
|
|
self.app.router.add_get("/", self.handle_status)
|
|
|
|
# Add static route for example images if the path exists in settings
|
|
settings_path = ensure_settings_file(logger)
|
|
if os.path.exists(settings_path):
|
|
with open(settings_path, "r", encoding="utf-8") as f:
|
|
settings = json.load(f)
|
|
example_images_path = settings.get("example_images_path")
|
|
logger.info(f"Example images path: {example_images_path}")
|
|
if example_images_path and os.path.exists(example_images_path):
|
|
self.app.router.add_static(
|
|
"/example_images_static", example_images_path
|
|
)
|
|
logger.info(
|
|
f"Added static route for example images: /example_images_static -> {example_images_path}"
|
|
)
|
|
|
|
async def handle_status(self, request):
|
|
"""Handle status request by redirecting to loras page"""
|
|
# Redirect to loras page instead of showing status
|
|
raise web.HTTPFound("/loras")
|
|
|
|
# Original JSON response (commented out)
|
|
# return web.json_response({
|
|
# "status": "running",
|
|
# "mode": "standalone",
|
|
# "loras_roots": config.loras_roots,
|
|
# "checkpoints_roots": config.checkpoints_roots
|
|
# })
|
|
|
|
async def on_startup(self, app):
|
|
"""Startup handler"""
|
|
logger.info("LoRA Manager standalone server starting...")
|
|
|
|
async def on_shutdown(self, app):
|
|
"""Shutdown handler"""
|
|
logger.info("LoRA Manager standalone server shutting down...")
|
|
|
|
def send_sync(self, event_type, data, sid=None):
|
|
"""Stub for compatibility with PromptServer"""
|
|
# In standalone mode, we don't have the same websocket system
|
|
pass
|
|
|
|
async def start(self, host="127.0.0.1", port=8188):
|
|
"""Start the server"""
|
|
runner = web.AppRunner(self.app)
|
|
await runner.setup()
|
|
site = web.TCPSite(runner, host, port)
|
|
await site.start()
|
|
|
|
# Log the server address with a clickable localhost URL regardless of the actual binding
|
|
logger.info(f"Server started at http://127.0.0.1:{port}")
|
|
|
|
# Keep the server running
|
|
while True:
|
|
await asyncio.sleep(3600) # Sleep for a long time
|
|
|
|
async def publish_loop(self):
|
|
"""Stub for compatibility with PromptServer"""
|
|
# This method exists in ComfyUI's server but we don't need it
|
|
pass
|
|
|
|
|
|
# After all mocks are in place, import LoraManager
|
|
from py.lora_manager import LoraManager
|
|
|
|
|
|
def validate_settings():
|
|
"""Initialize settings and log any startup warnings."""
|
|
try:
|
|
from py.services.settings_manager import get_settings_manager
|
|
|
|
manager = get_settings_manager()
|
|
except Exception as exc: # pragma: no cover - defensive logging
|
|
logger.error("Failed to initialise settings manager: %s", exc, exc_info=True)
|
|
return False
|
|
|
|
messages = manager.get_startup_messages()
|
|
if messages:
|
|
logger.warning("=" * 80)
|
|
logger.warning("Standalone mode is using fallback configuration values.")
|
|
for message in messages:
|
|
severity = (message.get("severity") or "info").lower()
|
|
title = message.get("title")
|
|
body = message.get("message") or ""
|
|
details = message.get("details")
|
|
location = message.get("settings_file") or manager.settings_file
|
|
|
|
text = f"{title}: {body}" if title else body
|
|
log_method = logger.info
|
|
if severity == "error":
|
|
log_method = logger.error
|
|
elif severity == "warning":
|
|
log_method = logger.warning
|
|
|
|
log_method(text)
|
|
if details:
|
|
log_method("Details: %s", details)
|
|
if location:
|
|
log_method("Settings file: %s", location)
|
|
|
|
logger.warning("=" * 80)
|
|
else:
|
|
logger.info("Loaded settings from %s", manager.settings_file)
|
|
|
|
return True
|
|
|
|
|
|
class StandaloneLoraManager(LoraManager):
|
|
"""Extended LoraManager for standalone mode"""
|
|
|
|
@classmethod
|
|
def add_routes(cls, server_instance):
|
|
"""Initialize and register all routes for standalone mode"""
|
|
app = server_instance.app
|
|
|
|
# Store app in a global-like location for compatibility
|
|
sys.modules["server"].PromptServer.instance = server_instance
|
|
|
|
# Add static route for locales JSON files
|
|
if os.path.exists(config.i18n_path):
|
|
app.router.add_static("/locales", config.i18n_path)
|
|
logger.info(
|
|
f"Added static route for locales: /locales -> {config.i18n_path}"
|
|
)
|
|
|
|
# Add static route for plugin assets
|
|
app.router.add_static("/loras_static", config.static_path)
|
|
|
|
# Setup feature routes
|
|
from py.services.model_service_factory import (
|
|
ModelServiceFactory,
|
|
register_default_model_types,
|
|
)
|
|
from py.routes.recipe_routes import RecipeRoutes
|
|
from py.routes.update_routes import UpdateRoutes
|
|
from py.routes.misc_routes import MiscRoutes
|
|
from py.routes.example_images_routes import ExampleImagesRoutes
|
|
from py.routes.preview_routes import PreviewRoutes
|
|
from py.routes.stats_routes import StatsRoutes
|
|
from py.services.websocket_manager import ws_manager
|
|
|
|
register_default_model_types()
|
|
|
|
# Setup all model routes using the factory
|
|
ModelServiceFactory.setup_all_routes(app)
|
|
|
|
stats_routes = StatsRoutes()
|
|
|
|
# Initialize routes
|
|
stats_routes.setup_routes(app)
|
|
RecipeRoutes.setup_routes(app)
|
|
UpdateRoutes.setup_routes(app)
|
|
MiscRoutes.setup_routes(app)
|
|
ExampleImagesRoutes.setup_routes(app, ws_manager=ws_manager)
|
|
PreviewRoutes.setup_routes(app)
|
|
|
|
# Setup WebSocket routes that are shared across all model types
|
|
app.router.add_get("/ws/fetch-progress", ws_manager.handle_connection)
|
|
app.router.add_get(
|
|
"/ws/download-progress", ws_manager.handle_download_connection
|
|
)
|
|
app.router.add_get("/ws/init-progress", ws_manager.handle_init_connection)
|
|
app.router.add_get("/ws/batch-import-progress", ws_manager.handle_connection)
|
|
|
|
# Schedule service initialization
|
|
app.on_startup.append(lambda app: cls._initialize_services())
|
|
|
|
# Add cleanup
|
|
app.on_shutdown.append(cls._cleanup)
|
|
|
|
|
|
def parse_args():
|
|
"""Parse command line arguments"""
|
|
parser = argparse.ArgumentParser(description="LoRA Manager Standalone Server")
|
|
parser.add_argument(
|
|
"--host",
|
|
type=str,
|
|
default="0.0.0.0",
|
|
help="Host address to bind the server to (default: 0.0.0.0)",
|
|
)
|
|
parser.add_argument(
|
|
"--port",
|
|
type=int,
|
|
default=8188,
|
|
help="Port to bind the server to (default: 8188, access via http://localhost:8188/loras)",
|
|
)
|
|
# parser.add_argument("--loras", type=str, nargs="+",
|
|
# help="Additional paths to LoRA model directories (optional if settings.json has paths)")
|
|
# parser.add_argument("--checkpoints", type=str, nargs="+",
|
|
# help="Additional paths to checkpoint model directories (optional if settings.json has paths)")
|
|
parser.add_argument(
|
|
"--log-level",
|
|
type=str,
|
|
default="INFO",
|
|
choices=["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"],
|
|
help="Logging level",
|
|
)
|
|
parser.add_argument(
|
|
"--verbose",
|
|
action="store_true",
|
|
help="Enable verbose logging (equivalent to --log-level DEBUG)",
|
|
)
|
|
return parser.parse_args()
|
|
|
|
|
|
async def main():
|
|
"""Main entry point for standalone mode"""
|
|
args = parse_args()
|
|
|
|
# Set log level (verbose flag overrides to DEBUG)
|
|
log_level = "DEBUG" if args.verbose else args.log_level
|
|
logging.getLogger().setLevel(getattr(logging, log_level))
|
|
|
|
# Validate settings before proceeding
|
|
if not validate_settings():
|
|
logger.error("Cannot start server due to configuration issues.")
|
|
logger.error("Please fix the settings.json file and try again.")
|
|
return
|
|
|
|
# Create the server instance
|
|
server = StandaloneServer()
|
|
|
|
# Initialize routes via the standalone lora manager
|
|
StandaloneLoraManager.add_routes(server)
|
|
|
|
# Set up and start the server
|
|
await server.setup()
|
|
await server.start(host=args.host, port=args.port)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
try:
|
|
# Run the main function
|
|
asyncio.run(main())
|
|
except KeyboardInterrupt:
|
|
logger.info("Server stopped by user")
|