Vito Sansevero
66f61de0db
The workspace Images listing now admits a file under a Tags filter when every requested tag is carried by its linked positive or its current image tag set, and q also matches image tag names (case-folded substring). Image tags count only while a byte record is verified at the file's present (size, mtime_ns) (spec amendment S1): the tagged records are streamed once, only listed files carrying a filter tag or q hit are stat'ed, and their linked positives are read through the file_path index so tags, category, rating and the positive count combine. The rooted inspector envelope gains a validated image_tags facet (current / none / unavailable) read at the inspection's own stable stat. A failed image-tag read fails a Tags filter like a failed link read and degrades a q search to no image tags; plain listings read none. Legacy gallery and search responses are unchanged.
152 lines
4.5 KiB
Python
152 lines
4.5 KiB
Python
"""One bounded current-file inspection worker shared by physical identities."""
|
|
|
|
import os
|
|
import stat
|
|
from pathlib import Path
|
|
from typing import Callable
|
|
|
|
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,
|
|
image_tags: Callable[[int, int], dict] | None = None,
|
|
) -> dict:
|
|
"""Current-file evidence read between two equal stats of *path*.
|
|
|
|
*image_tags*, when given, is called once with that stable
|
|
``(st_size, st_mtime_ns)`` and its facet is returned as ``image_tags``
|
|
(spec amendment S1: tags of a byte record verified at exactly that stat).
|
|
"""
|
|
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
|
|
facets = {}
|
|
if image_tags is not None:
|
|
facets["image_tags"] = image_tags(before.st_size, before.st_mtime_ns)
|
|
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,
|
|
**facets,
|
|
}
|