Merge pull request 'remote' (#27) from master into prod

Reviewed-on: #27

.deploy/deploy-dev.yaml

@@ -6,7 +6,6 @@ services:
     image: mathwave/sprint-repo:queues
     networks:
       - queues-development
-      - configurator
     environment:
       MONGO_HOST: "mongo.develop.sprinthub.ru"
       MONGO_PASSWORD: $MONGO_PASSWORD_DEV
@@ -22,5 +21,3 @@ services:
 networks:
   queues-development:
     external: true
-  configurator:
-    external: true

.deploy/deploy-prod.yaml

@@ -6,7 +6,6 @@ services:
     image: mathwave/sprint-repo:queues
     networks:
       - queues
-      - configurator
     environment:
       MONGO_HOST: "mongo.sprinthub.ru"
       MONGO_PASSWORD: $MONGO_PASSWORD_PROD
@@ -22,5 +21,3 @@ services:
 networks:
   queues:
     external: true
-  configurator:
-    external: true

app/routers/take.py

@@ -3,7 +3,6 @@ import pydantic
 import typing
 
 from app.storage.mongo import tasks
-# from app.utils.configurator import configurator
 
 
 DEFAULT_RETRY_AFTER = 0.2
@@ -29,6 +28,4 @@ async def execute(queue: typing.Annotated[str, fastapi.Header()]) -> Response:
         return Response(task=None)
     if not task:
         return Response(task=None)
-    # retry_after_config = configurator.get_config('retry_after')
-    # retry_after = retry_after_config.get(queue) or retry_after_config.get('default') or DEFAULT_RETRY_AFTER
     return Response(task=Task(id=str(task._id), attempt=task.attempts, payload=task.payload))

app/utils/configurator.py

@@ -1,88 +0,0 @@
-import json
-import urllib.parse
-import os
-from threading import Thread
-from time import sleep
-
-from requests import get
-
-
-class ConfiguratorClient:
-    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]
-    
-
-# configurator = ConfiguratorClient('queues', os.getenv('STAGE', 'local'))