From 7c896bf830836e00d2bf04926eea341a549654be Mon Sep 17 00:00:00 2001
From: Bjarke Madsen <bjarke.madsen@geant.org>
Date: Wed, 24 Feb 2021 11:44:31 +0100
Subject: [PATCH] formatting
---
brian_dashboard_manager/grafana/folder.py | 9 ++++++---
brian_dashboard_manager/grafana/organization.py | 8 +++++---
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/brian_dashboard_manager/grafana/folder.py b/brian_dashboard_manager/grafana/folder.py
index ce81f8b..181ea8e 100644
--- a/brian_dashboard_manager/grafana/folder.py
+++ b/brian_dashboard_manager/grafana/folder.py
@@ -1,10 +1,11 @@
import logging
from requests.exceptions import HTTPError
-from brian_dashboard_manager.grafana.utils.request import Request, TokenRequest
+from brian_dashboard_manager.grafana.utils.request import TokenRequest
logger = logging.getLogger(__name__)
+
def get_folders(request: TokenRequest):
return request.get('api/folders')
@@ -13,7 +14,9 @@ def create_folder(request: TokenRequest, title):
try:
data = {'title': title, 'uid': title.replace(' ', '_')}
r = request.post('api/folders', json=data)
- except HTTPError:
- logger.exception(f'Error when creating folder {title}')
+ except HTTPError as e:
+ message = e.content.get("message", "")
+ logger.exception(
+ f'Error when creating folder {title} ({message})')
return None
return r
diff --git a/brian_dashboard_manager/grafana/organization.py b/brian_dashboard_manager/grafana/organization.py
index c989f77..4c01096 100644
--- a/brian_dashboard_manager/grafana/organization.py
+++ b/brian_dashboard_manager/grafana/organization.py
@@ -4,7 +4,8 @@ import logging
from typing import Dict, List, Union
from datetime import datetime
-from brian_dashboard_manager.grafana.utils.request import AdminRequest, TokenRequest
+from brian_dashboard_manager.grafana.utils.request import AdminRequest, \
+ TokenRequest
logger = logging.getLogger(__name__)
@@ -88,8 +89,9 @@ def delete_expired_api_tokens(request: AdminRequest, org_id: int) -> bool:
delete_api_token(request, org_id, token['id'])
return True
+
def set_home_dashboard(request: TokenRequest, dashboard_id: int):
- r = request.put(f'api/org/preferences', json={
+ r = request.put('api/org/preferences', json={
'homeDashboardId': dashboard_id
})
- return r and r.get('message') == 'Preferences updated'
\ No newline at end of file
+ return r and r.get('message') == 'Preferences updated'
--
GitLab