mirror of
https://github.com/comfyanonymous/ComfyUI.git
synced 2026-03-09 23:30:02 +00:00
2f3d18ae71
Add ingest_existing_file() to services/ingest.py as a public one-call wrapper for registering on-disk files (stat, BLAKE3 hash, MIME detection, path-based tag derivation). After each prompt execution in the main loop, iterate history_result['outputs'] and register files with type 'output' as assets. Runs while the asset seeder is paused, gated behind asset_seeder.is_disabled(). Stores prompt_id in user_metadata for provenance tracking. Amp-Thread-ID: https://ampcode.com/threads/T-019cc013-1444-73c8-81d6-07cae6e5e38d Co-authored-by: Amp <amp@ampcode.com> refactor(assets): two-phase ingest — stub insert then hash ingest_existing_file() now inserts a stub record (hash=NULL) first for instant UX visibility, then computes the BLAKE3 hash and runs the full ingest pipeline. No compute_hash flag exposed — both phases always run. Amp-Thread-ID: https://ampcode.com/threads/T-019cc013-1444-73c8-81d6-07cae6e5e38d Co-authored-by: Amp <amp@ampcode.com> refactor(assets): defer hashing to background seeder enrich phase ingest_existing_file() now only inserts a stub record (hash=NULL) for instant UX visibility. After registering outputs, triggers asset_seeder.start_enrich() to compute hashes in the background. This avoids blocking the prompt worker thread on hash computation. Co-authored-by: Amp <amp@ampcode.com> Amp-Thread-ID: https://ampcode.com/threads/T-019ccb2f-8bfd-74b3-9005-3a4ace919554
90 lines
2.0 KiB
Python
90 lines
2.0 KiB
Python
from app.assets.services.asset_management import (
|
|
asset_exists,
|
|
delete_asset_reference,
|
|
get_asset_by_hash,
|
|
get_asset_detail,
|
|
list_assets_page,
|
|
resolve_asset_for_download,
|
|
set_asset_preview,
|
|
update_asset_metadata,
|
|
)
|
|
from app.assets.services.bulk_ingest import (
|
|
BulkInsertResult,
|
|
batch_insert_seed_assets,
|
|
cleanup_unreferenced_assets,
|
|
)
|
|
from app.assets.services.file_utils import (
|
|
get_mtime_ns,
|
|
get_size_and_mtime_ns,
|
|
list_files_recursively,
|
|
verify_file_unchanged,
|
|
)
|
|
from app.assets.services.ingest import (
|
|
DependencyMissingError,
|
|
HashMismatchError,
|
|
create_from_hash,
|
|
ingest_existing_file,
|
|
upload_from_temp_path,
|
|
)
|
|
from app.assets.database.queries import (
|
|
AddTagsResult,
|
|
RemoveTagsResult,
|
|
)
|
|
from app.assets.services.schemas import (
|
|
AssetData,
|
|
AssetDetailResult,
|
|
AssetSummaryData,
|
|
DownloadResolutionResult,
|
|
IngestResult,
|
|
ListAssetsResult,
|
|
ReferenceData,
|
|
RegisterAssetResult,
|
|
TagUsage,
|
|
UploadResult,
|
|
UserMetadata,
|
|
)
|
|
from app.assets.services.tagging import (
|
|
apply_tags,
|
|
list_tags,
|
|
remove_tags,
|
|
)
|
|
|
|
__all__ = [
|
|
"AddTagsResult",
|
|
"AssetData",
|
|
"AssetDetailResult",
|
|
"AssetSummaryData",
|
|
"ReferenceData",
|
|
"BulkInsertResult",
|
|
"DependencyMissingError",
|
|
"DownloadResolutionResult",
|
|
"HashMismatchError",
|
|
"IngestResult",
|
|
"ListAssetsResult",
|
|
"RegisterAssetResult",
|
|
"RemoveTagsResult",
|
|
"TagUsage",
|
|
"UploadResult",
|
|
"UserMetadata",
|
|
"apply_tags",
|
|
"asset_exists",
|
|
"batch_insert_seed_assets",
|
|
"create_from_hash",
|
|
"delete_asset_reference",
|
|
"get_asset_by_hash",
|
|
"get_asset_detail",
|
|
"ingest_existing_file",
|
|
"get_mtime_ns",
|
|
"get_size_and_mtime_ns",
|
|
"list_assets_page",
|
|
"list_files_recursively",
|
|
"list_tags",
|
|
"cleanup_unreferenced_assets",
|
|
"remove_tags",
|
|
"resolve_asset_for_download",
|
|
"set_asset_preview",
|
|
"update_asset_metadata",
|
|
"upload_from_temp_path",
|
|
"verify_file_unchanged",
|
|
]
|