alphard/ComfyUI-Lora-Manager
1
0
Fork 0
mirror of https://github.com/willmiao/ComfyUI-Lora-Manager.git synced 2026-03-25 07:05:43 -03:00
Code Issues Packages Projects Releases Wiki Activity

feat: implement task cancellation for model scanning and bulk operations

Browse Source
This commit is contained in:
Will Miao
2026-01-02 18:48:28 +08:00
parent 953117efa1
commit 837c32c42f
24 changed files with 505 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
py/routes/handlers/model_handlers.py
View File

@@ -618,6 +618,8 @@ class ModelQueryHandler:
try:
full_rebuild = request.query.get("full_rebuild", "false").lower() == "true"
await self._service.scan_models(force_refresh=True, rebuild_cache=full_rebuild)
if self._service.scanner.is_cancelled():
return web.json_response({"status": "cancelled", "message": f"{self._service.model_type.capitalize()} scan cancelled"})
return web.json_response({"status": "success", "message": f"{self._service.model_type.capitalize()} scan completed"})
except Exception as exc:
self._logger.error("Error scanning %ss: %s", self._service.model_type, exc, exc_info=True)
@@ -639,6 +641,14 @@ class ModelQueryHandler:
self._logger.error("Error getting folders: %s", exc)
return web.json_response({"success": False, "error": str(exc)}, status=500)
async def cancel_task(self, request: web.Request) -> web.Response:
try:
self._service.scanner.cancel_task()
return web.json_response({"status": "success", "message": "Cancellation requested"})
except Exception as exc:
self._logger.error("Error cancelling task for %s: %s", self._service.model_type, exc)
return web.json_response({"success": False, "error": str(exc)}, status=500)
async def get_folder_tree(self, request: web.Request) -> web.Response:
try:
model_root = request.query.get("model_root")
@@ -1262,6 +1272,8 @@ class ModelUpdateHandler:
force_refresh=force_refresh,
target_model_ids=target_model_ids or None,
)
if self._service.scanner.is_cancelled():
return web.json_response({"success": False, "status": "cancelled", "message": "Update refresh cancelled"})
except RateLimitError as exc:
return web.json_response(
{"success": False, "error": str(exc) or "Rate limited"}, status=429
@@ -1678,4 +1690,5 @@ class ModelHandlerSet:
"set_version_update_ignore": self.updates.set_version_update_ignore,
"get_model_update_status": self.updates.get_model_update_status,
"get_model_versions": self.updates.get_model_versions,
"cancel_task": self.query.cancel_task,
}

1
py/routes/model_route_registrar.py
View File

@@ -68,6 +68,7 @@ COMMON_ROUTE_DEFINITIONS: tuple[RouteDefinition, ...] = (
RouteDefinition("GET", "/api/lm/pause-download", "pause_download_get"),
RouteDefinition("GET", "/api/lm/resume-download", "resume_download_get"),
RouteDefinition("GET", "/api/lm/download-progress/{download_id}", "get_download_progress"),
RouteDefinition("POST", "/api/lm/{prefix}/cancel-task", "cancel_task"),
RouteDefinition("GET", "/{prefix}", "handle_models_page"),
)