test

back/api/celery.py

@@ -5,9 +5,16 @@ from django.conf import settings
 from celery import Celery
 from datetime import timedelta
 
+from celery.utils.log import get_task_logger
+
+logger = get_task_logger(__name__)
 
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "api.settings")
 
 celery_app = Celery("api")
 celery_app.config_from_object(f'django.conf:settings', namespace='CELERY')
-celery_app.autodiscover_tasks()
+celery_app.autodiscover_tasks()
+
+@celery_app.task(bind=True)
+def debug_task(self):
+    print(f'Request: {self.request!r}')

back/tgbot/tasks.py

@@ -1,9 +1,12 @@
 from celery import shared_task
 from celery.utils.log import get_task_logger
 
+from api.celery import celery_app
+
 logger = get_task_logger(__name__)
 
 
-@shared_task
+@celery_app.task
 def upload_file(file_id):
+    logger.info('123')
     logger.info(file_id)

back/tgbot/tgbot.py

@@ -29,8 +29,8 @@ from django.conf import settings
 from django.urls import reverse
 from django.db import models
 
-from .tasks import upload_file
 from .models import TgItem, TmcElement, TmcField
+from .tasks import upload_file
 from tmc.models import CustomTable, BaseCustomField, Territory, TerritoryItem
 
 
@@ -128,7 +128,7 @@ class TgBot:
         TgBot.app.add_error_handler(self.error_handler)
 
     async def start(self, update: Update, context: CallbackContext):
-        await update.effective_message.reply_markdown_v2(
+        await update.effective_message.reply_text(
             (
                 "Это бот для проведения инвентаризации\n"
                 "/ter \-\- список территорий\n"
@@ -149,7 +149,7 @@ class TgBot:
             inv.append({"name": e.name, "id": str(e.id)})
         keys = chunk(1, inv)
         if len(inv) > 0:
-            await update.message.reply_markdown_v2(
+            await update.message.reply_text(
                 ("Ваши инвентаризации"),
                 reply_markup=InlineKeyboardMarkup(
                     [
@@ -166,7 +166,7 @@ class TgBot:
                 reply_parameters=ReplyParameters(message_id=update.message.message_id),
             )
         else:
-            await update.message.reply_markdown_v2(
+            await update.message.reply_text(
                 "У вас нет доступных для редактирования инвентаризаций"
             )
 
@@ -385,7 +385,7 @@ class TgBot:
             "Вы выбрали территорию инвентаризации\n"
             "Теперь вы можете начать инвентаризацию /inv"
         )
-        await update.effective_message.reply_markdown_v2(
+        await update.effective_message.reply_text(
             text=text,
             reply_parameters=ReplyParameters(
                 message_id=update.effective_message.message_id
@@ -399,7 +399,7 @@ class TgBot:
         logger.info(f"Step {current_step} from user {user.full_name}")
 
         if not context.chat_data.get("terdeep_value", None):
-            await update.effective_message.reply_markdown_v2(
+            await update.effective_message.reply_text(
                 text=("Вы не выбрали территорию /ter"),
                 reply_parameters=ReplyParameters(
                     message_id=update.effective_message.message_id
@@ -411,7 +411,7 @@ class TgBot:
             context.chat_data["step"] = "name"
             current_ter_id = context.chat_data.get("terdeep_value", None)
             current_ter = await TerritoryItem.objects.aget(id=current_ter_id)
-            await update.effective_message.reply_markdown_v2(
+            await update.effective_message.reply_text(
                 "\n".join([self.format_username(user), f"Введите название объекта"]),
                 reply_parameters=ReplyParameters(
                     message_id=update.effective_message.message_id
@@ -462,7 +462,7 @@ class TgBot:
             ]
             keyboard.append(self.stop_inv_button())
 
-            await update.effective_message.reply_markdown_v2(
+            await update.effective_message.reply_text(
                 text,
                 reply_parameters=ReplyParameters(
                     message_id=update.effective_message.message_id
@@ -504,7 +504,7 @@ class TgBot:
             ]
             keyboard.append(self.stop_inv_button())
 
-            await update.effective_message.reply_markdown_v2(
+            await update.effective_message.reply_text(
                 text,
                 reply_parameters=ReplyParameters(
                     message_id=update.effective_message.message_id
@@ -521,7 +521,7 @@ class TgBot:
 
             context.chat_data["step"] = "add_element_data"
 
-            await update.effective_message.reply_markdown_v2(
+            await update.effective_message.reply_text(
                 "\n".join(
                     [
                         self.format_inv(inv),
@@ -553,7 +553,7 @@ class TgBot:
             await element.asave()
             await inv.asave()
 
-            await update.effective_message.reply_markdown_v2(
+            await update.effective_message.reply_text(
                 "Изображение сохранено" if update.message.photo else "Текст сохранен"
             )
 

docker-compose.yml

@@ -36,7 +36,7 @@ services:
     volumes:
       - ./env/back.env:/app/.env
     depends_on:
-      back:
+      redis:
         condition: service_healthy
 
   front:
@@ -66,6 +66,7 @@ services:
     links:
       - back:back
       - front:front
+      - redis:redis
     volumes:
       - ./nginx/nginx.conf:/etc/nginx/nginx.conf
       - ./nginx/conf.d:/etc/nginx/conf.d