.gitignore

@@ -116,6 +116,4 @@ GitHub.sublime-settings
 !.vscode/tasks.json
 !.vscode/launch.json
 !.vscode/extensions.json
-.history
+.history
-
-*pb2*

.gitlab-ci.yml

@@ -0,0 +1,51 @@
+stages:
+  - build
+  - deploy-dev
+  - deploy-prod
+
+build:
+  stage: build
+  tags:
+    - dev
+  before_script:
+    - docker login -u mathwave -p $DOCKERHUB_PASSWORD
+  script:
+    - docker build -t mathwave/sprint-repo:pizda-bot .
+
+push:
+  stage: build
+  tags:
+    - dev
+  before_script:
+    - docker login -u mathwave -p $DOCKERHUB_PASSWORD
+  script:
+    - docker push mathwave/sprint-repo:pizda-bot
+
+.deploy:
+  before_script:
+    - docker login -u mathwave -p $DOCKERHUB_PASSWORD
+
+deploy-dev:
+  extends:
+    - .deploy
+  stage: deploy-dev
+  tags:
+    - dev
+  rules:
+    - if: '$CI_COMMIT_BRANCH == "master"'
+      when: on_success
+    - when: manual
+  script:
+    - docker stack deploy --with-registry-auth -c ./.deploy/deploy-dev.yaml pizda-bot
+
+deploy-prod:
+  extends:
+    - .deploy
+  stage: deploy-prod
+  tags:
+    - prod
+  only:
+    - master
+  when: manual
+  script:
+    - docker stack deploy --with-registry-auth -c ./.deploy/deploy-prod.yaml pizda-bot

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

api.py

@@ -2,7 +2,7 @@ from collections import defaultdict
 
 from flask import Flask
 
-from utils.mongo import mongo
+from mongo import mongo
 
 app = Flask(__name__)
 

daemons/base.py

@@ -1,18 +1,3 @@
-import os
+class BaseDaemon:
-import grpc
-from queues import tasks_pb2_grpc
-
-
-stage = os.getenv("STAGE", 'local')
-if stage == 'local':
-    QUEUES_URL = 'localhost:50051'
-else:
-    QUEUES_URL = 'queues-grpc:50051'
-
-
-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
+        raise NotImplementedError

daemons/worker.py

@@ -6,9 +6,9 @@ from utils import queues
 from telebot.types import Message
 import json
 
-from utils.mongo import mongo
+from mongo import mongo
-from utils.sprint_platform import PlatformClient
+from sprint_platform import PlatformClient
-from utils.storage import set_values, get_chat_info
+from storage import set_values, get_chat_info
 
 security_token = os.getenv("PLATFORM_SECURITY_TOKEN")
 stage = os.getenv("STAGE", 'local')
@@ -49,7 +49,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 +64,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',
@@ -120,9 +118,9 @@ class Daemon(base.BaseDaemon, queues.TasksHandlerMixin):
             set_values(message.chat.id, state="set_probability")
 
     def process(self, payload):
-        message: Message = Message.de_json(json.dumps(payload))
         if not message.text:
             return
+        message: Message = Message.de_json(json.dumps(payload))
         if message.text.startswith('/'):
             self.process_command(message)
             return

local_platform.json

@@ -0,0 +1,5 @@
+{
+    "configs": {},
+    "experiments": {},
+    "platform_staff": {}
+}

main.py

@@ -6,7 +6,7 @@ if arg == 'worker':
     from daemons import worker
     daemon = worker.Daemon()
 else:
-    from daemons.api import app
+    from api import app
     app.run(host="0.0.0.0", port=1238)
 
 daemon.execute()

mongo.py

@@ -1,14 +1,10 @@
 import pymongo
-import os
+import settings
-
-MONGO_USER = os.getenv("MONGO_USER", "mongo")
-MONGO_PASSWORD = os.getenv("MONGO_PASSWORD", "password")
-MONGO_HOST = os.getenv("MONGO_HOST", "localhost")
 
 
 class Mongo:
     def __init__(self):
-        url = f"mongodb://{MONGO_USER}:{MONGO_PASSWORD}@{MONGO_HOST}:27017/"
+        url = f"mongodb://{settings.MONGO_USER}:{settings.MONGO_PASSWORD}@{settings.MONGO_HOST}:27017/"
         self.client = pymongo.MongoClient(url)
         self.database = self.client.get_database("pizda-bot")
         self.chats_collection.create_index([

settings.py

@@ -0,0 +1,10 @@
+import os
+import sys
+import zoneinfo
+
+MONGO_USER = os.getenv("MONGO_USER", "mongo")
+MONGO_PASSWORD = os.getenv("MONGO_PASSWORD", "password")
+MONGO_HOST = os.getenv("MONGO_HOST", "localhost")
+
+CACHE_SIZE = int(os.getenv("CACHE_SIZE", 1000))
+CACHE_TTL = int(os.getenv("CACHE_TTL", 3600))

storage.py

@@ -1,12 +1,9 @@
 from cachetools import TTLCache
-import os
 
-from utils.mongo import mongo
+import settings
+from mongo import mongo
 
-CACHE_SIZE = int(os.getenv("CACHE_SIZE", 1000))
+cache = TTLCache(settings.CACHE_SIZE, settings.CACHE_TTL)
-CACHE_TTL = int(os.getenv("CACHE_TTL", 3600))
-
-cache = TTLCache(CACHE_SIZE, CACHE_TTL)
 
 
 def get_chat_info(chat_id: int) -> dict:

updater.py

@@ -2,7 +2,7 @@ import datetime
 import random
 from time import sleep
 
-from utils.mongo import mongo
+from mongo import mongo
 
 
 def update():

utils/queues.py

@@ -1,8 +1,14 @@
+import json
+import os
+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):
@@ -12,21 +18,22 @@ class QueuesException(Exception):
 class TasksHandlerMixin:
     def poll(self):
         while True:
-            response: tasks_pb2.TakeResponse = self.stub.Take(tasks_pb2.TakeRequest(queue=self.queue_name))
+            response = requests.get(f'{QUEUES_URL}/api/v1/take', headers={'queue': self.queue_name}).json()
-            task = response.task
+            task = response.get('task')
             if not task:
                 time.sleep(0.2)
                 continue
             try:
-                payload = json_format.MessageToDict(task.payload)
+                self.process(task['payload'])
-                self.process(payload)
             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
             try:
-                self.stub.Finish(tasks_pb2.FinishRequest(id=task.id))
+                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}')
+                print(f'Failed to finish task id={task["id"]}')
 
     @property
     def queue_name(self):
@@ -35,12 +42,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