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

Reviewed-on: #49

.deploy/deploy-dev.yaml

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

.deploy/deploy-prod.yaml

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

Dockerfile

@@ -4,6 +4,5 @@ WORKDIR /usr/src/app
 COPY requirements.txt requirements.txt
 RUN pip install -r requirements.txt
 COPY . .
-RUN make gen
 ENV PYTHONUNBUFFERED 1
 ENTRYPOINT ["python", "main.py"]

Makefile

@@ -1,7 +0,0 @@
-gen:
-	pip install grpcio grpcio-tools
-	curl https://platform.sprinthub.ru/generator >> generator.py
-	python generator.py
-	rm generator.py
-run:
-	python ./server.py

daemons/base.py

@@ -1,6 +1,4 @@
 import os
-import grpc
-from queues import tasks_pb2_grpc
 
 
 stage = os.getenv("STAGE", 'local')
@@ -11,8 +9,5 @@ else:
 
 
 class Daemon:
-    def __init__(self):
-        self.channel = grpc.insecure_channel(QUEUES_URL)
-        self.stub = tasks_pb2_grpc.TasksStub(channel=self.channel)     
     def execute(self):
         raise NotImplemented

daemons/worker.py

@@ -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,7 +53,6 @@ class Daemon(base.BaseDaemon, queues.TasksHandlerMixin):
 
     def reply(self, text: str, chat_id: int, message_id: int):
         queues.set_task(
-            self.stub,
             'botalka_mailbox', 
             {
                 'project': 'pizda-bot',
@@ -65,7 +68,6 @@ class Daemon(base.BaseDaemon, queues.TasksHandlerMixin):
 
     def send(self, text: str, chat_id: int):
         queues.set_task(
-            self.stub,
             'botalka_mailbox', 
             {
                 'project': 'pizda-bot',
@@ -153,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)

utils/queues.py

@@ -1,8 +1,16 @@
+from concurrent.futures import ThreadPoolExecutor
+import datetime
+import os
+import zoneinfo
+import requests
 import time
-from queues import tasks_pb2_grpc
-from queues import tasks_pb2
 
-from google.protobuf import json_format
+
+stage = os.getenv("STAGE", 'local')
+if stage == 'local':
+    QUEUES_URL = 'http://localhost:1239'
+else:
+    QUEUES_URL = 'http://queues:1239'
 
 
 class QueuesException(Exception):
@@ -10,23 +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: tasks_pb2.TakeResponse = self.stub.Take(tasks_pb2.TakeRequest(queue=self.queue_name))
+            try:
-            task = response.task
+                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:
-                payload = json_format.MessageToDict(task.payload)
+                print(f'process task with id {task["id"]}, attempt {task["attempt"]}')
-                self.process(payload)
+                self.process(task['payload'])
+                success = True
             except Exception as exc:
-                print(f'Error processing message id={task.id}, payload={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"))
-                self.stub.Finish(tasks_pb2.FinishRequest(id=task.id))
+            if success:
-            except:
+                try:
-                print(f'Failed to finish task id={task.id}')
+                    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):
@@ -35,12 +74,12 @@ class TasksHandlerMixin:
     def process(self, payload):
         raise NotImplemented
 
-def set_task(stub: tasks_pb2_grpc.TasksStub, queue_name: str, payload: dict, seconds_to_execute: int, delay: int|None = None):
+
-    stub.Put(
+def set_task(queue_name: str, payload: dict, seconds_to_execute: int, delay: int|None = None):
-        tasks_pb2.PutRequest(
+    resp = requests.post(f'{QUEUES_URL}/api/v1/put', headers={'queue': queue_name}, json={
-            queue=queue_name, 
+        'payload': payload,
-            seconds_to_execute=seconds_to_execute, 
+        'seconds_to_execute': seconds_to_execute,
-            delay=delay, 
+        'delay': delay,
-            payload=payload
+    })
-        )
+    if resp.status_code != 202:
-    )
+        raise QueuesException