From 8c3f7d36d89244704dc4c8dc4ea71b62b899ae7f Mon Sep 17 00:00:00 2001 From: Redume Date: Sun, 31 Dec 2023 12:43:45 +0300 Subject: [PATCH 1/5] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B8=D0=BB=20=D0=B1?= =?UTF-8?q?=D0=BE=D1=82=D0=B0=20=D0=B4=D0=BE=20+-=20=D1=80=D0=B0=D0=B1?= =?UTF-8?q?=D0=BE=D1=87=D0=B5=D0=B3=D0=BE=20=D1=81=D0=BE=D1=81=D1=82=D0=BE?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.py | 119 +++++++++++++++++++++++++++++++------------------------- 1 file changed, 67 insertions(+), 52 deletions(-) diff --git a/main.py b/main.py index 619a7a7..83e222a 100644 --- a/main.py +++ b/main.py @@ -1,24 +1,32 @@ #!/usr/bin/env python3 -import aiohttp.client_exceptions -from pydantic.v1 import BaseSettings -from typing import List, Any, Dict, Optional -import logging - -from aiogram import Dispatcher, types, Bot - -import requests -import json - -import hashlib import asyncio - +import hashlib +import json +import logging import re + import string +from typing import List, Any, Dict, Optional + +import requests +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 from .env class Settings(BaseSettings): debug: bool + timeout: int = 2 + ndigits: int = 3 coinapi_keys: List[str] telegram_token: str @@ -27,8 +35,11 @@ class Settings(BaseSettings): env_file_encoding = 'utf-8' -settings = Settings() +settings = Settings() # type: ignore +# --- + +# Logging log = logging.getLogger('shirino') handler = logging.StreamHandler() fmt = logging.Formatter('%(asctime)s %(levelname)s %(message)s') @@ -39,32 +50,34 @@ log.addHandler(handler) if settings.debug: handler.setLevel(logging.DEBUG) log.setLevel(logging.DEBUG) +# --- + coinapi_len = len(settings.coinapi_keys) -coinapi_active = [0] - +coinapi_active = [0] # API key index dp = Dispatcher() -DDG_URL = 'https://duckduckgo.com/js/spice/currency' -COINAPI_URL = 'https://rest.coinapi.io/v1/exchangerate' +class CurrencyConverter: -class Currency: def __init__(self) -> None: + self.amount: float = 1.0 - self.conv_amount: float = 1.0 + self.conv_amount: float = 0.0 self.from_currency = '' self.conv_currency = '' def convert(self) -> None: - if not self.ddg(): + """Currency conversion""" + + if not self.ddgapi(): self.coinapi() str_amount = f'{self.conv_amount}' - point = str_amount.find('.') + point = str_amount.find(".") after_point = str_amount[point + 1:] - fnz = min( + fnz = min( # index of first non-zero digit ( after_point.index(i) for i in string.digits[1:] @@ -79,16 +92,21 @@ class Currency: # how many digits should be after the point: # ndigits (3 by default) after first non-zero - ndigits = fnz + 3 + ndigits = fnz + settings.ndigits self.conv_amount = round(self.conv_amount, ndigits) - def ddg(self) -> float: + def ddgapi(self) -> bool: """Получение данных фиатной валюты через DuckDuckGo e.g: https://duckduckgo.com/js/spice/currency/1/USD/RUB + + Returns: + `False` если валюты нет в API + `True` если конвертация прошла успешно """ + # Запрос к API 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]) @@ -101,7 +119,6 @@ class Currency: conv_amount = conv.get("mid") if conv_amount is None: - print("FUCK") raise RuntimeError('Ошибка при конвертации валюты через DuckDuckGo') log.debug(conv) @@ -115,7 +132,7 @@ class Currency: """Получение данных с CoinAPI для получения курса криптовалюты Args: - depth (int, optional): Счетчик, защищающий от бесконечной рекурсии + depth (int, optional): Счетчик, защищающий от рекурсии """ if depth <= 0: @@ -129,7 +146,7 @@ class Currency: headers={ 'X-CoinAPI-Key': settings.coinapi_keys[coinapi_active[0]], }, - timeout=3, + timeout=settings.timeout, ) if resp.status_code == 429: @@ -163,53 +180,51 @@ async def currency(inline_query: types.InlineQuery) -> None: args = query.split() result_id = hashlib.md5(query.encode()).hexdigest() - conv = Currency() + conv = CurrencyConverter() try: - if len(args) == 0: - article[0] = types.InlineQueryResultArticle( - id=result_id, - title="Требуется 2, либо 3 аргумента", - description=f"@shirino_bot USD RUB \n@shirino_bot 12 USD RUB", - input_message_content=types.InputTextMessageContent( - message_text="Требуется 2, либо 3 аргумента" - ) - ) - - elif args[0].isdigit() or re.match(r'^-?\d+(?:\.\d+)$', args[0]) is not None: + if len(args) == 3: + conv.amount = float(args[0]) conv.from_currency = args[1].upper() conv.conv_currency = args[2].upper() conv.convert() - elif type(args[0]) is str: + elif len(args) == 2: conv.from_currency = args[0].upper() conv.conv_currency = args[1].upper() conv.convert() + else: + raise ValueError('Надо 2 или 3 аргумента') - result_title = f'{conv.amount} {conv.from_currency} = {conv.conv_amount} {conv.conv_currency}' - result_desc = None + result = ( + f'{conv.amount} {conv.from_currency} = ' + f'{conv.conv_amount} {conv.conv_currency}' + ) - - except aiohttp.client_exceptions.ClientError: - result_title = 'Произошла ошибка' - result_desc = 'Рейт-лимит от api telegram, попробуйте позже' + except aiohttp.client_exceptions.ClientError as ex: + article[0] = types.InlineQueryResultArticle( + id=result_id, + title="Rate-limit от API Telegram, повторите запрос позже.", + input_message_content=types.InputTextMessageContent( + message_text="Rate-limit от API Telegram, повторите запрос позже.", + ) + ) + log.debug(ex) await asyncio.sleep(1) except Exception as ex: log.debug(ex) - result_title = 'Произошла ошибка' - result_desc = f'{type(ex).__name__}: {ex}' + result = f'{type(ex).__name__}: {ex}' article[0] = types.InlineQueryResultArticle( id=result_id, - title=result_title, - description=result_desc, + title=result, input_message_content=types.InputTextMessageContent( - message_text=f"{result_title} \n{result_desc}", + message_text=result, ), ) await inline_query.answer( - article, + article, # type: ignore cache_time=1, is_personal=True, ) From f13ff07de736884beabef740bd2c250d3fd1867a Mon Sep 17 00:00:00 2001 From: Redume Date: Sun, 31 Dec 2023 13:26:38 +0300 Subject: [PATCH 2/5] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D0=BD=D0=BE=D0=B2=D0=BE=D0=B3=D0=BE=20?= =?UTF-8?q?=D1=83=D1=81=D0=BB=D0=BE=D0=B2=D0=B8=D1=8F=20=D0=B5=D1=89=D0=B5?= =?UTF-8?q?=20=D1=87=D0=B5=20=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.py | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/main.py b/main.py index 83e222a..dbd9658 100644 --- a/main.py +++ b/main.py @@ -183,6 +183,22 @@ async def currency(inline_query: types.InlineQuery) -> None: conv = CurrencyConverter() try: + log.debug(len(args)) + if len(args) <= 1: + article[0] = types.InlineQueryResultArticle( + id=result_id, + title="Требуется 2, либо 3 аргумента", + description=f"@shirino_bot USD RUB \n@shirino_bot 12 USD RUB", + input_message_content=types.InputTextMessageContent( + message_text="Требуется 2, либо 3 аргумента" + ) + ) + + await inline_query.answer( + article, + cache_time=1, + is_personal=True, + ) if len(args) == 3: conv.amount = float(args[0]) conv.from_currency = args[1].upper() @@ -192,8 +208,6 @@ async def currency(inline_query: types.InlineQuery) -> None: conv.from_currency = args[0].upper() conv.conv_currency = args[1].upper() conv.convert() - else: - raise ValueError('Надо 2 или 3 аргумента') result = ( f'{conv.amount} {conv.from_currency} = ' From bc9098cd148640f395964df72e0b94be1f18c840 Mon Sep 17 00:00:00 2001 From: Redume Date: Sun, 31 Dec 2023 14:12:13 +0300 Subject: [PATCH 3/5] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B4=D0=B5=D0=BB?= =?UTF-8?q?=D0=B0=D0=BD=D1=8B=20=D0=BE=D1=82=D0=B2=D0=B5=D1=82=D1=8B,=20?= =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D1=8C=D1=88=D0=B5=20=D0=B3=D0=BE=D0=B2=D0=BD?= =?UTF-8?q?=D0=BE=D0=BA=D0=BE=D0=B4=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.py | 63 +++++++++++++++++++++++++-------------------------------- 1 file changed, 28 insertions(+), 35 deletions(-) diff --git a/main.py b/main.py index dbd9658..ceb56be 100644 --- a/main.py +++ b/main.py @@ -13,6 +13,7 @@ import requests from aiogram import Dispatcher, types, Bot import aiohttp.client_exceptions from pydantic.v1 import BaseSettings +from selenium.webdriver.common.actions import interaction # Constants DDG_URL = 'https://duckduckgo.com/js/spice/currency' @@ -172,11 +173,27 @@ def rotate_token(lst: List[str], active: List[int]) -> None: 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] + article[0] = types.InlineQueryResultArticle( + id=result_id, + title=title, + description=description, + input_message_content=types.InputTextMessageContent( + message_text=title + ) + ) + + await inline_query.answer( + article, + cache_time=1, + is_personal=True, + ) + + @dp.inline_query() async def currency(inline_query: types.InlineQuery) -> None: query = inline_query.query - article: List[Optional[types.InlineQueryResultArticle]] = [None] - args = query.split() result_id = hashlib.md5(query.encode()).hexdigest() @@ -185,20 +202,10 @@ async def currency(inline_query: types.InlineQuery) -> None: try: log.debug(len(args)) if len(args) <= 1: - article[0] = types.InlineQueryResultArticle( - id=result_id, - title="Требуется 2, либо 3 аргумента", - description=f"@shirino_bot USD RUB \n@shirino_bot 12 USD RUB", - input_message_content=types.InputTextMessageContent( - message_text="Требуется 2, либо 3 аргумента" - ) - ) + await inline_reply(result_id, + "Требуется 2, либо 3 аргумента", + f"@shirino_bot USD RUB \n@shirino_bot 12 USD RUB", inline_query) - await inline_query.answer( - article, - cache_time=1, - is_personal=True, - ) if len(args) == 3: conv.amount = float(args[0]) conv.from_currency = args[1].upper() @@ -215,13 +222,11 @@ async def currency(inline_query: types.InlineQuery) -> None: ) except aiohttp.client_exceptions.ClientError as ex: - article[0] = types.InlineQueryResultArticle( - id=result_id, - title="Rate-limit от API Telegram, повторите запрос позже.", - input_message_content=types.InputTextMessageContent( - message_text="Rate-limit от API Telegram, повторите запрос позже.", - ) - ) + await inline_reply(result, + "Rate-limit от API Telegram, повторите запрос позже", + None, + inline_query) + log.debug(ex) await asyncio.sleep(1) @@ -229,19 +234,7 @@ async def currency(inline_query: types.InlineQuery) -> None: log.debug(ex) result = f'{type(ex).__name__}: {ex}' - article[0] = types.InlineQueryResultArticle( - id=result_id, - title=result, - input_message_content=types.InputTextMessageContent( - message_text=result, - ), - ) - - await inline_query.answer( - article, # type: ignore - cache_time=1, - is_personal=True, - ) + await inline_reply(result, result, None, inline_query) async def main() -> None: From 88b7fc6063f2ddd03d81822e1cbfb0b3a83a52aa Mon Sep 17 00:00:00 2001 From: Redume Date: Sun, 31 Dec 2023 14:19:28 +0300 Subject: [PATCH 4/5] =?UTF-8?q?=D1=8E=D0=B7=D0=B5=D1=80=20=D1=84=D1=80?= =?UTF-8?q?=D0=B5=D0=BD=D0=B4=D0=BB=D0=B8=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/main.py b/main.py index ceb56be..9412ff2 100644 --- a/main.py +++ b/main.py @@ -222,7 +222,7 @@ async def currency(inline_query: types.InlineQuery) -> None: ) except aiohttp.client_exceptions.ClientError as ex: - await inline_reply(result, + await inline_reply(result_id, "Rate-limit от API Telegram, повторите запрос позже", None, inline_query) @@ -232,9 +232,11 @@ async def currency(inline_query: types.InlineQuery) -> None: except Exception as ex: log.debug(ex) - result = f'{type(ex).__name__}: {ex}' + await inline_reply(result_id, "Неверный формат данных", + "@shirino_bot USD RUB \n@shirino_bot 12 USD RUB", + inline_query) - await inline_reply(result, result, None, inline_query) + await inline_reply(result_id, result, None, inline_query) async def main() -> None: From 6b943ad40abb425d8943b60a11f343c47e502d37 Mon Sep 17 00:00:00 2001 From: Redume Date: Sun, 31 Dec 2023 14:31:19 +0300 Subject: [PATCH 5/5] =?UTF-8?q?=D0=BE=D1=82=D0=BA=D1=83=D0=B4=D0=B0=20?= =?UTF-8?q?=D1=82=D1=83=D1=82=20=D1=81=D0=B5=D0=BB=D0=B5=D0=B4=D0=BA=D0=B0?= =?UTF-8?q?=3F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.py | 1 - 1 file changed, 1 deletion(-) diff --git a/main.py b/main.py index 9412ff2..55e612a 100644 --- a/main.py +++ b/main.py @@ -13,7 +13,6 @@ import requests from aiogram import Dispatcher, types, Bot import aiohttp.client_exceptions from pydantic.v1 import BaseSettings -from selenium.webdriver.common.actions import interaction # Constants DDG_URL = 'https://duckduckgo.com/js/spice/currency'