From 68fdb14cd606fa5e783785ab29c8f97cc0abc0a0 Mon Sep 17 00:00:00 2001 From: Will Miao <13051207myq@gmail.com> Date: Fri, 13 Jun 2025 05:46:22 +0800 Subject: [PATCH] Remove unused lora monitor retrieval and ignore path logic from ApiRoutes, DownloadManager, and ModelScanner. Fixes #226 --- py/routes/api_routes.py | 11 ----------- py/services/download_manager.py | 4 ---- py/services/model_scanner.py | 20 -------------------- 3 files changed, 35 deletions(-) diff --git a/py/routes/api_routes.py b/py/routes/api_routes.py index a1d7a8a8..3182dad6 100644 --- a/py/routes/api_routes.py +++ b/py/routes/api_routes.py @@ -985,17 +985,6 @@ class ApiRoutes: renamed_files = [] new_metadata_path = None - # Notify file monitor to ignore these events - main_file_path = os.path.join(target_dir, f"{old_file_name}.safetensors") - if os.path.exists(main_file_path): - # Get lora monitor through ServiceRegistry instead of download_manager - lora_monitor = await ServiceRegistry.get_lora_monitor() - if lora_monitor: - # Add old and new paths to ignore list - file_size = os.path.getsize(main_file_path) - lora_monitor.handler.add_ignore_path(main_file_path, file_size) - lora_monitor.handler.add_ignore_path(new_file_path, file_size) - for old_path, pattern in existing_files: # Get the file extension like .safetensors or .metadata.json ext = ModelRouteUtils.get_multipart_ext(pattern) diff --git a/py/services/download_manager.py b/py/services/download_manager.py index 2229367e..72c8ec14 100644 --- a/py/services/download_manager.py +++ b/py/services/download_manager.py @@ -38,10 +38,6 @@ class DownloadManager: if self._civitai_client is None: self._civitai_client = await ServiceRegistry.get_civitai_client() return self._civitai_client - - async def _get_lora_monitor(self): - """Get the lora file monitor from registry""" - return await ServiceRegistry.get_lora_monitor() async def _get_checkpoint_monitor(self): """Get the checkpoint file monitor from registry""" diff --git a/py/services/model_scanner.py b/py/services/model_scanner.py index 24406043..7d1ba8ef 100644 --- a/py/services/model_scanner.py +++ b/py/services/model_scanner.py @@ -989,26 +989,6 @@ class ModelScanner: real_source = os.path.realpath(source_path) real_target = os.path.realpath(target_file) - file_size = os.path.getsize(real_source) - - # Get the appropriate file monitor through ServiceRegistry - if self.model_type == "lora": - monitor = await ServiceRegistry.get_lora_monitor() - elif self.model_type == "checkpoint": - monitor = await ServiceRegistry.get_checkpoint_monitor() - else: - monitor = None - - if monitor: - monitor.handler.add_ignore_path( - real_source, - file_size - ) - monitor.handler.add_ignore_path( - real_target, - file_size - ) - shutil.move(real_source, real_target) # Move all associated files with the same base name