models + refactor

api/endpoints/album_router.py

@@ -1,4 +1,3 @@
-from typing import List, Optional
 from fastapi import APIRouter, HTTPException, status, Request
 from pydantic import BaseModel
 
@@ -13,18 +12,18 @@ router = APIRouter(prefix="/api/albums", tags=["Albums"])
 
 class AlbumCreateRequest(BaseModel):
     name: str
-    description: Optional[str] = None
+    description: str | None = None
 
 class AlbumUpdateRequest(BaseModel):
-    name: Optional[str] = None
-    description: Optional[str] = None
+    name: str | None = None
+    description: str | None = None
 
 class AlbumResponse(BaseModel):
     id: str
     name: str
-    description: Optional[str] = None
-    generation_ids: List[str] = []
-    cover_asset_id: Optional[str] = None # Not implemented yet
+    description: str | None = None
+    generation_ids: list[str] = []
+    cover_asset_id: str | None = None # Not implemented yet
 
 @router.post("", response_model=AlbumResponse)
 async def create_album(request: Request, album_in: AlbumCreateRequest):
@@ -32,7 +31,7 @@ async def create_album(request: Request, album_in: AlbumCreateRequest):
     album = await service.create_album(name=album_in.name, description=album_in.description)
     return AlbumResponse(**album.model_dump())
 
-@router.get("", response_model=List[AlbumResponse])
+@router.get("", response_model=list[AlbumResponse])
 async def get_albums(request: Request, limit: int = 10, offset: int = 0):
     service: AlbumService = request.app.state.album_service
     albums = await service.get_albums(limit=limit, offset=offset)
@@ -77,7 +76,7 @@ async def remove_generation_from_album(request: Request, album_id: str, generati
         raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Album or Generation not found")
     return {"status": "success"}
 
-@router.get("/{album_id}/generations", response_model=List[GenerationResponse])
+@router.get("/{album_id}/generations", response_model=list[GenerationResponse])
 async def get_album_generations(request: Request, album_id: str, limit: int = 10, offset: int = 0):
     service: AlbumService = request.app.state.album_service
     generations = await service.get_generations_by_album(album_id, limit=limit, offset=offset)