mirror of
https://github.com/comfyanonymous/ComfyUI.git
synced 2026-03-05 01:07:37 +08:00
67c4f79c22
- Extract validate_blake3_hash() into helpers.py, used by upload, schemas, routes - Extract get_reference_with_owner_check() into queries, used by 4 service functions - Extract build_prefix_like_conditions() into queries/common.py, used by 3 queries - Replace 3 inlined tag queries with get_reference_tags() calls - Consolidate AddTagsDict/RemoveTagsDict TypedDicts into AddTagsResult/RemoveTagsResult dataclasses, eliminating manual field copying in tagging.py - Make iter_row_chunks delegate to iter_chunks - Inline trivial compute_filename_for_reference wrapper (unused session param) - Remove mark_assets_missing_outside_prefixes pass-through in bulk_ingest.py - Clean up unused imports (os, time, dependencies_available) - Disable assets routes on DB init failure in main.py Amp-Thread-ID: https://ampcode.com/threads/T-019cb649-dd4e-71ff-9a0e-ae517365207b Co-authored-by: Amp <amp@ampcode.com>
66 lines
2.0 KiB
Python
66 lines
2.0 KiB
Python
import os
|
|
from datetime import datetime, timezone
|
|
from typing import Sequence
|
|
|
|
|
|
def select_best_live_path(states: Sequence) -> str:
|
|
"""
|
|
Return the best on-disk path among cache states:
|
|
1) Prefer a path that exists with needs_verify == False (already verified).
|
|
2) Otherwise, pick the first path that exists.
|
|
3) Otherwise return empty string.
|
|
"""
|
|
alive = [
|
|
s
|
|
for s in states
|
|
if getattr(s, "file_path", None) and os.path.isfile(s.file_path)
|
|
]
|
|
if not alive:
|
|
return ""
|
|
for s in alive:
|
|
if not getattr(s, "needs_verify", False):
|
|
return s.file_path
|
|
return alive[0].file_path
|
|
|
|
|
|
def escape_sql_like_string(s: str, escape: str = "!") -> tuple[str, str]:
|
|
"""Escapes %, _ and the escape char in a LIKE prefix.
|
|
|
|
Returns (escaped_prefix, escape_char).
|
|
"""
|
|
s = s.replace(escape, escape + escape) # escape the escape char first
|
|
s = s.replace("%", escape + "%").replace("_", escape + "_") # escape LIKE wildcards
|
|
return s, escape
|
|
|
|
|
|
def get_utc_now() -> datetime:
|
|
"""Naive UTC timestamp (no tzinfo). We always treat DB datetimes as UTC."""
|
|
return datetime.now(timezone.utc).replace(tzinfo=None)
|
|
|
|
|
|
def normalize_tags(tags: list[str] | None) -> list[str]:
|
|
"""
|
|
Normalize a list of tags by:
|
|
- Stripping whitespace and converting to lowercase.
|
|
- Removing duplicates.
|
|
"""
|
|
return list(dict.fromkeys(t.strip().lower() for t in (tags or []) if (t or "").strip()))
|
|
|
|
|
|
def validate_blake3_hash(s: str) -> str:
|
|
"""Validate and normalize a blake3 hash string.
|
|
|
|
Returns canonical 'blake3:<hex>' or raises ValueError.
|
|
"""
|
|
s = s.strip().lower()
|
|
if not s or ":" not in s:
|
|
raise ValueError("hash must be 'blake3:<hex>'")
|
|
algo, digest = s.split(":", 1)
|
|
if (
|
|
algo != "blake3"
|
|
or len(digest) != 64
|
|
or any(c for c in digest if c not in "0123456789abcdef")
|
|
):
|
|
raise ValueError("hash must be 'blake3:<hex>'")
|
|
return f"{algo}:{digest}"
|