From a89362205a64344434adc59a3a9b8fc475b2d6d9 Mon Sep 17 00:00:00 2001 From: Redume Date: Thu, 28 Nov 2024 21:50:03 +0300 Subject: [PATCH 1/2] chore: Divided the functionality into folders --- function/get_chart.py | 22 +++++++++++++++++ function/inline_query.py | 36 ++++++++++++++++++++++++++++ {function => utils}/convert.py | 2 +- {function => utils}/format_number.py | 0 4 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 function/get_chart.py create mode 100644 function/inline_query.py rename {function => utils}/convert.py (97%) rename {function => utils}/format_number.py (100%) diff --git a/function/get_chart.py b/function/get_chart.py new file mode 100644 index 0000000..a29a36e --- /dev/null +++ b/function/get_chart.py @@ -0,0 +1,22 @@ +from http import HTTPStatus + +import yaml +import requests +from urllib3 import HTTPSConnectionPool + +config = yaml.safe_load(open('config.yaml')) + +def get_chart(from_currency: str, conv_currency: str) -> (dict, None): + try: + res = requests.get(f'{config['kekkai_instance']}/api/getChart/week/', { + 'from_currency': from_currency, + 'conv_currency': conv_currency + }, timeout=3) + except requests.exceptions.ConnectionError: + return None + + if not HTTPStatus(res.status_code).is_success: + return None + + + return res.json().get('message', None) \ No newline at end of file diff --git a/function/inline_query.py b/function/inline_query.py new file mode 100644 index 0000000..5aed88f --- /dev/null +++ b/function/inline_query.py @@ -0,0 +1,36 @@ +import re + +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=re.sub(r'\[([^\[]+)\]\([^\)]+\)', '', title).replace('График', ''), + 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 diff --git a/function/convert.py b/utils/convert.py similarity index 97% rename from function/convert.py rename to utils/convert.py index bd983b8..acbd79d 100644 --- a/function/convert.py +++ b/utils/convert.py @@ -5,7 +5,7 @@ import json import re from decimal import Decimal, ROUND_DOWN -from function.format_number import format_number +from utils.format_number import format_number config = yaml.safe_load(open('config.yaml')) diff --git a/function/format_number.py b/utils/format_number.py similarity index 100% rename from function/format_number.py rename to utils/format_number.py From 4fbc2c6571841578a677baa1f40a50214c8d1c96 Mon Sep 17 00:00:00 2001 From: Redume Date: Thu, 28 Nov 2024 21:50:52 +0300 Subject: [PATCH 2/2] feat: If the charts API does not work, the suggestion will be removed from the responses --- main.py | 93 ++++++++++++++++++++------------------------------------- 1 file changed, 32 insertions(+), 61 deletions(-) diff --git a/main.py b/main.py index 45bab00..0b92670 100644 --- a/main.py +++ b/main.py @@ -2,16 +2,13 @@ from aiogram import Bot, Dispatcher, types import yaml import asyncio -import requests import hashlib -import json -from http import HTTPStatus -import re - -from function.convert import Converter -from function.format_number import format_number +from function.get_chart import get_chart +from utils.convert import Converter +from utils.format_number import format_number +from function.inline_query import reply dp = Dispatcher() config = yaml.safe_load(open('config.yaml')) @@ -43,7 +40,15 @@ async def currency(query: types.InlineQuery) -> None: 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) + return await reply(result_id, + [ + ( + 'The source and target currency could not be determined.', + None, + None + ) + ], + query) if not from_currency or not conv_currency: return await reply(result_id, [('The currency exchange rate could not be found.', None, None)], query) @@ -52,26 +57,33 @@ async def currency(query: types.InlineQuery) -> None: conv.conv_currency = conv_currency.upper() conv.convert() - req_chart = requests.get(f'{config['kekkai_instance']}/api/getChart/week/', { - 'from_currency': from_currency, - 'conv_currency': conv_currency - }, timeout=3) + chart = get_chart(from_currency, conv_currency) - if not HTTPStatus(req_chart.status_code).is_success: - req_chart = None - else: - req_chart = req_chart.json().get('message', None) + if not chart: + return await reply(result_id, + [ + ( + f'{format_number(conv.amount)} {conv.from_currency} ' + f'= {conv.conv_amount} {conv.conv_currency}' \ + f'\n{f'[График]({chart})' if chart else ''}', + None, + chart + ) + ], + query) await reply(result_id, [ ( - f'{format_number(conv.amount)} {conv.from_currency} = {conv.conv_amount} {conv.conv_currency}' \ - f'\n{f'[График]({req_chart})' if req_chart else ''}', + f'{format_number(conv.amount)} {conv.from_currency} ' + f'= {conv.conv_amount} {conv.conv_currency}' \ + f'\n{f'[График]({chart})' if chart else ''}', None, - req_chart + chart ), ( - f'{format_number(conv.amount)} {conv.from_currency} = {conv.conv_amount} {conv.conv_currency}', + f'{format_number(conv.amount)} {conv.from_currency} ' + f'= {conv.conv_amount} {conv.conv_currency}', None, None ) @@ -82,47 +94,6 @@ async def currency(query: types.InlineQuery) -> None: print(e) -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=remove_markdown(title).replace('График', ''), - 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 - ) - -def remove_markdown(text: str) -> str: - text = re.sub(r'\*([^\*]+)\*', r'\1', text) - text = re.sub(r'\_([^\_]+)\_', r'\1', text) - text = re.sub(r'\[([^\[]+)\]\([^\)]+\)', r'\1', text) - text = re.sub(r'[`]+([^`]+)`+', r'\1', text) - text = re.sub(r'~~([^~]+)~~', r'\1', text) - text = re.sub(r'\[([^\[]+)\]\([^\)]+\)', '', text) - return text - async def main() -> None: bot = Bot(config['telegram_token'])