Merge pull request 'master' (#32) from master into prod

Reviewed-on: #32

.deploy/deploy-dev.yaml

@@ -2,23 +2,6 @@ version: "3.4"
 
 
 services:
-
-  poll:
-    image: mathwave/sprint-repo:pizda-bot
-    command: poll
-    environment:
-      TELEGRAM_TOKEN: $TELEGRAM_TOKEN_DEV
-      STAGE: "development"
-    networks:
-      - queues
-    deploy:
-      mode: replicated
-      restart_policy:
-        condition: any
-      update_config:
-        parallelism: 1
-        order: start-first
-
   worker:
     image: mathwave/sprint-repo:pizda-bot
     command: worker
@@ -26,25 +9,9 @@ services:
       MONGO_HOST: "mongo.develop.sprinthub.ru"
       MONGO_PASSWORD: $MONGO_PASSWORD_DEV
       STAGE: "development"
-      PLATFORM_SECURITY_TOKEN: $PLATFORM_SECURITY_TOKEN
     networks:
-      - queues
+      - queues-development
-    deploy:
+      - configurator
-      mode: replicated
-      restart_policy:
-        condition: any
-      update_config:
-        parallelism: 1
-        order: start-first
-
-  mailbox:
-    image: mathwave/sprint-repo:pizda-bot
-    command: mailbox
-    environment:
-      TELEGRAM_TOKEN: $TELEGRAM_TOKEN_DEV
-      STAGE: "development"
-    networks:
-      - queues
     deploy:
       mode: replicated
       restart_policy:
@@ -57,13 +24,11 @@ services:
     image: mathwave/sprint-repo:pizda-bot
     command: api
     environment:
-      TELEGRAM_TOKEN: $TELEGRAM_TOKEN_DEV
       MONGO_HOST: "mongo.develop.sprinthub.ru"
       MONGO_PASSWORD: $MONGO_PASSWORD_DEV
-      PLATFORM_SECURITY_TOKEN: $PLATFORM_SECURITY_TOKEN
       STAGE: "development"
     networks:
-      - common-infra-nginx
+      - common-infra-nginx-development
     deploy:
       mode: replicated
       restart_policy:
@@ -73,7 +38,9 @@ services:
         order: start-first
 
 networks:
-  common-infra-nginx:
+  common-infra-nginx-development:
     external: true
-  queues:
+  queues-development:
+    external: true
+  configurator:
     external: true

.deploy/deploy-prod.yaml

@@ -2,23 +2,6 @@ version: "3.4"
 
 
 services:
-
-  poll:
-    image: mathwave/sprint-repo:pizda-bot
-    command: poll
-    environment:
-      TELEGRAM_TOKEN: $TELEGRAM_TOKEN_PROD
-      STAGE: "production"
-    networks:
-      - queues
-    deploy:
-      mode: replicated
-      restart_policy:
-        condition: any
-      update_config:
-        parallelism: 1
-        order: start-first
-
   worker:
     image: mathwave/sprint-repo:pizda-bot
     command: worker
@@ -29,22 +12,7 @@ services:
       PLATFORM_SECURITY_TOKEN: $PLATFORM_SECURITY_TOKEN
     networks:
       - queues
-    deploy:
+      - configurator
-      mode: replicated
-      restart_policy:
-        condition: any
-      update_config:
-        parallelism: 1
-        order: start-first
-
-  mailbox:
-    image: mathwave/sprint-repo:pizda-bot
-    command: mailbox
-    environment:
-      TELEGRAM_TOKEN: $TELEGRAM_TOKEN_PROD
-      STAGE: "production"
-    networks:
-      - queues
     deploy:
       mode: replicated
       restart_policy:
@@ -57,11 +25,8 @@ services:
     image: mathwave/sprint-repo:pizda-bot
     command: api
     environment:
-      TELEGRAM_TOKEN: $TELEGRAM_TOKEN_PROD
       MONGO_HOST: "mongo.sprinthub.ru"
       MONGO_PASSWORD: $MONGO_PASSWORD_PROD
-      PLATFORM_SECURITY_TOKEN: $PLATFORM_SECURITY_TOKEN
-      STAGE: "production"
     networks:
       - common-infra-nginx
     deploy:
@@ -77,3 +42,5 @@ networks:
     external: true
   queues:
     external: true
+  configurator:
+    external: true

.gitea/workflows/deploy-dev.yaml

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

.gitea/workflows/deploy-prod.yaml

@@ -39,7 +39,5 @@ jobs:
             ref: prod
       - name: deploy
         env:
-          TELEGRAM_TOKEN_PROD: ${{ secrets.TELEGRAM_TOKEN_PROD }}
           MONGO_PASSWORD_PROD: ${{ secrets.MONGO_PASSWORD_PROD }}
-          PLATFORM_SECURITY_TOKEN: ${{ secrets.PLATFORM_SECURITY_TOKEN }}
         run: docker stack deploy --with-registry-auth -c ./.deploy/deploy-prod.yaml pizda-bot

daemons/mailbox.py

@@ -1,27 +0,0 @@
-import telebot
-import os
-
-from daemons import base
-from utils import queues
-
-
-class Daemon(base.BaseDaemon, queues.TasksHandlerMixin):
-    def __init__(self):
-        super().__init__()
-        self.bot = telebot.TeleBot(os.getenv("TELEGRAM_TOKEN"))
-
-    @property
-    def queue_name(self):
-        return 'pizda_bot_mailbox'
-    
-    def execute(self):
-        self.poll()
-
-    def process(self, payload):
-        body = {
-            'chat_id': payload['chat_id'],
-            'text': payload['message'],
-        }
-        if payload['action'] == 'reply':
-            body['reply_to_message_id'] = payload['reply_to']
-        self.bot.send_message(**body)

daemons/poll.py

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

daemons/worker.py

@@ -49,23 +49,29 @@ class Daemon(base.BaseDaemon, queues.TasksHandlerMixin):
 
     def reply(self, text: str, chat_id: int, message_id: int):
         queues.set_task(
-            'pizda_bot_mailbox', 
+            'botalka_mailbox', 
             {
-                'action': 'reply', 
+                'project': 'pizda-bot',
-                'message': text,
+                'name': 'telegram-bot',
-                'reply_to': message_id, 
+                'body': {
-                'chat_id': chat_id
+                    'text': text,
+                    'reply_to_message_id': message_id,
+                    'chat_id': chat_id,
+                }
             },
             1,
         )
 
     def send(self, text: str, chat_id: int):
         queues.set_task(
-            'pizda_bot_mailbox', 
+            'botalka_mailbox', 
             {
-                'action': 'send', 
+                'project': 'pizda-bot',
-                'message': text,
+                'name': 'telegram-bot',
-                'chat_id': chat_id
+                'body': {
+                    'text': text,
+                    'chat_id': chat_id,
+                }
             },
             1,
         )

main.py

@@ -2,15 +2,9 @@ import sys
 
 
 arg = sys.argv[-1]
-if arg == 'poll':
+if arg == 'worker':
-    from daemons import poll
-    daemon = poll.Daemon()
-elif arg == 'worker':
     from daemons import worker
     daemon = worker.Daemon()
-elif arg == 'mailbox':
-    from daemons import mailbox
-    daemon = mailbox.Daemon()
 else:
     from api import app
     app.run(host="0.0.0.0", port=1238)

sprint_platform.py

@@ -14,11 +14,8 @@ class PlatformClient:
         self.stage = stage
         self.configs = configs
         self.experiments = experiments
-        self.endpoint = 'https://platform.sprinthub.ru/'
+        self.endpoint = 'http://configurator/'
-        self.configs_url = urllib.parse.urljoin(self.endpoint, 'configs/get')
+        self.fetch_url = urllib.parse.urljoin(self.endpoint, '/api/v1/fetch')
-        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.config_storage = {}
         self.experiment_storage = {}
         self.staff_storage = {}
@@ -43,7 +40,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

@@ -18,22 +18,22 @@ class QueuesException(Exception):
 class TasksHandlerMixin:
     def poll(self):
         while True:
-            response = requests.get(f'{QUEUES_URL}/api/v1/take', headers={'queue': self.queue_name})
+            response = requests.get(f'{QUEUES_URL}/api/v1/take', headers={'queue': self.queue_name}).json()
-            if response.status_code == 404:
+            task = response.get('task')
+            if not task:
                 time.sleep(0.2)
                 continue
-            data = response.json()
             try:
-                self.process(data['payload'])
+                self.process(task['payload'])
             except Exception as exc:
-                print(f'Error processing message id={data["id"]}, payload={data["payload"]}, exc={exc}')
+                print(f'Error processing message id={task["id"]}, payload={task["payload"]}, exc={exc}')
                 continue
             try:
-                resp = requests.post(f'{QUEUES_URL}/api/v1/finish', json={'id': data['id']})
+                resp = requests.post(f'{QUEUES_URL}/api/v1/finish', json={'id': task['id']})
                 if resp.status_code != 202:
                     raise QueuesException
             except:
-                print(f'Failed to finish task id={data["id"]}')
+                print(f'Failed to finish task id={task["id"]}')
 
     @property
     def queue_name(self):