diff --git a/analysis/analyzers/render/__init__.py b/analysis/analyzers/render/__init__.py index aeb6a20..24c4d2d 100644 --- a/analysis/analyzers/render/__init__.py +++ b/analysis/analyzers/render/__init__.py @@ -5,7 +5,7 @@ from .. import Result class Render: result_types = [] - def render(self, results: List[Result], name=None): + def render(self, results: List[Result], name=None) -> [str]: raise NotImplementedError() def filter(self, results: List[Result]): diff --git a/analysis/analyzers/render/biogames.py b/analysis/analyzers/render/biogames.py index 16e8b63..53c12c4 100644 --- a/analysis/analyzers/render/biogames.py +++ b/analysis/analyzers/render/biogames.py @@ -135,16 +135,16 @@ class BoardDurationHistRender(Render): class BoardDurationBoxRender(Render): result_types = [BoardDurationAnalyzer] - def render(self, results: List[Result], name=None): + def render(self, results: List[Result], name=None) -> [str]: data = defaultdict(list) for result in self.filter(results): - get = result.get() - for board in get: + for board in result.get(): duration = board['active'] if 'active' in board else 0 data[board['id']].append(duration) data_tuples = [(key, data[key]) for key in sorted(data)] data_tuples = sorted(data_tuples, key=lambda x: sum(x[1])) - plot(data_tuples) + plot(data_tuples, name=name) + return [name] class ActivityMapperRender(Render): diff --git a/docker-compose.yml b/docker-compose.yml index 9a91058..ba49ee1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -version: "2.2" +version: "3" services: app: @@ -10,6 +10,7 @@ services: command: python3 webserver.py environment: - PYTHONPATH=/app + - PYTHONUNBUFFERED=1 networks: - default - traefik_net @@ -23,6 +24,7 @@ services: image: docker.clkl.de/ma/celery:0.4.1 environment: - PYTHONPATH=/app + - PYTHONUNBUFFERED=1 volumes: - ./:/app - ./data/results:/data/results