From 4e0090e90e4aff8af754416ac44fb8ba463fa1a2 Mon Sep 17 00:00:00 2001 From: Redume Date: Sun, 25 Aug 2024 18:03:26 +0300 Subject: [PATCH 1/7] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8=D0=BB?= =?UTF-8?q?=20=D0=B3=D0=BE=D0=B4=20=D0=BB=D0=B8=D1=86=D1=83=D1=85=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index ecd20b0..bc0e7aa 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2023 Redume, DarkCat09 (Chechkenev Andrey) +Copyright (c) 2023-2024 Redume, DarkCat09 (Chechkenev Andrey) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From e2316f69b485f9e10300320d550bc0e7fe0e7c17 Mon Sep 17 00:00:00 2001 From: Redume Date: Sun, 25 Aug 2024 18:04:34 +0300 Subject: [PATCH 2/7] =?UTF-8?q?=D0=A0=D0=B0=D0=B7=D0=B4=D0=B5=D0=BB=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BA=D0=BE=D0=B4=20=D0=BD=D0=B0=20=D1=84=D0=B0=D0=B9?= =?UTF-8?q?=D0=BB=D1=8B.=20=D0=A0=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?= =?UTF-8?q?=D1=80=D0=B8=D0=BD=D0=B3=20=D0=BA=D0=BE=D0=B4=D0=B0.=20=D0=A2?= =?UTF-8?q?=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE?= =?UTF-8?q?=20=D0=BF=D0=B8=D1=81=D0=B0=D1=82=D1=8C=20=D0=BD=D0=B0=20=D1=80?= =?UTF-8?q?=D0=BE=D0=B4=D0=BD=D0=BE=D0=BC=20=D1=8F=D0=B7=D1=8B=D0=BA=D0=B5?= =?UTF-8?q?=20=D0=BA=D1=83=D1=80=D1=81=20=D0=B2=D0=B0=D0=BB=D1=8E=D1=82?= =?UTF-8?q?=D1=8B=20(e.g:=202=20=D1=80=D1=83=D0=B1=D0=BB=D1=8F=20=D0=B2=20?= =?UTF-8?q?=D0=B4=D0=BE=D0=BB=D0=BB=D0=B0=D1=80=D1=8B)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- function/convert.py | 85 ++++++++++++++++++ function/format_number.py | 14 +++ main.py | 177 +++++++++++--------------------------- 3 files changed, 147 insertions(+), 129 deletions(-) create mode 100644 function/convert.py create mode 100644 function/format_number.py diff --git a/function/convert.py b/function/convert.py new file mode 100644 index 0000000..308f3c2 --- /dev/null +++ b/function/convert.py @@ -0,0 +1,85 @@ +import yaml +import requests + +import json +import re + +from decimal import Decimal, ROUND_DOWN +from function.format_number import format_number + +config = yaml.safe_load(open('config.yaml')) + +coinapi_len = len(config['coinapi_keys']) +coinapi_active = [0] + + +class Converter: + def __init__(self): + self.amount: float = 1.0 + self.conv_amount: float = 0.0 + self.from_currency: str = '' + self.conv_currency: str = '' + + def convert(self) -> None: + if not self.ddg(): + self.coinapi() + + number = Decimal(str(self.conv_amount)) + + self.conv_amount = format_number(number.quantize(Decimal('1.00'), rounding=ROUND_DOWN)) + + def ddg(self) -> bool: + res = requests.get('https://duckduckgo.com/js/spice/currency' + f'/{self.amount}' + f'/{self.from_currency}' + f'/{self.conv_currency}') + + data = json.loads(re.findall(r'\(\s*(.*)\s*\);$', res.text)[0]) + + del data['terms'] + del data['privacy'] + del data['timestamp'] + + if len(data.get('to')) == 0: + return False + + conv = data.get('to')[0] + conv_amount = conv.get('mid') + + if conv_amount is None: + raise RuntimeError('Ошибка при конвертации валюты через DuckDuckGo') + + self.conv_amount = float(conv_amount) + + return True + + def coinapi(self, depth: int = config['coinapi_keys']) -> None: + if depth <= 0: + raise RecursionError('Rate limit on all tokens') + + resp = requests.get( + ( + 'https://rest.coinapi.io/v1/exchangerate' + f'/{self.from_currency}' + f'/{self.conv_currency}' + ), + headers={ + 'X-CoinAPI-Key': config['coinapi_keys'][coinapi_active[0]], + }, + timeout=config['timeout'], + ) + + if resp.status_code == 429: + rotate_token(config['coinapi_keys'], coinapi_active) + self.coinapi(depth - 1) + + data = resp.json() + rate = data.get('rate') + if rate is None: + raise RuntimeError('Failed to get the exchange rate from CoinAPI') + + self.conv_amount = float(rate * self.amount) + + +def rotate_token(lst, active) -> None: + active[0] = (active[0] + 1) % len(lst) diff --git a/function/format_number.py b/function/format_number.py new file mode 100644 index 0000000..8d475b9 --- /dev/null +++ b/function/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 diff --git a/main.py b/main.py index 9fd20b1..e8d1d7b 100644 --- a/main.py +++ b/main.py @@ -1,130 +1,59 @@ -#!/usr/bin/env python3 +from aiogram import Bot, Dispatcher, types + import asyncio -import hashlib -import json -import string - -import aiohttp -import requests -import re -import logging import yaml +import hashlib +import aiohttp +import json -from aiogram import Dispatcher, types, Bot -from aiogram.filters import CommandStart - -# Constants -DDG_URL = 'https://duckduckgo.com/js/spice/currency' -COINAPI_URL = 'https://rest.coinapi.io/v1/exchangerate' +from function.convert import Converter config = yaml.safe_load(open("config.yaml")) - -log = logging.getLogger('shirino') -handler = logging.StreamHandler() -fmt = logging.Formatter('%(asctime)s %(levelname)s %(message)s') - -handler.setFormatter(fmt) -log.addHandler(handler) - -if config['debug']: - handler.setLevel(logging.DEBUG) - log.setLevel(logging.DEBUG) - - -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' +@dp.message() +async def message_conv(message: types.Message): + query = message.text.split(' ') + conv = Converter() - def convert(self): - if not self.ddgapi(): - self.coinapi() + amount = query[0] + source_currency_alias = query[1] + target_currency_alias = query[3] - str_amount = f'{self.conv_amount}' - point = str_amount.find(".") - after_point = str_amount[point + 1:] + with open('currency.json', encoding='utf-8') as file: + currency_json = json.loads(file.read()) - fnz = min( - ( - after_point.index(i) - for i in string.digits[1:] - if i in after_point - ), - default=-1, - ) + source_currency_code = None + target_currency_code = None - if fnz == -1: + for currency_code, aliases in currency_json.items(): + if source_currency_alias in aliases: + source_currency_code = currency_code + + elif target_currency_alias in aliases: + target_currency_code = currency_code + + elif source_currency_code and target_currency_code: + break + else: return - ndigits = fnz + config['ndigits'] + if source_currency_code and target_currency_code: + conv.amount = float(amount) + conv.from_currency = source_currency_code.upper() + conv.conv_currency = target_currency_code.upper() + conv.convert() - self.conv_amount = round(self.conv_amount, ndigits) + result = ( + f'{conv.amount} {conv.from_currency} = ' + f'{conv.conv_amount} {conv.conv_currency}' + ) - def ddgapi(self): - res = requests.get(f'{DDG_URL}/{self.amount}/{self.from_currency}/{self.conv_currency}') - 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 = data.get('to')[0] - conv_amount = conv.get("mid") - - if conv_amount is None: - raise RuntimeError('Ошибка при конвертации валюты через DuckDuckGo') - - log.debug(conv) - log.debug(conv_amount) - - self.conv_amount = float(conv_amount) - - return True - - def coinapi(self, depth: int = config['coinapi_keys']): - if depth <= 0: - raise RecursionError('Рейтлимит на всех токенах') - - resp = requests.get( - ( - f'{COINAPI_URL}/{self.from_currency}' - f'/{self.conv_currency}' - ), - headers={ - 'X-CoinAPI-Key': config['coinapi_keys'][coinapi_active[0]], - }, - timeout=config['timeout'], - ) - - if resp.status_code == 429: - log.warning('CoinAPI ratelimited, rotating token') - rotate_token(config['coinapi_keys'], coinapi_active) - self.coinapi(depth - 1) - - data = resp.json() - rate = data.get('rate') - if rate is None: - raise RuntimeError('Не удалось получить курс валюты от CoinAPI') - self.conv_amount = float(rate * self.amount) + await message.reply(result) -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): +async def inline_reply(result_id: str, title: str, description: str or None, inline_query: types.InlineQuery) -> None: article = [None] article[0] = types.InlineQueryResultArticle( id=result_id, @@ -143,18 +72,17 @@ async def inline_reply(result_id: str, title: str, description: str or None, inl @dp.inline_query() -async def currency(inline_query: types.InlineQuery): +async def currency(inline_query: types.InlineQuery) -> None: query = inline_query.query args = query.split() result_id = hashlib.md5(query.encode()).hexdigest() - conv = CurrencyConverter() + conv = Converter() try: - log.debug(len(args)) if len(args) <= 1: await inline_reply(result_id, - "Требуется 2, либо 3 аргумента", + "2 or 3 arguments are required", f"@shirino_bot USD RUB \n@shirino_bot 12 USD RUB", inline_query) if len(args) == 3: @@ -172,35 +100,26 @@ async def currency(inline_query: types.InlineQuery): f'{conv.conv_amount} {conv.conv_currency}' ) - except aiohttp.client_exceptions.ClientError as ex: + except aiohttp.client_exceptions.ClientError: await inline_reply(result_id, - "Rate-limit от API Telegram, повторите запрос позже", + "Rate-limit from the Telegram API, repeat the request later", None, inline_query) - log.debug(ex) await asyncio.sleep(1) - except Exception as ex: - log.debug(ex) - await inline_reply(result_id, "Неверный формат данных", + except Exception as e: + print(e) + await inline_reply(result_id, "Invalid data format", "@shirino_bot USD RUB \n@shirino_bot 12 USD RUB", inline_query) + except UnboundLocalError: + pass 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']) await dp.start_polling(bot) From 8a3c09c50f38aeacd5a89deda350026f81efa66f Mon Sep 17 00:00:00 2001 From: Redume Date: Sun, 25 Aug 2024 18:05:00 +0300 Subject: [PATCH 3/7] =?UTF-8?q?=D0=A4=D0=B0=D0=B9=D0=BB=20=D1=81=20=D0=B0?= =?UTF-8?q?=D0=BB=D0=B8=D0=B0=D1=81=D0=B0=D0=BC=D0=B8=20=D0=BD=D0=B0=20?= =?UTF-8?q?=D1=80=D0=B0=D0=B7=D0=BD=D1=8B=D1=85=20=D1=8F=D0=B7=D1=8B=D0=BA?= =?UTF-8?q?=D0=B0=D1=85,=20=D0=BF=D0=BE=D0=BA=D0=B0=20=D0=B1=D0=B5=D1=82?= =?UTF-8?q?=D0=B0=20=D0=BF=D1=80=D0=B8=D0=BC=D0=B5=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- currency.json | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 currency.json diff --git a/currency.json b/currency.json new file mode 100644 index 0000000..5a4a341 --- /dev/null +++ b/currency.json @@ -0,0 +1,4 @@ +{ + "RUB": ["руб", "рубли", "рубля", "рублей", "рубль", "rub", "rouble", "roubles"], + "USD": ["доллары", "доллар", "доллара", "зеленых", "usd", "dollar", "dollars"] +} \ No newline at end of file From 46a1ecdbf8dc5d1f42ffaf5ddbccd971ef51e454 Mon Sep 17 00:00:00 2001 From: Redume Date: Sun, 25 Aug 2024 19:55:56 +0300 Subject: [PATCH 4/7] =?UTF-8?q?=D1=83=D0=B1=D1=80=D0=B0=D0=BB=20=D0=B8?= =?UTF-8?q?=D0=B7=20=D0=BA=D0=BE=D0=BD=D1=84=D0=B8=D0=B3=D0=B0=20=D0=BA?= =?UTF-8?q?=D0=BE=D0=BB=D0=B2=D0=BE=20=D0=B7=D0=BD=D0=B0=D0=BA=D0=BE=D0=B2?= =?UTF-8?q?=20=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=20=D0=B7=D0=B0=D0=BF=D1=8F?= =?UTF-8?q?=D1=82=D0=BE=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config_sample.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/config_sample.yaml b/config_sample.yaml index d4ae8e7..e23a850 100644 --- a/config_sample.yaml +++ b/config_sample.yaml @@ -1,6 +1,5 @@ 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 From 5bc5f37723d2cf9426b70c8727ac2bb26a86aa2e Mon Sep 17 00:00:00 2001 From: Redume Date: Sun, 25 Aug 2024 20:01:25 +0300 Subject: [PATCH 5/7] =?UTF-8?q?=D0=A2=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20?= =?UTF-8?q?=D0=BF=D0=BE=D0=B4=D0=B4=D0=B5=D1=80=D0=B6=D0=B8=D0=B2=D0=B0?= =?UTF-8?q?=D0=B5=D1=82=D1=81=D1=8F=20=D0=BF=D0=BB=D0=B0=D0=B2=D0=B0=D1=8E?= =?UTF-8?q?=D1=89=D0=B0=D1=8F=20=D0=B7=D0=B0=D0=BF=D1=8F=D1=82=D0=B0=D1=8F?= =?UTF-8?q?,=20=D0=B0=20=D0=BD=D0=B5=20=D1=82=D0=BE=D0=BB=D1=8C=D0=BA?= =?UTF-8?q?=D0=BE=20=D1=82=D0=BE=D1=87=D0=BA=D0=B0.=20=D0=A4=D0=B8=D0=BA?= =?UTF-8?q?=D1=81=20(=D0=B2=D1=80=D0=BE=D0=B4=D0=B5)=20UnboundLocalError?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/main.py b/main.py index e8d1d7b..ed0e1c9 100644 --- a/main.py +++ b/main.py @@ -73,6 +73,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: + global result query = inline_query.query args = query.split() @@ -86,7 +87,7 @@ async def currency(inline_query: types.InlineQuery) -> None: f"@shirino_bot USD RUB \n@shirino_bot 12 USD RUB", inline_query) if len(args) == 3: - conv.amount = float(args[0]) + conv.amount = float(args[0].replace(',', '.')) conv.from_currency = args[1].upper() conv.conv_currency = args[2].upper() conv.convert() @@ -108,13 +109,10 @@ async def currency(inline_query: types.InlineQuery) -> None: await asyncio.sleep(1) - except Exception as e: - print(e) + except Exception: await inline_reply(result_id, "Invalid data format", "@shirino_bot USD RUB \n@shirino_bot 12 USD RUB", inline_query) - except UnboundLocalError: - pass await inline_reply(result_id, result, None, inline_query) From b2aa0589a5ccb535acdc9654891ec3b5186e7eb7 Mon Sep 17 00:00:00 2001 From: Redume Date: Sun, 25 Aug 2024 20:01:43 +0300 Subject: [PATCH 6/7] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B2=D0=B5=D0=BB?= =?UTF-8?q?=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D1=83=20=D0=BD=D0=B0=20=D0=B0?= =?UTF-8?q?=D0=BD=D0=B3=D0=BB=D0=B8=D0=B9=D1=81=D0=BA=D0=B8=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- function/convert.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/function/convert.py b/function/convert.py index 308f3c2..bd983b8 100644 --- a/function/convert.py +++ b/function/convert.py @@ -47,7 +47,7 @@ class Converter: conv_amount = conv.get('mid') if conv_amount is None: - raise RuntimeError('Ошибка при конвертации валюты через DuckDuckGo') + raise RuntimeError('Error when converting currency via DuckDuckGo') self.conv_amount = float(conv_amount) From 019f844e4ffd431ff7879028568147ddca132116 Mon Sep 17 00:00:00 2001 From: Redume Date: Sun, 25 Aug 2024 22:16:23 +0300 Subject: [PATCH 7/7] =?UTF-8?q?=D1=81=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20w2n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.py | 68 +++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 44 insertions(+), 24 deletions(-) diff --git a/main.py b/main.py index ed0e1c9..aeed7fe 100644 --- a/main.py +++ b/main.py @@ -2,10 +2,14 @@ from aiogram import Bot, Dispatcher, types import asyncio import yaml + import hashlib import aiohttp -import json +import json +import re + +from word2number import w2n from function.convert import Converter config = yaml.safe_load(open("config.yaml")) @@ -14,15 +18,37 @@ dp = Dispatcher() @dp.message() async def message_conv(message: types.Message): - query = message.text.split(' ') - conv = Converter() + with open('currency.json', 'r', encoding='utf-8') as f: + currency_json = json.load(f) - amount = query[0] - source_currency_alias = query[1] - target_currency_alias = query[3] + text = message.text.lower() + args = text.split() - with open('currency.json', encoding='utf-8') as file: - currency_json = json.loads(file.read()) + number_match = re.match(r'\d+\.?\d*|\w+', args[0]) + if number_match: + number_text = number_match.group(0) + + try: + amount = float(number_text) + except ValueError: + try: + amount = float(w2n.word_to_num(number_text)) + except ValueError: + await message.reply("Не удалось распознать числовое значение.") + return + else: + await message.reply("Не удалось найти числовое значение.") + return + + if len(args) == 4: + source_currency_alias = args[1] + target_currency_alias = args[3] + elif len(args) == 3: + source_currency_alias = args[0] + target_currency_alias = args[2] + else: + await message.reply("Не удалось определить исходную и целевую валюту.") + return source_currency_code = None target_currency_code = None @@ -30,26 +56,20 @@ async def message_conv(message: types.Message): for currency_code, aliases in currency_json.items(): if source_currency_alias in aliases: source_currency_code = currency_code - - elif target_currency_alias in aliases: + if target_currency_alias in aliases: target_currency_code = currency_code - elif source_currency_code and target_currency_code: - break - else: - return + if not source_currency_code or not target_currency_code or amount is None: + await message.reply("Не удалось найти сумму или валюты по указанным данным.") + return - if source_currency_code and target_currency_code: - conv.amount = float(amount) - conv.from_currency = source_currency_code.upper() - conv.conv_currency = target_currency_code.upper() - conv.convert() - - result = ( - f'{conv.amount} {conv.from_currency} = ' - f'{conv.conv_amount} {conv.conv_currency}' - ) + conv = Converter() + conv.amount = amount + conv.from_currency = source_currency_code.upper() + conv.conv_currency = target_currency_code.upper() + conv.convert() + result = f'{conv.amount} {conv.from_currency} = {conv.conv_amount} {conv.conv_currency}' await message.reply(result)