Vito Sansevero
80a4ba3ba4
A stage whose outputs reach only non-file outputs (PreviewImage and the other
non_file_outputs) cannot have written a saved file, yet it stayed an
unanchored candidate, so a preview-only FaceDetailer made the saved branch
ambiguous (f01b).
The inspection profile now drops such stages before detailer absorption,
using two linear backward passes over the graph (charged like the consumer
map; a failed pass keeps every stage). A stage without consumers, or one that
also reaches any other terminal, is kept, and nothing is dropped when every
stage is preview-only. Raw plus detailed double saves both write files and
stay ambiguous. A file in the host temp folder may itself be a preview, so it
is inspected with PREVIEW_INSPECTION_PROFILE, which keeps those stages.
Workspace facts follow the same choice: an absent or unresolved result that
names a sampler merges facts across that sampler's stages only, so the
dropped detailer's settings no longer blur the saved file's facts.
f01b now resolves (absent negative, guider has none); its vector is updated
and the expected failure removed. The default profile is unchanged:
differential against 39dcc40 identical over 160,256 cases. Over 60,054
inspection cases no previously resolved or absent result changed.
136 lines
4.0 KiB
Python
136 lines
4.0 KiB
Python
"""One bounded current-file inspection worker shared by physical identities."""
|
|
|
|
import os
|
|
import stat
|
|
from pathlib import Path
|
|
|
|
try:
|
|
from ...utils.prompt_inspector import (
|
|
MetadataReadError,
|
|
inspect_prompt_evidence,
|
|
read_inspection_file,
|
|
unreadable_evidence,
|
|
)
|
|
from ...utils.prompt_pair_resolver import (
|
|
INSPECTION_PROFILE,
|
|
PREVIEW_INSPECTION_PROFILE,
|
|
)
|
|
from ...utils.video_metadata import is_video_path
|
|
except ImportError:
|
|
from utils.prompt_inspector import (
|
|
MetadataReadError,
|
|
inspect_prompt_evidence,
|
|
read_inspection_file,
|
|
unreadable_evidence,
|
|
)
|
|
from utils.prompt_pair_resolver import (
|
|
INSPECTION_PROFILE,
|
|
PREVIEW_INSPECTION_PROFILE,
|
|
)
|
|
from utils.video_metadata import is_video_path
|
|
|
|
|
|
# Only these file types are served or inspected within an authorized directory.
|
|
IMAGE_EXTENSIONS = frozenset(
|
|
{
|
|
".png",
|
|
".jpg",
|
|
".jpeg",
|
|
".webp",
|
|
".gif",
|
|
".bmp",
|
|
".tiff",
|
|
".tif",
|
|
".mp4",
|
|
".webm",
|
|
".mov",
|
|
}
|
|
)
|
|
VIDEO_EXTENSIONS = frozenset({".mp4", ".webm", ".avi", ".mov", ".mkv", ".m4v", ".wmv"})
|
|
SERVABLE_EXTENSIONS = IMAGE_EXTENSIONS | VIDEO_EXTENSIONS
|
|
|
|
|
|
class CurrentFileChanged(Exception):
|
|
"""File facts are invalid or changed across the bounded metadata observation."""
|
|
|
|
|
|
def _current_file_facts(path: Path) -> os.stat_result:
|
|
if path.suffix.lower() not in SERVABLE_EXTENSIONS:
|
|
raise CurrentFileChanged
|
|
try:
|
|
observed = path.stat()
|
|
except (FileNotFoundError, NotADirectoryError, PermissionError):
|
|
raise CurrentFileChanged from None
|
|
if (
|
|
not stat.S_ISREG(observed.st_mode)
|
|
or not observed.st_mode & 0o444
|
|
or not os.access(path, os.R_OK)
|
|
):
|
|
raise CurrentFileChanged
|
|
return observed
|
|
|
|
|
|
def _in_host_temp(path: Path) -> bool:
|
|
"""Whether a file lies in ComfyUI's temp folder, where previews are written.
|
|
|
|
An unknown temp folder reads as no: the file is then inspected as saved
|
|
output.
|
|
"""
|
|
try:
|
|
import folder_paths
|
|
|
|
temp = folder_paths.get_temp_directory()
|
|
except (ImportError, AttributeError, OSError):
|
|
return False
|
|
if type(temp) is not str or not temp:
|
|
return False
|
|
try:
|
|
folder = os.path.normcase(os.path.realpath(temp))
|
|
target = os.path.normcase(os.path.realpath(path))
|
|
return os.path.commonpath([folder, target]) == folder
|
|
except (OSError, ValueError):
|
|
return False
|
|
|
|
|
|
def inspect_current_file(
|
|
path: Path, *, source_label: str, saved: dict | None, library: dict
|
|
) -> dict:
|
|
before = _current_file_facts(path)
|
|
try:
|
|
inspection = read_inspection_file(path)
|
|
except MetadataReadError:
|
|
inspection = None
|
|
after = _current_file_facts(path)
|
|
fields = ("st_dev", "st_ino", "st_mode", "st_size", "st_mtime_ns", "st_ctime_ns")
|
|
if any(getattr(before, key) != getattr(after, key) for key in fields):
|
|
raise CurrentFileChanged
|
|
if inspection is None:
|
|
evidence = unreadable_evidence()
|
|
else:
|
|
role_saved = (
|
|
None if saved and saved.get("association_status") == "ambiguous" else saved
|
|
)
|
|
# A preview may be the output of a stage that reaches only previews.
|
|
profile = (
|
|
PREVIEW_INSPECTION_PROFILE if _in_host_temp(path) else INSPECTION_PROFILE
|
|
)
|
|
evidence = inspect_prompt_evidence(
|
|
inspection.metadata, role_saved, profile=profile
|
|
)
|
|
return {
|
|
"file": {
|
|
"observation": "current-file",
|
|
"source_label": source_label,
|
|
"media_type": "video" if is_video_path(path) else "image",
|
|
"extension": path.suffix.lower(),
|
|
"size": before.st_size,
|
|
"modified_time": before.st_mtime,
|
|
"format": None,
|
|
"width": None,
|
|
"height": None,
|
|
},
|
|
**evidence,
|
|
"inspection": inspection,
|
|
"library": library,
|
|
}
|