fix

Reviewed-on: #18

.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
@@ -26,25 +9,9 @@ services:
       MONGO_HOST: "mongo.sprinthub.ru"
       MONGO_PASSWORD: $MONGO_PASSWORD_PROD
       STAGE: "production"
-      PLATFORM_SECURITY_TOKEN: $PLATFORM_SECURITY_TOKEN
-    networks:
-      - queues
-    deploy:
-      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
+      - configurator
     deploy:
       mode: replicated
       restart_policy:
@@ -57,11 +24,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 +41,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

.gitignore

@@ -116,4 +116,6 @@ GitHub.sublime-settings
 !.vscode/tasks.json
 !.vscode/launch.json
 !.vscode/extensions.json
-.history
+.history
+
+*pb2*

.gitlab-ci.yml

@@ -1,51 +0,0 @@
-stages:
-  - build
-  - deploy-dev
-  - deploy-prod
-
-build:
-  stage: build
-  tags:
-    - dev
-  before_script:
-    - docker login -u mathwave -p $DOCKERHUB_PASSWORD
-  script:
-    - docker build -t mathwave/sprint-repo:pizda-bot .
-
-push:
-  stage: build
-  tags:
-    - dev
-  before_script:
-    - docker login -u mathwave -p $DOCKERHUB_PASSWORD
-  script:
-    - docker push mathwave/sprint-repo:pizda-bot
-
-.deploy:
-  before_script:
-    - docker login -u mathwave -p $DOCKERHUB_PASSWORD
-
-deploy-dev:
-  extends:
-    - .deploy
-  stage: deploy-dev
-  tags:
-    - dev
-  rules:
-    - if: '$CI_COMMIT_BRANCH == "master"'
-      when: on_success
-    - when: manual
-  script:
-    - docker stack deploy --with-registry-auth -c ./.deploy/deploy-dev.yaml pizda-bot
-
-deploy-prod:
-  extends:
-    - .deploy
-  stage: deploy-prod
-  tags:
-    - prod
-  only:
-    - master
-  when: manual
-  script:
-    - docker stack deploy --with-registry-auth -c ./.deploy/deploy-prod.yaml pizda-bot

daemons/api.py

@@ -2,7 +2,7 @@ from collections import defaultdict
 
 from flask import Flask
 
-from mongo import mongo
+from utils.mongo import mongo
 
 app = Flask(__name__)
 

daemons/base.py

@@ -1,3 +1,13 @@
-class BaseDaemon:
+import os
+
+
+stage = os.getenv("STAGE", 'local')
+if stage == 'local':
+    QUEUES_URL = 'localhost:50051'
+else:
+    QUEUES_URL = 'queues-grpc:50051'
+
+
+class Daemon:
     def execute(self):
-        raise NotImplementedError
+        raise NotImplemented

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/updater.py

@@ -2,7 +2,7 @@ import datetime
 import random
 from time import sleep
 
-from mongo import mongo
+from utils.mongo import mongo
 
 
 def update():

daemons/worker.py

@@ -6,9 +6,9 @@ from utils import queues
 from telebot.types import Message
 import json
 
-from mongo import mongo
+from utils.mongo import mongo
-from sprint_platform import PlatformClient
+from utils.sprint_platform import PlatformClient
-from storage import set_values, get_chat_info
+from utils.storage import set_values, get_chat_info
 
 security_token = os.getenv("PLATFORM_SECURITY_TOKEN")
 stage = os.getenv("STAGE", 'local')
@@ -35,11 +35,15 @@ def get_answers():
     return client.get_config('answers')
 
 
+def get_ignored_users():
+    return client.get_config('ignored_users')['users']
+
+
 def get_replies():
     return client.get_config('replies')
 
 
-class Daemon(base.BaseDaemon, queues.TasksHandlerMixin):
+class Daemon(base.Daemon, queues.TasksHandlerMixin):
     @property
     def queue_name(self):
         return 'pizda_bot_worker'
@@ -49,23 +53,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,
         )
@@ -113,6 +123,8 @@ class Daemon(base.BaseDaemon, queues.TasksHandlerMixin):
 
     def process(self, payload):
         message: Message = Message.de_json(json.dumps(payload))
+        if not message.text:
+            return
         if message.text.startswith('/'):
             self.process_command(message)
             return
@@ -143,6 +155,6 @@ class Daemon(base.BaseDaemon, queues.TasksHandlerMixin):
         else:
             return
         ans = get_answers().get(convert_text)
-        if ans is not None and randrange(1, 101) <= info["probability"]:
+        if ans is not None and randrange(1, 101) <= info["probability"] and message.from_user.id not in get_ignored_users():
             self.reply(ans, message.chat.id, message.message_id)
             mongo.inc(message.from_user.username, message.chat.id)

local_platform.json

@@ -1,5 +0,0 @@
-{
-    "configs": {},
-    "experiments": {},
-    "platform_staff": {}
-}

main.py

@@ -2,17 +2,11 @@ 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
+    from daemons.api import app
     app.run(host="0.0.0.0", port=1238)
 
 daemon.execute()

settings.py

@@ -1,10 +0,0 @@
-import os
-import sys
-import zoneinfo
-
-MONGO_USER = os.getenv("MONGO_USER", "mongo")
-MONGO_PASSWORD = os.getenv("MONGO_PASSWORD", "password")
-MONGO_HOST = os.getenv("MONGO_HOST", "localhost")
-
-CACHE_SIZE = int(os.getenv("CACHE_SIZE", 1000))
-CACHE_TTL = int(os.getenv("CACHE_TTL", 3600))

utils/mongo.py

@@ -1,10 +1,14 @@
 import pymongo
-import settings
+import os
+
+MONGO_USER = os.getenv("MONGO_USER", "mongo")
+MONGO_PASSWORD = os.getenv("MONGO_PASSWORD", "password")
+MONGO_HOST = os.getenv("MONGO_HOST", "localhost")
 
 
 class Mongo:
     def __init__(self):
-        url = f"mongodb://{settings.MONGO_USER}:{settings.MONGO_PASSWORD}@{settings.MONGO_HOST}:27017/"
+        url = f"mongodb://{MONGO_USER}:{MONGO_PASSWORD}@{MONGO_HOST}:27017/"
         self.client = pymongo.MongoClient(url)
         self.database = self.client.get_database("pizda-bot")
         self.chats_collection.create_index([

utils/queues.py

@@ -1,5 +1,7 @@
-import json
+from concurrent.futures import ThreadPoolExecutor
+import datetime
 import os
+import zoneinfo
 import requests
 import time
 
@@ -16,24 +18,54 @@ 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': 'botalka',
+                '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:
-            response = requests.get(f'{QUEUES_URL}/api/v1/take', headers={'queue': self.queue_name})
+            try:
-            if response.status_code == 404:
+                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
-            data = response.json()
+            start = datetime.datetime.now(zoneinfo.ZoneInfo("Europe/Moscow"))
             try:
-                self.process(data['payload'])
+                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}')
+                print(f'Error processing message id={task["id"]}, payload={task["payload"]}, exc={exc}')
-                continue
+                success = False
-            try:
+            end = datetime.datetime.now(zoneinfo.ZoneInfo("Europe/Moscow"))
-                resp = requests.post(f'{QUEUES_URL}/api/v1/finish', json={'id': data['id']})
+            if success:
-                if resp.status_code != 202:
+                try:
-                    raise QueuesException
+                    resp = requests.post(f'{QUEUES_URL}/api/v1/finish', json={'id': task['id']})
-            except:
+                    if resp.status_code != 202:
-                print(f'Failed to finish task id={data["id"]}')
+                        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):

utils/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/storage.py

@@ -1,9 +1,12 @@
 from cachetools import TTLCache
+import os
 
-import settings
+from utils.mongo import mongo
-from mongo import mongo
 
-cache = TTLCache(settings.CACHE_SIZE, settings.CACHE_TTL)
+CACHE_SIZE = int(os.getenv("CACHE_SIZE", 1000))
+CACHE_TTL = int(os.getenv("CACHE_TTL", 3600))
+
+cache = TTLCache(CACHE_SIZE, CACHE_TTL)
 
 
 def get_chat_info(chat_id: int) -> dict: