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

Reviewed-on: #13

.deploy/deploy-dev.yaml

@@ -6,11 +6,9 @@ services:
     image: mathwave/sprint-repo:queues-grpc
     networks:
       - queues-development
-      - configurator
     environment:
       MONGO_HOST: "mongo.develop.sprinthub.ru"
       MONGO_PASSWORD: $MONGO_PASSWORD_DEV
-      STAGE: "development"
     deploy:
       mode: replicated
       restart_policy:
@@ -22,5 +20,3 @@ services:
 networks:
   queues-development:
     external: true
-  configurator:
-    external: true

.deploy/deploy-prod.yaml

@@ -6,11 +6,9 @@ services:
     image: mathwave/sprint-repo:queues-grpc
     networks:
       - queues
-      - configurator
     environment:
       MONGO_HOST: "mongo.sprinthub.ru"
       MONGO_PASSWORD: $MONGO_PASSWORD_PROD
-      STAGE: "production"
     deploy:
       mode: replicated
       restart_policy:
@@ -22,5 +20,3 @@ services:
 networks:
   queues:
     external: true
-  configurator:
-    external: true

server.py

@@ -2,7 +2,6 @@ import asyncio
 import datetime
 import grpc
 import bson
-import os
 
 from queues import tasks_pb2
 from queues import tasks_pb2_grpc
@@ -10,18 +9,6 @@ from queues import tasks_pb2_grpc
 from utils import time
 from storage.mongo import tasks
 
-from utils import configurator
-
-
-DEFAULT_RETRY_AFTER = 0.2
-
-
-client = configurator.Client(
-    'queues',
-    os.environ['STAGE'],
-    need_poll=True,
-)
-
 
 def get_feature(feature_db, point):
     """Returns Feature at given location or None."""
@@ -49,9 +36,7 @@ class TasksServicer(tasks_pb2_grpc.TasksServicer):
         task = await tasks.take_task(request.queue)
         if not task:
             return tasks_pb2.TakeResponse(task=None)
-        retry_after_settings = client.get_config('retry_after_settings')
+        return tasks_pb2.TakeResponse(task=tasks_pb2.Task(id=str(task._id), attempt=task.attempts, payload=task.payload))
-        retry_after = retry_after_settings.get(request.queue) or retry_after_settings.get('__default__') or DEFAULT_RETRY_AFTER
-        return tasks_pb2.TakeResponse(task=tasks_pb2.Task(id=str(task._id), attempt=task.attempts, payload=task.payload), retry_after=retry_after)
 
     async def Finish(self, request: tasks_pb2.FinishRequest, context) -> tasks_pb2.EmptyResponse:
         if await tasks.finish_task(bson.ObjectId(request.id)):

utils/configurator.py

@@ -1,84 +0,0 @@
-import json
-import urllib.parse
-from threading import Thread
-from time import sleep
-
-from requests import get
-
-
-class Client:
-    def __init__(self, app_name: str, stage: str, need_poll: bool = True):
-        self.app_name = app_name
-        self.stage = stage
-        self.endpoint = 'http://configurator/'
-        self.fetch_url = urllib.parse.urljoin(self.endpoint, '/api/v1/fetch')
-        self.config_storage = {}
-        self.experiment_storage = {}
-        self.staff_storage = {}
-        self.poll_data()
-        if need_poll:
-            self.poll_data_in_thread()
-
-    def poll_data_in_thread(self):
-        def inner():
-            while True:
-                sleep(30)
-                self.fetch()
-
-        Thread(target=inner, daemon=True).start()
-
-    def poll_data(self):
-        self.fetch(with_exception=True)
-
-    def request_with_retries(self, url, params, with_exception=False, retries_count=3):
-        exception_to_throw = None
-        for _ in range(retries_count):
-            try:
-                response = get(
-                    url,
-                    params=params
-                )
-                if response.status_code == 200:
-                    return response.json()
-                print(f'Failed to request {url}, status_code={response.status_code}')
-                exception_to_throw = Exception('Not 200 status')
-            except Exception as exc:
-                print(exc)
-                exception_to_throw = exc
-            sleep(1)
-        print(f'Failed fetching with retries: {url}, {params}')
-        if with_exception:
-            raise exception_to_throw
-
-    def fetch(self, with_exception=False):
-        if self.stage == 'local':
-            local_platform = json.loads(open('local_platform.json', 'r').read())
-            self.config_storage = local_platform['configs']
-            self.experiment_storage = local_platform['experiments']
-            self.staff_storage = {
-                key: set(value)
-                for key, value in local_platform['platform_staff'].items()
-            }
-            return
-        response_data = self.request_with_retries(self.fetch_url, {
-            'project': self.app_name,
-            'stage': self.stage,
-        }, with_exception)
-        self.config_storage = response_data['configs']
-        self.experiment_storage = response_data['experiments']
-        self.staff_storage = {
-            key: set(value)
-            for key, value in response_data['platform_staff'].items()
-        }
-
-    def is_staff(self, **kwargs):
-        for key, value in kwargs.items():
-            if value in self.staff_storage[key]:
-                return True
-        return False
-
-    def get_config(self, name):
-        return self.config_storage[name]
-
-    def get_experiment(self, name):
-        return self.experiment_storage[name]