Merge pull request 'fix' (#43) from master into dev

Reviewed-on: https://gitea.sprinthub.ru/self/pizda-bot/pulls/43

.deploy/deploy-dev.yaml

@@ -6,13 +6,12 @@ services:
     image: mathwave/sprint-repo:pizda-bot
     command: worker
     environment:
-      MONGO_HOST: "mongo"
+      MONGO_HOST: "mongo.develop.sprinthub.ru"
       MONGO_PASSWORD: $MONGO_PASSWORD_DEV
       STAGE: "development"
     networks:
       - queues-development
       - configurator
-      - mongo-development
     deploy:
       mode: replicated
       restart_policy:
@@ -25,12 +24,11 @@ services:
     image: mathwave/sprint-repo:pizda-bot
     command: api
     environment:
-      MONGO_HOST: "mongo"
+      MONGO_HOST: "mongo.develop.sprinthub.ru"
       MONGO_PASSWORD: $MONGO_PASSWORD_DEV
       STAGE: "development"
     networks:
       - common-infra-nginx-development
-      - mongo-development
     deploy:
       mode: replicated
       restart_policy:
@@ -46,5 +44,3 @@ networks:
     external: true
   configurator:
     external: true
-  mongo-development:
-    external: true

.deploy/deploy-prod.yaml

@@ -6,13 +6,12 @@ services:
     image: mathwave/sprint-repo:pizda-bot
     command: worker
     environment:
-      MONGO_HOST: "mongo"
+      MONGO_HOST: "mongo.sprinthub.ru"
       MONGO_PASSWORD: $MONGO_PASSWORD_PROD
       STAGE: "production"
     networks:
       - queues
       - configurator
-      - mongo
     deploy:
       mode: replicated
       restart_policy:
@@ -25,11 +24,10 @@ services:
     image: mathwave/sprint-repo:pizda-bot
     command: api
     environment:
-      MONGO_HOST: "mongo"
+      MONGO_HOST: "mongo.sprinthub.ru"
       MONGO_PASSWORD: $MONGO_PASSWORD_PROD
     networks:
       - common-infra-nginx
-      - mongo
     deploy:
       mode: replicated
       restart_policy:
@@ -45,5 +43,3 @@ networks:
     external: true
   configurator:
     external: true
-  mongo:
-    external: true

daemons/worker.py

@@ -28,72 +28,15 @@ all_letters = "йцукенгшщзхъёфывапролджэячсмитьб
 
 
 def get_self_name():
-    return 'answer_da_bot'
+    return client.get_config('constants')['self_name']
 
 
 def get_answers():
-    return {
+    return client.get_config('answers')
-        "200": "Отсоси на месте!",
-        "300": "Отсоси у тракториста!",
-        "a": "Хуй на!",
-        "da": "Pizda!",
-        "а": "Хуй на!",
-        "я": "Головка от хуя!",
-        "dа": "Pizda!",
-        "gde": "V pizde!",
-        "net": "Pidora otvet!",
-        "yes": "Hues!",
-        "дa": "Пизда!",
-        "чe": "Хуй через плечо!",
-        "чo": "Хуй через плечо!",
-        "gdе": "V pizde!",
-        "heт": "Пидора ответ!",
-        "nеt": "Pidora otvet!",
-        "да": "Пизда!",
-        "ды": "Получишь пизды!",
-        "ес": "Хуес!",
-        "ты": "Попой нюхаешь цветы!",
-        "че": "Хуй через плечо!",
-        "чо": "Хуй через плечо!",
-        "чё": "Хуй через плечо!",
-        "hет": "Пидора ответ!",
-        "гдe": "В пизде!",
-        "нeт": "Пидора ответ!",
-        "ага": "В жопе нога!",
-        "ало": "Хуем по лбу не дало?",
-        "бот": "Я ебал твой рот!",
-        "вот": "Хуй те в рот!",
-        "где": "В пизде!",
-        "как": "Жопой об косяк!",
-        "кто": "Конь в пальто!",
-        "мне": "Хуем по губе!",
-        "нет": "Пидора ответ!",
-        "ога": "В жопе нога!",
-        "опа": "Срослась пизда и жопа!",
-        "три": "Жопу подотри!",
-        "угу": "Иди в пизду!",
-        "хех": "В жопе орех!",
-        "алло": "Хуем по лбу не дало?",
-        "неть": "Хуеть!",
-        "слыш": "За углом поссышь!",
-        "когда": "Иди на!",
-        "ладно": "В трусах прохладно!",
-        "слышь": "За углом поссышь!",
-        "двести": "Отсоси на месте!",
-        "делать": "Хуй ко лбу приделать!",
-        "именно": "Хуименно!",
-        "триста": "Тебе нужна помощь специалиста!",
-        "здрасте": "Пизду покрасьте!",
-        "грустный": "Хуй сосал невкусный!",
-        "здрасьте": "Пизду покрасьте!",
-        "правильно": "Хуявильно!",
-        "случилась": "Рубаха в жопу засучилась!",
-        "случилось": "Рубаха в жопу засучилась!"
-    }
 
 
 def get_ignored_users():
-    return []
+    return client.get_config('ignored_users')['users']
 
 
 def get_replies():
@@ -190,6 +133,8 @@ class Daemon(base.Daemon, queues.TasksHandlerMixin):
                 self.reply(choice(get_replies()), message.chat.id, message.message_id)
                 return
         info = get_chat_info(message.chat.id)
+        if client.get_config('updater')['enabled']:
+            set_values(message.chat.id, last_time_updated=datetime.datetime.now())
         if message.text == '#debug' and client.is_staff(telegram_id=message.from_user.id):
             self.reply(f'chat id: {message.chat.id}\nprobability: {info["probability"]}', message.chat.id, message.message_id)
             return

utils/queues.py

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