wangbo/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2026-03-02 15:57:40 +08:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Fixed issues in manager.py that had to do with creating a result after closing the db session

Browse Source
This commit is contained in:
Jedrzej Kosinski 2026-01-29 16:58:48 -08:00
parent eb78ea0cff
commit 1e622d3923
1 changed files with 50 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
app/assets/manager.py
View File

@ -271,21 +271,22 @@ def upload_asset_from_temp_path(
raise RuntimeError("inconsistent DB state after ingest") raise RuntimeError("inconsistent DB state after ingest")
info, asset = pair info, asset = pair
tag_names = get_asset_tags(session, asset_info_id=info.id) tag_names = get_asset_tags(session, asset_info_id=info.id)
created_result = schemas_out.AssetCreated(
id=info.id,
name=info.name,
asset_hash=asset.hash,
size=int(asset.size_bytes),
mime_type=asset.mime_type,
tags=tag_names,
user_metadata=info.user_metadata or {},
preview_id=info.preview_id,
created_at=info.created_at,
last_access_time=info.last_access_time,
created_new=result["asset_created"],
)
session.commit() session.commit()
return schemas_out.AssetCreated( return created_result
id=info.id,
name=info.name,
asset_hash=asset.hash,
size=int(asset.size_bytes),
mime_type=asset.mime_type,
tags=tag_names,
user_metadata=info.user_metadata or {},
preview_id=info.preview_id,
created_at=info.created_at,
last_access_time=info.last_access_time,
created_new=result["asset_created"],
)
def update_asset( def update_asset(
@ -314,16 +315,17 @@ def update_asset(
) )
tag_names = get_asset_tags(session, asset_info_id=asset_info_id) tag_names = get_asset_tags(session, asset_info_id=asset_info_id)
result = schemas_out.AssetUpdated(
id=info.id,
name=info.name,
asset_hash=info.asset.hash if info.asset else None,
tags=tag_names,
user_metadata=info.user_metadata or {},
updated_at=info.updated_at,
)
session.commit() session.commit()
return schemas_out.AssetUpdated( return result
id=info.id,
name=info.name,
asset_hash=info.asset.hash if info.asset else None,
tags=tag_names,
user_metadata=info.user_metadata or {},
updated_at=info.updated_at,
)
def set_asset_preview( def set_asset_preview(
@ -349,20 +351,21 @@ def set_asset_preview(
if not res: if not res:
raise RuntimeError("State changed during preview update") raise RuntimeError("State changed during preview update")
info, asset, tags = res info, asset, tags = res
result = schemas_out.AssetDetail(
id=info.id,
name=info.name,
asset_hash=asset.hash if asset else None,
size=int(asset.size_bytes) if asset and asset.size_bytes is not None else None,
mime_type=asset.mime_type if asset else None,
tags=tags,
user_metadata=info.user_metadata or {},
preview_id=info.preview_id,
created_at=info.created_at,
last_access_time=info.last_access_time,
)
session.commit() session.commit()
return schemas_out.AssetDetail( return result
id=info.id,
name=info.name,
asset_hash=asset.hash if asset else None,
size=int(asset.size_bytes) if asset and asset.size_bytes is not None else None,
mime_type=asset.mime_type if asset else None,
tags=tags,
user_metadata=info.user_metadata or {},
preview_id=info.preview_id,
created_at=info.created_at,
last_access_time=info.last_access_time,
)
def delete_asset_reference(*, asset_info_id: str, owner_id: str, delete_content_if_orphan: bool = True) -> bool: def delete_asset_reference(*, asset_info_id: str, owner_id: str, delete_content_if_orphan: bool = True) -> bool:
@ -422,21 +425,22 @@ def create_asset_from_hash(
owner_id=owner_id, owner_id=owner_id,
) )
tag_names = get_asset_tags(session, asset_info_id=info.id) tag_names = get_asset_tags(session, asset_info_id=info.id)
result = schemas_out.AssetCreated(
id=info.id,
name=info.name,
asset_hash=asset.hash,
size=int(asset.size_bytes),
mime_type=asset.mime_type,
tags=tag_names,
user_metadata=info.user_metadata or {},
preview_id=info.preview_id,
created_at=info.created_at,
last_access_time=info.last_access_time,
created_new=False,
)
session.commit() session.commit()
return schemas_out.AssetCreated( return result
id=info.id,
name=info.name,
asset_hash=asset.hash,
size=int(asset.size_bytes),
mime_type=asset.mime_type,
tags=tag_names,
user_metadata=info.user_metadata or {},
preview_id=info.preview_id,
created_at=info.created_at,
last_access_time=info.last_access_time,
created_new=False,
)
def add_tags_to_asset( def add_tags_to_asset(