diff --git a/brian_dashboard_manager/grafana/organization.py b/brian_dashboard_manager/grafana/organization.py index bd8e73595f4f7ded691328e7f1bb8ee48c2452e8..654e0f28901a54e4e1a244b4170820a0df152a1e 100644 --- a/brian_dashboard_manager/grafana/organization.py +++ b/brian_dashboard_manager/grafana/organization.py @@ -4,12 +4,12 @@ import logging from typing import Dict, List, Union from datetime import datetime -from brian_dashboard_manager.grafana.utils.request import Request, AdminRequest +from brian_dashboard_manager.grafana.utils.request import AdminRequest logger = logging.getLogger(__name__) -def switch_active_organization(request: Request, org_id: int): +def switch_active_organization(request: AdminRequest, org_id: int): assert org_id logger.debug(f'Switched {str(request)} active organization to #{org_id}') @@ -52,7 +52,7 @@ def create_api_token(request: AdminRequest, org_id: int, key_data=None): data.update(key_data) switch_active_organization(request, org_id) - result = request.post(f'api/auth/keys', json=data) + result = request.post('api/auth/keys', json=data) token_id = result.get('id') logger.debug(f'Created API token #{token_id} for organization #{org_id}') diff --git a/brian_dashboard_manager/routes/common.py b/brian_dashboard_manager/routes/common.py index 2714cfcec13980b20587fed2c60cf7b18873f37d..b1a2720ff96d6cd9383a121ea860bac78c919d81 100644 --- a/brian_dashboard_manager/routes/common.py +++ b/brian_dashboard_manager/routes/common.py @@ -7,6 +7,7 @@ from flask import request, Response logger = logging.getLogger(__name__) + def require_accepts_json(f): """ used as a route handler decorator to return an error @@ -42,7 +43,9 @@ def after_request(response): logging.exception('INTERNAL DECODING ERROR') data = 'decoding error (see logs)' - logger.warning(f'[{response.status_code}] {request.method} {request.path} {data}') + logger.warning( + f'[{response.status_code}] {request.method} {request.path} {data}') else: - logger.info(f'[{response.status_code}] {request.method} {request.path}') + logger.info( + f'[{response.status_code}] {request.method} {request.path}') return response