xync-bot 0.2.9__tar.gz → 0.3.31.dev0__tar.gz

xync_bot-0.3.31.dev0/.env.dist

@@ -0,0 +1,4 @@
+WH_DOMAIN=https://
+TWA_DOMAIN=https://
+TOKEN=
+DB_URL=postgres://user:pwd@host/db_name

xync_bot-0.3.31.dev0/.gitignore

@@ -0,0 +1,8 @@
+/.idea
+/venv
+/.env
+__pycache__
+*.pyc
+*.egg-info
+/build
+/dist

xync_bot-0.3.31.dev0/.pre-commit-config.yaml

@@ -0,0 +1,36 @@
+repos:
+- repo: local
+  hooks:
+  - id: tag
+    name: tag
+    ### make tag with next ver only if "fix" in commit_msg or starts with "feat"
+    entry: bash -c 'grep -e ^feat -e fix .git/COMMIT_EDITMSG && make patch || exit 0'
+    language: system
+    verbose: true
+    pass_filenames: false
+    always_run: true
+    stages: [post-commit]
+
+  - id: build
+    name: build
+    ### build & upload package only for "main" branch push
+    entry: bash -c 'echo $PRE_COMMIT_LOCAL_BRANCH | grep /main && make build || echo 0'
+    language: system
+    pass_filenames: false
+    verbose: true
+    require_serial: true
+    stages: [pre-push]
+
+- repo: https://github.com/astral-sh/ruff-pre-commit
+  ### Ruff version.
+  rev: v0.14.5
+  hooks:
+    ### Run the linter.
+    - id: ruff
+      args: [--fix, --unsafe-fixes]
+      stages: [pre-commit]
+    ### Run the formatter.
+    - id: ruff-format
+      types_or: [python, pyi]
+      verbose: true
+      stages: [pre-commit]

xync_bot-0.3.31.dev0/PKG-INFO

@@ -0,0 +1,21 @@
+Metadata-Version: 2.4
+Name: xync-bot
+Version: 0.3.31.dev0
+Summary: Telegram bot with web app for xync net
+Author-email: Artemiev <mixartemev@gmail.com>
+License-Expression: GPL-3.0-or-later
+Project-URL: Homepage, https://gitlab.com/xync/back/tg-bot
+Project-URL: Repository, https://gitlab.com/xync/back/tg-bot
+Keywords: aiogram,cyrtranslit,xync-net
+Requires-Python: >=3.12
+Requires-Dist: cyrtranslit
+Requires-Dist: xn-auth
+Requires-Dist: xync-schema
+Provides-Extra: dev
+Requires-Dist: PGram; extra == "dev"
+Requires-Dist: pre-commit; extra == "dev"
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: python-dotenv; extra == "dev"
+Requires-Dist: setuptools-scm; extra == "dev"
+Requires-Dist: build; extra == "dev"
+Requires-Dist: twine; extra == "dev"

xync_bot-0.3.31.dev0/makefile

@@ -0,0 +1,24 @@
+include .env
+PACKAGE := xync_bot
+VPYTHON := $(VENV)/bin/python
+
+.PHONY: all install pre-commit clean build twine patch
+
+all:
+	make install clean build
+
+install: $(VENV)
+	$(VPYTHON) -m pip install .[dev]; make pre-commit
+pre-commit: .pre-commit-config.yaml
+	pre-commit install -t pre-commit -t post-commit -t pre-push
+
+clean: dist $(PACKAGE).egg-info
+	rm -rf dist/* $(PACKAGE).egg-info $(PACKAGE)/__pycache__ dist/__pycache__
+
+build: $(VENV)
+	$(VPYTHON) -m build; make twine
+twine: dist
+	$(VPYTHON) -m twine upload dist/* --skip-existing
+
+patch:
+	git tag `$(VPYTHON) -m setuptools_scm --strip-dev`; git push --tags --prune -f

xync_bot-0.3.31.dev0/pager.py

@@ -0,0 +1,274 @@
+from aiogram import Bot, Dispatcher, types
+from aiogram.types import InlineKeyboardMarkup, InlineKeyboardButton
+from aiogram.filters import Command
+import asyncio
+import logging
+
+from xync_bot.loader import TOKEN
+
+# Пример списка из 200 вариантов (замените на ваши данные)
+OPTIONS = (
+    [
+        f"Apple {i}"
+        for i in range(50)  # 50 вариантов на A
+    ]
+    + [
+        "Banana"  # 1 вариант на B
+    ]
+    + [
+        f"Dog {i}"
+        for i in range(30)  # 30 вариантов на D
+    ]
+    + [
+        f"Elephant {i}"
+        for i in range(20)  # 20 вариантов на E
+    ]
+    + [
+        f"Fish {i}"
+        for i in range(40)  # 40 вариантов на F
+    ]
+    + [
+        f"Zebra {i}"
+        for i in range(59)  # 59 вариантов на Z
+    ]
+)
+
+
+class SmartAlphaPager:
+    def __init__(self, options, items_per_page=15):
+        self.options = sorted(options)  # Сортируем по алфавиту
+        self.items_per_page = items_per_page
+        self.pages = self._create_balanced_pages()
+
+    def _create_balanced_pages(self):
+        """Создаем страницы с примерно равным количеством элементов"""
+        pages = []
+        current_page = []
+
+        for option in self.options:
+            current_page.append(option)
+
+            # Если страница заполнена, создаем новую
+            if len(current_page) >= self.items_per_page:
+                pages.append(current_page)
+                current_page = []
+
+        # Добавляем последнюю страницу, если есть остатки
+        if current_page:
+            pages.append(current_page)
+
+        return pages
+
+    def _get_page_title(self, page_items):
+        """Создает заголовок страницы на основе диапазона букв"""
+        if not page_items:
+            return "Пустая страница"
+
+        first_letter = page_items[0][0].upper()
+        last_letter = page_items[-1][0].upper()
+
+        if first_letter == last_letter:
+            return f"📋 Буква '{first_letter}'"
+        else:
+            return f"📋 Буквы '{first_letter}' - '{last_letter}'"
+
+    def get_overview_menu(self):
+        """Возвращает обзорное меню со всеми страницами"""
+        if not self.pages:
+            return InlineKeyboardMarkup(inline_keyboard=[])
+
+        keyboard = InlineKeyboardMarkup(inline_keyboard=[])
+
+        # Создаем кнопки для каждой страницы
+        for i, page_items in enumerate(self.pages):
+            first_letter = page_items[0][0].upper()
+            last_letter = page_items[-1][0].upper()
+            count = len(page_items)
+
+            if first_letter == last_letter:
+                button_text = f"{first_letter} ({count})"
+            else:
+                button_text = f"{first_letter}-{last_letter} ({count})"
+
+            # Группируем по 3 кнопки в ряд
+            if i % 3 == 0:
+                keyboard.inline_keyboard.append([])
+
+            keyboard.inline_keyboard[-1].append(InlineKeyboardButton(text=button_text, callback_data=f"page_{i}"))
+
+        return keyboard
+
+    def get_page_keyboard(self, page_num):
+        """Возвращает клавиатуру для конкретной страницы"""
+        if page_num < 0 or page_num >= len(self.pages):
+            return None, None
+
+        page_items = self.pages[page_num]
+        title = self._get_page_title(page_items)
+
+        keyboard = InlineKeyboardMarkup(inline_keyboard=[])
+
+        # Добавляем кнопки с вариантами
+        for option in page_items:
+            keyboard.inline_keyboard.append([InlineKeyboardButton(text=option, callback_data=f"select_{option}")])
+
+        # Навигационные кнопки
+        nav_row = []
+
+        # Кнопка "К обзору"
+        nav_row.append(InlineKeyboardButton(text="📖 Обзор", callback_data="back_to_overview"))
+
+        # Кнопки навигации между страницами
+        if len(self.pages) > 1:
+            if page_num > 0:
+                nav_row.append(InlineKeyboardButton(text="⬅️ Пред", callback_data=f"nav_page_{page_num - 1}"))
+
+            nav_row.append(
+                InlineKeyboardButton(text=f"{page_num + 1}/{len(self.pages)}", callback_data="current_page_info")
+            )
+
+            if page_num < len(self.pages) - 1:
+                nav_row.append(InlineKeyboardButton(text="След ➡️", callback_data=f"nav_page_{page_num + 1}"))
+
+        keyboard.inline_keyboard.append(nav_row)
+
+        # Дополнительная информация в заголовке
+        items_count = len(page_items)
+        total_items = sum(len(page) for page in self.pages)
+        full_title = f"{title}\nСтраница {page_num + 1}/{len(self.pages)} • {items_count} из {total_items} вариантов"
+
+        return keyboard, full_title
+
+    def get_stats(self):
+        """Возвращает статистику распределения"""
+        stats = {}
+        for page_num, page_items in enumerate(self.pages):
+            first_letter = page_items[0][0].upper()
+            last_letter = page_items[-1][0].upper()
+
+            if first_letter == last_letter:
+                range_text = f"'{first_letter}'"
+            else:
+                range_text = f"'{first_letter}'-'{last_letter}'"
+
+            stats[f"Страница {page_num + 1}"] = {"range": range_text, "count": len(page_items)}
+
+        return stats
+
+
+# Инициализация бота
+bot = Bot(token=TOKEN)
+dp = Dispatcher()
+
+pager = SmartAlphaPager(OPTIONS)
+
+
+@dp.message(Command("start"))
+async def start_handler(message: types.Message):
+    """Стартовая команда - показываем обзор страниц"""
+    keyboard = pager.get_overview_menu()
+    total_options = len(pager.options)
+    total_pages = len(pager.pages)
+
+    text = (
+        f"🔍 Выберите диапазон для просмотра:\n\n"
+        f"📊 Всего вариантов: {total_options}\n"
+        f"📄 Всего страниц: {total_pages}"
+    )
+
+    await message.answer(text, reply_markup=keyboard)
+
+
+@dp.message(Command("stats"))
+async def stats_handler(message: types.Message):
+    """Показать статистику распределения"""
+    stats = pager.get_stats()
+
+    text = "📊 Статистика распределения по страницам:\n\n"
+    for page_name, info in stats.items():
+        text += f"{page_name}: {info['range']} — {info['count']} вариантов\n"
+
+    await message.answer(text)
+
+
+@dp.callback_query(lambda c: c.data == "back_to_overview")
+async def back_to_overview(callback: types.CallbackQuery):
+    """Возврат к обзору страниц"""
+    keyboard = pager.get_overview_menu()
+    total_options = len(pager.options)
+    total_pages = len(pager.pages)
+
+    text = (
+        f"🔍 Выберите диапазон для просмотра:\n\n"
+        f"📊 Всего вариантов: {total_options}\n"
+        f"📄 Всего страниц: {total_pages}"
+    )
+
+    await callback.message.edit_text(text, reply_markup=keyboard)
+    await callback.answer()
+
+
+@dp.callback_query(lambda c: c.data.startswith("page_"))
+async def show_page(callback: types.CallbackQuery):
+    """Показываем конкретную страницу"""
+    page_num = int(callback.data.split("_")[1])
+    keyboard, text = pager.get_page_keyboard(page_num)
+
+    if keyboard:
+        await callback.message.edit_text(text, reply_markup=keyboard)
+    else:
+        await callback.answer("Ошибка: страница не найдена")
+
+    await callback.answer()
+
+
+@dp.callback_query(lambda c: c.data.startswith("nav_page_"))
+async def navigate_pages(callback: types.CallbackQuery):
+    """Навигация между страницами"""
+    page_num = int(callback.data.split("_")[2])
+    keyboard, text = pager.get_page_keyboard(page_num)
+
+    if keyboard:
+        await callback.message.edit_text(text, reply_markup=keyboard)
+    else:
+        await callback.answer("Ошибка навигации")
+
+    await callback.answer()
+
+
+@dp.callback_query(lambda c: c.data.startswith("select_"))
+async def option_selected(callback: types.CallbackQuery):
+    """Обработка выбора варианта"""
+    selected = callback.data.replace("select_", "")
+
+    await callback.message.edit_text(
+        f"✅ Вы выбрали: {selected}\n\n"
+        f"Используйте /start для нового выбора\n"
+        f"Используйте /stats для просмотра статистики"
+    )
+    await callback.answer(f"Выбран: {selected}")
+
+
+@dp.callback_query(lambda c: c.data == "current_page_info")
+async def current_page_info(callback: types.CallbackQuery):
+    """Информация о текущей странице"""
+    await callback.answer("Информация о текущей странице")
+
+
+async def main():
+    """Запуск бота"""
+    logging.basicConfig(level=logging.INFO)
+    print("Бот запущен...")
+
+    # Выводим статистику при запуске
+    stats = pager.get_stats()
+    print("\n📊 Статистика распределения:")
+    for page_name, info in stats.items():
+        print(f"{page_name}: {info['range']} — {info['count']} вариантов")
+    print()
+
+    await dp.start_polling(bot)
+
+
+if __name__ == "__main__":
+    asyncio.run(main())

xync_bot-0.3.31.dev0/pyproject.toml

@@ -0,0 +1,47 @@
+[project]
+name = "xync-bot"
+requires-python = ">=3.12"
+authors = [
+    {name = "Artemiev", email = "mixartemev@gmail.com"},
+]
+keywords = ["aiogram", "cyrtranslit", "xync-net"]
+description = "Telegram bot with web app for xync net"
+#readme = "README.md"
+license = "GPL-3.0-or-later"
+dynamic = ["version"]
+dependencies = [
+    "cyrtranslit",
+    "xn-auth",
+    "xync-schema",
+]
+[project.optional-dependencies]
+dev = [
+    "PGram",
+    "pre-commit",
+    "pytest",
+    "python-dotenv",
+    "setuptools-scm",
+    "build",
+    "twine",
+]
+
+[project.urls]
+Homepage = "https://gitlab.com/xync/back/tg-bot"
+Repository = "https://gitlab.com/xync/back/tg-bot"
+
+[build-system]
+requires = ["setuptools>=64", "setuptools-scm[toml]>=8"]
+build-backend = "setuptools.build_meta"
+[tool.setuptools_scm]
+version_scheme = "python-simplified-semver" # if "feature" in `branch_name` SEMVER_MINOR++ else SEMVER_PATCH++
+local_scheme = "no-local-version"
+
+[tool.pytest.ini_options]
+asyncio_mode = "auto"
+asyncio_default_fixture_loop_scope = "function"
+
+[tool.ruff]
+line-length = 120
+
+[tool.setuptools]
+packages = ["xync_bot"]

xync_bot-0.3.31.dev0/test_main.http

@@ -0,0 +1,9 @@
+# Test your FastAPI endpoints
+
+GET http://127.0.0.1:8000/
+Accept: application/json
+###
+
+GET http://127.0.0.1:8000/hello/User
+Accept: application/json
+###

xync_bot-0.3.31.dev0/xync_bot/__init__.py

@@ -0,0 +1,93 @@
+import random
+from datetime import timedelta
+from itertools import groupby
+
+from PGram import Bot
+from aiogram.client.default import DefaultBotProperties
+from aiogram.enums import UpdateType
+from aiogram.types import InlineKeyboardButton
+from tortoise.timezone import now
+from xync_schema.enums import HotStatus
+
+from xync_bot.shared import BoolCd
+from xync_schema.models import Order, MyAd, User, Hot, CurEx
+
+from xync_bot.store import Store
+from xync_bot.routers import last
+from xync_bot.routers.main.handler import mr
+from xync_bot.routers.pay.handler import pr
+from xync_bot.routers.cond import cr
+from xync_bot.routers.send import sd
+from xync_bot.routers.hot import hot
+
+
+au = [
+    UpdateType.MESSAGE,
+    UpdateType.CALLBACK_QUERY,
+    UpdateType.CHAT_MEMBER,
+    UpdateType.MY_CHAT_MEMBER,
+]  # , UpdateType.CHAT_JOIN_REQUEST
+
+
+class XyncBot(Bot):
+    def __init__(self, token, cn):
+        super().__init__(token, cn, [hot, sd, cr, pr, mr, last], Store(), DefaultBotProperties(parse_mode="HTML"))
+
+    async def start(self, wh_host: str = None):
+        self.dp.workflow_data["xbt"] = self  # todo: refact?
+        # self.dp.workflow_data["store"].glob = await Store.Global()  # todo: refact store loading
+        await super().start(au, wh_host)
+        return self
+
+    # итерация: предоставляем юзеру кнопки для перехода на hot объявления
+    async def go_hot(self, username_id: int, ex_ids: list[int]):
+        ex_ids = ex_ids or [4]
+        adq = MyAd.hot_mads_query(ex_ids)
+        if not (ads := await adq.filter(ad__pair_side__is_sell=False)):
+            raise ValueError({1: ex_ids})
+        user = await User.get(username_id=username_id)
+        hot_db, _ = await Hot.get_or_create(
+            {}, user=user, updated_at__gt=now() - timedelta(hours=1), status=HotStatus.opened
+        )
+        ads = {cur: random.choice(list(g)) for cur, g in groupby(ads, key=lambda x: x.ad.pair_side.pair.cur_id)}
+        await hot_db.ads_shared.add(*ads.values())
+        btns = [
+            [
+                InlineKeyboardButton(text=ad.ad.pair_side.pair.cur.ticker + " 🌐", url=ad.get_url()[0]),
+                InlineKeyboardButton(text=ad.ad.pair_side.pair.cur.ticker + " 📱", url=ad.get_url()[1]),
+            ]
+            for ad in ads.values()
+        ]
+        await self.send(username_id, "🟥Sell USDT", btns)
+
+        if balances := await user.balances():
+            curexs = await CurEx.filter(cur_id__in=balances.keys(), ex_id__in=ex_ids)
+            minimums = {cx.cur_id: cx.minimum for cx in curexs}
+            balances = {cur_id: b for cur_id, b in balances.items() if b >= minimums[cur_id]}
+            if ads := await adq.filter(
+                ad__pair_side__is_sell=True, ad__pair_side__pair__cur_id__in=balances.keys()
+            ).all():
+                ads = {cur: random.choice(list(g)) for cur, g in groupby(ads, key=lambda x: x.ad.pair_side.pair.cur_id)}
+                await hot_db.ads_shared.add(*ads.values())
+                btns = [
+                    [
+                        InlineKeyboardButton(text=rng + ad.ad.pair_side.pair.cur.ticker + " 🌐", url=ad.get_url()[0]),
+                        InlineKeyboardButton(text=rng + ad.ad.pair_side.pair.cur.ticker + " 📱", url=ad.get_url()[1]),
+                    ]
+                    for cur_id, ad in ads.items()
+                    if (rng := f"≤ {balances[cur_id]} ")
+                ]
+                await self.send(username_id, "🟩Buy USDT", btns)
+
+    async def def_actor(self, uid: int, order: Order):
+        """
+        Если актор прилетевшего ордера по прогреву еще не связан ни с одним юзером, спрашиваем hot-юзера он ли это
+        """
+        txt = f"{order.taker.name}:{order.taker.exid} is you?"
+        btns = [
+            [
+                InlineKeyboardButton(text="Yes", callback_data=BoolCd(req="is_you", res=True, xtr=order.id).pack()),
+                InlineKeyboardButton(text="No", callback_data=BoolCd(req="is_you", res=False, xtr=order.id).pack()),
+            ]
+        ]
+        await self.send(uid, txt, btns)

xync_bot-0.3.31.dev0/xync_bot/__main__.py

@@ -0,0 +1,18 @@
+import logging
+from asyncio import run
+
+from x_model import init_db
+
+from xync_bot import XyncBot
+from xync_bot.loader import TOKEN
+
+if __name__ == "__main__":
+    from xync_bot.loader import TORM
+
+    logging.basicConfig(level=logging.INFO)
+
+    async def main() -> None:
+        cn = await init_db(TORM)
+        await XyncBot(TOKEN, cn).start()
+
+    run(main())

xync_bot-0.3.31.dev0/xync_bot/loader.py

@@ -0,0 +1,23 @@
+from dotenv import load_dotenv
+from os import getenv as env
+
+from xync_schema import models
+
+load_dotenv()
+
+PG_DSN = (
+    f"postgres://{env('POSTGRES_USER')}:{env('POSTGRES_PASSWORD')}@{env('POSTGRES_HOST', 'dbs')}"
+    f":{env('POSTGRES_PORT', 5432)}/{env('POSTGRES_DB', env('POSTGRES_USER'))}"
+)
+TOKEN = env("TOKEN")
+API_URL = "https://" + env("API_DOMAIN")
+WH_URL = API_URL + "/wh/" + TOKEN
+
+TORM = {
+    "connections": {"default": PG_DSN},
+    "apps": {"models": {"models": [models, "aerich.models"]}},
+    "use_tz": False,
+    "timezone": "UTC",
+}
+
+glob = object

xync_bot-0.3.31.dev0/xync_bot/routers/__init__.py

@@ -0,0 +1,41 @@
+import logging
+
+from aiogram import Router, F
+from aiogram.enums import ContentType
+from aiogram.exceptions import TelegramBadRequest
+from aiogram.types import Message
+
+last = Router(name="last")
+
+
+@last.message(
+    F.content_type.not_in(
+        {
+            ContentType.NEW_CHAT_MEMBERS,
+            # ContentType.LEFT_CHAT_MEMBER,
+            # ContentType.SUPERGROUP_CHAT_CREATED,
+            # ContentType.NEW_CHAT_PHOTO,
+            # ContentType.FORUM_TOPIC_CREATED,
+            # ContentType.FORUM_TOPIC_EDITED,
+            ContentType.FORUM_TOPIC_CLOSED,
+            # ContentType.GENERAL_FORUM_TOPIC_HIDDEN, # deletable
+        }
+    )
+)
+async def del_cbq(msg: Message):
+    try:
+        await msg.delete()
+        logging.info({"DELETED": msg.model_dump(exclude_none=True)})
+    except TelegramBadRequest:
+        logging.error({"NOT_DELETED": msg.model_dump(exclude_none=True)})
+
+
+@last.message()
+async def all_rest(msg: Message):
+    logging.warning(
+        {
+            "NO_HANDLED": msg.model_dump(
+                exclude_none=True,
+            )
+        }
+    )