* feat(system): resolve every library path in one place utils/library_location.py decides where the library lives: the PROMPT_MANAGER_DATA_DIR folder (validated: absolute, never inside a folder ComfyUI or Prompt Manager serves), an explicit database.default_path as before, a node-folder library that was not moved, else ComfyUI's user/__promptmanager. The database, diagnostics, config.json, logs and the LoRA image cache all ask it, so a new install never writes into the node folder and an existing one keeps every path until the user moves it. "Keep it here" is persisted as library.keep_in_node_folder. * feat(system): move the library as a verified Activity job POST /prompt_manager/system/library/move starts "Move library", an exclusive, non-cancellable job (database/library_move.py). It checks the target volume's free space, copies the database with SQLite's backup API from one read snapshot, verifies the copy (integrity check, every workflow document, the same rows in every table), copies the safety and pre-migration backups and config.json (owner-only, checked by size and SHA-256), then publishes under the old file's write lock and switches the live process (every PromptModel, the review and history observers, the API's plans and health report). The old prompts.db and config.json are renamed *.moved-to-<folder> only after the switch. A failure removes everything it wrote and leaves the old library in use; a marker in the new folder makes a restart after any crash pick the right library. GET /prompt_manager/system/library and the Overview's "location" say where the library lives and why; POST .../keep persists "Keep it here". * feat(system): show where the library lives and offer the move D129. System > Overview's Library health gains a "Library location" row (the database path, why it is there, the "Keep it here" choice and any PROMPT_MANAGER_DATA_DIR problem) with Move library for a node-folder library and Details otherwise. While a node-folder library is not kept there, the workspace shows the concept's .notice above every page: "Keep it here" saves the choice on the server and stops the notice; "Move library" opens the shared review (From, To, Size, what moves, what happens to the old files) and starts the exclusive job in Activity. The notice and the Overview read the location again when the job ends. The Overview comparison maps the inserted row; a new comparison holds the notice to the concept's Sources notice (markup, tokens, alignment, both themes and widths) with a mutation check. * feat(system): close the browser server's log files before its root goes The logs now live in the library's data folder, which for the browser test server is <root>/user/__promptmanager; Windows could not remove the temp root while the server still held prompt_manager.log open. The API test's node folder is spelled in lower case because public paths are case-folded on Windows. * feat(system): show the library location on the legacy admin page A line under the admin page's statistics names the database path and why it is there (ComfyUI's user folder, PROMPT_MANAGER_DATA_DIR, config.json, or the node folder with a pointer to Move library), read once from GET /prompt_manager/system/library. * feat(system): prove a fresh host keeps its library in user/__promptmanager The execution suite starts one pinned CPU ComfyUI with no configuration at all on an OS-chosen port: the library is created in user/__promptmanager (database and logs), nothing but byte code is added to the node folder, the location route reports the default folder, and ComfyUI's /userdata API serves none of it (traversal spellings, a listing, a system-user header). * feat(system): document where the library lives and how it moves README: where the library lives, the upgrade path (Move library / Keep it here), PROMPT_MANAGER_DATA_DIR, explicit paths unchanged, and the way back to an older version. TESTING.md: D129 and the library location contract (resolution order, move steps, crash windows, coded refusals, Windows handling). * wip(system): library move fix round in progress * fix(system): retry a fallback image link that races the library switch The image monitor's fallback and recent-prompt links went through PromptDatabase.link_image_to_prompt, which logs and returns 0 on any error, so survive_switch never saw a "database is locked" or closed connection during Move library and the link was lost in both files. The monitor now links through link_image_to_prompt_or_raise (one transaction per attempt); link_image_to_prompt keeps its log-and-return-0 contract for other callers. A link that returns 0 is no longer logged as "Successfully linked image 0". A switch that fails after repointing the models now closes the old file's detached connections instead of leaving them to GC: switch() adds them to a list the mover owns. The mocked retry test is replaced by a real-lock race asserting the image row lands in the new library only. * fix(system): say which source is the default and where a symlinked library lives Sources & scans: with no source configured, ComfyUI's output folder now reads "ComfyUI/output · watching · default" on its own row instead of a separate note line. GET /settings marks each effective source with in_comfyui (its public path is relative to the ComfyUI base) so only those get the "ComfyUI/" prefix; the scan still sends the server's public path. Library location: a library in the node folder reads through the node folder's unresolved place in custom_nodes, so a node folder symlinked to a checkout outside ComfyUI shows custom_nodes/promptmanager/prompts.db instead of prompts.db (System library row, Move review, admin Library line). Never absolute or "..", else the shared _public_path, which sources and jobs keep using unchanged.
210 lines
7.6 KiB
Python
210 lines
7.6 KiB
Python
"""Transactional attempt writes and process-local restore invalidation."""
|
|
|
|
import os
|
|
import sqlite3
|
|
import threading
|
|
from contextlib import contextmanager
|
|
from typing import Callable, Iterator
|
|
|
|
try:
|
|
from ..utils.execution_history_events import (
|
|
RunFinish,
|
|
RunStart,
|
|
classify_evidence,
|
|
encode_command,
|
|
)
|
|
from ..utils.logging_config import get_logger
|
|
except ImportError:
|
|
from utils.execution_history_events import (
|
|
RunFinish,
|
|
RunStart,
|
|
classify_evidence,
|
|
encode_command,
|
|
)
|
|
from utils.logging_config import get_logger
|
|
|
|
|
|
_logger = get_logger("prompt_manager.database.execution_history")
|
|
# Bounded wait for a history write lock. History is best effort and must
|
|
# never stall ComfyUI's queue: a write that cannot start in time raises
|
|
# "database is locked" and the writer records a gap instead of waiting.
|
|
EXECUTION_BUSY_TIMEOUT_MS = 250
|
|
_restore_lock = threading.Lock()
|
|
_restore_observers: dict[str, dict[object, Callable[[], None]]] = {}
|
|
|
|
|
|
def _database_identity(db_path: str) -> str:
|
|
return os.path.normcase(os.path.realpath(db_path))
|
|
|
|
|
|
def subscribe_history_restore(
|
|
db_path: str, callback: Callable[[], None]
|
|
) -> Callable[[], None]:
|
|
"""Observe successful restores of the canonical database path."""
|
|
identity = _database_identity(db_path)
|
|
token = object()
|
|
with _restore_lock:
|
|
_restore_observers.setdefault(identity, {})[token] = callback
|
|
|
|
def unsubscribe() -> None:
|
|
with _restore_lock:
|
|
observers = _restore_observers.get(identity)
|
|
if observers is not None:
|
|
observers.pop(token, None)
|
|
if not observers:
|
|
_restore_observers.pop(identity, None)
|
|
|
|
return unsubscribe
|
|
|
|
|
|
def notify_history_restore(db_path: str) -> None:
|
|
"""Notify outside the registry lock; observers cannot fail a restore."""
|
|
with _restore_lock:
|
|
callbacks = tuple(
|
|
_restore_observers.get(_database_identity(db_path), {}).values()
|
|
)
|
|
for callback in callbacks:
|
|
try:
|
|
callback()
|
|
except Exception:
|
|
_logger.warning("Execution history restore observer failed", exc_info=True)
|
|
|
|
|
|
class HistoryEpochChanged(Exception):
|
|
"""A command belongs to storage replaced by a completed restore."""
|
|
|
|
def __init__(self, storage_epoch: str):
|
|
self.storage_epoch = storage_epoch
|
|
super().__init__("Execution history storage epoch changed")
|
|
|
|
|
|
class ExecutionHistoryOperations:
|
|
"""Mixin using the calling thread's existing managed model connection."""
|
|
|
|
def get_execution_epoch(self) -> str:
|
|
row = (
|
|
self.model.get_connection()
|
|
.execute(
|
|
"SELECT storage_epoch FROM execution_history_metadata "
|
|
"WHERE singleton_id=1"
|
|
)
|
|
.fetchone()
|
|
)
|
|
if row is None:
|
|
raise sqlite3.DatabaseError("Missing execution history metadata")
|
|
return row[0]
|
|
|
|
@contextmanager
|
|
def _execution_transaction(
|
|
self, expected_epoch: str
|
|
) -> Iterator[sqlite3.Connection]:
|
|
conn = self.model.get_connection()
|
|
if conn.in_transaction:
|
|
raise sqlite3.ProgrammingError(
|
|
"Execution history requires its own transaction"
|
|
)
|
|
timeout = conn.execute("PRAGMA busy_timeout").fetchone()[0]
|
|
conn.execute(f"PRAGMA busy_timeout={int(EXECUTION_BUSY_TIMEOUT_MS)}")
|
|
try:
|
|
conn.execute("BEGIN IMMEDIATE")
|
|
try:
|
|
epoch = self.get_execution_epoch()
|
|
if epoch != expected_epoch:
|
|
raise HistoryEpochChanged(epoch)
|
|
yield conn
|
|
conn.commit()
|
|
except BaseException:
|
|
conn.rollback()
|
|
raise
|
|
finally:
|
|
conn.execute(f"PRAGMA busy_timeout={timeout}")
|
|
|
|
def write_execution_start(self, command: RunStart) -> bool:
|
|
encode_command(command)
|
|
if type(command) is not RunStart:
|
|
raise ValueError("Expected execution start command")
|
|
with self._execution_transaction(command.storage_epoch) as conn:
|
|
conn.execute(
|
|
"INSERT INTO execution_runs "
|
|
"(run_id,session_id,queue_item_id,job_id,storage_epoch,record_version,"
|
|
"observed_dequeue_at,outcome,diagnostics_omitted) "
|
|
"VALUES(?,?,?,?,?,1,?,'observed',0) "
|
|
"ON CONFLICT(session_id,queue_item_id) DO NOTHING",
|
|
(
|
|
command.run_id,
|
|
command.session_id,
|
|
command.queue_item_id,
|
|
command.job_id,
|
|
command.storage_epoch,
|
|
command.observed_dequeue_at,
|
|
),
|
|
)
|
|
return True
|
|
|
|
def write_execution_finish(self, command: RunFinish) -> bool:
|
|
encode_command(command)
|
|
if type(command) is not RunFinish:
|
|
raise ValueError("Expected execution finish command")
|
|
with self._execution_transaction(command.storage_epoch) as conn:
|
|
row = conn.execute(
|
|
"SELECT * FROM execution_runs WHERE session_id=? AND queue_item_id=? "
|
|
"AND storage_epoch=?",
|
|
(command.session_id, command.queue_item_id, command.storage_epoch),
|
|
).fetchone()
|
|
if row is None:
|
|
return False
|
|
completion = classify_evidence(row["job_id"], command.evidence)
|
|
if row["outcome"] == "unknown":
|
|
return True
|
|
if row["outcome"] != "observed":
|
|
contradictory = completion.reason == "conflicting_terminal" or (
|
|
completion.outcome in ("succeeded", "failed", "interrupted")
|
|
and completion.outcome != row["outcome"]
|
|
)
|
|
if contradictory:
|
|
conn.execute(
|
|
"UPDATE execution_runs SET outcome='unknown',"
|
|
"reason='conflicting_terminal' WHERE run_id=?",
|
|
(row["run_id"],),
|
|
)
|
|
return True
|
|
conn.execute(
|
|
"UPDATE execution_runs SET observed_callback_at=?,"
|
|
"executor_started_at=?,"
|
|
"terminal_event_at=?,outcome=?,reason=?,diagnostics_omitted=?,"
|
|
"node_id=?,"
|
|
"node_type=?,exception_type=? WHERE run_id=?",
|
|
(
|
|
command.observed_callback_at,
|
|
completion.executor_started_at,
|
|
completion.terminal_event_at,
|
|
completion.outcome,
|
|
completion.reason,
|
|
int(completion.diagnostics_omitted),
|
|
completion.node_id,
|
|
completion.node_type,
|
|
completion.exception_type,
|
|
row["run_id"],
|
|
),
|
|
)
|
|
return True
|
|
|
|
def get_execution_run(self, run_id: str) -> dict | None:
|
|
row = (
|
|
self.model.get_connection()
|
|
.execute("SELECT * FROM execution_runs WHERE run_id=?", (run_id,))
|
|
.fetchone()
|
|
)
|
|
return dict(row) if row is not None else None
|
|
|
|
|
|
def rekey_history_restore(old_path: str, new_path: str) -> None:
|
|
"""Move the observers of ``old_path`` to ``new_path`` (Move library)."""
|
|
old, new = _database_identity(old_path), _database_identity(new_path)
|
|
if old == new:
|
|
return
|
|
with _restore_lock:
|
|
observers = _restore_observers.pop(old, None)
|
|
if observers:
|
|
_restore_observers.setdefault(new, {}).update(observers)
|