let5see/AI-Video
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化ComfyKit实例管理逻辑, 提升调用runninghub时的稳定性

Browse Source
This commit is contained in:
puke
2025-11-19 17:14:27 +08:00
parent 374246237d
commit 8aad91006d
8 changed files with 176 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pixelle_video/services/comfy_base_service.py
View File

@@ -45,13 +45,14 @@ class ComfyBaseService:
DEFAULT_WORKFLOW: str = "" # Must be overridden by subclass
WORKFLOWS_DIR: str = "workflows"
def __init__(self, config: dict, service_name: str):
def __init__(self, config: dict, service_name: str, core=None):
"""
Initialize ComfyUI base service
Args:
config: Full application config dict
service_name: Service name in config (e.g., "tts", "image")
core: PixelleVideoCore instance (for accessing shared ComfyKit)
"""
# Service-specific config (e.g., config["comfyui"]["tts"])
comfyui_config = config.get("comfyui", {})
@@ -62,6 +63,9 @@ class ComfyBaseService:
self.service_name = service_name
self._workflows_cache: Optional[List[str]] = None
# Reference to core (for accessing shared ComfyKit)
self.core = core
def _scan_workflows(self) -> List[Dict[str, Any]]:
"""

18
pixelle_video/services/media.py
View File

@@ -55,14 +55,15 @@ class MediaService(ComfyBaseService):
DEFAULT_WORKFLOW = None # No hardcoded default, must be configured
WORKFLOWS_DIR = "workflows"
def __init__(self, config: dict):
def __init__(self, config: dict, core=None):
"""
Initialize media service
Args:
config: Full application config dict
core: PixelleVideoCore instance (for accessing shared ComfyKit)
"""
super().__init__(config, service_name="image") # Keep "image" for config compatibility
super().__init__(config, service_name="image", core=core) # Keep "image" for config compatibility
def _scan_workflows(self):
"""
@@ -194,13 +195,7 @@ class MediaService(ComfyBaseService):
# 1. Resolve workflow (returns structured info)
workflow_info = self._resolve_workflow(workflow=workflow)
# 2. Prepare ComfyKit config (supports both selfhost and runninghub)
kit_config = self._prepare_comfykit_config(
comfyui_url=comfyui_url,
runninghub_api_key=runninghub_api_key
)
# 3. Build workflow parameters
# 2. Build workflow parameters (ComfyKit config is now managed by core)
workflow_params = {"prompt": prompt}
# Add optional parameters
@@ -224,9 +219,10 @@ class MediaService(ComfyBaseService):
logger.debug(f"Workflow parameters: {workflow_params}")
# 4. Execute workflow (ComfyKit auto-detects based on input type)
# 4. Execute workflow using shared ComfyKit instance from core
try:
kit = ComfyKit(**kit_config)
# Get shared ComfyKit instance (lazy initialization + config hot-reload)
kit = await self.core._get_or_create_comfykit()
# Determine what to pass to ComfyKit based on source
if workflow_info["source"] == "runninghub" and "workflow_id" in workflow_info:

18
pixelle_video/services/tts_service.py
View File

@@ -51,14 +51,15 @@ class TTSService(ComfyBaseService):
DEFAULT_WORKFLOW = None # No hardcoded default, must be configured
WORKFLOWS_DIR = "workflows"
def __init__(self, config: dict):
def __init__(self, config: dict, core=None):
"""
Initialize TTS service
Args:
config: Full application config dict
core: PixelleVideoCore instance (for accessing shared ComfyKit)
"""
super().__init__(config, service_name="tts")
super().__init__(config, service_name="tts", core=core)
async def __call__(
@@ -222,13 +223,7 @@ class TTSService(ComfyBaseService):
"""
logger.info(f"🎙️ Using workflow: {workflow_info['key']}")
# 1. Prepare ComfyKit config (supports both selfhost and runninghub)
kit_config = self._prepare_comfykit_config(
comfyui_url=comfyui_url,
runninghub_api_key=runninghub_api_key
)
# 2. Build workflow parameters
# 1. Build workflow parameters (ComfyKit config is now managed by core)
workflow_params = {"text": text}
# Add optional TTS parameters (only if explicitly provided and not None)
@@ -242,9 +237,10 @@ class TTSService(ComfyBaseService):
logger.debug(f"Workflow parameters: {workflow_params}")
# 3. Execute workflow (ComfyKit auto-detects based on input type)
# 3. Execute workflow using shared ComfyKit instance from core
try:
kit = ComfyKit(**kit_config)
# Get shared ComfyKit instance (lazy initialization + config hot-reload)
kit = await self.core._get_or_create_comfykit()
# Determine what to pass to ComfyKit based on source
if workflow_info["source"] == "runninghub" and "workflow_id" in workflow_info: