diff --git a/alembic_db/versions/0001_assets.py b/alembic_db/versions/0001_assets.py index 9fb80ea8c..18b1c71a1 100644 --- a/alembic_db/versions/0001_assets.py +++ b/alembic_db/versions/0001_assets.py @@ -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("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("added_by", sa.String(length=128), nullable=True), sa.Column("added_at", sa.DateTime(timezone=False), nullable=False), sa.PrimaryKeyConstraint("asset_info_id", "tag_name", name="pk_asset_info_tags"), ) diff --git a/app/api/assets_routes.py b/app/api/assets_routes.py index bdbb36167..61188c090 100644 --- a/app/api/assets_routes.py +++ b/app/api/assets_routes.py @@ -397,7 +397,6 @@ async def add_asset_tags(request: web.Request) -> web.Response: asset_info_id=asset_info_id, tags=data.tags, origin="manual", - added_by=None, owner_id=UserManager.get_request_user_id(request), ) except (ValueError, PermissionError) as ve: diff --git a/app/assets_manager.py b/app/assets_manager.py index bb2762497..f9046c5ed 100644 --- a/app/assets_manager.py +++ b/app/assets_manager.py @@ -246,7 +246,6 @@ async def upload_asset_from_temp_path( user_metadata=spec.user_metadata or {}, tags=spec.tags or [], tag_origin="manual", - added_by=None, owner_id=owner_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 {}, tags=spec.tags, tag_origin="manual", - added_by=None, require_existing_tags=False, ) info_id = result["asset_info_id"] @@ -357,7 +355,6 @@ async def update_asset( tags=tags, user_metadata=user_metadata, tag_origin="manual", - added_by=None, asset_info_row=info_row, ) @@ -402,7 +399,6 @@ async def create_asset_from_hash( user_metadata=user_metadata or {}, tags=tags or [], tag_origin="manual", - added_by=None, owner_id=owner_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, tags: list[str], origin: str = "manual", - added_by: Optional[str] = None, owner_id: str = "", ) -> schemas_out.TagsAdd: async with await create_session() as session: @@ -469,7 +464,6 @@ async def add_tags_to_asset( asset_info_id=asset_info_id, tags=tags, origin=origin, - added_by=added_by, create_if_missing=True, asset_info_row=info_row, ) diff --git a/app/database/models.py b/app/database/models.py index d964a5226..87aa942ed 100644 --- a/app/database/models.py +++ b/app/database/models.py @@ -244,7 +244,6 @@ class AssetInfoTag(Base): String(512), ForeignKey("tags.name", ondelete="RESTRICT"), primary_key=True ) 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( DateTime(timezone=False), nullable=False, default=utcnow ) diff --git a/app/database/services.py b/app/database/services.py index 4bf09ed97..66d519032 100644 --- a/app/database/services.py +++ b/app/database/services.py @@ -79,7 +79,6 @@ async def ingest_fs_asset( user_metadata: Optional[dict] = None, tags: Sequence[str] = (), tag_origin: str = "manual", - added_by: Optional[str] = None, require_existing_tags: bool = False, ) -> dict: """ @@ -247,7 +246,6 @@ async def ingest_fs_asset( asset_info_id=out["asset_info_id"], tag_name=t, origin=tag_origin, - added_by=added_by, added_at=datetime_now, ) for t in to_add @@ -516,7 +514,6 @@ async def create_asset_info_for_existing_asset( user_metadata: Optional[dict] = None, tags: Optional[Sequence[str]] = None, tag_origin: str = "manual", - added_by: Optional[str] = None, owner_id: str = "", ) -> AssetInfo: """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, tags=tags, origin=tag_origin, - added_by=added_by, ) return info @@ -555,7 +551,6 @@ async def set_asset_info_tags( asset_info_id: int, tags: Sequence[str], origin: str = "manual", - added_by: Optional[str] = None, ) -> dict: """ Replace the tag set on an AssetInfo with `tags`. Idempotent. @@ -576,7 +571,7 @@ async def set_asset_info_tags( if to_add: await _ensure_tags_exist(session, to_add, tag_type="user") 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 ]) await session.flush() @@ -599,7 +594,6 @@ async def update_asset_info_full( tags: Optional[Sequence[str]] = None, user_metadata: Optional[dict] = None, tag_origin: str = "manual", - added_by: Optional[str] = None, asset_info_row: Any = None, ) -> AssetInfo: """ @@ -633,7 +627,6 @@ async def update_asset_info_full( asset_info_id=asset_info_id, tags=tags, origin=tag_origin, - added_by=added_by, ) touched = True @@ -776,7 +769,6 @@ async def add_tags_to_asset_info( asset_info_id: int, tags: Sequence[str], origin: str = "manual", - added_by: Optional[str] = None, create_if_missing: bool = True, asset_info_row: Any = None, ) -> dict: @@ -820,7 +812,6 @@ async def add_tags_to_asset_info( asset_info_id=asset_info_id, tag_name=t, origin=origin, - added_by=added_by, added_at=utcnow(), ) for t in to_add