Update app.py

app.py

@@ -1,4 +1,4 @@
-from asyncio import create_subprocess_shell, gather, sleep
+from asyncio import create_subprocess_shell, create_task, gather, sleep
 from logging import ERROR, INFO, basicConfig, getLogger
 from pathlib import Path
 from shutil import rmtree
@@ -11,7 +11,8 @@ from fastapi import FastAPI, HTTPException
 from fastapi.responses import PlainTextResponse
 from httpx import AsyncClient, HTTPStatusError, RequestError
 from pydantic import BaseModel, HttpUrl
-from ytelegraph import TelegraphAPI
+# from ytelegraph import TelegraphAPI
+from aiorentry.client import Client as RentryClient
 from uvicorn import run as uvicorn_run
 
 need_logging = False
@@ -115,7 +116,7 @@ async def upload_image_to_imgbb(file_path: Path, file_type: str = 'png') -> str
             with file_path.open('rb') as file:
                 files = {'image': (file_path.name, file, f'image/{file_type}')}
                 data = {}
-                async with AsyncClient() as client:
+                async with AsyncClient(verify=False, follow_redirects=True, timeout=30.0) as client:
                     response = await client.post(url, files=files, data=data, timeout=30)
                     response.raise_for_status()
                     json = response.json()
@@ -127,16 +128,31 @@ async def upload_image_to_imgbb(file_path: Path, file_type: str = 'png') -> str
     return None
 
 
+async def upload_image_to_freeimagehost(image_path: Path, file_type: str = 'png') -> str | None:
+    try:
+        async with AsyncClient(verify=False, follow_redirects=True, timeout=30.0) as client:
+            with image_path.open("rb") as image_file:
+                files = {'source': (image_path.name, image_file, f'image/{file_type}')}
+                payload = {'key': '6d207e02198a847aa98d0a2a901485a5', 'action': 'upload', 'format': 'json'}
+                response = await client.post('https://freeimage.host/api/1/upload', data=payload, files=files)
+            response.raise_for_status()
+            response_data = response.json()
+            return response_data['image']['url']
+    except Exception as e:
+        print(f'ошибка при загрузке {image_path}: {e}')
+        return None
+
+
 async def upload_image(file_path: Path | str, file_type: str = 'png') -> str | None:
     file_path = Path(file_path)
-    return await upload_image_to_imgbb(file_path, file_type)
-
+    return await upload_image_to_freeimagehost(file_path, file_type) or upload_image_to_imgbb(file_path, file_type)
 
 
 async def process_image(old_url: str, image_path: Path, convert: bool) -> tuple[str, Path]:
     new_url = await upload_image(image_path, 'png' if not convert else 'jpeg')
     if new_url:
-        print(f'загружено изображение {image_path} в {new_url}')
+        # print(f'загружено изображение {image_path} в {new_url}')
+        pass
     else:
         new_url = old_url
         print(f'не удалось загрузить изображение {image_path}, оставим старую ссылку: {old_url}')
@@ -151,18 +167,28 @@ async def process_image(old_url: str, image_path: Path, convert: bool) -> tuple[
 
 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
-    # print(f'принятые ссылки в обработку ({len(images_urls)}): {images_urls}')
+    if convert:
+        async with RentryClient('https://rentry.org') as client:
+            page = await client.new_page('content')
+            page_id, code = page.url, page.edit_code
+            continue_task = create_task(continue_optimizing_and_uploading(images_urls, page_id, code))
+            return [page.url]
+    else:
+        return await continue_optimizing_and_uploading(images_urls)
+
 
+async def continue_optimizing_and_uploading(images_urls: list[str], page_id: str = None, code: str = None) -> list[str]:
     images_paths = await download_pngs(images_urls)
-    if not convert:
+
+    if not page_id:  # convert=False
         await optimize_pngs(images_paths)
 
     new_images_urls = []
-    images_paths = images_paths if not convert else await convert_to_jpegs(images_paths)
+    images_paths = images_paths if not page_id else await convert_to_jpegs(images_paths)
 
     tasks = []
     for old_url, image_path in zip(images_urls, images_paths):
-        tasks.append(process_image(old_url, image_path, convert))
+        tasks.append(process_image(old_url, image_path, page_id is not None))
 
     results = await gather(*tasks)
     new_images_urls = [result[0] for result in results]
@@ -173,26 +199,22 @@ async def optimize_and_upload(images_urls: List[str] | str, convert: bool = Fals
     except Exception as e:
         print(f'не удалось удалить файл {images_paths[0].parent}: {e}')
 
-    if convert:
+    # Если была создана страница (convert=True), редактируем контент
+    if page_id and code:
         content = '\n\n'.join([f'![]({url})' for url in new_images_urls])
         try:
-            ph = TelegraphAPI()
-            ph_link = ph.create_page_md('Dall-E 3 картинки', content)
-            return [ph_link]
+            async with RentryClient('https://rentry.org') as client:
+                await client.edit_page(
+                    text=content,
+                    url=page_id,
+                    edit_code=code,
+                )
+                print(f'https://rentry.co/{page_id}', f'https://rentry.org/{page_id}')
+                return [f'https://rentry.co/{page_id}', f'https://rentry.org/{page_id}']
         except Exception as e:
-            print(f'не удалось создать страницу в телеграфе: {e}')
-            try:
-                from aiorentry.client import Client as RentryClient
-                async with RentryClient('https://rentry.org') as client:
-                    page = await client.new_page(content)
-                    page_id = page.url
-                    print(f'https://rentry.co/{page_id}', f'https://rentry.org/{page_id}')
-                    return [f'https://rentry.co/{page_id}', f'https://rentry.org/{page_id}']
-            except Exception as e:
-                print(f'не удалось создать страницу в rentry: {e}')
-    return new_images_urls
-
+            print(f'не удалось создать страницу в rentry: {e}')
 
+    return new_images_urls
 
 
 app = FastAPI()