diff --git a/grafana_client/client.py b/grafana_client/client.py index d295c5c..4a9b597 100644 --- a/grafana_client/client.py +++ b/grafana_client/client.py @@ -113,7 +113,7 @@ def __request_runnner(url, json=None, headers=None): response = r.json() except ValueError: response = r.text - message = response["message"] if "message" in response else r.text + message = response["message"] if type(response) == dict and "message" in response else r.text if 500 <= r.status_code < 600: raise GrafanaServerError( diff --git a/grafana_client/elements/annotations.py b/grafana_client/elements/annotations.py index a01337e..b22ea79 100644 --- a/grafana_client/elements/annotations.py +++ b/grafana_client/elements/annotations.py @@ -52,10 +52,10 @@ def get_annotation( params.append("panelId=%s" % panel_id) if user_id: - params.append("userId=%s", user_id) + params.append("userId=%s" % user_id) if ann_type: - params.append("type=%s", ann_type) + params.append("type=%s" % ann_type) if tags: for tag in tags: