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

Reviewed-on: #37

.deploy/deploy-dev.yaml

@@ -6,12 +6,12 @@ services:
   worker:
     image: mathwave/sprint-repo:ruz-bot
     environment:
-      MONGO_HOST: "mongo.develop.sprinthub.ru"
       STAGE: "development"
       MONGO_PASSWORD: $MONGO_PASSWORD_DEV
     networks:
       - queues-development
       - configurator
+      - mongo-development
     command: worker
     deploy:
       mode: replicated
@@ -24,12 +24,11 @@ services:
   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
     networks:
       - queues-development
+      - mongo-development
     command: fetch
     deploy:
       mode: replicated
@@ -42,12 +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
     networks:
       - queues-development
+      - mongo-development
     command: notify
     deploy:
       mode: replicated
@@ -62,11 +60,10 @@ services:
     networks:
       - 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
     command: api
     deploy:
       mode: replicated
@@ -83,3 +80,5 @@ networks:
     external: true
   configurator:
     external: true
+  mongo-development:
+    external: true

.deploy/deploy-prod.yaml

@@ -6,12 +6,12 @@ services:
   worker:
     image: mathwave/sprint-repo:ruz-bot
     environment:
-      MONGO_HOST: "mongo.sprinthub.ru"
       STAGE: "production"
       MONGO_PASSWORD: $MONGO_PASSWORD_PROD
     networks:
       - queues
       - configurator
+      - mongo
     command: worker
     deploy:
       mode: replicated
@@ -24,13 +24,13 @@ services:
   fetch:
     image: mathwave/sprint-repo:ruz-bot
     environment:
-      MONGO_HOST: "mongo.sprinthub.ru"
       STAGE: "production"
       MONGO_PASSWORD: $MONGO_PASSWORD_PROD
       DEBUG: "false"
     networks:
       - queues
       - configurator
+      - mongo
     command: fetch
     deploy:
       mode: replicated
@@ -43,13 +43,13 @@ services:
   notify:
     image: mathwave/sprint-repo:ruz-bot
     environment:
-      MONGO_HOST: "mongo.sprinthub.ru"
       STAGE: "production"
       MONGO_PASSWORD: $MONGO_PASSWORD_PROD
       DEBUG: "false"
     networks:
       - queues
       - configurator
+      - mongo
     command: notify
     deploy:
       mode: replicated
@@ -64,8 +64,8 @@ services:
     networks:
       - common-infra-nginx
       - configurator
+      - mongo
     environment:
-      MONGO_HOST: "mongo.sprinthub.ru"
       STAGE: "production"
       MONGO_PASSWORD: $MONGO_PASSWORD_PROD
       DEBUG: "false"
@@ -85,3 +85,5 @@ networks:
     external: true
   configurator:
     external: true
+  mongo:
+    external: true

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 . .

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'],

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([

utils/queues.py

@@ -1,4 +1,8 @@
+from concurrent.futures import ThreadPoolExecutor
+import datetime
 import os
+import traceback
+import zoneinfo
 import requests
 import time
 
@@ -15,24 +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:
-            response = requests.get(f'{QUEUES_URL}/api/v1/take', headers={'queue': self.queue_name}).json()
+            try:
+                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}')
-                continue
-            try:
-                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={task["id"]}')
+                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):
@@ -49,4 +84,4 @@ def set_task(queue_name: str, payload: dict, seconds_to_execute: int, delay: int
         'delay': delay,
     })
     if resp.status_code != 202:
-        raise QueuesException
+        raise QueuesException