Update app.py

app.py

@@ -1,6 +1,8 @@
 from asyncio import create_subprocess_shell, gather, sleep
+from logging import ERROR, INFO, basicConfig, getLogger
 from pathlib import Path
 from random import choice
+from shutil import rmtree
 from subprocess import CalledProcessError, PIPE
 from typing import Any, List
 from uuid import uuid4
@@ -11,6 +13,11 @@ from httpx import AsyncClient, HTTPStatusError, RequestError
 from pydantic import BaseModel, HttpUrl
 from uvicorn import run as uvicorn_run
 
+need_logging = True
+
+basicConfig(level = INFO if need_logging else ERROR)
+logger = getLogger(__name__)
+
 oxipng_bin = Path(__file__).parent / 'oxipng'
 if not oxipng_bin.stat().st_mode & 0o111:
     oxipng_bin.chmod(0o755)
@@ -25,12 +32,14 @@ tokens = [
 ]
 
 
-async def download_png(url: str, client: AsyncClient, retries: int = 5) -> Path:
+async def download_png(url: str, folder: str, client: AsyncClient, retries: int = 5) -> Path:
+    logger.info(f'загрузка изображения: {url}')
     for attempt in range(retries):
         try:
             response = await client.get(url, timeout=30.0)
             response.raise_for_status()
-            file_path = Path(f'{uuid4()}.png')
+            file_path = Path(__file__).parent / folder / f'{uuid4()}.png'
+            file_path.parent.mkdir(parents=True, exist_ok=True)
             file_path.write_bytes(response.content)
             return file_path
         except (HTTPStatusError, RequestError) as e:
@@ -42,13 +51,15 @@ async def download_png(url: str, client: AsyncClient, retries: int = 5) -> Path:
 
 async def download_pngs(urls: str | list[str]) -> list[Any]:
     urls = [urls] if isinstance(urls, str) else urls
+    logger.info(f'скачивается список список из {len(urls)}: {urls}')
     async with AsyncClient() as client:
-        tasks = [download_png(url, client) for url in urls]
+        tasks = [download_png(url, str(uuid4()), client) for url in urls]
         return list(await gather(*tasks))
 
 
 async def optimize_png(image_path: Path, retries: int = 3) -> None:
     command = f'{oxipng_bin.resolve()} --opt 2 --strip safe --out {image_path} {image_path}'
+    logger.info(f'оптимизация картинки {image_path}')
     for attempt in range(retries):
         try:
             process = await create_subprocess_shell(command, stdout=PIPE, stderr=PIPE)
@@ -58,6 +69,7 @@ async def optimize_png(image_path: Path, retries: int = 3) -> None:
             else:
                 raise CalledProcessError(process.returncode, command, output=stdout, stderr=stderr)
         except CalledProcessError as e:
+            logger.error(f'ошибка при оптимизации {image_path}')
             if attempt < retries - 1:
                 await sleep(2 ** attempt)
             else:
@@ -66,6 +78,7 @@ async def optimize_png(image_path: Path, retries: int = 3) -> None:
 
 async def optimize_pngs(image_paths: list[str | Path] | str | Path) -> None:
     image_paths = [Path(image_file) for image_file in ([image_paths] if not isinstance(image_paths, list) else image_paths)]
+    logger.info(f'оптимизируется список список из {len(image_paths)}: {image_paths}')
     tasks = [optimize_png(image_path) for image_path in image_paths]
     await gather(*tasks)
 
@@ -119,6 +132,7 @@ async def upload_image(file_path: Path | str) -> str | None:
 
 async def optimize_and_upload(images_urls: list[str] | str) -> list[str]:
     images_urls = [images_urls] if isinstance(images_urls, str) else images_urls
+    logger.info(f'принятые ссылки в обработку ({len(images_urls)}): {images_urls}')
     images_paths = await download_pngs(images_urls)
     await optimize_pngs(images_paths)
     new_images_urls = []
@@ -126,7 +140,16 @@ async def optimize_and_upload(images_urls: list[str] | str) -> list[str]:
         new_url = await upload_image(image_path)
         if new_url:
             new_images_urls.append(new_url)
-        image_path.unlink(missing_ok=True)
+        logger.info(f'загружено изображение {image_path} в {new_url}')
+        try:
+            image_path.unlink()
+        except Exception as e:
+            logger.error(f'не удалось удалить файл {image_path}: {e}')
+    logger.info(f'новые ссылки: ({len(new_images_urls)}): {new_images_urls}')
+    try:
+        rmtree(images_paths[0].parent)
+    except Exception as e:
+        logger.error(f'не удалось удалить файл {images_paths[0].parent}: {e}')
     return new_images_urls