From c92508aa5f62402ee9d1d3a8af6364b5d8c9b98c Mon Sep 17 00:00:00 2001 From: Kseninia Mikhaylova Date: Wed, 7 Aug 2024 17:20:13 +0300 Subject: [PATCH] test --- back/api/__init__.py | 0 back/api/celery.py | 9 ++++++++- back/tgbot/tasks.py | 5 ++++- back/tgbot/tgbot.py | 22 +++++++++++----------- docker-compose.yml | 3 ++- 5 files changed, 25 insertions(+), 14 deletions(-) delete mode 100644 back/api/__init__.py diff --git a/back/api/__init__.py b/back/api/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/back/api/celery.py b/back/api/celery.py index 680a2c1..1a6760b 100644 --- a/back/api/celery.py +++ b/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() \ No newline at end of file +celery_app.autodiscover_tasks() + +@celery_app.task(bind=True) +def debug_task(self): + print(f'Request: {self.request!r}') \ No newline at end of file diff --git a/back/tgbot/tasks.py b/back/tgbot/tasks.py index e2c8e8d..470a42d 100644 --- a/back/tgbot/tasks.py +++ b/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) diff --git a/back/tgbot/tgbot.py b/back/tgbot/tgbot.py index 14ce27c..66a052b 100644 --- a/back/tgbot/tgbot.py +++ b/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 "Текст сохранен" ) diff --git a/docker-compose.yml b/docker-compose.yml index 0fd50d7..89f3b2d 100644 --- a/docker-compose.yml +++ b/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