feat: Add logging to API endpoints, update generation response model, and refine project configurations.

api/endpoints/assets_router.py

@@ -13,12 +13,16 @@ from models.Asset import Asset, AssetType
 from repos.dao import DAO
 from api.dependency import get_dao
 
+import logging
+
+logger = logging.getLogger(__name__)
+
 router = APIRouter(prefix="/api/assets", tags=["Assets"])
 
 
 @router.get("/{asset_id}")
 async def get_asset(asset_id: str, request: Request,dao: DAO = Depends(get_dao),) -> Response:
-
+    logger.debug(f"get_asset called for ID: {asset_id}")
     asset = await dao.assets.get_asset(asset_id)
     # 2. Проверка на существование
     if not asset:
@@ -32,8 +36,9 @@ async def get_asset(asset_id: str, request: Request,dao: DAO = Depends(get_dao),
 
 @router.get("")
 async def get_assets(request: Request, dao: DAO = Depends(get_dao), 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()
+    # assets = await dao.assets.get_assets() # This line seemed redundant/conflicting in original code
     total_count = await dao.assets.get_asset_count()
 
     return AssetsResponse(assets=assets, total_count=total_count)
@@ -46,6 +51,7 @@ async def upload_asset(
     linked_char_id: Optional[str] = Form(None),
     dao: DAO = Depends(get_dao),
 ):
+    logger.info(f"upload_asset called. Filename: {file.filename}, ContentType: {file.content_type}, LinkedCharId: {linked_char_id}")
     if not file.content_type:
         raise HTTPException(status_code=400, detail="Unknown file type")
 
@@ -65,6 +71,7 @@ async def upload_asset(
 
     asset_id = await dao.assets.create_asset(asset)
     asset.id = str(asset_id)
+    logger.info(f"Asset created successfully. ID: {asset_id}")
 
     return AssetResponse(
         id=asset.id,

api/endpoints/character_router.py

@@ -12,11 +12,16 @@ from models.Character import Character
 from repos.dao import DAO
 from api.dependency import get_dao
 
+import logging
+
+logger = logging.getLogger(__name__)
+
 router = APIRouter(prefix="/api/characters", tags=["Characters"])
 
 
 @router.get("/", response_model=List[Character])
 async def get_characters(request: Request, dao: DAO = Depends(get_dao), ) -> List[Character]:
+    logger.info("get_characters called")
     characters = await dao.chars.get_all_characters()
     return characters
 
@@ -24,6 +29,7 @@ async def get_characters(request: Request, dao: DAO = Depends(get_dao), ) -> Lis
 @router.get("/{character_id}/assets", response_model=AssetsResponse)
 async def get_character_assets(character_id: str, dao: DAO = Depends(get_dao), limit: int = 10,
                                offset: int = 0, ) -> AssetsResponse:
+    logger.info(f"get_character_assets called. CharacterID: {character_id}, Limit: {limit}, Offset: {offset}")
     character = await dao.chars.get_character(character_id)
     if character is None:
         raise HTTPException(status_code=404, detail="Character not found")
@@ -34,11 +40,13 @@ async def get_character_assets(character_id: str, dao: DAO = Depends(get_dao), l
 
 @router.get("/{character_id}", response_model=Character)
 async def get_character_by_id(character_id: str, request: Request, dao: DAO = Depends(get_dao)) -> Character:
+    logger.debug(f"get_character_by_id called. ID: {character_id}")
     character = await dao.chars.get_character(character_id)
     return character
 
 
-@router.post("/{character_id}/_run", response_model=Asset)
+@router.post("/{character_id}/_run", response_model=GenerationResponse)
 async def post_character_generation(character_id: str, generation: GenerationRequest,
                                     request: Request) -> GenerationResponse:
+    logger.info(f"post_character_generation called. CharacterID: {character_id}")
     generation_service = request.app.state.generation_service

api/endpoints/generation_router.py

@@ -1,6 +1,6 @@
 from typing import List, Optional
 
-from fastapi import APIRouter
+from fastapi import APIRouter, UploadFile, File, Form
 from fastapi.params import Depends
 from starlette.requests import Request
 
@@ -11,6 +11,10 @@ from api.models.GenerationRequest import GenerationResponse, GenerationRequest,
 from api.service.generation_service import GenerationService
 from models.Generation import Generation
 
+import logging
+
+logger = logging.getLogger(__name__)
+
 router = APIRouter(prefix='/api/generations', tags=["Generation"])
 
 
@@ -18,13 +22,31 @@ router = APIRouter(prefix='/api/generations', tags=["Generation"])
 async def ask_prompt_assistant(prompt_request: PromptRequest, request: Request,
                                generation_service: GenerationService = Depends(
                                    get_generation_service)) -> PromptResponse:
+    logger.info(f"ask_prompt_assistant called with prompt length: {len(prompt_request.prompt)}. Linked assets: {len(prompt_request.linked_assets) if prompt_request.linked_assets else 0}")
     generated_prompt = await generation_service.ask_prompt_assistant(prompt_request.prompt, prompt_request.linked_assets)
     return PromptResponse(prompt=generated_prompt)
 
 
+@router.post("/prompt-from-image", response_model=PromptResponse)
+async def prompt_from_image(
+        prompt: Optional[str] = Form(None),
+        images: List[UploadFile] = File(...),
+        generation_service: GenerationService = Depends(get_generation_service)
+) -> PromptResponse:
+    logger.info(f"prompt_from_image called. Images count: {len(images)}. Prompt provided: {bool(prompt)}")
+    images_bytes = []
+    for image in images:
+        content = await image.read()
+        images_bytes.append(content)
+
+    generated_prompt = await generation_service.generate_prompt_from_images(images_bytes, prompt)
+    return PromptResponse(prompt=generated_prompt)
+
+
 @router.get("", response_model=List[GenerationResponse])
-async def get_generations(character_id: Optional[str], limit: int = 10, offset: int = 0,
+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}")
     return await generation_service.get_generations(character_id, limit=limit, offset=offset)
 
 
@@ -32,12 +54,14 @@ async def get_generations(character_id: Optional[str], limit: int = 10, offset:
 async def post_generation(generation: GenerationRequest, request: Request,
                           generation_service: GenerationService = Depends(
                               get_generation_service)) -> GenerationResponse:
+    logger.info(f"post_generation (run) called. LinkedCharId: {generation.linked_character_id}, PromptLength: {len(generation.prompt)}")
     return await generation_service.create_generation_task(generation)
 
 
 @router.get("/{generation_id}", response_model=GenerationResponse)
 async def get_generation(generation_id: str,
                          generation_service: GenerationService = Depends(get_generation_service)) -> GenerationResponse:
+    logger.debug(f"get_generation called for ID: {generation_id}")
     return await generation_service.get_generation(generation_id)