Update app.py

app.py

@@ -7,6 +7,7 @@ from subprocess import CalledProcessError, PIPE
 from typing import Any, List
 from uuid import uuid4
 
+from PIL import Image
 from fastapi import FastAPI, HTTPException
 from fastapi.responses import PlainTextResponse
 from httpx import AsyncClient, HTTPStatusError, RequestError
@@ -15,7 +16,7 @@ from uvicorn import run as uvicorn_run
 
 need_logging = False
 
-basicConfig(level = INFO if need_logging else ERROR)
+basicConfig(level=INFO if need_logging else ERROR)
 logger = getLogger(__name__)
 
 oxipng_bin = Path(__file__).parent / 'oxipng'
@@ -80,6 +81,26 @@ async def optimize_png(image_path: Path, retries: int = 3) -> None:
                 raise e
 
 
+async def convert_to_jpeg(image_path: Path) -> Path:
+    logger.info(f'конвертируется {image_path}')
+    try:
+        image = Image.open(image_path)
+        output_path = image_path.with_suffix('.jpg')
+        image.save(output_path, 'JPEG', quality=98, optimize=True)
+        image_path.unlink(missing_ok=True)
+        return output_path
+    except:
+        logger.error(f'ошибка при конвертации {image_path}')
+        return image_path
+
+
+async def convert_to_jpegs(image_paths: list[str | Path] | str | Path) -> tuple[Path]:
+    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 = [convert_to_jpeg(image_path) for image_path in image_paths]
+    return await gather(*tasks)
+
+
 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}')
@@ -87,32 +108,6 @@ async def optimize_pngs(image_paths: list[str | Path] | str | Path) -> None:
     await gather(*tasks)
 
 
-async def telegraph_upload_png(file_path: str | Path) -> str | None:
-    file_path = Path(file_path)
-    if not file_path.is_file() or file_path.stat().st_size > 5 * 1024 * 1024:
-        return None
-    url = 'https://telegra.ph/upload'
-    headers = {
-        'authority': url.rsplit('/')[2],
-        'accept': 'application/json, text/javascript, */*; q=0.01',
-        'origin': url.rsplit('/', 1)[0],
-        'referer': url.rsplit('/', 1)[0],
-        'x-requested-with': 'XMLHttpRequest',
-    }
-    async with AsyncClient() as client:
-        try:
-            response = await client.post(url, headers=headers, files={'file': ('blob', file_path.read_bytes(), 'image/png')})
-            response.raise_for_status()
-            result = response.json()
-        except:
-            return None
-    if response.is_success and 'error' not in result:
-        link = result[0]['src']
-        return url.rsplit('/', 1)[0] + link
-    else:
-        return None
-
-
 async def upload_image_to_imgbb(file_path: Path) -> str | None:
     url = f'https://api.imgbb.com/1/upload?key={choice(tokens)}'
     try:
@@ -131,15 +126,17 @@ async def upload_image_to_imgbb(file_path: Path) -> str | None:
 
 async def upload_image(file_path: Path | str) -> str | None:
     file_path = Path(file_path)
-    return await telegraph_upload_png(file_path) or await upload_image_to_imgbb(file_path)
+    return await upload_image_to_imgbb(file_path)
 
 
-async def optimize_and_upload(images_urls: list[str] | str) -> list[str]:
+async def optimize_and_upload(images_urls: list[str] | str, convert: bool = False) -> 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)
+    if not convert:
+        await optimize_pngs(images_paths)
     new_images_urls = []
+    images_paths = images_paths if not convert else await convert_to_jpegs(images_paths)
     for image_path in images_paths:
         new_url = await upload_image(image_path)
         if new_url:
@@ -178,5 +175,14 @@ async def optimize_images_endpoint(image_urls: ImageURLs):
         raise HTTPException(status_code=500, detail=str(e))
 
 
+@app.post('/jpegs_by_urls/')
+async def optimize_images_endpoint(image_urls: ImageURLs):
+    try:
+        optimized_urls = await optimize_and_upload([str(url) for url in image_urls.urls])
+        return {"optimized_urls": optimized_urls}
+    except Exception as e:
+        raise HTTPException(status_code=500, detail=str(e))
+
+
 if __name__ == "__main__":
     uvicorn_run(app, host='0.0.0.0', port=7860, timeout_keep_alive=90)