mirror of
https://github.com/willmiao/ComfyUI-Lora-Manager.git
synced 2026-03-24 22:52:12 -03:00
refactor: Simplify service initialization in LoraRoutes and RecipeRoutes, and adjust logging level in ServiceRegistry
This commit is contained in:
@@ -99,7 +99,6 @@ class LoraManager:
|
|||||||
|
|
||||||
# Initialize CivitaiClient first to ensure it's ready for other services
|
# Initialize CivitaiClient first to ensure it's ready for other services
|
||||||
civitai_client = await ServiceRegistry.get_civitai_client()
|
civitai_client = await ServiceRegistry.get_civitai_client()
|
||||||
logger.info("CivitaiClient registered in ServiceRegistry")
|
|
||||||
|
|
||||||
# Get file monitors through ServiceRegistry
|
# Get file monitors through ServiceRegistry
|
||||||
lora_monitor = await ServiceRegistry.get_lora_monitor()
|
lora_monitor = await ServiceRegistry.get_lora_monitor()
|
||||||
@@ -116,11 +115,9 @@ class LoraManager:
|
|||||||
|
|
||||||
# Register DownloadManager with ServiceRegistry
|
# Register DownloadManager with ServiceRegistry
|
||||||
download_manager = await ServiceRegistry.get_download_manager()
|
download_manager = await ServiceRegistry.get_download_manager()
|
||||||
logger.info("DownloadManager registered in ServiceRegistry")
|
|
||||||
|
|
||||||
# Initialize WebSocket manager
|
# Initialize WebSocket manager
|
||||||
ws_manager = await ServiceRegistry.get_websocket_manager()
|
ws_manager = await ServiceRegistry.get_websocket_manager()
|
||||||
logger.info("WebSocketManager registered in ServiceRegistry")
|
|
||||||
|
|
||||||
# Initialize scanners in background
|
# Initialize scanners in background
|
||||||
lora_scanner = await ServiceRegistry.get_lora_scanner()
|
lora_scanner = await ServiceRegistry.get_lora_scanner()
|
||||||
|
|||||||
@@ -24,13 +24,8 @@ class LoraRoutes:
|
|||||||
|
|
||||||
async def init_services(self):
|
async def init_services(self):
|
||||||
"""Initialize services from ServiceRegistry"""
|
"""Initialize services from ServiceRegistry"""
|
||||||
if self.scanner is None:
|
self.scanner = await ServiceRegistry.get_lora_scanner()
|
||||||
self.scanner = await ServiceRegistry.get_lora_scanner()
|
self.recipe_scanner = await ServiceRegistry.get_recipe_scanner()
|
||||||
logger.info("LoraRoutes: Retrieved LoraScanner from ServiceRegistry")
|
|
||||||
|
|
||||||
if self.recipe_scanner is None:
|
|
||||||
self.recipe_scanner = await ServiceRegistry.get_recipe_scanner()
|
|
||||||
logger.info("LoraRoutes: Retrieved RecipeScanner from ServiceRegistry")
|
|
||||||
|
|
||||||
def format_lora_data(self, lora: Dict) -> Dict:
|
def format_lora_data(self, lora: Dict) -> Dict:
|
||||||
"""Format LoRA data for template rendering"""
|
"""Format LoRA data for template rendering"""
|
||||||
|
|||||||
@@ -31,13 +31,8 @@ class RecipeRoutes:
|
|||||||
|
|
||||||
async def init_services(self):
|
async def init_services(self):
|
||||||
"""Initialize services from ServiceRegistry"""
|
"""Initialize services from ServiceRegistry"""
|
||||||
if self.recipe_scanner is None:
|
self.recipe_scanner = await ServiceRegistry.get_recipe_scanner()
|
||||||
self.recipe_scanner = await ServiceRegistry.get_recipe_scanner()
|
self.civitai_client = await ServiceRegistry.get_civitai_client()
|
||||||
logger.info("RecipeRoutes: Retrieved RecipeScanner from ServiceRegistry")
|
|
||||||
|
|
||||||
if self.civitai_client is None:
|
|
||||||
self.civitai_client = await ServiceRegistry.get_civitai_client()
|
|
||||||
logger.info("RecipeRoutes: Retrieved CivitaiClient from ServiceRegistry")
|
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def setup_routes(cls, app: web.Application):
|
def setup_routes(cls, app: web.Application):
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ class ServiceRegistry:
|
|||||||
registry = cls.get_instance()
|
registry = cls.get_instance()
|
||||||
async with cls._lock:
|
async with cls._lock:
|
||||||
if service_name not in registry._services:
|
if service_name not in registry._services:
|
||||||
logger.warning(f"Service {service_name} not found in registry")
|
logger.debug(f"Service {service_name} not found in registry")
|
||||||
return None
|
return None
|
||||||
return registry._services[service_name]
|
return registry._services[service_name]
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user