fix

.deploy/deploy-dev.yaml

@@ -22,7 +22,6 @@ services:
     networks:
       - configurator
       - queues-development
-      - locks-development
     environment:
       STAGE: "development"
     command: mailbox
@@ -39,5 +38,3 @@ networks:
     external: true
   queues-development:
     external: true
-  locks-development:
-    external: true

.deploy/deploy-prod.yaml

@@ -22,7 +22,6 @@ services:
     networks:
       - configurator
       - queues
-      - locks
     environment:
       STAGE: "production"
     command: mailbox
@@ -39,5 +38,3 @@ networks:
     external: true
   queues:
     external: true
-  locks:
-    external: true

.gitignore

@@ -119,3 +119,6 @@ GitHub.sublime-settings
 .history
 
 local_platform.json
+
+*pb2*
+schemas

daemons/mailbox.py

@@ -5,7 +5,6 @@ from telebot import apihelper
 from daemons import base
 from utils import platform
 from utils import queues
-from utils import locks
 
 
 class Message(pydantic.BaseModel):
@@ -23,9 +22,6 @@ class Daemon(base.Daemon, queues.TasksHandlerMixin):
     def queue_name(self):
         return 'botalka_mailbox'
     
-    def before_execute(self, task: dict):
-        locks.acquire(task['id'], 60)
-    
     def process(self, payload: dict):
         message = Message.model_validate(payload)
         bot = platform.platform_client.get_config('bots')[message.project][message.name]

daemons/poll.py

@@ -1,6 +1,7 @@
 import telebot
-import threading
+import multiprocessing
 import time
+import json
 
 from daemons import base
 from utils import platform
@@ -9,45 +10,37 @@ from utils import queues
 
 class Daemon(base.Daemon):
     def __init__(self):
-        self.telegram_bots: dict[str, dict[str, telebot.TeleBot|None]] = {}
+        self.processes: dict[str, multiprocessing.Process|None] = {}
-        self.threads: dict[str, dict[str, threading.Thread|None]] = {}
 
     def execute(self):
         while True:
             bots = platform.platform_client.get_config('bots')
             for project_name, project in bots.items():
-                if project_name not in self.telegram_bots:
-                    self.telegram_bots[project_name] = {}
-                    self.threads[project_name] = {}
                 for bot_name, bot_info in project.items():
-                    if bot_name not in self.telegram_bots[project_name]:
+                    key = f'{project_name}_{bot_name}'
-                        self.telegram_bots[project_name][bot_name] = None
+                    proc = self.processes.get(key)
-                        self.threads[project_name][bot_name] = None
-                    bot = self.telegram_bots[project_name][bot_name]
                     if bot_info.get('poll_enabled'):
-                        if bot is not None and self.threads[project_name][bot_name].is_alive():
+                        if proc and proc.is_alive():
                             print(f'process for {project_name} {bot_name} is alive')
                             continue
                         print(f'starting process for {project_name} {bot_name}')
-                        bot = telebot.TeleBot(bot_info['secrets']['telegram_token'])
+                        process = multiprocessing.Process(target=self.start_polling, args=(bot_info['secrets']['telegram_token'], bot_info['queue']))
-                        thread = self.start_polling(bot, bot_info['queue'])
+                        process.start()
-                        self.telegram_bots[project_name][bot_name] = bot 
+                        self.processes[key] = process
-                        self.threads[project_name][bot_name] = thread 
                         print(f'started process for {project_name} {bot_name}')
                     else:
-                        if bot is None:
+                        if proc is None:
                             print(f'process for {project_name} {bot_name} is not alive')
                             continue
                         print(f'terminating process for {project_name} {bot_name}')
-                        bot.stop_bot()
+                        proc.terminate()
-                        self.telegram_bots[project_name][bot_name] = None
+                        self.processes[key] = None
                         print(f'terminated process for {project_name} {bot_name}')
             time.sleep(10)
 
-    def start_polling(self, bot: telebot.TeleBot, queue: str) -> threading.Thread:
+    def start_polling(self, token: str, queue: str):
+        bot = telebot.TeleBot(token)
         @bot.message_handler(content_types=['audio', 'photo', 'voice', 'video', 'document', 'animation', 'text', 'location', 'contact', 'sticker', 'video_note'])
         def do_action(message: telebot.types.Message):
             queues.set_task(queue, message.json, 1)
-        thread = threading.Thread(target=bot.polling)
+        bot.polling()
-        thread.start()
-        return thread

requirements.txt

@@ -1,10 +1,10 @@
 annotated-types==0.7.0
-certifi==2024.8.30
+certifi==2024.12.14
 charset-normalizer==3.4.0
 idna==3.10
-pydantic==2.10.2
+pydantic==2.10.4
-pydantic_core==2.27.1
+pydantic_core==2.27.2
 pyTelegramBotAPI==4.1.1
 requests==2.32.3
 typing_extensions==4.12.2
-urllib3==2.2.3
+urllib3==2.3.0

utils/locks.py

@@ -1,27 +0,0 @@
-import requests
-
-
-LOCKS_URL = 'http://locks'
-
-
-class Conflict(Exception):
-    pass
-
-
-def acquire(name: str, ttl: int = 1):
-    resp = requests.post(f'{LOCKS_URL}/api/v1/acquire', json={
-        'name': name,
-        'ttl': ttl,
-    })
-    if resp.status_code == 409:
-        raise Conflict
-    if resp.status_code != 202:
-        raise Exception
-
-
-def release(name: str):
-    resp = requests.post(f'{LOCKS_URL}/api/v1/release', json={
-        'name': name,
-    })
-    if resp.status_code != 202:
-        raise Exception

utils/queues.py

@@ -1,4 +1,10 @@
+from concurrent.futures import ThreadPoolExecutor
+import datetime
+import json
 import os
+import traceback
+import uuid
+import zoneinfo
 import requests
 import time
 
@@ -15,32 +21,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': '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()
+            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:
-                self.before_execute(task)
+                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
+                traceback.print_stack()
+                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
-                self.after_execute(task)
+                    print(f'finish task with id {task["id"]}')
                 except:
                     print(f'Failed to finish task id={task["id"]}')
-
+            self._send_metric(start, end, success)
-    def before_execute(self, task: dict):
-        pass
-
-    def after_execute(self, task: dict):
-        pass
 
     @property
     def queue_name(self):