Merge pull request 'fix' (#12) from queues into dev

Reviewed-on: #12

.deploy/deploy-dev.yaml

@@ -9,8 +9,7 @@ services:
     environment:
       TELEGRAM_TOKEN: $TELEGRAM_TOKEN_DEV
       STAGE: "development"
-    networks:
+      QUEUES_TOKEN: $QUEUES_TOKEN_DEV
-      - queues
     deploy:
       mode: replicated
       restart_policy:
@@ -26,9 +25,8 @@ services:
       MONGO_HOST: "mongo.develop.sprinthub.ru"
       MONGO_PASSWORD: $MONGO_PASSWORD_DEV
       STAGE: "development"
+      QUEUES_TOKEN: $QUEUES_TOKEN_DEV
       PLATFORM_SECURITY_TOKEN: $PLATFORM_SECURITY_TOKEN
-    networks:
-      - queues
     deploy:
       mode: replicated
       restart_policy:
@@ -43,8 +41,7 @@ services:
     environment:
       TELEGRAM_TOKEN: $TELEGRAM_TOKEN_DEV
       STAGE: "development"
-    networks:
+      QUEUES_TOKEN: $QUEUES_TOKEN_DEV
-      - queues
     deploy:
       mode: replicated
       restart_policy:
@@ -75,5 +72,3 @@ services:
 networks:
   common-infra-nginx:
     external: true
-  queues:
-    external: true

.deploy/deploy-prod.yaml

@@ -9,8 +9,7 @@ services:
     environment:
       TELEGRAM_TOKEN: $TELEGRAM_TOKEN_PROD
       STAGE: "production"
-    networks:
+      QUEUES_TOKEN: $QUEUES_TOKEN_PROD
-      - queues
     deploy:
       mode: replicated
       restart_policy:
@@ -26,9 +25,8 @@ services:
       MONGO_HOST: "mongo.sprinthub.ru"
       MONGO_PASSWORD: $MONGO_PASSWORD_PROD
       STAGE: "production"
+      QUEUES_TOKEN: $QUEUES_TOKEN_PROD
       PLATFORM_SECURITY_TOKEN: $PLATFORM_SECURITY_TOKEN
-    networks:
-      - queues
     deploy:
       mode: replicated
       restart_policy:
@@ -43,8 +41,7 @@ services:
     environment:
       TELEGRAM_TOKEN: $TELEGRAM_TOKEN_PROD
       STAGE: "production"
-    networks:
+      QUEUES_TOKEN: $QUEUES_TOKEN_PROD
-      - queues
     deploy:
       mode: replicated
       restart_policy:
@@ -75,5 +72,3 @@ services:
 networks:
   common-infra-nginx:
     external: true
-  queues:
-    external: true

.gitea/workflows/deploy-dev.yaml

@@ -42,4 +42,5 @@ jobs:
           TELEGRAM_TOKEN_DEV: ${{ secrets.TELEGRAM_TOKEN_DEV }}
           MONGO_PASSWORD_DEV: ${{ secrets.MONGO_PASSWORD_DEV }}
           PLATFORM_SECURITY_TOKEN: ${{ secrets.PLATFORM_SECURITY_TOKEN }}
+          QUEUES_TOKEN_DEV: ${{ secrets.QUEUES_TOKEN_DEV }}
         run: docker stack deploy --with-registry-auth -c ./.deploy/deploy-dev.yaml pizda-bot

.gitea/workflows/deploy-prod.yaml

@@ -42,4 +42,5 @@ jobs:
           TELEGRAM_TOKEN_PROD: ${{ secrets.TELEGRAM_TOKEN_PROD }}
           MONGO_PASSWORD_PROD: ${{ secrets.MONGO_PASSWORD_PROD }}
           PLATFORM_SECURITY_TOKEN: ${{ secrets.PLATFORM_SECURITY_TOKEN }}
+          QUEUES_TOKEN_PROD: ${{ secrets.QUEUES_TOKEN_PROD }}
         run: docker stack deploy --with-registry-auth -c ./.deploy/deploy-prod.yaml pizda-bot

daemons/worker.py

@@ -47,7 +47,7 @@ class Daemon(base.BaseDaemon, queues.TasksHandlerMixin):
     def execute(self):
         self.poll()
 
-    def reply(self, text: str, chat_id: int, message_id: int):
+    def reply(text: str, chat_id: int, message_id: int):
         queues.set_task(
             'pizda_bot_mailbox', 
             {
@@ -59,7 +59,7 @@ class Daemon(base.BaseDaemon, queues.TasksHandlerMixin):
             1,
         )
 
-    def send(self, text: str, chat_id: int):
+    def send(text: str, chat_id: int):
         queues.set_task(
             'pizda_bot_mailbox', 
             {

main.py

@@ -8,9 +8,6 @@ if arg == 'poll':
 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
     app.run(host="0.0.0.0", port=1238)

utils/queues.py

@@ -5,10 +5,14 @@ import time
 
 
 stage = os.getenv("STAGE", 'local')
-if stage == 'local':
+if stage == 'development':
-    QUEUES_URL = 'http://localhost:1239'
+    QUEUES_URL = 'https://queues.develop.sprinthub.ru'
+elif stage == 'production':
+    QUEUES_URL = 'https://queues.sprinthub.ru'
 else:
-    QUEUES_URL = 'http://queues:1239'
+    QUEUES_URL = None
+
+token = os.getenv('QUEUES_TOKEN')
 
 
 class QueuesException(Exception):
@@ -18,18 +22,25 @@ class QueuesException(Exception):
 class TasksHandlerMixin:
     def poll(self):
         while True:
-            response = requests.get(f'{QUEUES_URL}/api/v1/take', headers={'queue': self.queue_name})
+            if QUEUES_URL is None:
-            if response.status_code == 404:
+                data = {'payload': json.loads(input('Input message: '))}
-                time.sleep(0.2)
+            else:
-                continue
+                response = requests.get(f'{QUEUES_URL}/api/v1/take', headers={'queue': self.queue_name, 'X-Queues-Token': token})
-            data = response.json()
+                if response.status_code == 404:
+                    time.sleep(0.2)
+                    continue
+                if response.status_code == 403:
+                    raise NotImplemented('QUEUE_TOKEN is incorrect')
+                data = response.json()
             try:
                 self.process(data['payload'])
             except Exception as exc:
                 print(f'Error processing message id={data["id"]}, payload={data["payload"]}, exc={exc}')
                 continue
+            if QUEUES_URL is None:
+                continue
             try:
-                resp = requests.post(f'{QUEUES_URL}/api/v1/finish', json={'id': data['id']})
+                resp = requests.post(f'{QUEUES_URL}/api/v1/finish', json={'id': data['id']}, headers={'X-Queues-Token': token})
                 if resp.status_code != 202:
                     raise QueuesException
             except:
@@ -44,7 +55,7 @@ class TasksHandlerMixin:
 
 
 def set_task(queue_name: str, payload: dict, seconds_to_execute: int, delay: int|None = None):
-    resp = requests.post(f'{QUEUES_URL}/api/v1/put', headers={'queue': queue_name}, json={
+    resp = requests.post(f'{QUEUES_URL}/api/v1/put', headers={'queue': queue_name, 'X-Queues-Token': token}, json={
         'payload': payload,
         'seconds_to_execute': seconds_to_execute,
         'delay': delay,