fix

Reviewed-on: #19

.deploy/deploy-dev.yaml

@@ -3,29 +3,15 @@ version: "3.4"
 
 services:
 
-  poll:
-    image: mathwave/sprint-repo:ruz-bot
-    environment:
-      STAGE: "development"
-      TELEGRAM_TOKEN: $TELEGRAM_TOKEN_DEV
-      QUEUES_TOKEN: $QUEUES_TOKEN_DEV
-    command: poll
-    deploy:
-      mode: replicated
-      restart_policy:
-        condition: any
-      update_config:
-        parallelism: 1
-        order: start-first
-
   worker:
     image: mathwave/sprint-repo:ruz-bot
     environment:
-      MONGO_HOST: "mongo.develop.sprinthub.ru"
       STAGE: "development"
       MONGO_PASSWORD: $MONGO_PASSWORD_DEV
-      PLATFORM_SECURITY_TOKEN: $PLATFORM_SECURITY_TOKEN
-      QUEUES_TOKEN: $QUEUES_TOKEN_DEV
+    networks:
+      - queues-development
+      - configurator
+      - mongo-development
     command: worker
     deploy:
       mode: replicated
@@ -35,29 +21,14 @@ services:
         parallelism: 1
         order: start-first
 
-  mailbox:
-    image: mathwave/sprint-repo:ruz-bot
-    environment:
-      STAGE: "development"
-      TELEGRAM_TOKEN: $TELEGRAM_TOKEN_DEV
-      QUEUES_TOKEN: $QUEUES_TOKEN_DEV
-    command: mailbox
-    deploy:
-      mode: replicated
-      restart_policy:
-        condition: any
-      update_config:
-        parallelism: 1
-        order: start-first
-
   fetch:
     image: mathwave/sprint-repo:ruz-bot
     environment:
-      MONGO_HOST: "mongo.develop.sprinthub.ru"
       STAGE: "development"
       MONGO_PASSWORD: $MONGO_PASSWORD_DEV
-      PLATFORM_SECURITY_TOKEN: $PLATFORM_SECURITY_TOKEN
-      QUEUES_TOKEN: $QUEUES_TOKEN_DEV
+    networks:
+      - queues-development
+      - mongo-development
     command: fetch
     deploy:
       mode: replicated
@@ -70,11 +41,11 @@ services:
   notify:
     image: mathwave/sprint-repo:ruz-bot
     environment:
-      MONGO_HOST: "mongo.develop.sprinthub.ru"
       STAGE: "development"
       MONGO_PASSWORD: $MONGO_PASSWORD_DEV
-      PLATFORM_SECURITY_TOKEN: $PLATFORM_SECURITY_TOKEN
-      QUEUES_TOKEN: $QUEUES_TOKEN_DEV
+    networks:
+      - queues-development
+      - mongo-development
     command: notify
     deploy:
       mode: replicated
@@ -87,13 +58,12 @@ services:
   ruz-bot-nginx:
     image: mathwave/sprint-repo:ruz-bot
     networks:
-      - common-infra-nginx
+      - common-infra-nginx-development
+      - queues-development
+      - mongo-development
     environment:
-      MONGO_HOST: "mongo.develop.sprinthub.ru"
       STAGE: "development"
       MONGO_PASSWORD: $MONGO_PASSWORD_DEV
-      PLATFORM_SECURITY_TOKEN: $PLATFORM_SECURITY_TOKEN
-      QUEUES_TOKEN: $QUEUES_TOKEN_DEV
     command: api
     deploy:
       mode: replicated
@@ -104,5 +74,11 @@ services:
         order: start-first
 
 networks:
-  common-infra-nginx:
+  common-infra-nginx-development:
+    external: true
+  queues-development:
+    external: true
+  configurator:
+    external: true
+  mongo-development:
     external: true

.deploy/deploy-prod.yaml

@@ -3,29 +3,15 @@ version: "3.4"
 
 services:
 
-  poll:
-    image: mathwave/sprint-repo:ruz-bot
-    environment:
-      STAGE: "production"
-      TELEGRAM_TOKEN: $TELEGRAM_TOKEN_PROD
-      QUEUES_TOKEN: $QUEUES_TOKEN_PROD
-    command: poll
-    deploy:
-      mode: replicated
-      restart_policy:
-        condition: any
-      update_config:
-        parallelism: 1
-        order: start-first
-
   worker:
     image: mathwave/sprint-repo:ruz-bot
     environment:
-      MONGO_HOST: "mongo.sprinthub.ru"
       STAGE: "production"
       MONGO_PASSWORD: $MONGO_PASSWORD_PROD
-      PLATFORM_SECURITY_TOKEN: $PLATFORM_SECURITY_TOKEN
-      QUEUES_TOKEN: $QUEUES_TOKEN_PROD
+    networks:
+      - queues
+      - configurator
+      - mongo
     command: worker
     deploy:
       mode: replicated
@@ -35,39 +21,21 @@ services:
         parallelism: 1
         order: start-first
 
-  mailbox:
-    image: mathwave/sprint-repo:ruz-bot
-    environment:
-      STAGE: "production"
-      TELEGRAM_TOKEN: $TELEGRAM_TOKEN_PROD
-      QUEUES_TOKEN: $QUEUES_TOKEN_PROD
-    command: mailbox
-    deploy:
-      mode: replicated
-      restart_policy:
-        condition: any
-      update_config:
-        parallelism: 1
-        order: start-first
-
   fetch:
     image: mathwave/sprint-repo:ruz-bot
     environment:
-      MONGO_HOST: "mongo.sprinthub.ru"
       STAGE: "production"
       MONGO_PASSWORD: $MONGO_PASSWORD_PROD
-      PLATFORM_SECURITY_TOKEN: $PLATFORM_SECURITY_TOKEN
       DEBUG: "false"
-      QUEUES_TOKEN: $QUEUES_TOKEN_PROD
+    networks:
+      - queues
+      - configurator
+      - mongo
     command: fetch
     deploy:
       mode: replicated
       restart_policy:
         condition: any
-      placement:
-        constraints:
-          - node.role == worker
-          - node.labels.zone == ru
       update_config:
         parallelism: 1
         order: start-first
@@ -75,21 +43,18 @@ services:
   notify:
     image: mathwave/sprint-repo:ruz-bot
     environment:
-      MONGO_HOST: "mongo.sprinthub.ru"
       STAGE: "production"
       MONGO_PASSWORD: $MONGO_PASSWORD_PROD
-      PLATFORM_SECURITY_TOKEN: $PLATFORM_SECURITY_TOKEN
       DEBUG: "false"
-      QUEUES_TOKEN: $QUEUES_TOKEN_PROD
+    networks:
+      - queues
+      - configurator
+      - mongo
     command: notify
     deploy:
       mode: replicated
       restart_policy:
         condition: any
-      placement:
-        constraints:
-          - node.role == worker
-          - node.labels.zone == ru
       update_config:
         parallelism: 1
         order: start-first
@@ -98,21 +63,17 @@ services:
     image: mathwave/sprint-repo:ruz-bot
     networks:
       - common-infra-nginx
+      - configurator
+      - mongo
     environment:
-      MONGO_HOST: "mongo.sprinthub.ru"
       STAGE: "production"
       MONGO_PASSWORD: $MONGO_PASSWORD_PROD
-      PLATFORM_SECURITY_TOKEN: $PLATFORM_SECURITY_TOKEN
       DEBUG: "false"
     command: api
     deploy:
       mode: replicated
       restart_policy:
         condition: any
-      placement:
-        constraints:
-          - node.role == worker
-          - node.labels.zone == ru
       update_config:
         parallelism: 1
         order: start-first
@@ -120,3 +81,9 @@ services:
 networks:
   common-infra-nginx:
     external: true
+  queues:
+    external: true
+  configurator:
+    external: true
+  mongo:
+    external: true

.gitea/workflows/deploy-dev.yaml

@@ -28,7 +28,7 @@ jobs:
         run: docker push mathwave/sprint-repo:ruz-bot
   deploy-dev:
     name: Deploy dev
-    runs-on: [dev]
+    runs-on: [prod]
     needs: push
     steps:
       - name: login
@@ -41,6 +41,4 @@ jobs:
         env:
           TELEGRAM_TOKEN_DEV: ${{ secrets.TELEGRAM_TOKEN_DEV }}
           MONGO_PASSWORD_DEV: ${{ secrets.MONGO_PASSWORD_DEV }}
-          PLATFORM_SECURITY_TOKEN: ${{ secrets.PLATFORM_SECURITY_TOKEN }}
-          QUEUES_TOKEN_DEV: ${{ secrets.QUEUES_TOKEN_DEV }}
-        run: docker stack deploy --with-registry-auth -c ./.deploy/deploy-dev.yaml ruz-bot
+        run: docker stack deploy --with-registry-auth -c ./.deploy/deploy-dev.yaml ruz-bot-development

.gitea/workflows/deploy-prod.yaml

@@ -42,5 +42,4 @@ jobs:
           TELEGRAM_TOKEN_PROD: ${{ secrets.TELEGRAM_TOKEN_PROD }}
           MONGO_PASSWORD_PROD: ${{ secrets.MONGO_PASSWORD_PROD }}
           PLATFORM_SECURITY_TOKEN: ${{ secrets.PLATFORM_SECURITY_TOKEN }}
-          QUEUES_TOKEN_PROD: ${{ secrets.QUEUES_TOKEN_PROD }}
         run: docker stack deploy --with-registry-auth -c ./.deploy/deploy-prod.yaml ruz-bot

Dockerfile

@@ -7,6 +7,7 @@ RUN apt-get install -y locales locales-all
 ENV LANGUAGE ru_RU.UTF-8
 ENV LANG ru_RU.UTF-8
 ENV LC_ALL ru_RU.UTF-8
+ENV PYTHONUNBUFFERED=1
 COPY requirements.txt requirements.txt
 RUN pip install -r requirements.txt
 COPY . .

daemons/mailbox.py

@@ -1,28 +0,0 @@
-import telebot
-import os
-
-from daemons import base
-from utils import queues
-
-
-class Daemon(base.Daemon, queues.TasksHandlerMixin):
-    def __init__(self):
-        super().__init__()
-        self.bot = telebot.TeleBot(os.getenv("TELEGRAM_TOKEN"))
-
-    @property
-    def queue_name(self):
-        return 'ruz_bot_mailbox'
-    
-    def execute(self):
-        self.poll()
-
-    def process(self, payload):
-        body = {
-            'chat_id': payload['chat_id'],
-            'text': payload['text'],
-        }
-        reply_markup = payload.get('reply_markup')
-        if reply_markup:
-            body['reply_markup'] = reply_markup
-        self.bot.send_message(**body, parse_mode='Markdown')

daemons/notify.py

@@ -25,7 +25,7 @@ def process():
             ans += f"🧑‍🏫 {(lesson['lecturer'] or 'Неизвестно')}\n"
             if lesson.get('link', None):
                 ans += f"🔗 {lesson['link']}"
-            queues.set_task('ruz_bot_mailbox', {'text': f"Через {user['notify_minutes']} минут у тебя занятие!\n" + ans, 'chat_id': user["chat_id"]}, 1)
+            queues.set_task('botalka_mailbox', {'project': 'ruz-bot', 'name': 'telegram-bot', 'body': {'text': f"Через {user['notify_minutes']} минут у тебя занятие!\n" + ans, 'chat_id': user["chat_id"], 'parse_mode': 'Markdown'}}, 1)
             mongo.lessons_collection.update_one({"_id": lesson['_id']}, {"$set": {"notified": True}})
     time_now = datetime.datetime.now()
     for user in mongo.users_collection.find({"next_daily_notify_time": {"$lte": time_now}}):
@@ -40,7 +40,7 @@ def process():
             else:
                 text = ruz.schedule_builder(lessons)
             try:
-                queues.set_task('ruz_bot_mailbox', {'text': f"Уведомляю о занятиях! Твое расписание на {'сегодня' if user.get('daily_notify_today', True) else 'завтра'}:\n" + text, 'chat_id': user["chat_id"]}, 1)
+                queues.set_task('botalka_mailbox', {'project': 'ruz-bot', 'name': 'telegram-bot', 'body': {'text': f"Уведомляю о занятиях! Твое расписание на {'сегодня' if user.get('daily_notify_today', True) else 'завтра'}:\n" + text, 'chat_id': user["chat_id"], 'parse_mode': 'Markdown'}}, 1)
             except:
                 pass
         mongo.users_collection.update_one(
@@ -72,7 +72,7 @@ def process():
             else:
                 mess += "12 часов"
             mess += "!\n\nТвоя первая пара:\n\n" + ans
-            queues.set_task('ruz_bot_mailbox', {'text': mess, 'chat_id': user["chat_id"]}, 1)
+            queues.set_task('botalka_mailbox', {'project': 'ruz-bot', 'name': 'telegram-bot', 'body': {'text': mess, 'chat_id': user["chat_id"], 'parse_mode': 'Markdown'}}, 1)
             start_of_day = datetime.datetime(year=time_now.year, month=time_now.month, day=time_now.day)
             mongo.lessons_collection.update_many({"begin": {"$gte": start_of_day, "$lt": (start_of_day + datetime.timedelta(days=1))}, "user_email": user["email"]}, {"$set": {"notified_today": True}})
             break

daemons/poll.py

@@ -1,15 +0,0 @@
-import os
-import telebot
-
-from daemons import base
-from telebot import types
-from utils import queues
-
-
-class Daemon(base.Daemon):
-    def execute(self):
-        bot = telebot.TeleBot(os.getenv("TELEGRAM_TOKEN"))
-        @bot.message_handler()
-        def do_action(message: types.Message):
-            queues.set_task('ruz_bot_worker', message.json, 1)
-        bot.polling()

helpers/answer.py

@@ -55,13 +55,6 @@ class Answer:
 
     def process(self):
         user = User(self.user['chat_id'])
-        try:
-            bot_enabled_exp = platform.get_experiment('bot_enabled')
-            if not bot_enabled_exp['enabled'] or not eval(bot_enabled_exp['condition']):
-                return
-        except Exception as exc:
-            logging.info(exc)
-            return
         getattr(
             self,
             "handle_state_" + self.user['state'],
@@ -74,10 +67,10 @@ class Answer:
     def send_message(self, text, reply_markup=None, remove_keyboard=True, **kwargs):
         if reply_markup is None and remove_keyboard:
             reply_markup = ReplyKeyboardRemove()
-        body = {'text': text, 'chat_id': self.user['chat_id']}
+        body = {'text': text, 'chat_id': self.user['chat_id'], 'parse_mode': 'Markdown'}
         if reply_markup:
             body['reply_markup'] = reply_markup.to_json()
-        queues.set_task('ruz_bot_mailbox', body, 1)
+        queues.set_task('botalka_mailbox', {'project': 'ruz-bot', 'name': 'telegram-bot', 'body': body}, 5)
 
     def set_state(self, state: str):
         self.user['state'] = state

helpers/mongo.py

@@ -9,7 +9,7 @@ from helpers import now
 
 class Mongo:
     def __init__(self):
-        url = f"mongodb://{settings.MONGO_USER}:{settings.MONGO_PASSWORD}@{settings.MONGO_HOST}:27017/"
+        url = f"mongodb://{settings.MONGO_USER}:{settings.MONGO_PASSWORD}@mongo:27017/"
         self.client = pymongo.MongoClient(url)
         self.database = self.client.get_database("ruz-bot")
         self.users_collection.create_index([

helpers/ruz.py

@@ -12,7 +12,8 @@ fields = [
     'date_start',
     'date_end',
     'lecturer_profiles',
-    'stream_links'
+    'stream_links',
+    'type',
 ]
 
 

helpers/sprint_platform.py

@@ -15,11 +15,8 @@ class PlatformClient:
         self.stage = stage
         self.configs = configs
         self.experiments = experiments
-        self.endpoint = 'https://platform.sprinthub.ru/'
-        self.configs_url = urllib.parse.urljoin(self.endpoint, 'configs/get')
-        self.experiments_url = urllib.parse.urljoin(self.endpoint, 'experiments/get')
-        self.staff_url = urllib.parse.urljoin(self.endpoint, 'is_staff')
-        self.fetch_url = urllib.parse.urljoin(self.endpoint, 'fetch')
+        self.endpoint = 'http://configurator/'
+        self.fetch_url = urllib.parse.urljoin(self.endpoint, '/api/v1/fetch')
         self.config_storage = {}
         self.experiment_storage = {}
         self.staff_storage = {}
@@ -44,7 +41,6 @@ class PlatformClient:
             try:
                 response = get(
                     url,
-                    headers={'X-Security-Token': self.platform_security_token},
                     params=params
                 )
                 if response.status_code == 200:

utils/queues.py

@@ -1,18 +1,17 @@
-import json
+from concurrent.futures import ThreadPoolExecutor
+import datetime
 import os
+import traceback
+import zoneinfo
 import requests
 import time
 
 
 stage = os.getenv("STAGE", 'local')
-if stage == 'development':
-    QUEUES_URL = 'https://queues.develop.sprinthub.ru'
-elif stage == 'production':
-    QUEUES_URL = 'https://queues.sprinthub.ru'
+if stage == 'local':
+    QUEUES_URL = 'http://localhost:1239'
 else:
-    QUEUES_URL = None
-
-token = os.getenv('QUEUES_TOKEN')
+    QUEUES_URL = 'http://queues:1239'
 
 
 class QueuesException(Exception):
@@ -20,31 +19,55 @@ class QueuesException(Exception):
 
 
 class TasksHandlerMixin:
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.executor = ThreadPoolExecutor(max_workers=1)
+
+    def _send_metric(self, start: datetime.datetime, end: datetime.datetime, success: bool):
+        def send():
+            requests.post(f'{QUEUES_URL}/api/v1/metric', json={
+                'service': 'ruz-bot',
+                'queue': self.queue_name,
+                'success': success,
+                'timestamp': start.strftime("%Y-%m-%dT%H:%M:%S") + "Z",
+                "success": success,
+                "execution_time_ms": (end - start).microseconds // 1000,
+                "environment": stage,
+            })
+        
+        self.executor.submit(send)
+
     def poll(self):
         while True:
-            if QUEUES_URL is None:
-                data = {'payload': json.loads(input('Input message: '))}
-            else:
-                response = requests.get(f'{QUEUES_URL}/api/v1/take', headers={'queue': self.queue_name, 'X-Queues-Token': token})
-                if response.status_code == 404:
-                    time.sleep(0.2)
-                    continue
-                if response.status_code == 403:
-                    raise NotImplemented('QUEUE_TOKEN is incorrect')
-                data = response.json()
             try:
-                self.process(data['payload'])
+                response = requests.get(f'{QUEUES_URL}/api/v1/take', headers={'queue': self.queue_name}).json()
+            except requests.JSONDecodeError:
+                print('Unable to decode json')
+                time.sleep(3)
+                continue
+            task = response.get('task')
+            if not task:
+                time.sleep(0.2)
+                continue
+            start = datetime.datetime.now(zoneinfo.ZoneInfo("Europe/Moscow"))
+            try:
+                print(f'process task with id {task["id"]}, attempt {task["attempt"]}')
+                self.process(task['payload'])
+                success = True
             except Exception as exc:
-                print(f'Error processing message id={data["id"]}, payload={data["payload"]}, exc={exc}')
-                continue
-            if QUEUES_URL is None:
-                continue
-            try:
-                resp = requests.post(f'{QUEUES_URL}/api/v1/finish', json={'id': data['id']}, headers={'X-Queues-Token': token})
-                if resp.status_code != 202:
-                    raise QueuesException
-            except:
-                print(f'Failed to finish task id={data["id"]}')
+                print(f'Error processing message id={task["id"]}, payload={task["payload"]}, exc={exc}')
+                traceback.print_exc()
+                success = False
+            end = datetime.datetime.now(zoneinfo.ZoneInfo("Europe/Moscow"))
+            if success:
+                try:
+                    resp = requests.post(f'{QUEUES_URL}/api/v1/finish', json={'id': task['id']})
+                    if resp.status_code != 202:
+                        raise QueuesException
+                    print(f'finish task with id {task["id"]}')
+                except:
+                    print(f'Failed to finish task id={task["id"]}')
+            self._send_metric(start, end, success)
 
     @property
     def queue_name(self):
@@ -55,7 +78,7 @@ class TasksHandlerMixin:
 
 
 def set_task(queue_name: str, payload: dict, seconds_to_execute: int, delay: int|None = None):
-    resp = requests.post(f'{QUEUES_URL}/api/v1/put', headers={'queue': queue_name, 'X-Queues-Token': token}, json={
+    resp = requests.post(f'{QUEUES_URL}/api/v1/put', headers={'queue': queue_name}, json={
         'payload': payload,
         'seconds_to_execute': seconds_to_execute,
         'delay': delay,