From 1e2e7565db1ec8edcb07fc08b80163183ed560ba Mon Sep 17 00:00:00 2001 From: Redume Date: Fri, 14 Jun 2024 14:01:03 +0300 Subject: [PATCH 1/7] =?UTF-8?q?=D0=97=D0=B0=D0=BC=D0=B5=D0=BD=D0=B0=20?= =?UTF-8?q?=D0=BA=D0=BE=D0=BD=D1=84=D0=B8=D0=B3=D0=B0=20=D0=BD=D0=B0=20yam?= =?UTF-8?q?l,=20=D1=81=20.env?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env_sample | 5 ----- config_sample.yaml | 7 +++++++ 2 files changed, 7 insertions(+), 5 deletions(-) delete mode 100644 .env_sample create mode 100644 config_sample.yaml diff --git a/.env_sample b/.env_sample deleted file mode 100644 index 1ef3619..0000000 --- a/.env_sample +++ /dev/null @@ -1,5 +0,0 @@ -DEBUG=false # debug logging -TIMEOUT=2 # http requests timeout -NDIGITS=3 # digits after floating point or after zeroes -COINAPI_KEYS=["key"] # coinapi keys list -TELEGRAM_TOKEN= # telegram bot token diff --git a/config_sample.yaml b/config_sample.yaml new file mode 100644 index 0000000..d4ae8e7 --- /dev/null +++ b/config_sample.yaml @@ -0,0 +1,7 @@ +debug: false # debug logging +timeout: 2 # http requests timeout +ndigits: 3 # digits after floating point or after zeroes +coinapi_keys: + - key + - key2 # coinapi keys list +telegram_token: # telegram bot token From 1bd1bf9cb611f93bd2586d7e5d2344541a0424b1 Mon Sep 17 00:00:00 2001 From: Redume Date: Fri, 14 Jun 2024 14:01:31 +0300 Subject: [PATCH 2/7] =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D1=8B=D0=B5=20=D0=B2?= =?UTF-8?q?=D0=B5=D1=80=D1=81=D0=B8=D0=B8=20=D0=BC=D0=BE=D0=B4=D1=83=D0=BB?= =?UTF-8?q?=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- requirements.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index 17a1a25..a713e12 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -requests==2.31.0 -aiogram==3.1.1 -aiohttp==3.8.5 -pydantic[dotenv]==2.5.2 \ No newline at end of file +aiohttp~=3.9.5 +requests~=2.32.3 +PyYAML~=6.0.1 +aiogram~=3.7.0 \ No newline at end of file From 2d9ad91f49b6c71e1ca251bf672e247779433791 Mon Sep 17 00:00:00 2001 From: Redume Date: Fri, 14 Jun 2024 14:02:10 +0300 Subject: [PATCH 3/7] =?UTF-8?q?=D0=91=D0=BE=D1=82=20=D1=82=D0=B5=D0=BF?= =?UTF-8?q?=D0=B5=D1=80=D1=8C=20=D0=B1=D0=B5=D0=B7=20=D1=82=D0=B8=D0=BF?= =?UTF-8?q?=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D0=B8=20=D0=B4=D0=B0=D0=BD=D0=BD?= =?UTF-8?q?=D1=8B=D1=85,=20=D0=BA=D0=BE=D0=BD=D1=84=D0=B8=D0=B3=20=D1=82?= =?UTF-8?q?=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20yaml,=20=D1=83=D0=B4=D0=B0?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BB=D0=B8=D1=88=D0=BD=D0=B8?= =?UTF-8?q?=D0=B9=20=D0=B8=D0=BD=D1=84=D1=8B=20=D0=B2=20json=20=D1=87?= =?UTF-8?q?=D0=B5=D1=80=D0=B5=D0=B7=20=D1=80=D0=B5=D0=B3=D1=83=D0=BB=D1=8F?= =?UTF-8?q?=D1=80=D0=BA=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.py | 119 +++++++++++++++++--------------------------------------- 1 file changed, 36 insertions(+), 83 deletions(-) diff --git a/main.py b/main.py index 55e612a..edcbe19 100644 --- a/main.py +++ b/main.py @@ -1,45 +1,23 @@ #!/usr/bin/env python3 - import asyncio import hashlib import json -import logging -import re - import string -from typing import List, Any, Dict, Optional +import aiohttp import requests +import re +import logging +import yaml + from aiogram import Dispatcher, types, Bot -import aiohttp.client_exceptions -from pydantic.v1 import BaseSettings # Constants DDG_URL = 'https://duckduckgo.com/js/spice/currency' COINAPI_URL = 'https://rest.coinapi.io/v1/exchangerate' +config = yaml.safe_load(open("config.yaml")) -# --- - - -# Config from .env -class Settings(BaseSettings): - debug: bool - timeout: int = 2 - ndigits: int = 3 - coinapi_keys: List[str] - telegram_token: str - - class Config: - env_file = '.env' - env_file_encoding = 'utf-8' - - -settings = Settings() # type: ignore -# --- - - -# Logging log = logging.getLogger('shirino') handler = logging.StreamHandler() fmt = logging.Formatter('%(asctime)s %(levelname)s %(message)s') @@ -47,29 +25,26 @@ fmt = logging.Formatter('%(asctime)s %(levelname)s %(message)s') handler.setFormatter(fmt) log.addHandler(handler) -if settings.debug: +print(config) + +if config['debug']: handler.setLevel(logging.DEBUG) log.setLevel(logging.DEBUG) -# --- -coinapi_len = len(settings.coinapi_keys) -coinapi_active = [0] # API key index +coinapi_len = len(config['coinapi_keys']) +coinapi_active = [0] dp = Dispatcher() class CurrencyConverter: + def __init__(self): + self.amount = 1.0 + self.conv_amount = 0.0 + self.from_currency = 'RUB' + self.conv_currency = 'USD' - def __init__(self) -> None: - - self.amount: float = 1.0 - self.conv_amount: float = 0.0 - self.from_currency = '' - self.conv_currency = '' - - def convert(self) -> None: - """Currency conversion""" - + def convert(self): if not self.ddgapi(): self.coinapi() @@ -77,7 +52,7 @@ class CurrencyConverter: point = str_amount.find(".") after_point = str_amount[point + 1:] - fnz = min( # index of first non-zero digit + fnz = min( ( after_point.index(i) for i in string.digits[1:] @@ -87,35 +62,26 @@ class CurrencyConverter: ) if fnz == -1: - # it is an integer like 81.0 return - # how many digits should be after the point: - # ndigits (3 by default) after first non-zero - ndigits = fnz + settings.ndigits + ndigits = fnz + config['ndigits'] self.conv_amount = round(self.conv_amount, ndigits) - def ddgapi(self) -> bool: - """Получение данных фиатной валюты через DuckDuckGo - - e.g: https://duckduckgo.com/js/spice/currency/1/USD/RUB - - Returns: - `False` если валюты нет в API - `True` если конвертация прошла успешно - """ - - # Запрос к API + def ddgapi(self): res = requests.get(f'{DDG_URL}/{self.amount}/{self.from_currency}/{self.conv_currency}') - data: Dict[str, Any] = json.loads(re.findall(r'(.+)\);', res.text)[0]) + data = json.loads(re.findall(r'\(\s*(.*)\s*\);$', res.text)[0]) + + del data['terms'] + del data['privacy'] + del data['timestamp'] log.debug(data) if len(data.get('to')) == 0: return False - conv: Dict[str, str] = data.get('to')[0] + conv = data.get('to')[0] conv_amount = conv.get("mid") if conv_amount is None: @@ -128,13 +94,7 @@ class CurrencyConverter: return True - def coinapi(self, depth: int = coinapi_len) -> None: - """Получение данных с CoinAPI для получения курса криптовалюты - - Args: - depth (int, optional): Счетчик, защищающий от рекурсии - """ - + def coinapi(self, depth: int = config['coinapi_keys']): if depth <= 0: raise RecursionError('Рейтлимит на всех токенах') @@ -144,36 +104,29 @@ class CurrencyConverter: f'/{self.conv_currency}' ), headers={ - 'X-CoinAPI-Key': settings.coinapi_keys[coinapi_active[0]], + 'X-CoinAPI-Key': config['coinapi_keys'][coinapi_active[0]], }, - timeout=settings.timeout, + timeout=config['timeout'], ) if resp.status_code == 429: log.warning('CoinAPI ratelimited, rotating token') - rotate_token(settings.coinapi_keys, coinapi_active) + rotate_token(config['coinapi_keys'], coinapi_active) self.coinapi(depth - 1) - data: Dict[str, Any] = resp.json() + data = resp.json() rate = data.get('rate') if rate is None: raise RuntimeError('Не удалось получить курс валюты от CoinAPI') self.conv_amount = float(rate * self.amount) -def rotate_token(lst: List[str], active: List[int]) -> None: - """Смена API-ключей CoinAPI при ratelimits - - Args: - lst (List[str]): Список ключей - active (List[str]): Изменяемый объект с текущим ключевым индексом - """ - +def rotate_token(lst, active): active[0] = (active[0] + 1) % len(lst) -async def inline_reply(result_id: str, title: str, description: str or None, inline_query: types.InlineQuery) -> None: - article: List[Optional[types.InlineQueryResultArticle]] = [None] +async def inline_reply(result_id: str, title: str, description: str or None, inline_query: types.InlineQuery): + article = [None] article[0] = types.InlineQueryResultArticle( id=result_id, title=title, @@ -191,7 +144,7 @@ async def inline_reply(result_id: str, title: str, description: str or None, inl @dp.inline_query() -async def currency(inline_query: types.InlineQuery) -> None: +async def currency(inline_query: types.InlineQuery): query = inline_query.query args = query.split() @@ -239,7 +192,7 @@ async def currency(inline_query: types.InlineQuery) -> None: async def main() -> None: - bot = Bot(settings.telegram_token) + bot = Bot(config['telegram_token']) await dp.start_polling(bot) From cfdaa866d6c529cbe034672e2feabf6a6252806c Mon Sep 17 00:00:00 2001 From: Redume Date: Fri, 14 Jun 2024 14:02:19 +0300 Subject: [PATCH 4/7] =?UTF-8?q?=D0=B8=D0=B3=D0=BD=D0=BE=D1=80=20=D1=84?= =?UTF-8?q?=D0=B0=D0=B9=D0=BB=D0=BE=D0=B2=20=D0=BA=D0=BE=D0=BD=D1=84=D0=B8?= =?UTF-8?q?=D0=B3=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 32ec512..d306159 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,4 @@ __pycache__ .mypy_cache venv -.env +config.yaml \ No newline at end of file From 481e6e5016e143a1a84ff12677960faf7067c8ca Mon Sep 17 00:00:00 2001 From: Redume Date: Fri, 14 Jun 2024 14:04:53 +0300 Subject: [PATCH 5/7] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=B8=D0=BD=D1=84=D1=8B=20=D0=BA=D0=B0=D1=81?= =?UTF-8?q?=D0=B0=D1=82=D0=B5=D0=BB=D1=8C=D0=BD=D0=BE=20=D0=BA=D0=BE=D0=BD?= =?UTF-8?q?=D1=84=D0=B8=D0=B3=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index e5a2dd7..e495c1f 100644 --- a/README.md +++ b/README.md @@ -9,15 +9,18 @@ https://t.me/Shirino_bot Получите токен бота в телеграме и токен CoinAPI. Вставьте в файл `.env` в формате: -``` -COINAPI_KEYS=["Токен от CoinAPI"] -TELEGRAM_TOKEN=Токен Telegram-бота +```yaml +coinapi_keys: + - key1 + - key2 + - etc. +telegram_token: Токен Telegram-бота ``` В .env файл ещё можно такие переменные добавить: -``` -DEBUG=false или true, включает отладочные логи -TIMEOUT=таймаут для библиотеки requests, в секундах (2 по дефолту) +```yaml +debug: false или true, включает отладочные логи +timeout: таймаут для библиотеки requests, в секундах (2 по дефолту) ``` ## Хочу сделать пулл-реквест @@ -28,8 +31,11 @@ TIMEOUT=таймаут для библиотеки requests, в секундах ## Почему энв для CoinAPI -- список? Можно получить несколько ключей на разные почтовые ящики и все ключи вписать в список: -``` -COINAPI_KEYS=["первый", "второй", "и так далее"] +```yaml +coinapi_keys: + - key1 + - key2 + - etc. ``` Если вдруг один из них будет заблокирован по рейтлимиту, From 53603773753b35d10140be4d72d77f56a7f25fab Mon Sep 17 00:00:00 2001 From: Redume Date: Fri, 14 Jun 2024 14:10:46 +0300 Subject: [PATCH 6/7] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=20=D0=B2=20=D0=B4=D0=B5=D0=B1=D0=B0=D0=B3=20=D0=BB=D0=BE?= =?UTF-8?q?=D0=B3=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=20=D0=BA=D0=BE=D0=BD?= =?UTF-8?q?=D1=84=D0=B8=D0=B3=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/main.py b/main.py index edcbe19..d9ecce0 100644 --- a/main.py +++ b/main.py @@ -25,8 +25,6 @@ fmt = logging.Formatter('%(asctime)s %(levelname)s %(message)s') handler.setFormatter(fmt) log.addHandler(handler) -print(config) - if config['debug']: handler.setLevel(logging.DEBUG) log.setLevel(logging.DEBUG) @@ -192,6 +190,7 @@ async def currency(inline_query: types.InlineQuery): async def main() -> None: + log.debug(config) bot = Bot(config['telegram_token']) await dp.start_polling(bot) From c2d675aa09a44a1c441059879f999cd9fd8454e2 Mon Sep 17 00:00:00 2001 From: Redume Date: Fri, 14 Jun 2024 14:35:06 +0300 Subject: [PATCH 7/7] =?UTF-8?q?=D0=B2=D0=B5=D1=80=D0=BD=D1=83=D0=BB=20?= =?UTF-8?q?=D1=81=D1=82=D0=B0=D1=80=D1=82=20=D0=BA=D0=BE=D0=BC=D0=B0=D0=BD?= =?UTF-8?q?=D0=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/main.py b/main.py index d9ecce0..9fd20b1 100644 --- a/main.py +++ b/main.py @@ -11,6 +11,7 @@ import logging import yaml from aiogram import Dispatcher, types, Bot +from aiogram.filters import CommandStart # Constants DDG_URL = 'https://duckduckgo.com/js/spice/currency' @@ -189,6 +190,15 @@ async def currency(inline_query: types.InlineQuery): await inline_reply(result_id, result, None, inline_query) +@dp.message(CommandStart()) +async def start(message: types.Message): + await message.answer("Привет! Бот может показывать курс обмена криптовалюты и фиатной валюты. " + "Бот используется с помощью инлайн-команд: " + "`@shirino_bot 12 usd rub` или `@shirino_bot usd rub`" + "\n\nИсходный код опубликован на [Github](https://github.com/redume/shirino)", + parse_mode="markdown") + + async def main() -> None: log.debug(config) bot = Bot(config['telegram_token'])