Update app.py

app.py

@@ -3,13 +3,13 @@ import asyncio
 import re
 import urllib.parse
 import io
-import traceback
-import requests
-import torch
 import logging
 import random
 import json
-from typing import Optional, Dict, List, Tuple
+import aiohttp
+from typing import Optional, Dict
+from aiohttp import web
+
 from telegram import (
     Update,
     InlineKeyboardButton,
@@ -37,7 +37,8 @@ logger = logging.getLogger(__name__)
 # ============================================================
 # КОНФИГУРАЦИЯ БОТА
 # ============================================================
-BOT_TOKEN = "8605889873:AAE2gV2t0psXKlj-8h9ksyyoCrWa8Q-TdkA"
+# РЕКОМЕНДАЦИЯ: В будущем лучше вынести токены в Secrets (переменные окружения) Hugging Face
+BOT_TOKEN = os.environ.get("BOT_TOKEN", "8605889873:AAE2gV2t0psXKlj-8h9ksyyoCrWa8Q-TdkA")
 
 # КЛЮЧИ GEMINI
 GEMINI_API_KEYS = [
@@ -64,24 +65,22 @@ AI_TRIGGER_KEYWORDS = ["inai", "инэй", "инаи", "ии", "ai", "бот", "
 IMAGE_KEYWORDS = ["нарисуй", "рисуй", "draw", "картинка", "фото"]
 
 # ============================================================
-# РАБОТА С GEMINI API
+# РАБОТА С GEMINI И ИЗОБРАЖЕНИЯМИ (ЧЕРЕЗ AIOHTTP)
 # ============================================================
 
 async def get_next_key():
     global current_key_index
     async with key_lock:
         key = GEMINI_API_KEYS[current_key_index]
+        idx = current_key_index
         current_key_index = (current_key_index + 1) % len(GEMINI_API_KEYS)
-        return key, (current_key_index - 1) % len(GEMINI_API_KEYS)
+        return key, idx
 
 async def call_gemini_api(prompt: str, system_prompt: str = None, history: list = None) -> str:
     if system_prompt is None:
         system_prompt = INAI_SYSTEM_PROMPT
 
-    messages = []
-    if history:
-        for item in history:
-            messages.append(item)
+    messages = history.copy() if history else []
     messages.append({"role": "user", "parts": [{"text": prompt}]})
 
     request_body = {
@@ -91,21 +90,35 @@ async def call_gemini_api(prompt: str, system_prompt: str = None, history: list
     }
 
     attempts = 0
-    while attempts < len(GEMINI_API_KEYS):
-        key, key_idx = await get_next_key()
-        attempts += 1
-        url = GEMINI_API_URL.format(model=GEMINI_MODEL, key=key)
-        try:
-            response = await asyncio.to_thread(
-                lambda: requests.post(url, json=request_body, timeout=30)
-            )
-            if response.status_code == 200:
-                return response.json()["candidates"][0]["content"]["parts"][0]["text"]
-            logger.warning(f"Ключ {key_idx} ошибка {response.status_code}")
-        except Exception as e:
-            logger.error(f"Ошибка API: {e}")
+    async with aiohttp.ClientSession() as session:
+        while attempts < len(GEMINI_API_KEYS):
+            key, key_idx = await get_next_key()
+            attempts += 1
+            url = GEMINI_API_URL.format(model=GEMINI_MODEL, key=key)
+            
+            try:
+                async with session.post(url, json=request_body, timeout=30) as response:
+                    if response.status == 200:
+                        data = await response.json()
+                        return data["candidates"][0]["content"]["parts"][0]["text"]
+                    else:
+                        logger.warning(f"Ключ {key_idx} вернул статус {response.status}")
+            except Exception as e:
+                logger.error(f"Ошибка API Gemini: {e}")
+                
     return "❌ Ошибка сервиса Gemini. Попробуйте позже."
 
+async def generate_image(prompt: str) -> Optional[bytes]:
+    url = f"https://image.pollinations.ai/prompt/{urllib.parse.quote(prompt)}?nologo=true&seed={random.randint(1,999)}"
+    try:
+        async with aiohttp.ClientSession() as session:
+            async with session.get(url, timeout=40) as res:
+                if res.status == 200:
+                    return await res.read()
+    except Exception as e:
+        logger.error(f"Ошибка генерации картинки: {e}")
+    return None
+
 # ============================================================
 # ВСПОМОГАТЕЛЬНЫЕ ФУНКЦИИ
 # ============================================================
@@ -136,13 +149,6 @@ def build_inline_keyboard(buttons: list) -> Optional[InlineKeyboardMarkup]:
         keyboard.append([InlineKeyboardButton(btn.get("text", "OK"), callback_data=f"ai_action:{btn.get('action', 'none')[:40]}")])
     return InlineKeyboardMarkup(keyboard)
 
-async def generate_image(prompt: str) -> Optional[bytes]:
-    try:
-        url = f"https://image.pollinations.ai/prompt/{urllib.parse.quote(prompt)}?nologo=true&seed={random.randint(1,999)}"
-        res = await asyncio.to_thread(lambda: requests.get(url, timeout=40))
-        return res.content if res.status_code == 200 else None
-    except: return None
-
 # ============================================================
 # ИСТОРИЯ ЧАТА
 # ============================================================
@@ -151,7 +157,9 @@ chat_history: Dict[int, list] = {}
 def add_to_history(chat_id: int, role: str, text: str):
     if chat_id not in chat_history: chat_history[chat_id] = []
     chat_history[chat_id].append({"role": role, "parts": [{"text": text}]})
-    if len(chat_history[chat_id]) > 10: chat_history[chat_id].pop(0)
+    # Храним последние 10 сообщений
+    if len(chat_history[chat_id]) > 10: 
+        chat_history[chat_id].pop(0)
 
 # ============================================================
 # ОБРАБОТЧИКИ
@@ -166,7 +174,6 @@ async def handle_message(update: Update, context: ContextTypes.DEFAULT_TYPE):
     chat_id = update.effective_chat.id
     text = update.message.text
     
-    # Логика ответа (упрощенно для полной версии)
     is_group = update.message.chat.type in ["group", "supergroup"]
     is_reply = update.message.reply_to_message and update.message.reply_to_message.from_user.is_bot
     
@@ -176,8 +183,11 @@ async def handle_message(update: Update, context: ContextTypes.DEFAULT_TYPE):
     await context.bot.send_chat_action(chat_id=chat_id, action=ChatAction.TYPING)
     status = await update.message.reply_text("💠 Думаю...")
     
+    # Получаем историю без последнего сообщения пользователя
+    history = chat_history.get(chat_id, [])
+    
     add_to_history(chat_id, "user", text)
-    ai_resp = await call_gemini_api(text, history=chat_history.get(chat_id)[:-1])
+    ai_resp = await call_gemini_api(text, history=history)
     
     clean_text, buttons, draw_prompt = parse_ai_response(ai_resp)
     add_to_history(chat_id, "model", clean_text)
@@ -187,10 +197,26 @@ async def handle_message(update: Update, context: ContextTypes.DEFAULT_TYPE):
         img = await generate_image(draw_prompt if draw_prompt else text)
         if img:
             await status.delete()
-            await update.message.reply_photo(photo=io.BytesIO(img), caption=clean_text[:1000], reply_markup=build_inline_keyboard(buttons))
+            await update.message.reply_photo(
+                photo=io.BytesIO(img), 
+                caption=clean_text[:1000], 
+                reply_markup=build_inline_keyboard(buttons)
+            )
             return
 
-    await status.edit_text(clean_text[:4090], reply_markup=build_inline_keyboard(buttons), parse_mode=ParseMode.MARKDOWN)
+    # Защита от падений из-за неправильного Markdown, сгенерированного ИИ
+    try:
+        await status.edit_text(
+            clean_text[:4090], 
+            reply_markup=build_inline_keyboard(buttons), 
+            parse_mode=ParseMode.MARKDOWN
+        )
+    except Exception as e:
+        logger.warning(f"Ошибка Markdown разметки. Отправляю как текст: {e}")
+        await status.edit_text(
+            clean_text[:4090], 
+            reply_markup=build_inline_keyboard(buttons)
+        )
 
 async def handle_callback(update: Update, context: ContextTypes.DEFAULT_TYPE):
     query = update.callback_query
@@ -201,6 +227,25 @@ async def handle_callback(update: Update, context: ContextTypes.DEFAULT_TYPE):
 async def error_handler(update: object, context: ContextTypes.DEFAULT_TYPE):
     logger.error(f"Error: {context.error}")
 
+# ============================================================
+# ВЕБ-СЕРВЕР ДЛЯ HUGGING FACE (ПРЕДОТВРАЩАЕТ TIMEOUT ОШИБКИ)
+# ============================================================
+async def health_check(request):
+    return web.Response(text="Бот INAI успешно работает!")
+
+async def start_web_server():
+    app = web.Application()
+    app.router.add_get('/', health_check)
+    runner = web.AppRunner(app)
+    await runner.setup()
+    site = web.TCPSite(runner, '0.0.0.0', 7860)
+    await site.start()
+    logger.info("✅ Локальный веб-сервер запущен на порту 7860 (Hugging Face счастлив)")
+
+# Хук, который запускает веб-сервер одновременно с ботом
+async def post_init(application: Application):
+    asyncio.create_task(start_web_server())
+
 # ============================================================
 # MAIN - ЗАПУСК
 # ============================================================
@@ -208,10 +253,11 @@ async def error_handler(update: object, context: ContextTypes.DEFAULT_TYPE):
 def main():
     print("🚀 Starting INAI Bot on Hugging Face...")
     
-    # Настройка с МАКСИМАЛЬНЫМИ таймаутами для облака
+    # Настройка с МАКСИМАЛЬНЫМИ таймаутами
     application = (
         Application.builder()
         .token(BOT_TOKEN)
+        .post_init(post_init) # Запуск веб-сервера для HF
         .connect_timeout(60.0)
         .read_timeout(60.0)
         .write_timeout(60.0)