Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
834 changes: 834 additions & 0 deletions app/asset_export.py

Large diffs are not rendered by default.

67 changes: 64 additions & 3 deletions app/assets/services/asset_management.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
"""Serves the per-asset operations behind the API: reading an asset's detail,
updating its name, tags, metadata and preview, deleting a record, and resolving
a hash to a servable path. Name and tag updates move ``updated_at`` only when
the requested values differ. Other supplied metadata fields record a write.
updating its name, tags, metadata and preview, deleting a record, resolving
a hash to a servable path, and looking up the files an export zips. Name and
tag updates move ``updated_at`` only when the requested values differ. Other
supplied metadata fields record a write.
"""

import mimetypes
Expand Down Expand Up @@ -30,6 +31,7 @@
AssetData,
AssetDetailResult,
DownloadResolutionResult,
ExportableAssetFile,
ReferenceData,
UserMetadata,
)
Expand Down Expand Up @@ -269,3 +271,62 @@ def resolve_asset_for_download(
content_type=ctype,
download_name=download_name,
)


def list_job_export_files(
job_ids: Sequence[str], include_previews: bool
) -> list[ExportableAssetFile]:
"""Live output records of the given jobs, plus their temp records when previews are requested."""
if not job_ids:
return []
tags = ["output", "temp"] if include_previews else ["output"]
with create_session() as session:
rows = session.execute(
select(
Asset.id,
Asset.name,
Asset.job_id,
Asset.created_at,
AssetContent.path,
AssetContent.hash,
)
.join(AssetContent, Asset.content_id == AssetContent.id)
.where(
Asset.job_id.in_(list(job_ids)),
AssetContent.is_missing.is_(False),
Asset.id.in_(
select(AssetTag.asset_id).where(AssetTag.tag_name.in_(tags))
),
)
).all()
return [
ExportableAssetFile(
id=row.id,
name=row.name,
path=row.path,
hash=row.hash,
job_id=row.job_id,
created_at=row.created_at,
)
for row in rows
]


def get_export_file(reference_id: str) -> ExportableAssetFile:
with create_session() as session:
record = get_record_by_id(session, reference_id)
if record is None:
raise ValueError(f"AssetReference {reference_id} not found")
content = session.get(AssetContent, record.content_id)
if content is None or content.is_missing:
raise FileNotFoundError(
f"No live content for AssetReference {reference_id}"
)
return ExportableAssetFile(
id=record.id,
name=record.name,
path=content.path,
hash=content.hash,
job_id=record.job_id,
created_at=record.created_at,
)
10 changes: 10 additions & 0 deletions app/assets/services/schemas.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,16 @@ class DownloadResolutionResult:
download_name: str


@dataclass(frozen=True)
class ExportableAssetFile:
id: str
name: str
path: str
hash: str | None
job_id: str | None
created_at: datetime


@dataclass(frozen=True)
class RegisteredAsset:
id: str
Expand Down
32 changes: 32 additions & 0 deletions comfy_execution/jobs.py
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,38 @@ def get_job(prompt_id: str, running: list, queued: list, history: dict) -> Optio
return None


def get_job_create_times(
prompt_ids: list[str],
running: list,
queued: list,
history: dict,
) -> dict[str, int]:
"""
Get the creation time (ms since epoch) of each given job that is still known.

A job is known while it is queued, running or in history.

Args:
prompt_ids: The prompt IDs to look up
running: List of currently running queue items
queued: List of pending queue items
history: Dict of history items keyed by prompt_id

Returns:
Dict of creation times keyed by prompt_id; jobs the server no longer knows are left out
"""
extra_data_by_prompt = {item[1]: item[3] for item in [*running, *queued]}
for prompt_id, history_item in history.items():
extra_data_by_prompt[prompt_id] = history_item['prompt'][3]

create_times = {}
for prompt_id in prompt_ids:
create_time = (extra_data_by_prompt.get(prompt_id) or {}).get('create_time')
if isinstance(create_time, int):
create_times[prompt_id] = create_time
return create_times


def get_all_jobs(
running: list,
queued: list,
Expand Down
28 changes: 27 additions & 1 deletion server.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
JobStatus,
get_job,
get_all_jobs,
get_job_create_times,
validate_job_id,
cancel_job,
CANCEL_PENDING,
Expand Down Expand Up @@ -48,7 +49,12 @@
from app.database.db import dependencies_available

if dependencies_available():
from app.assets.services.asset_management import resolve_hash_to_path
from app.assets.services.asset_management import (
get_export_file,
list_job_export_files,
resolve_hash_to_path,
)
from app.asset_export import AssetExportManager

from app.user_manager import UserManager
from app.model_manager import ModelFileManager
Expand Down Expand Up @@ -260,6 +266,26 @@ def __init__(self, loop, asset_manager: "AssetManager"):
logging.info(f"[Prompt Server] web root: {self.web_root}")
self.asset_manager.register_routes(self.app, self.user_manager)
self.asset_manager.set_event_sink(self.send_sync)

def _job_create_times(prompt_ids):
"""Creation times of the given jobs, from the queue and history."""
running, queued = self.prompt_queue.get_current_queue_volatile()
history = {}
for prompt_id in prompt_ids:
history.update(
self.prompt_queue.get_history(prompt_id=prompt_id, map_function=lambda item: item)
)
return get_job_create_times(prompt_ids, running, queued, history)
Comment thread
jtydhr88 marked this conversation as resolved.
Resolved

if dependencies_available():
self.asset_export_manager = AssetExportManager(
list_job_files=list_job_export_files,
get_asset_file=get_export_file,
get_job_create_times=_job_create_times,
event_sink=self.send_sync,
get_user_id=self.user_manager.get_request_user_id,
)
self.asset_export_manager.register_routes(self.app)
if self.asset_manager.enabled:
emit("assets.enabled", hashing_enabled=args.enable_asset_hashing)
routes = web.RouteTableDef()
Expand Down
Empty file.
Loading
Loading