Jensen Zhang
7b688d3174
- Remove duplicate imports in __init__.py - Remove duplicate executor initialization - Fix comfy_cli_routes.py imports (remove duplicate wrong imports) - Clean up all duplicate code blocks Issues fixed: 1. __init__.py had duplicate imports (lines 17-21, 31-39) 2. __init__.py had duplicate executor initialization 3. comfy_cli_routes.py had both correct and incorrect imports 4. Multiple logger.info() calls Now imports are clean and non-duplicate.
91 lines
2.6 KiB
Python
91 lines
2.6 KiB
Python
"""
|
|
cm-cli-rest & comfy-cli REST: REST API for ComfyUI management
|
|
|
|
A ComfyUI custom node that exposes REST API endpoints for managing
|
|
custom nodes via cm-cli (ComfyUI-Manager CLI) and comfy-cli.
|
|
|
|
Usage:
|
|
Install this in ComfyUI/custom_nodes/cm-cli-rest/
|
|
Restart ComfyUI
|
|
API endpoints available at: http://localhost:8188/cm-cli-rest/* and /comfy-cli/*
|
|
"""
|
|
|
|
from server import PromptServer
|
|
import logging
|
|
|
|
from .cm_cli import CMCLIExecutor
|
|
from .comfy_cli import ComfyCliExecutor
|
|
from .api.routes import setup_routes
|
|
from .comfy_cli_routes import setup_comfy_cli_routes
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
# Initialize cm-cli executor
|
|
executor = CMCLIExecutor()
|
|
|
|
# Initialize comfy-cli executor
|
|
comfy_executor = ComfyCliExecutor()
|
|
|
|
# Register cm-cli REST API routes
|
|
setup_routes(PromptServer.instance.app, executor)
|
|
|
|
# Register comfy-cli REST API routes
|
|
setup_comfy_cli_routes(PromptServer.instance.app, comfy_executor)
|
|
|
|
logger.info("cm-cli-rest & comfy-cli REST initialized - APIs available at /cm-cli-rest/* and /comfy-cli/*")
|
|
|
|
|
|
# Optional: ComfyUI workflow node for triggering API calls
|
|
# This allows using the API from within ComfyUI workflows
|
|
class CMCLIRestNode:
|
|
"""
|
|
ComfyUI node for triggering cm-cli REST API calls.
|
|
|
|
This is optional - the REST API works independently.
|
|
"""
|
|
|
|
@classmethod
|
|
def INPUT_TYPES(cls):
|
|
return {
|
|
"required": {
|
|
"endpoint": (["health", "list_nodes", "update_all"], {
|
|
"default": "health"
|
|
}),
|
|
"trigger": ("BOOLEAN", {"default": False}),
|
|
},
|
|
"optional": {
|
|
"node_name": ("STRING", {"default": ""}),
|
|
}
|
|
}
|
|
|
|
RETURN_TYPES = ("STRING", "BOOLEAN")
|
|
RETURN_NAMES = ("response", "success")
|
|
CATEGORY = "utils/cm-cli-rest"
|
|
FUNCTION = "execute"
|
|
|
|
def execute(self, endpoint: str, trigger: bool, node_name: str = ""):
|
|
"""
|
|
Execute API call (synchronous, for simple endpoints only).
|
|
|
|
Note: For complex operations (install, update), use the REST API directly.
|
|
This node is mainly for health checks and simple queries.
|
|
"""
|
|
if not trigger:
|
|
return ("", False)
|
|
|
|
# For actual implementation, you would make HTTP requests to the API
|
|
# This is a placeholder - in practice, use the REST API directly
|
|
return (f"Use REST API at /cm-cli-rest/{endpoint}", True)
|
|
|
|
|
|
# Node registration (optional - the REST API is the main feature)
|
|
NODE_CLASS_MAPPINGS = {
|
|
"CMCLIRest": CMCLIRestNode,
|
|
}
|
|
|
|
NODE_DISPLAY_NAME_MAPPINGS = {
|
|
"CMCLIRest": "cm-cli REST API",
|
|
}
|
|
|
|
__all__ = ["NODE_CLASS_MAPPINGS", "NODE_DISPLAY_NAME_MAPPINGS"]
|