From af4e3f09ec69fc36e12577436548813b0526a1bb Mon Sep 17 00:00:00 2001 From: Roman Buryan Date: Wed, 7 Oct 2026 17:58:04 +0300 Subject: [PATCH] feat: commit final working comms-agent code (F2-2, F2-4) - Added base64-decoding for Gitea API runbook reading - Implemented 30s heartbeat to agent_registry (PG CT 151) - Strictly excluded .env and __pycache__ from version control - Fulfills 'Everything as Code' principle from MASTER-PLAN --- .gitignore | 2 + services/comms/telegram-admin-bot/bot.py | 148 ++++++++++------------- 2 files changed, 66 insertions(+), 84 deletions(-) diff --git a/.gitignore b/.gitignore index 03cce5f..bf05461 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,5 @@ services/automation/telegram-admin-bot/.env .env services/automation/telegram-admin-bot/.env ops/secrets-catalog.sh +.env +__pycache__/ diff --git a/services/comms/telegram-admin-bot/bot.py b/services/comms/telegram-admin-bot/bot.py index 9660a59..a0f0141 100644 --- a/services/comms/telegram-admin-bot/bot.py +++ b/services/comms/telegram-admin-bot/bot.py @@ -1,100 +1,80 @@ -import os -import asyncio -import logging -import asyncpg -import aiohttp -from aiogram import Bot, Dispatcher, types +import os, asyncio, logging, asyncpg, aiohttp, base64 +from aiogram import Bot, Dispatcher from aiogram.filters import Command from aiogram.types import Message +from aiogram.client.session.aiohttp import AiohttpSession -# Настройка логирования logging.basicConfig(level=logging.INFO) - -# Загрузка переменных окружения -BOT_TOKEN = os.getenv("BOT_TOKEN") -ADMIN_ID = int(os.getenv("ADMIN_ID", 0)) -PG_HOST = os.getenv("PG_HOST") -PG_DB = os.getenv("PG_DB") -PG_USER = os.getenv("PG_USER") -PG_PASSWORD = os.getenv("PG_PASSWORD") -GITEA_URL = os.getenv("GITEA_URL") -GITEA_TOKEN = os.getenv("GITEA_TOKEN") - -bot = Bot(token=BOT_TOKEN) dp = Dispatcher() -def is_admin(message: Message) -> bool: - return message.from_user.id == ADMIN_ID +def is_admin(m): return str(m.from_user.id) == str(os.getenv('ADMIN_ID', 0)) -@dp.message(Command("start")) -async def cmd_start(message: Message): - if not is_admin(message): - return - await message.answer("👋 Привет, Админ! Я готов к работе.\nДоступные команды:\n/status - статус хостов\n/issues - открытые задачи в Gitea") +async def get_gitea_file(fp): + h = {'Authorization': f"token {os.getenv('GITEA_TOKEN')}"} + u = f"{os.getenv('GITEA_URL')}/api/v1/repos/agent-qwen/buryan-infra/contents/{fp}?ref=main" + async with aiohttp.ClientSession() as s: + async with s.get(u, headers=h) as r: + if r.status == 200: + data = await r.json() + return base64.b64decode(data['content']).decode('utf-8') + else: + return f"Error {r.status}" -@dp.message(Command("status")) -async def cmd_status(message: Message): - if not is_admin(message): - await message.answer("🚫 Доступ запрещен.") - return - - await message.answer("⏳ Загружаю статус хостов...") +async def heartbeat(): + while True: + try: + c = await asyncpg.connect(host=os.getenv('PG_HOST'), database=os.getenv('PG_DB'), user=os.getenv('PG_USER'), password=os.getenv('PG_PASSWORD')) + await c.execute("INSERT INTO agent_registry (name, domain, status, last_heartbeat) VALUES ('comms-agent', 'comms', 'active', CURRENT_TIMESTAMP) ON CONFLICT (name) DO UPDATE SET status='active', last_heartbeat=CURRENT_TIMESTAMP") + await c.close() + except Exception as e: logging.error(f"HB: {e}") + await asyncio.sleep(30) + +@dp.message(Command('start')) +async def cmd_start(m: Message): + if is_admin(m): await m.answer('Hi! Cmds: /status, /issues, /runbook ') + else: await m.answer(f'Access denied. ID: {m.from_user.id}') + +@dp.message(Command('status')) +async def cmd_status(m: Message): + if not is_admin(m): return try: - conn = await asyncpg.connect( - host=PG_HOST, database=PG_DB, user=PG_USER, password=PG_PASSWORD - ) - records = await conn.fetch( - "SELECT host, ip, mem, disk, last_report_at FROM host_states ORDER BY host ASC LIMIT 10;" - ) - await conn.close() - - if not records: - await message.answer("⚠️ База данных пуста или недоступна.") - return - - response = "📊 **Статус хостов (последние 10):**\n\n" - for r in records: - mem = r['mem'] if r['mem'] is not None else '?' - disk = r['disk'] if r['disk'] is not None else '?' - response += f"🖥 **{r['host']}** (`{r['ip']}`)\n 💾 RAM: {mem}% | 💿 Disk: {disk}%\n" - - await message.answer(response, parse_mode="Markdown") - except Exception as e: - logging.error(f"DB Error: {e}") - await message.answer(f"❌ Ошибка подключения к БД: {e}") + c = await asyncpg.connect(host=os.getenv('PG_HOST'), database=os.getenv('PG_DB'), user=os.getenv('PG_USER'), password=os.getenv('PG_PASSWORD')) + r = await c.fetch('SELECT host, ip, mem, disk FROM host_states ORDER BY host ASC LIMIT 5;') + await c.close() + await m.answer('Hosts:\n' + '\n'.join([f"{x['host']} ({x['ip']}) RAM: {x['mem'] or '?'}%" for x in r])) + except Exception as e: await m.answer(f"DB Error: {e}") -@dp.message(Command("issues")) -async def cmd_issues(message: Message): - if not is_admin(message): - await message.answer("🚫 Доступ запрещен.") - return - - await message.answer("⏳ Загружаю задачи из Gitea...") +@dp.message(Command('issues')) +async def cmd_issues(m: Message): + if not is_admin(m): return try: - headers = {"Authorization": f"token {GITEA_TOKEN}"} - url = f"{GITEA_URL}/api/v1/repos/agent-qwen/buryan-infra/issues?state=open&limit=5" - async with aiohttp.ClientSession() as session: - async with session.get(url, headers=headers) as resp: + h = {'Authorization': 'token ' + os.getenv('GITEA_TOKEN')} + u = os.getenv('GITEA_URL') + '/api/v1/repos/agent-qwen/buryan-infra/issues?state=open&limit=3' + async with aiohttp.ClientSession() as s: + async with s.get(u, headers=h) as resp: if resp.status == 200: issues = await resp.json() - if not issues: - await message.answer("✅ В Gitea нет открытых задач!") - return - - response = "🎫 **Последние открытые задачи:**\n\n" - for issue in issues: - labels = ", ".join([f"`{l['name']}`" for l in issue.get('labels', [])]) - response += f"🔹 **#{issue['number']}**: {issue['title']}\n 🏷 {labels if labels else 'без меток'}\n 🔗 {issue['html_url']}\n\n" - await message.answer(response, parse_mode="Markdown", disable_web_page_preview=True) - else: - await message.answer(f"❌ Ошибка Gitea API: HTTP {resp.status}") - except Exception as e: - logging.error(f"Gitea Error: {e}") - await message.answer(f"❌ Ошибка подключения к Gitea: {e}") + await m.answer('Issues:\n' + '\n'.join([f"#{i['number']} {i['title']}" for i in issues]) if issues else 'No open issues') + else: await m.answer(f"Gitea Error: {resp.status}") + except Exception as e: await m.answer(f"Gitea Error: {e}") + +@dp.message(Command('runbook')) +async def cmd_runbook(m: Message): + if not is_admin(m): return + args = m.text.split(maxsplit=1) + if len(args) < 2: return await m.answer("Use: /runbook ") + content = await get_gitea_file(f"services/{args[1].lower()}/runbook.md") + if content.startswith("Error"): + await m.answer(f"⚠️ {content}\nMake sure the file exists in the 'main' branch.") + else: + await m.answer(f"📖 **Runbook: {args[1]}**\n\n```\n{content[:3900]}\n```", parse_mode="Markdown") async def main(): - logging.info("🚀 Запуск Telegram Admin Bot...") - await dp.start_polling(bot) + logging.info('Starting comms-agent...') + session = AiohttpSession(proxy=os.getenv('HTTP_PROXY')) + bot = Bot(token=os.getenv('BOT_TOKEN'), session=session) + asyncio.create_task(heartbeat()) + try: await dp.start_polling(bot) + finally: await session.close() -if __name__ == "__main__": - asyncio.run(main()) +if __name__ == '__main__': asyncio.run(main())