refactor: Simplify service initialization in LoraRoutes and RecipeRoutes, and adjust logging level in ServiceRegistry

This commit is contained in:
Will Miao
2025-04-12 09:01:09 +08:00
parent a8d21fb1d6
commit d5ce6441e3
4 changed files with 5 additions and 18 deletions

View File

@@ -99,7 +99,6 @@ class LoraManager:
# Initialize CivitaiClient first to ensure it's ready for other services
civitai_client = await ServiceRegistry.get_civitai_client()
logger.info("CivitaiClient registered in ServiceRegistry")
# Get file monitors through ServiceRegistry
lora_monitor = await ServiceRegistry.get_lora_monitor()
@@ -116,11 +115,9 @@ class LoraManager:
# Register DownloadManager with ServiceRegistry
download_manager = await ServiceRegistry.get_download_manager()
logger.info("DownloadManager registered in ServiceRegistry")
# Initialize WebSocket manager
ws_manager = await ServiceRegistry.get_websocket_manager()
logger.info("WebSocketManager registered in ServiceRegistry")
# Initialize scanners in background
lora_scanner = await ServiceRegistry.get_lora_scanner()

View File

@@ -24,13 +24,8 @@ class LoraRoutes:
async def init_services(self):
"""Initialize services from ServiceRegistry"""
if self.scanner is None:
self.scanner = await ServiceRegistry.get_lora_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")
self.scanner = await ServiceRegistry.get_lora_scanner()
self.recipe_scanner = await ServiceRegistry.get_recipe_scanner()
def format_lora_data(self, lora: Dict) -> Dict:
"""Format LoRA data for template rendering"""

View File

@@ -31,13 +31,8 @@ class RecipeRoutes:
async def init_services(self):
"""Initialize services from ServiceRegistry"""
if self.recipe_scanner is None:
self.recipe_scanner = await ServiceRegistry.get_recipe_scanner()
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")
self.recipe_scanner = await ServiceRegistry.get_recipe_scanner()
self.civitai_client = await ServiceRegistry.get_civitai_client()
@classmethod
def setup_routes(cls, app: web.Application):

View File

@@ -34,7 +34,7 @@ class ServiceRegistry:
registry = cls.get_instance()
async with cls._lock:
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 registry._services[service_name]