mirror of
https://github.com/MrSleeps/jellyfin-scene-search.git
synced 2026-11-17 23:41:28 +00:00
Add cooperative stop for caption jobs
This commit is contained in:
@@ -20,6 +20,10 @@ from .search_service import SearchService
|
||||
from .sync import rebuild_meili
|
||||
|
||||
|
||||
class CaptionJobStopped(Exception):
|
||||
"""Raised at a safe boundary when a caption job is stopped."""
|
||||
|
||||
|
||||
class CaptionJobManager:
|
||||
"""Runs one resumable caption job at a time for indexed Jellyfin frames."""
|
||||
|
||||
@@ -29,6 +33,7 @@ class CaptionJobManager:
|
||||
self._thread: threading.Thread | None = None
|
||||
self._gpu_busy = False
|
||||
self._pause_requested = threading.Event()
|
||||
self._stop_requested = threading.Event()
|
||||
self._resume_event = threading.Event()
|
||||
self._resume_event.set()
|
||||
self._state: dict[str, Any] = {
|
||||
@@ -44,6 +49,7 @@ class CaptionJobManager:
|
||||
"percent": 0.0,
|
||||
"paused": False,
|
||||
"pause_requested": False,
|
||||
"stop_requested": False,
|
||||
}
|
||||
|
||||
@property
|
||||
@@ -93,24 +99,49 @@ class CaptionJobManager:
|
||||
)
|
||||
return self.status()
|
||||
|
||||
def _wait_if_paused(self, resume_stage: str = "captioning") -> None:
|
||||
if not self._pause_requested.is_set():
|
||||
return
|
||||
|
||||
def stop(self) -> dict[str, Any]:
|
||||
with self._state_lock:
|
||||
self._state["paused"] = True
|
||||
self._state["pause_requested"] = True
|
||||
self._state["paused_from_stage"] = resume_stage
|
||||
self._state["stage"] = "paused"
|
||||
if not self._state.get("running"):
|
||||
raise RuntimeError("No captioning job is running.")
|
||||
if self._state.get("stage") in {"sync", "syncing", "synced"}:
|
||||
raise RuntimeError(
|
||||
"Captioning has finished; the search index is rebuilding."
|
||||
)
|
||||
|
||||
while self._pause_requested.is_set():
|
||||
self._resume_event.wait(timeout=0.5)
|
||||
|
||||
with self._state_lock:
|
||||
self._state["paused"] = False
|
||||
self._stop_requested.set()
|
||||
self._pause_requested.clear()
|
||||
self._resume_event.set()
|
||||
self._state["stop_requested"] = True
|
||||
self._state["pause_requested"] = False
|
||||
if self._state.get("running"):
|
||||
self._state["stage"] = resume_stage
|
||||
self._state["paused"] = False
|
||||
|
||||
return self.status()
|
||||
|
||||
def _wait_if_paused(self, resume_stage: str = "captioning") -> None:
|
||||
if self._stop_requested.is_set():
|
||||
raise CaptionJobStopped()
|
||||
|
||||
if self._pause_requested.is_set():
|
||||
with self._state_lock:
|
||||
self._state["paused"] = True
|
||||
self._state["pause_requested"] = True
|
||||
self._state["paused_from_stage"] = resume_stage
|
||||
self._state["stage"] = "paused"
|
||||
|
||||
while self._pause_requested.is_set() and not self._stop_requested.is_set():
|
||||
self._resume_event.wait(timeout=0.5)
|
||||
|
||||
if self._stop_requested.is_set():
|
||||
raise CaptionJobStopped()
|
||||
|
||||
with self._state_lock:
|
||||
self._state["paused"] = False
|
||||
self._state["pause_requested"] = False
|
||||
if self._state.get("running"):
|
||||
self._state["stage"] = resume_stage
|
||||
|
||||
if self._stop_requested.is_set():
|
||||
raise CaptionJobStopped()
|
||||
|
||||
def start(self, library_ids: list[str], *, force: bool = False) -> dict[str, Any]:
|
||||
library_ids = [str(value).strip() for value in library_ids if str(value).strip()]
|
||||
@@ -122,6 +153,7 @@ class CaptionJobManager:
|
||||
raise RuntimeError("A captioning job is already running.")
|
||||
|
||||
self._pause_requested.clear()
|
||||
self._stop_requested.clear()
|
||||
self._resume_event.set()
|
||||
|
||||
init_db(settings.db_path)
|
||||
@@ -170,6 +202,7 @@ class CaptionJobManager:
|
||||
"percent": 0.0 if rows else 100.0,
|
||||
"paused": False,
|
||||
"pause_requested": False,
|
||||
"stop_requested": False,
|
||||
}
|
||||
|
||||
if not rows:
|
||||
@@ -368,6 +401,22 @@ class CaptionJobManager:
|
||||
"documents_processed": documents,
|
||||
}
|
||||
)
|
||||
except CaptionJobStopped:
|
||||
self._set_gpu_busy(False)
|
||||
self._pause_requested.clear()
|
||||
self._stop_requested.clear()
|
||||
self._resume_event.set()
|
||||
self._progress(
|
||||
{
|
||||
"running": False,
|
||||
"stage": "stopped",
|
||||
"finished_at": datetime.now(timezone.utc).isoformat(),
|
||||
"paused": False,
|
||||
"pause_requested": False,
|
||||
"stop_requested": False,
|
||||
"error": None,
|
||||
}
|
||||
)
|
||||
except Exception as exc:
|
||||
self._set_gpu_busy(False)
|
||||
self._progress(
|
||||
|
||||
Reference in New Issue
Block a user