From efd3f7846397ec16fce9a5af70bd5438eb1d68d0 Mon Sep 17 00:00:00 2001 From: umbilnm Date: Wed, 3 Apr 2024 01:37:04 +0300 Subject: [PATCH 1/8] Fixed bug --- src/handlers/commands.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/handlers/commands.py b/src/handlers/commands.py index c3e5dc6..85abcfb 100644 --- a/src/handlers/commands.py +++ b/src/handlers/commands.py @@ -72,7 +72,6 @@ async def find_answer(message: types.Message, command: CommandObject): start_time = time.time() msg = await message.answer("👀 Ищем ответы...") - update_task = asyncio.create_task(update_loading_message(msg)) chroma_manager = ChromaManager(channel=channel) @@ -94,14 +93,15 @@ async def find_answer(message: types.Message, command: CommandObject): ) query_prompt = QUERY_TEAMPLATE.format(context=context_text, question=query) - update_task.cancel() + msg_text = "🙋🏼‍♂️ *Ваш вопрос:*\n" + query + "\n\n🔍 *Найденный ответ:*\n" await msg.edit_text(msg_text) response = "" async for stream_response in llm.astream(query_prompt): - response += stream_response.content - msg_text += stream_response.content + if len(stream_response.content)!=0: + response += stream_response.content + msg_text += stream_response.content if (len(msg_text.split()) % 7 == 0) and len(msg_text.split()) >= 7: await msg.edit_text(msg_text) From 24e141a9f5cbeaff564fa1e55f906a255dc9bb5c Mon Sep 17 00:00:00 2001 From: umbilnm Date: Wed, 3 Apr 2024 01:39:10 +0300 Subject: [PATCH 2/8] Del import --- src/handlers/commands.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/handlers/commands.py b/src/handlers/commands.py index 85abcfb..ab76576 100644 --- a/src/handlers/commands.py +++ b/src/handlers/commands.py @@ -1,4 +1,3 @@ -import asyncio import time import yaml from aiogram import Router, types From f462e81bf48d29132b09971af3464fbb6608913e Mon Sep 17 00:00:00 2001 From: umbilnm Date: Wed, 3 Apr 2024 01:41:15 +0300 Subject: [PATCH 3/8] Del import2 --- src/handlers/commands.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/handlers/commands.py b/src/handlers/commands.py index ab76576..7b64f0a 100644 --- a/src/handlers/commands.py +++ b/src/handlers/commands.py @@ -11,7 +11,6 @@ from src.utils.validation import validate_parse_command_args from src.utils.filters import UnknownCommandFilter from src.utils.markup import inline_markup -from src.utils.ui_helpers import update_loading_message router = Router() @router.message(Command(commands=["start", "help"])) From ce51a4a55db63a93019a2a725c76e8791b9e6165 Mon Sep 17 00:00:00 2001 From: umbilnm Date: Thu, 4 Apr 2024 20:30:43 +0300 Subject: [PATCH 4/8] for PR --- src/handlers/commands.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/handlers/commands.py b/src/handlers/commands.py index 86da686..bdb53e4 100644 --- a/src/handlers/commands.py +++ b/src/handlers/commands.py @@ -1,3 +1,4 @@ +import asyncio import time from aiogram import Router, types @@ -10,7 +11,9 @@ from src.config import config from src.utils.validation import validate_parse_command_args from src.utils.filters import UnknownCommandFilter -from src.utils.markup import inline_markup +from src.utils.markup import inline_markup_feedback +from src.utils.ui_helpers import update_loading_message +from src.utils.admin_service import send_to_admins router = Router() @router.message(Command(commands=["start", "help"])) @@ -80,7 +83,8 @@ async def find_answer(message: types.Message, command: CommandObject): start_time = time.time() - msg = await message.answer("👀 Ищем ответы...") + msg = await message.answer(config.get(['messages', 'searching'])) + update_task = asyncio.create_task(update_loading_message(msg)) chroma_manager = ChromaManager(channel=channel) @@ -104,15 +108,14 @@ async def find_answer(message: types.Message, command: CommandObject): ) query_prompt = QUERY_TEAMPLATE.format(context=context_text, question=query) - + update_task.cancel() msg_text = "🙋🏼‍♂️ *Ваш вопрос:*\n" + query + "\n\n🔍 *Найденный ответ:*\n" await msg.edit_text(msg_text) response = "" async for stream_response in llm.astream(query_prompt): - if len(stream_response.content)!=0: - response += stream_response.content - msg_text += stream_response.content + response += stream_response.content + msg_text += stream_response.content if (len(msg_text.split()) % 7 == 0) and len(msg_text.split()) >= 7: await msg.edit_text(msg_text) From c2ab316b9bb2e9a4194231ed01ec6078a2c2d4e0 Mon Sep 17 00:00:00 2001 From: umbilnm Date: Fri, 5 Apr 2024 23:40:23 +0300 Subject: [PATCH 5/8] Fix adminchat id --- src/utils/admin_service.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/utils/admin_service.py b/src/utils/admin_service.py index ca9a327..cdec039 100644 --- a/src/utils/admin_service.py +++ b/src/utils/admin_service.py @@ -1,12 +1,12 @@ from src.app.loader import bot -from src.config import config +from src.config import config, ADMIN_CHAT_ID from src.utils.markup import inline_markup_admin async def send_to_admins(user_id: int, username: str, first_name: str, last_name: str): if user_id not in config.whitelist: await bot.send_message( - config.admin_ids, + ADMIN_CHAT_ID, f"user_id: {user_id}\nusername: {username}\nfirst_name: {first_name}\nlast_name: {last_name}\n\nРазрешить доступ?", reply_markup=inline_markup_admin(user_id=user_id, username=username), parse_mode=None, From 6a60f99a81efc77e3de821df170bb1905d12c0f5 Mon Sep 17 00:00:00 2001 From: umbilnm Date: Wed, 3 Apr 2024 01:37:04 +0300 Subject: [PATCH 6/8] Fixed bug --- src/handlers/commands.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/handlers/commands.py b/src/handlers/commands.py index bdb53e4..68cc831 100644 --- a/src/handlers/commands.py +++ b/src/handlers/commands.py @@ -83,8 +83,7 @@ async def find_answer(message: types.Message, command: CommandObject): start_time = time.time() - msg = await message.answer(config.get(['messages', 'searching'])) - update_task = asyncio.create_task(update_loading_message(msg)) + msg = await message.answer("👀 Ищем ответы...") chroma_manager = ChromaManager(channel=channel) @@ -108,14 +107,15 @@ async def find_answer(message: types.Message, command: CommandObject): ) query_prompt = QUERY_TEAMPLATE.format(context=context_text, question=query) - update_task.cancel() + msg_text = "🙋🏼‍♂️ *Ваш вопрос:*\n" + query + "\n\n🔍 *Найденный ответ:*\n" await msg.edit_text(msg_text) response = "" async for stream_response in llm.astream(query_prompt): - response += stream_response.content - msg_text += stream_response.content + if len(stream_response.content)!=0: + response += stream_response.content + msg_text += stream_response.content if (len(msg_text.split()) % 7 == 0) and len(msg_text.split()) >= 7: await msg.edit_text(msg_text) From b669fced874707e687b55a36c46d3ff2e6ddabac Mon Sep 17 00:00:00 2001 From: umbilnm Date: Wed, 3 Apr 2024 01:39:10 +0300 Subject: [PATCH 7/8] Del import --- src/handlers/commands.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/handlers/commands.py b/src/handlers/commands.py index 68cc831..0643b14 100644 --- a/src/handlers/commands.py +++ b/src/handlers/commands.py @@ -1,4 +1,3 @@ -import asyncio import time from aiogram import Router, types From 654e19a18749b5f623900e37845f514eeab74b4f Mon Sep 17 00:00:00 2001 From: umbilnm Date: Sat, 6 Apr 2024 00:20:09 +0300 Subject: [PATCH 8/8] . --- src/handlers/commands.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/handlers/commands.py b/src/handlers/commands.py index 0643b14..147d1c2 100644 --- a/src/handlers/commands.py +++ b/src/handlers/commands.py @@ -82,7 +82,7 @@ async def find_answer(message: types.Message, command: CommandObject): start_time = time.time() - msg = await message.answer("👀 Ищем ответы...") + msg = await message.answer(config.get(['messages', 'searching'])) chroma_manager = ChromaManager(channel=channel)