use UUID instead of autoincrement Integer for Assets ID field

app/database/models.py

@@ -1,5 +1,6 @@
 from datetime import datetime
 from typing import Any, Optional
+import uuid
 
 from sqlalchemy import (
     Integer,
@@ -135,7 +136,7 @@ class AssetLocation(Base):
 class AssetInfo(Base):
     __tablename__ = "assets_info"
 
-    id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
+    id: Mapped[str] = mapped_column(String(36), primary_key=True, default=lambda: str(uuid.uuid4()))
     owner_id: Mapped[str] = mapped_column(String(128), nullable=False, default="")
     name: Mapped[str] = mapped_column(String(512), nullable=False)
     asset_hash: Mapped[str] = mapped_column(
@@ -194,7 +195,6 @@ class AssetInfo(Base):
         Index("ix_assets_info_name", "name"),
         Index("ix_assets_info_created_at", "created_at"),
         Index("ix_assets_info_last_access_time", "last_access_time"),
-        {"sqlite_autoincrement": True},
     )
 
     def to_dict(self, include_none: bool = False) -> dict[str, Any]:
@@ -209,8 +209,8 @@ class AssetInfo(Base):
 class AssetInfoMeta(Base):
     __tablename__ = "asset_info_meta"
 
-    asset_info_id: Mapped[int] = mapped_column(
-        Integer, ForeignKey("assets_info.id", ondelete="CASCADE"), primary_key=True
+    asset_info_id: Mapped[str] = mapped_column(
+        String(36), ForeignKey("assets_info.id", ondelete="CASCADE"), primary_key=True
     )
     key: Mapped[str] = mapped_column(String(256), primary_key=True)
     ordinal: Mapped[int] = mapped_column(Integer, primary_key=True, default=0)
@@ -233,8 +233,8 @@ class AssetInfoMeta(Base):
 class AssetInfoTag(Base):
     __tablename__ = "asset_info_tags"
 
-    asset_info_id: Mapped[int] = mapped_column(
-        Integer, ForeignKey("assets_info.id", ondelete="CASCADE"), primary_key=True
+    asset_info_id: Mapped[str] = mapped_column(
+        String(36), ForeignKey("assets_info.id", ondelete="CASCADE"), primary_key=True
     )
     tag_name: Mapped[str] = mapped_column(
         String(512), ForeignKey("tags.name", ondelete="RESTRICT"), primary_key=True

app/database/services.py

@@ -30,7 +30,7 @@ async def get_asset_by_hash(session: AsyncSession, *, asset_hash: str) -> Option
     return await session.get(Asset, asset_hash)
 
 
-async def get_asset_info_by_id(session: AsyncSession, *, asset_info_id: int) -> Optional[AssetInfo]:
+async def get_asset_info_by_id(session: AsyncSession, *, asset_info_id: str) -> Optional[AssetInfo]:
     return await session.get(AssetInfo, asset_info_id)
 
 
@@ -100,13 +100,13 @@ async def ingest_fs_asset(
         "asset_updated": bool,
         "state_created": bool,
         "state_updated": bool,
-        "asset_info_id": int | None,
+        "asset_info_id": str | None,
       }
     """
     locator = os.path.abspath(abs_path)
     datetime_now = utcnow()
 
-    out = {
+    out: dict[str, Any] = {
         "asset_created": False,
         "asset_updated": False,
         "state_created": False,
@@ -187,7 +187,7 @@ async def ingest_fs_asset(
                     last_access_time=datetime_now,
                 )
                 session.add(info)
-                await session.flush()  # get info.id
+                await session.flush()  # get info.id (UUID)
                 out["asset_info_id"] = info.id
 
         existing_info = (
@@ -263,11 +263,11 @@ async def ingest_fs_asset(
 async def touch_asset_infos_by_fs_path(
     session: AsyncSession,
     *,
-    abs_path: str,
+    file_path: str,
     ts: Optional[datetime] = None,
     only_if_newer: bool = True,
 ) -> int:
-    locator = os.path.abspath(abs_path)
+    locator = os.path.abspath(file_path)
     ts = ts or utcnow()
 
     stmt = sa.update(AssetInfo).where(
@@ -298,7 +298,7 @@ async def touch_asset_infos_by_fs_path(
 async def touch_asset_info_by_id(
     session: AsyncSession,
     *,
-    asset_info_id: int,
+    asset_info_id: str,
     ts: Optional[datetime] = None,
     only_if_newer: bool = True,
 ) -> int:
@@ -325,7 +325,7 @@ async def list_asset_infos_page(
     offset: int = 0,
     sort: str = "created_at",
     order: str = "desc",
-) -> tuple[list[AssetInfo], dict[int, list[str]], int]:
+) -> tuple[list[AssetInfo], dict[str, list[str]], int]:
     """Return page of AssetInfo rows in the viewers visibility."""
     base = (
         select(AssetInfo)
@@ -373,8 +373,8 @@ async def list_asset_infos_page(
     infos = (await session.execute(base)).scalars().unique().all()
 
     # Collect tags in bulk (single query)
-    id_list = [i.id for i in infos]
-    tag_map: dict[int, list[str]] = defaultdict(list)
+    id_list: list[str] = [i.id for i in infos]
+    tag_map: dict[str, list[str]] = defaultdict(list)
     if id_list:
         rows = await session.execute(
             select(AssetInfoTag.asset_info_id, Tag.name)
@@ -390,7 +390,7 @@ async def list_asset_infos_page(
 async def fetch_asset_info_and_asset(
     session: AsyncSession,
     *,
-    asset_info_id: int,
+    asset_info_id: str,
     owner_id: str = "",
 ) -> Optional[tuple[AssetInfo, Asset]]:
     stmt = (
@@ -412,7 +412,7 @@ async def fetch_asset_info_and_asset(
 async def fetch_asset_info_asset_and_tags(
     session: AsyncSession,
     *,
-    asset_info_id: int,
+    asset_info_id: str,
     owner_id: str = "",
 ) -> Optional[tuple[AssetInfo, Asset, list[str]]]:
     stmt = (
@@ -449,7 +449,7 @@ async def get_cache_state_by_asset_hash(session: AsyncSession, *, asset_hash: st
 
 async def list_asset_locations(
         session: AsyncSession, *, asset_hash: str, provider: Optional[str] = None
-) -> list[AssetLocation]:
+) -> list[AssetLocation] | Sequence[AssetLocation]:
     stmt = select(AssetLocation).where(AssetLocation.asset_hash == asset_hash)
     if provider:
         stmt = stmt.where(AssetLocation.provider == provider)
@@ -545,7 +545,7 @@ async def create_asset_info_for_existing_asset(
 async def set_asset_info_tags(
     session: AsyncSession,
     *,
-    asset_info_id: int,
+    asset_info_id: str,
     tags: Sequence[str],
     origin: str = "manual",
 ) -> dict:
@@ -586,7 +586,7 @@ async def set_asset_info_tags(
 async def update_asset_info_full(
     session: AsyncSession,
     *,
-    asset_info_id: int,
+    asset_info_id: str,
     name: Optional[str] = None,
     tags: Optional[Sequence[str]] = None,
     user_metadata: Optional[dict] = None,
@@ -634,7 +634,7 @@ async def update_asset_info_full(
     return info
 
 
-async def delete_asset_info_by_id(session: AsyncSession, *, asset_info_id: int, owner_id: str) -> bool:
+async def delete_asset_info_by_id(session: AsyncSession, *, asset_info_id: str, owner_id: str) -> bool:
     """Delete the user-visible AssetInfo row. Cascades clear tags and metadata."""
     res = await session.execute(delete(AssetInfo).where(
         AssetInfo.id == asset_info_id,
@@ -646,7 +646,7 @@ async def delete_asset_info_by_id(session: AsyncSession, *, asset_info_id: int,
 async def replace_asset_info_metadata_projection(
     session: AsyncSession,
     *,
-    asset_info_id: int,
+    asset_info_id: str,
     user_metadata: Optional[dict],
 ) -> None:
     """Replaces the `assets_info.user_metadata` AND rebuild the projection rows in `asset_info_meta`."""
@@ -683,7 +683,7 @@ async def replace_asset_info_metadata_projection(
         await session.flush()
 
 
-async def get_asset_tags(session: AsyncSession, *, asset_info_id: int) -> list[str]:
+async def get_asset_tags(session: AsyncSession, *, asset_info_id: str) -> list[str]:
     return [
             tag_name
             for (tag_name,) in (
@@ -763,7 +763,7 @@ async def list_tags_with_usage(
 async def add_tags_to_asset_info(
     session: AsyncSession,
     *,
-    asset_info_id: int,
+    asset_info_id: str,
     tags: Sequence[str],
     origin: str = "manual",
     create_if_missing: bool = True,
@@ -829,7 +829,7 @@ async def add_tags_to_asset_info(
 async def remove_tags_from_asset_info(
     session: AsyncSession,
     *,
-    asset_info_id: int,
+    asset_info_id: str,
     tags: Sequence[str],
 ) -> dict:
     """Removes tags from an AssetInfo.