From 90c1717b6b87c4ddbc7dde9a0e63f789bedd7cc4 Mon Sep 17 00:00:00 2001 From: Redume Date: Wed, 8 Jan 2025 22:52:12 +0300 Subject: [PATCH 1/9] refactor(convert): Rewrote the requests to aiohttp. Reverted the old query algorithm, first kekkai, then ddg --- functions/convert.py | 74 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 functions/convert.py diff --git a/functions/convert.py b/functions/convert.py new file mode 100644 index 0000000..7c18700 --- /dev/null +++ b/functions/convert.py @@ -0,0 +1,74 @@ +from utils.format_number import format_number + +import yaml + +import aiohttp +import json +import re + +from datetime import datetime +from http import HTTPStatus +from decimal import Decimal, ROUND_DOWN +from utils.format_number import format_number + +config = yaml.safe_load(open('config.yaml')) + +class Converter: + def __init__(self): + self.amount: float = 1.0 + self.conv_amount: float = 0.0 + self.from_currency: str = '' + self.conv_currency: str = '' + + async def convert(self) -> None: + if not await self.kekkai(): + await self.ddg() + + number = Decimal(str(self.conv_amount)) + self.conv_amount = format_number(number.quantize(Decimal('1.0000'), rounding=ROUND_DOWN)) + + + async def kekkai(self) -> bool: + date = datetime.today().strftime('%Y-%m-%d') + + async with aiohttp.ClientSession(timeout=aiohttp.ClientTimeout(total=3)) as session: + async with session.get(f'{config['kekkai_instance']}/api/getRate/', params={ + 'from_currency': self.from_currency, + 'conv_currency': self.conv_currency, + 'date': date, + 'conv_amount': self.amount + }, + timeout=3) as res: + if not HTTPStatus(res.status).is_success: + return False + + data = await res.json() + self.conv_amount = data.get('conv_amount', 0.0) + + return True + + + async def ddg(self) -> None: + async with aiohttp.ClientSession(timeout=aiohttp.ClientTimeout(total=3)) as session: + async with session.get( + 'https://duckduckgo.com/js/spice/currency/' + f'{self.amount}/{self.from_currency}/{self.conv_currency}' + ) as res: + + data_text = await res.text() + + data = json.loads(re.findall(r'\(\s*(.*)\s*\);$', data_text)[0]) + + for key in ['terms', 'privacy', 'timestamp']: + data.pop(key, None) + + if len(data.get('to')) == 0: + raise RuntimeError('Failed to get the exchange rate from DuckDuckGo') + + conv = data.get('to')[0] + conv_amount = conv.get('mid') + + if conv_amount is None: + raise RuntimeError('Error when converting currency via DuckDuckGo') + + self.conv_amount = float(conv_amount) From 8cc073c47335ea5773255f9e71fe10800cb46d8b Mon Sep 17 00:00:00 2001 From: Redume Date: Wed, 8 Jan 2025 22:58:12 +0300 Subject: [PATCH 2/9] chore: Returned the formatting and the inline query response --- utils/format_number.py | 14 ++++++++++++++ utils/inline_query.py | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 utils/format_number.py create mode 100644 utils/inline_query.py diff --git a/utils/format_number.py b/utils/format_number.py new file mode 100644 index 0000000..0694895 --- /dev/null +++ b/utils/format_number.py @@ -0,0 +1,14 @@ +def format_number(number): + number_str = str(number) + + if '.' in number_str: + integer_part, fractional_part = number_str.split('.') + else: + integer_part, fractional_part = number_str, '' + + formatted_integer_part = '{:,}'.format(int(integer_part)).replace(',', ' ') + + if fractional_part: + return formatted_integer_part + '.' + fractional_part + else: + return formatted_integer_part \ No newline at end of file diff --git a/utils/inline_query.py b/utils/inline_query.py new file mode 100644 index 0000000..edf921d --- /dev/null +++ b/utils/inline_query.py @@ -0,0 +1,34 @@ +from aiogram import types + + +async def reply(result_id: str, args: list, query: types.InlineQuery) -> None: + if not args: + return + + articles = [] + + for idx, arg in enumerate(args): + title = arg[0] + description = arg[1] if arg[1] else None + img = arg[2] if arg[2] else None + + + article = types.InlineQueryResultArticle( + id=f"{result_id}_{idx}", + title=title, + thumbnail_url=img, + description=description, + input_message_content=types.InputTextMessageContent( + message_text=title, + parse_mode='markdown' + ) + ) + + articles.append(article) + + await query.answer( + results=articles, + parse_mode='markdown', + cache_time=0, + is_personal=True + ) \ No newline at end of file From c7ab4b72f9f0644c0661bfa13c5ee4224c9305d8 Mon Sep 17 00:00:00 2001 From: Redume Date: Thu, 9 Jan 2025 00:02:42 +0300 Subject: [PATCH 3/9] chore: deleted timeout in request --- functions/convert.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/functions/convert.py b/functions/convert.py index 7c18700..1e898c4 100644 --- a/functions/convert.py +++ b/functions/convert.py @@ -37,8 +37,7 @@ class Converter: 'conv_currency': self.conv_currency, 'date': date, 'conv_amount': self.amount - }, - timeout=3) as res: + }) as res: if not HTTPStatus(res.status).is_success: return False From f122614b9fb84f23c9fc00db9595872a3e1d622d Mon Sep 17 00:00:00 2001 From: Redume Date: Thu, 9 Jan 2025 00:03:19 +0300 Subject: [PATCH 4/9] chore: Made a regular expression to remove the graph reference from the previews --- utils/inline_query.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/utils/inline_query.py b/utils/inline_query.py index edf921d..282ad95 100644 --- a/utils/inline_query.py +++ b/utils/inline_query.py @@ -1,5 +1,6 @@ from aiogram import types +import re async def reply(result_id: str, args: list, query: types.InlineQuery) -> None: if not args: @@ -15,7 +16,7 @@ async def reply(result_id: str, args: list, query: types.InlineQuery) -> None: article = types.InlineQueryResultArticle( id=f"{result_id}_{idx}", - title=title, + title=re.sub(r'\bГрафик\b|\[([^\]]+)\]\([^)]+\)', '', title, flags=re.IGNORECASE), thumbnail_url=img, description=description, input_message_content=types.InputTextMessageContent( From d8d6635987fc6d68ec5a8346e2b27998cf2f0497 Mon Sep 17 00:00:00 2001 From: Redume Date: Thu, 9 Jan 2025 00:04:31 +0300 Subject: [PATCH 5/9] refactor: Rewrote the creation of graphs on aiohttp --- functions/create_chart.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 functions/create_chart.py diff --git a/functions/create_chart.py b/functions/create_chart.py new file mode 100644 index 0000000..078effb --- /dev/null +++ b/functions/create_chart.py @@ -0,0 +1,19 @@ +import yaml +import aiohttp + +from http import HTTPStatus + +config = yaml.safe_load(open('config.yaml')) + +async def create_chart(from_currency: str, conv_currency: str) -> (dict, None): + async with aiohttp.ClientSession(timeout=aiohttp.ClientTimeout(total=3)) as session: + async with session.get(f'{config["kekkai_instance"]}/api/getChart/week/', params={ + 'from_currency': from_currency, + 'conv_currency': conv_currency + }) as res: + if not HTTPStatus(res.status).is_success: + return None + + data = await res.json() + + return data.get('message', None) From 234e8bf244ef395663dd395f732329b463fbe05b Mon Sep 17 00:00:00 2001 From: Redume Date: Thu, 9 Jan 2025 00:18:24 +0300 Subject: [PATCH 6/9] fix: handle exponential notation and large numbers in format_number function --- utils/format_number.py | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/utils/format_number.py b/utils/format_number.py index 0694895..fe0de81 100644 --- a/utils/format_number.py +++ b/utils/format_number.py @@ -1,14 +1,12 @@ +from decimal import Decimal + def format_number(number): - number_str = str(number) - - if '.' in number_str: - integer_part, fractional_part = number_str.split('.') - else: - integer_part, fractional_part = number_str, '' - - formatted_integer_part = '{:,}'.format(int(integer_part)).replace(',', ' ') - - if fractional_part: + number = Decimal(str(number)) + + formatted_integer_part = '{:,.0f}'.format(number).replace(',', ' ') + + if '.' in str(number): + fractional_part = str(number).split('.')[1] return formatted_integer_part + '.' + fractional_part else: - return formatted_integer_part \ No newline at end of file + return formatted_integer_part From a1ad2d16944670fd4a3efa479e7420f5d1f89e7a Mon Sep 17 00:00:00 2001 From: Redume Date: Thu, 9 Jan 2025 00:19:00 +0300 Subject: [PATCH 7/9] refactor: Bot rewritten to webhooks, duplicate code removed --- main.py | 84 ++++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 65 insertions(+), 19 deletions(-) diff --git a/main.py b/main.py index b9ef92b..80a3632 100644 --- a/main.py +++ b/main.py @@ -1,34 +1,83 @@ -import logging -import sys +from functions.convert import Converter +from utils.format_number import format_number +from utils.inline_query import reply +from functions.create_chart import create_chart import yaml from aiohttp import web -from aiogram import Bot, Dispatcher, Router +from aiogram import Bot, Dispatcher, Router, types from aiogram.client.default import DefaultBotProperties from aiogram.enums import ParseMode -from aiogram.filters import CommandStart -from aiogram.types import Message -from aiogram.utils.markdown import hbold from aiogram.webhook.aiohttp_server import SimpleRequestHandler, setup_application +import hashlib + config = yaml.safe_load(open('config.yaml')) +bot = Bot(token=config['telegram_token'], default=DefaultBotProperties(parse_mode=ParseMode.HTML)) router = Router() -@router.message() -async def echo_handler(message: Message) -> None: - try: - # Send a copy of the received message - await message.send_copy(chat_id=message.chat.id) - except TypeError: - # But not all the types is supported to be copied so need to handle it - await message.answer("Nice try!") +@router.inline_query() +async def currency(query: types.InlineQuery) -> None: + text = query.query.lower() + args = text.split() + result_id = hashlib.md5(text.encode()).hexdigest() + + if len(args) < 2: + get_bot = await bot.get_me() + return await reply(result_id, + [("2 or 3 arguments are required.", + f'@{get_bot.username} USD RUB \n' + f'@{get_bot.username} 12 USD RUB', + None, None)], + query) + + conv = Converter() + + from_currency, conv_currency = '', '' + + if len(args) == 3: + conv.amount = float(args[0].replace(',', '.')) + from_currency = args[1] + conv_currency = args[2] + elif len(args) == 2: + from_currency = args[0] + conv_currency = args[1] + else: + return await reply(result_id, + [( + 'The source and target currency could not be determined.', + None, None + )], + query) + + if not conv_currency or not from_currency: + return await reply(result_id, [('The currency exchange rate could not be found.', None, None)], query) + + conv.from_currency = from_currency.upper() + conv.conv_currency = conv_currency.upper() + await conv.convert() + + chart = await create_chart(from_currency, conv_currency) + + message = f'{format_number(conv.amount)} {conv.from_currency} = {conv.conv_amount} {conv.conv_currency}' + + results = [(message, None, None)] + + if chart: + results.insert(0, (f'{message}\n[График]({chart})', None, chart)) + + await reply(result_id, results, query) + async def on_startup(bot: Bot) -> None: - # Убедитесь, что передаете HTTPS URL - await bot.set_webhook(f"{config['webhook']['base_url']}{config['webhook']['path']}", secret_token=config['webhook']['secret_token']) + await bot.set_webhook( + f"{config['webhook']['base_url']}{config['webhook']['path']}", + secret_token=config['webhook']['secret_token'], + allowed_updates=['inline_query'] + ) def main() -> None: @@ -37,8 +86,6 @@ def main() -> None: dp.include_router(router) dp.startup.register(on_startup) - bot = Bot(token=config['telegram_token'], default=DefaultBotProperties(parse_mode=ParseMode.HTML)) - app = web.Application() webhook_requests_handler = SimpleRequestHandler( dispatcher=dp, @@ -53,5 +100,4 @@ def main() -> None: if __name__ == '__main__': - logging.basicConfig(level=logging.INFO, stream=sys.stdout) main() From 0ca150eec8822ca114bec20ff2a38e0cddc6a956 Mon Sep 17 00:00:00 2001 From: Redume Date: Thu, 9 Jan 2025 00:29:34 +0300 Subject: [PATCH 8/9] fix: did a check for negative numbers --- main.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/main.py b/main.py index 80a3632..a90008a 100644 --- a/main.py +++ b/main.py @@ -39,7 +39,13 @@ async def currency(query: types.InlineQuery) -> None: from_currency, conv_currency = '', '' if len(args) == 3: - conv.amount = float(args[0].replace(',', '.')) + try: + conv.amount = float(args[0].replace(',', '.')) + if conv.amount < 0: + raise ValueError("Negative amounts are not supported.") + except ValueError: + return await reply(result_id, [("Please enter a positive amount.", None, None)], query) + from_currency = args[1] conv_currency = args[2] elif len(args) == 2: From 0537bfe3cf74aae08d3fc6acdbe7efa86a788c97 Mon Sep 17 00:00:00 2001 From: Redume Date: Thu, 9 Jan 2025 00:55:50 +0300 Subject: [PATCH 9/9] fix: Fixed conditions with negative numbers and if text is written instead of number --- main.py | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/main.py b/main.py index a90008a..ff5a6d1 100644 --- a/main.py +++ b/main.py @@ -25,14 +25,15 @@ async def currency(query: types.InlineQuery) -> None: args = text.split() result_id = hashlib.md5(text.encode()).hexdigest() + get_bot = await bot.get_me() + if len(args) < 2: - get_bot = await bot.get_me() - return await reply(result_id, - [("2 or 3 arguments are required.", - f'@{get_bot.username} USD RUB \n' - f'@{get_bot.username} 12 USD RUB', - None, None)], - query) + return await reply(result_id, + [("2 or 3 arguments are required.", + f'@{get_bot.username} USD RUB \n' + f'@{get_bot.username} 12 USD RUB', + None, None)], + query) conv = Converter() @@ -42,9 +43,13 @@ async def currency(query: types.InlineQuery) -> None: try: conv.amount = float(args[0].replace(',', '.')) if conv.amount < 0: - raise ValueError("Negative amounts are not supported.") + return await reply(result_id, [("Negative amounts are not supported.", None, None)], query) + except ValueError: - return await reply(result_id, [("Please enter a positive amount.", None, None)], query) + return await reply(result_id, [("Please enter a valid number for the amount.", + f'@{get_bot.username} USD RUB \n' + f'@{get_bot.username} 12 USD RUB', + None, None)], query) from_currency = args[1] conv_currency = args[2]