feat: Add pagination with total count to generation listings and enable filtering assets by type.

api/endpoints/assets_router.py

@@ -66,9 +66,9 @@ async def delete_asset(
 
 
 @router.get("")
-async def get_assets(request: Request, dao: DAO = Depends(get_dao), limit: int = 10, offset: int = 0) -> AssetsResponse:
+async def get_assets(request: Request, dao: DAO = Depends(get_dao), type: Optional[str] = None, limit: int = 10, offset: int = 0) -> AssetsResponse:
     logger.info(f"get_assets called. Limit: {limit}, Offset: {offset}")
-    assets = await dao.assets.get_assets(limit, offset)
+    assets = await dao.assets.get_assets(type, limit, offset)
     # assets = await dao.assets.get_assets() # This line seemed redundant/conflicting in original code
     total_count = await dao.assets.get_asset_count()
 

api/endpoints/generation_router.py

@@ -7,7 +7,7 @@ from starlette.requests import Request
 from api import service
 from api.dependency import get_generation_service
 
-from api.models.GenerationRequest import GenerationResponse, GenerationRequest, PromptResponse, PromptRequest
+from api.models.GenerationRequest import GenerationResponse, GenerationRequest,  GenerationsResponse, PromptResponse, PromptRequest
 from api.service.generation_service import GenerationService
 from models.Generation import Generation
 
@@ -43,7 +43,7 @@ async def prompt_from_image(
     return PromptResponse(prompt=generated_prompt)
 
 
-@router.get("", response_model=List[GenerationResponse])
+@router.get("", response_model=GenerationsResponse)
 async def get_generations(character_id: Optional[str] = None, limit: int = 10, offset: int = 0,
                           generation_service: GenerationService = Depends(get_generation_service)):
     logger.info(f"get_generations called. CharacterId: {character_id}, Limit: {limit}, Offset: {offset}")

api/models/GenerationRequest.py

@@ -18,6 +18,11 @@ class GenerationRequest(BaseModel):
     assets_list: List[str]
 
 
+class GenerationsResponse(BaseModel):
+    generations: List["GenerationResponse"]
+    total_count: int
+
+
 class GenerationResponse(BaseModel):
     id: str
     status: GenerationStatus

api/service/generation_service.py

@@ -9,7 +9,7 @@ from aiogram import Bot
 from aiogram.types import BufferedInputFile
 from adapters.Exception import GoogleGenerationException
 from adapters.google_adapter import GoogleAdapter
-from api.models.GenerationRequest import GenerationRequest, GenerationResponse
+from api.models.GenerationRequest import GenerationRequest, GenerationResponse, GenerationsResponse
 # Импортируйте ваши модели DAO, Asset, Generation корректно
 from models.Asset import Asset, AssetType, AssetContentType
 from models.Generation import Generation, GenerationStatus
@@ -94,7 +94,10 @@ class GenerationService:
 
     async def get_generations(self, character_id: Optional[str] = None, limit: int = 10, offset: int = 0) -> List[
         Generation]:
-        return await self.dao.generations.get_generations(character_id = character_id,limit=limit, offset=offset)
+        generations = await self.dao.generations.get_generations(character_id = character_id,limit=limit, offset=offset)
+        total_count = await self.dao.generations.count_generations(character_id = character_id)
+        generations = [GenerationResponse(**gen.model_dump()) for gen in generations]
+        return GenerationsResponse(generations=generations, total_count=total_count)
 
     async def get_generation(self, generation_id: str) -> Optional[GenerationResponse]:
         gen = await self.dao.generations.get_generation(generation_id)