wolfram request refactoring

Author: ProgrammingLanguageLeader

telegram_bot/handlers/messages/wolfram_request.py

@@ -1,7 +1,5 @@
 from io import BytesIO
 
-from telegram.ext import run_async
-
 from system.config import WOLFRAM_APP_ID
 from system.db import db
 from telegram_bot.handlers.utils.decorators import write_logs, send_typing, \
@@ -13,35 +11,60 @@
 from wolfram.api import make_wolfram_request, make_simple_wolfram_request
 
 
-@run_async
 @write_logs
 @send_typing
 @remember_new_user
 def handle_wolfram_request(bot, update, prefix: str = '') -> int:
     chat_id = update.message.chat_id
+    reply_markup = create_main_reply_markup()
     request = f'{prefix} {update.message.text}'.strip()
     current_user = db.session.query(User).filter_by(
         telegram_id=update.message.from_user.id
     ).first()
-    reply_markup = create_main_reply_markup()
-
     if current_user.simple_mode:
-        answer = make_simple_wolfram_request(request, WOLFRAM_APP_ID)
-        if not answer:
-            bot.send_message(
-                chat_id=chat_id,
-                text='Unsuccessful. Check your request and try again',
-                reply_markup=reply_markup
-            )
-        else:
-            bytes_io = BytesIO(answer)
-            bot.send_photo(
-                chat_id=chat_id,
-                photo=bytes_io,
-                reply_markup=reply_markup
-            )
-        return MenuEntry.START_MENU.value
+        return handle_simple_wolfram_request(
+            bot,
+            chat_id,
+            request,
+            reply_markup
+        )
+    return handle_detailed_wolfram_request(
+        bot,
+        chat_id,
+        request,
+        reply_markup
+    )
+
+
+def handle_simple_wolfram_request(
+        bot,
+        chat_id,
+        request,
+        reply_markup
+) -> int:
+    answer = make_simple_wolfram_request(request, WOLFRAM_APP_ID)
+    if not answer:
+        bot.send_message(
+            chat_id=chat_id,
+            text='Unsuccessful. Check your request and try again',
+            reply_markup=reply_markup
+        )
+    else:
+        bytes_io = BytesIO(answer)
+        bot.send_photo(
+            chat_id=chat_id,
+            photo=bytes_io,
+            reply_markup=reply_markup
+        )
+    return MenuEntry.START_MENU.value
+
 
+def handle_detailed_wolfram_request(
+        bot,
+        chat_id,
+        request,
+        reply_markup
+) -> int:
     answer = make_wolfram_request(request, WOLFRAM_APP_ID)
     parsed_answer = parse_wolfram_answer(answer)
     for message in parsed_answer[:-1]: