mirror of
https://github.com/comfyanonymous/ComfyUI.git
synced 2025-12-23 13:00:54 +08:00
removed not used "added_by" column
This commit is contained in:
parent
0379eff0b5
commit
eb7008a4d3
@ -67,7 +67,6 @@ def upgrade() -> None:
|
|||||||
sa.Column("asset_info_id", sa.Integer(), sa.ForeignKey("assets_info.id", ondelete="CASCADE"), nullable=False),
|
sa.Column("asset_info_id", sa.Integer(), sa.ForeignKey("assets_info.id", ondelete="CASCADE"), nullable=False),
|
||||||
sa.Column("tag_name", sa.String(length=512), sa.ForeignKey("tags.name", ondelete="RESTRICT"), nullable=False),
|
sa.Column("tag_name", sa.String(length=512), sa.ForeignKey("tags.name", ondelete="RESTRICT"), nullable=False),
|
||||||
sa.Column("origin", sa.String(length=32), nullable=False, server_default="manual"),
|
sa.Column("origin", sa.String(length=32), nullable=False, server_default="manual"),
|
||||||
sa.Column("added_by", sa.String(length=128), nullable=True),
|
|
||||||
sa.Column("added_at", sa.DateTime(timezone=False), nullable=False),
|
sa.Column("added_at", sa.DateTime(timezone=False), nullable=False),
|
||||||
sa.PrimaryKeyConstraint("asset_info_id", "tag_name", name="pk_asset_info_tags"),
|
sa.PrimaryKeyConstraint("asset_info_id", "tag_name", name="pk_asset_info_tags"),
|
||||||
)
|
)
|
||||||
|
|||||||
@ -397,7 +397,6 @@ async def add_asset_tags(request: web.Request) -> web.Response:
|
|||||||
asset_info_id=asset_info_id,
|
asset_info_id=asset_info_id,
|
||||||
tags=data.tags,
|
tags=data.tags,
|
||||||
origin="manual",
|
origin="manual",
|
||||||
added_by=None,
|
|
||||||
owner_id=UserManager.get_request_user_id(request),
|
owner_id=UserManager.get_request_user_id(request),
|
||||||
)
|
)
|
||||||
except (ValueError, PermissionError) as ve:
|
except (ValueError, PermissionError) as ve:
|
||||||
|
|||||||
@ -246,7 +246,6 @@ async def upload_asset_from_temp_path(
|
|||||||
user_metadata=spec.user_metadata or {},
|
user_metadata=spec.user_metadata or {},
|
||||||
tags=spec.tags or [],
|
tags=spec.tags or [],
|
||||||
tag_origin="manual",
|
tag_origin="manual",
|
||||||
added_by=None,
|
|
||||||
owner_id=owner_id,
|
owner_id=owner_id,
|
||||||
)
|
)
|
||||||
tag_names = await get_asset_tags(session, asset_info_id=info.id)
|
tag_names = await get_asset_tags(session, asset_info_id=info.id)
|
||||||
@ -306,7 +305,6 @@ async def upload_asset_from_temp_path(
|
|||||||
user_metadata=spec.user_metadata or {},
|
user_metadata=spec.user_metadata or {},
|
||||||
tags=spec.tags,
|
tags=spec.tags,
|
||||||
tag_origin="manual",
|
tag_origin="manual",
|
||||||
added_by=None,
|
|
||||||
require_existing_tags=False,
|
require_existing_tags=False,
|
||||||
)
|
)
|
||||||
info_id = result["asset_info_id"]
|
info_id = result["asset_info_id"]
|
||||||
@ -357,7 +355,6 @@ async def update_asset(
|
|||||||
tags=tags,
|
tags=tags,
|
||||||
user_metadata=user_metadata,
|
user_metadata=user_metadata,
|
||||||
tag_origin="manual",
|
tag_origin="manual",
|
||||||
added_by=None,
|
|
||||||
asset_info_row=info_row,
|
asset_info_row=info_row,
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -402,7 +399,6 @@ async def create_asset_from_hash(
|
|||||||
user_metadata=user_metadata or {},
|
user_metadata=user_metadata or {},
|
||||||
tags=tags or [],
|
tags=tags or [],
|
||||||
tag_origin="manual",
|
tag_origin="manual",
|
||||||
added_by=None,
|
|
||||||
owner_id=owner_id,
|
owner_id=owner_id,
|
||||||
)
|
)
|
||||||
tag_names = await get_asset_tags(session, asset_info_id=info.id)
|
tag_names = await get_asset_tags(session, asset_info_id=info.id)
|
||||||
@ -455,7 +451,6 @@ async def add_tags_to_asset(
|
|||||||
asset_info_id: int,
|
asset_info_id: int,
|
||||||
tags: list[str],
|
tags: list[str],
|
||||||
origin: str = "manual",
|
origin: str = "manual",
|
||||||
added_by: Optional[str] = None,
|
|
||||||
owner_id: str = "",
|
owner_id: str = "",
|
||||||
) -> schemas_out.TagsAdd:
|
) -> schemas_out.TagsAdd:
|
||||||
async with await create_session() as session:
|
async with await create_session() as session:
|
||||||
@ -469,7 +464,6 @@ async def add_tags_to_asset(
|
|||||||
asset_info_id=asset_info_id,
|
asset_info_id=asset_info_id,
|
||||||
tags=tags,
|
tags=tags,
|
||||||
origin=origin,
|
origin=origin,
|
||||||
added_by=added_by,
|
|
||||||
create_if_missing=True,
|
create_if_missing=True,
|
||||||
asset_info_row=info_row,
|
asset_info_row=info_row,
|
||||||
)
|
)
|
||||||
|
|||||||
@ -244,7 +244,6 @@ class AssetInfoTag(Base):
|
|||||||
String(512), ForeignKey("tags.name", ondelete="RESTRICT"), primary_key=True
|
String(512), ForeignKey("tags.name", ondelete="RESTRICT"), primary_key=True
|
||||||
)
|
)
|
||||||
origin: Mapped[str] = mapped_column(String(32), nullable=False, default="manual")
|
origin: Mapped[str] = mapped_column(String(32), nullable=False, default="manual")
|
||||||
added_by: Mapped[str | None] = mapped_column(String(128))
|
|
||||||
added_at: Mapped[datetime] = mapped_column(
|
added_at: Mapped[datetime] = mapped_column(
|
||||||
DateTime(timezone=False), nullable=False, default=utcnow
|
DateTime(timezone=False), nullable=False, default=utcnow
|
||||||
)
|
)
|
||||||
|
|||||||
@ -79,7 +79,6 @@ async def ingest_fs_asset(
|
|||||||
user_metadata: Optional[dict] = None,
|
user_metadata: Optional[dict] = None,
|
||||||
tags: Sequence[str] = (),
|
tags: Sequence[str] = (),
|
||||||
tag_origin: str = "manual",
|
tag_origin: str = "manual",
|
||||||
added_by: Optional[str] = None,
|
|
||||||
require_existing_tags: bool = False,
|
require_existing_tags: bool = False,
|
||||||
) -> dict:
|
) -> dict:
|
||||||
"""
|
"""
|
||||||
@ -247,7 +246,6 @@ async def ingest_fs_asset(
|
|||||||
asset_info_id=out["asset_info_id"],
|
asset_info_id=out["asset_info_id"],
|
||||||
tag_name=t,
|
tag_name=t,
|
||||||
origin=tag_origin,
|
origin=tag_origin,
|
||||||
added_by=added_by,
|
|
||||||
added_at=datetime_now,
|
added_at=datetime_now,
|
||||||
)
|
)
|
||||||
for t in to_add
|
for t in to_add
|
||||||
@ -516,7 +514,6 @@ async def create_asset_info_for_existing_asset(
|
|||||||
user_metadata: Optional[dict] = None,
|
user_metadata: Optional[dict] = None,
|
||||||
tags: Optional[Sequence[str]] = None,
|
tags: Optional[Sequence[str]] = None,
|
||||||
tag_origin: str = "manual",
|
tag_origin: str = "manual",
|
||||||
added_by: Optional[str] = None,
|
|
||||||
owner_id: str = "",
|
owner_id: str = "",
|
||||||
) -> AssetInfo:
|
) -> AssetInfo:
|
||||||
"""Create a new AssetInfo referencing an existing Asset (no content write)."""
|
"""Create a new AssetInfo referencing an existing Asset (no content write)."""
|
||||||
@ -544,7 +541,6 @@ async def create_asset_info_for_existing_asset(
|
|||||||
asset_info_id=info.id,
|
asset_info_id=info.id,
|
||||||
tags=tags,
|
tags=tags,
|
||||||
origin=tag_origin,
|
origin=tag_origin,
|
||||||
added_by=added_by,
|
|
||||||
)
|
)
|
||||||
return info
|
return info
|
||||||
|
|
||||||
@ -555,7 +551,6 @@ async def set_asset_info_tags(
|
|||||||
asset_info_id: int,
|
asset_info_id: int,
|
||||||
tags: Sequence[str],
|
tags: Sequence[str],
|
||||||
origin: str = "manual",
|
origin: str = "manual",
|
||||||
added_by: Optional[str] = None,
|
|
||||||
) -> dict:
|
) -> dict:
|
||||||
"""
|
"""
|
||||||
Replace the tag set on an AssetInfo with `tags`. Idempotent.
|
Replace the tag set on an AssetInfo with `tags`. Idempotent.
|
||||||
@ -576,7 +571,7 @@ async def set_asset_info_tags(
|
|||||||
if to_add:
|
if to_add:
|
||||||
await _ensure_tags_exist(session, to_add, tag_type="user")
|
await _ensure_tags_exist(session, to_add, tag_type="user")
|
||||||
session.add_all([
|
session.add_all([
|
||||||
AssetInfoTag(asset_info_id=asset_info_id, tag_name=t, origin=origin, added_by=added_by, added_at=utcnow())
|
AssetInfoTag(asset_info_id=asset_info_id, tag_name=t, origin=origin, added_at=utcnow())
|
||||||
for t in to_add
|
for t in to_add
|
||||||
])
|
])
|
||||||
await session.flush()
|
await session.flush()
|
||||||
@ -599,7 +594,6 @@ async def update_asset_info_full(
|
|||||||
tags: Optional[Sequence[str]] = None,
|
tags: Optional[Sequence[str]] = None,
|
||||||
user_metadata: Optional[dict] = None,
|
user_metadata: Optional[dict] = None,
|
||||||
tag_origin: str = "manual",
|
tag_origin: str = "manual",
|
||||||
added_by: Optional[str] = None,
|
|
||||||
asset_info_row: Any = None,
|
asset_info_row: Any = None,
|
||||||
) -> AssetInfo:
|
) -> AssetInfo:
|
||||||
"""
|
"""
|
||||||
@ -633,7 +627,6 @@ async def update_asset_info_full(
|
|||||||
asset_info_id=asset_info_id,
|
asset_info_id=asset_info_id,
|
||||||
tags=tags,
|
tags=tags,
|
||||||
origin=tag_origin,
|
origin=tag_origin,
|
||||||
added_by=added_by,
|
|
||||||
)
|
)
|
||||||
touched = True
|
touched = True
|
||||||
|
|
||||||
@ -776,7 +769,6 @@ async def add_tags_to_asset_info(
|
|||||||
asset_info_id: int,
|
asset_info_id: int,
|
||||||
tags: Sequence[str],
|
tags: Sequence[str],
|
||||||
origin: str = "manual",
|
origin: str = "manual",
|
||||||
added_by: Optional[str] = None,
|
|
||||||
create_if_missing: bool = True,
|
create_if_missing: bool = True,
|
||||||
asset_info_row: Any = None,
|
asset_info_row: Any = None,
|
||||||
) -> dict:
|
) -> dict:
|
||||||
@ -820,7 +812,6 @@ async def add_tags_to_asset_info(
|
|||||||
asset_info_id=asset_info_id,
|
asset_info_id=asset_info_id,
|
||||||
tag_name=t,
|
tag_name=t,
|
||||||
origin=origin,
|
origin=origin,
|
||||||
added_by=added_by,
|
|
||||||
added_at=utcnow(),
|
added_at=utcnow(),
|
||||||
)
|
)
|
||||||
for t in to_add
|
for t in to_add
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user