feat: Adjust the version and fix lint issues

Author: ZPascal

grafana_api/alerting.py

@@ -151,11 +151,7 @@ def delete_alertmanager_silence_by_id(
                 RequestsMethods.DELETE,
             )
 
-            if (
-                    api_call == dict()
-                    or api_call.get("message")
-                    != "silence deleted"
-            ):
+            if api_call == dict() or api_call.get("message") != "silence deleted":
                 logging.error(f"Please, check the error: {api_call}.")
                 raise Exception
             else:
@@ -258,7 +254,9 @@ def create_or_update_alertmanager_silence(
                 json.dumps(silence_json_dict),
             )
 
-            if api_call == dict() or (api_call.get("id") is None and api_call.get("silenceID") is None):
+            if api_call == dict() or (
+                api_call.get("id") is None and api_call.get("silenceID") is None
+            ):
                 logging.error(f"Check the error: {api_call}.")
                 raise Exception
             else:
@@ -661,7 +659,12 @@ def create_or_update_ruler_group_by_namespace(
             None
         """
 
-        if len(datasource_uid) != 0 and len(namespace) != 0 and len(group_name) != 0 and rules != list():
+        if (
+            len(datasource_uid) != 0
+            and len(namespace) != 0
+            and len(group_name) != 0
+            and rules != list()
+        ):
             rules_json_list: list = list()
 
             for rule in rules:
@@ -696,7 +699,9 @@ def create_or_update_ruler_group_by_namespace(
             else:
                 logging.info("You successfully created an ruler group.")
         else:
-            logging.error("There is no datasource_uid, namespace, name or rules defined.")
+            logging.error(
+                "There is no datasource_uid, namespace, name or rules defined."
+            )
             raise ValueError
 
     def delete_ruler_group(
@@ -729,7 +734,9 @@ def delete_ruler_group(
             else:
                 logging.info("You successfully deleted a ruler group.")
         else:
-            logging.error("There is no datasource_uid, namespace or group_name defined.")
+            logging.error(
+                "There is no datasource_uid, namespace or group_name defined."
+            )
             raise ValueError
 
     def get_ruler_group(
@@ -761,7 +768,9 @@ def get_ruler_group(
             else:
                 return api_call
         else:
-            logging.error("There is no datasource_uid, namespace or group_name defined.")
+            logging.error(
+                "There is no datasource_uid, namespace or group_name defined."
+            )
             raise ValueError
 
     def test_rule(self, data_query: list) -> dict:
@@ -823,7 +832,11 @@ def test_rule(self, data_query: list) -> dict:
             raise ValueError
 
     def test_datasource_uid_rule(
-        self, expr: str, condition: str, data_query: list, datasource_uid: str = "grafana"
+        self,
+        expr: str,
+        condition: str,
+        data_query: list,
+        datasource_uid: str = "grafana",
     ) -> dict:
         """The method includes a functionality to test a datasource uid rule specified by the expr, the condition, a list of data queries and the datasource_uid
 
@@ -841,7 +854,12 @@ def test_datasource_uid_rule(
             api_call (dict): Returns the result of the specified datasource_uid rule
         """
 
-        if len(datasource_uid) != 0 and len(expr) != 0 and len(condition) != 0 and data_query != list():
+        if (
+            len(datasource_uid) != 0
+            and len(expr) != 0
+            and len(condition) != 0
+            and data_query != list()
+        ):
             datasource_rule_query_objects_json: list = list()
             datasource_rule_query_object_json: dict = dict()
 
@@ -1045,9 +1063,7 @@ def create_or_update_ngalert_organization_configuration(
                     "You successfully created an NGAlert organization configuration."
                 )
         else:
-            logging.error(
-                "There is no alert_managers or alertmanagers_choice defined."
-            )
+            logging.error("There is no alert_managers or alertmanagers_choice defined.")
             raise ValueError
 
     def get_ngalert_alertmanagers_by_organization(self) -> dict:

grafana_api/folder.py

@@ -108,7 +108,9 @@ def get_folder_by_id(self, id: int) -> dict:
             logging.error("There is no folder id defined.")
             raise ValueError
 
-    def create_folder(self, title: str, uid: str = None, parent_uid: str = None) -> dict:
+    def create_folder(
+        self, title: str, uid: str = None, parent_uid: str = None
+    ) -> dict:
         """The method includes a functionality to create a new folder inside the organization specified by the defined title and the optional uid
 
         Args:
@@ -243,7 +245,6 @@ def move_folder(self, uid: str, parent_uid: str = None):
             logging.error("There is no folder uid defined.")
             raise ValueError
 
-
     def delete_folder(self, uid: str):
         """The method includes a functionality to delete a folder inside the organization specified by the defined uid
 

setup.py

@@ -8,7 +8,7 @@
 
 setuptools.setup(
     name="grafana-api-sdk",
-    version="0.6.0",
+    version="0.6.1",
     author="Pascal Zimmermann",
     author_email="[email protected]",
     description="A Grafana API SDK",

tests/integrationtest/test_alerting.py

@@ -6,7 +6,6 @@
 from grafana_api.model import (
     APIModel,
     AlertmanagerConfig,
-    AlertmanagerReceivers,
     DatasourceRuleQuery,
 )
 from grafana_api.alerting import Alerting
@@ -66,16 +65,27 @@ def test_c_delete_alertmanager_config(self):
                     "group_by": ["grafana_folder", "alertname"],
                     "receiver": "grafana-default-email",
                     "provenance": "api",
-                    "routes": [{"object_matchers": [["__grafana_autogenerated__",
-                                                     "=",
-                                                     "true"]],
-                                "receiver": "grafana-default-email",
-                                "routes": [{"group_by": ["grafana_folder",
-                                                         "alertname"],
-                                            "object_matchers": [["__grafana_receiver__",
-                                                                 "=",
-                                                                 "grafana-default-email"]],
-                                            "receiver": "grafana-default-email"}]}]
+                    "routes": [
+                        {
+                            "object_matchers": [
+                                ["__grafana_autogenerated__", "=", "true"]
+                            ],
+                            "receiver": "grafana-default-email",
+                            "routes": [
+                                {
+                                    "group_by": ["grafana_folder", "alertname"],
+                                    "object_matchers": [
+                                        [
+                                            "__grafana_receiver__",
+                                            "=",
+                                            "grafana-default-email",
+                                        ]
+                                    ],
+                                    "receiver": "grafana-default-email",
+                                }
+                            ],
+                        }
+                    ],
                 },
                 "receivers": [
                     {
@@ -92,7 +102,7 @@ def test_c_delete_alertmanager_config(self):
                         ],
                     }
                 ],
-            }
+            },
         }
 
         self.assertEqual(result, self.alerting.get_alertmanager_config())
@@ -137,8 +147,8 @@ def test_get_prometheus_alerts(self):
 
         for i in range(0, MAX_TRIES):
             if (
-                    len(self.alerting.get_prometheus_alerts().get("data").get("alerts"))
-                    != 0
+                len(self.alerting.get_prometheus_alerts().get("data").get("alerts"))
+                != 0
             ):
                 time.sleep(0.1 + i / 2)
                 self.assertEqual(

tests/integrationtest/test_folder.py

@@ -74,7 +74,9 @@ def test_b_subfolder(self):
 
         subfolder: dict = self.folder.create_folder("test2", parent_uid=parent_uid)
 
-        self.assertEqual("test2", self.folder.get_folder_by_uid(subfolder["uid"]).get("title"))
+        self.assertEqual(
+            "test2", self.folder.get_folder_by_uid(subfolder["uid"]).get("title")
+        )
 
     def test_c_update_folder(self):
         self.folder.update_folder(
@@ -91,12 +93,13 @@ def test_d_move_folder(self):
 
         self.assertEqual("test12", self.folder.get_folder_by_uid(folder_uid_b)["title"])
 
-        moved_folder: dict = self.folder.move_folder(folder_uid_a, parent_uid=folder_uid_b)
+        moved_folder: dict = self.folder.move_folder(
+            folder_uid_a, parent_uid=folder_uid_b
+        )
 
         self.assertEqual("test12", moved_folder["parents"][0]["title"])
         self.folder.delete_folder(moved_folder["parents"][0]["uid"])
 
-
     def test_e_delete_folder(self):
         self.folder.delete_folder(self.folder.get_folders()[1].get("uid"))
 

tests/integrationtest/test_playlist.py

@@ -18,11 +18,14 @@ def test_search_playlist(self):
         self.assertEqual("Test1", self.playlist.search_playlist()[0].get("name"))
 
     def test_get_playlist(self):
-        self.assertEqual("Test1", self.playlist.get_playlist("edq1prp6dfy80c").get("name"))
+        self.assertEqual(
+            "Test1", self.playlist.get_playlist("edq1prp6dfy80c").get("name")
+        )
 
     def test_get_playlist_items(self):
         self.assertEqual(
-            "dashboard_by_uid", self.playlist.get_playlist_items("edq1prp6dfy80c")[0].get("type")
+            "dashboard_by_uid",
+            self.playlist.get_playlist_items("edq1prp6dfy80c")[0].get("type"),
         )
 
     def test_a_create_playlist(self):

tests/unittests/test_alerting.py

@@ -203,7 +203,9 @@ def test_create_or_update_alertmanager_silence(self, call_the_api_mock):
         )
 
     @patch("grafana_api.api.Api.call_the_api")
-    def test_create_or_update_alertmanager_silence_return_silence_id(self, call_the_api_mock):
+    def test_create_or_update_alertmanager_silence_return_silence_id(
+        self, call_the_api_mock
+    ):
         model: APIModel = APIModel(host=MagicMock(), token=MagicMock())
         alerting: Alerting = Alerting(grafana_api_model=model)
         silence: Silence = Silence(

tests/unittests/test_api.py

@@ -38,20 +38,34 @@ def test_call_the_api_basic_auth(self, httpx_client_mock):
     @patch("httpx.Client")
     def test_call_the_api_with_proxy_headers(self, httpx_client_mock):
         model: APIModel = APIModel(
-            host="https://test.test.de", username="test", password="test",
-            headers=dict({"X-Custom-Header": "custom_value"})
+            host="https://test.test.de",
+            username="test",
+            password="test",
+            headers=dict({"X-Custom-Header": "custom_value"}),
         )
         api: Api = Api(grafana_api_model=model)
 
-        httpx_client_mock.return_value.request.return_value.text = '{"status": "success"}'
+        httpx_client_mock.return_value.request.return_value.text = (
+            '{"status": "success"}'
+        )
 
         self.assertEqual(
             "success",
             api.call_the_api(api_call=MagicMock())["status"],
         )
 
         httpx_client_mock.assert_called()
-        self.assertEqual(dict({"X-Custom-Header": "custom_value", "Authorization": "Basic dGVzdDp0ZXN0", "Content-Type": "application/json", "Accept": "application/json"}), httpx_client_mock.call_args[1]["headers"])
+        self.assertEqual(
+            dict(
+                {
+                    "X-Custom-Header": "custom_value",
+                    "Authorization": "Basic dGVzdDp0ZXN0",
+                    "Content-Type": "application/json",
+                    "Accept": "application/json",
+                }
+            ),
+            httpx_client_mock.call_args[1]["headers"],
+        )
 
     @patch("httpx.Client")
     def test_call_the_api_org_id(self, httpx_client_mock):

tests/unittests/test_folder.py

@@ -113,7 +113,9 @@ def test_create_folder_parent_uid(self, call_the_api_mock):
         model: APIModel = APIModel(host=MagicMock(), token=MagicMock())
         folder: Folder = Folder(grafana_api_model=model)
 
-        call_the_api_mock.return_value = dict({"title": None, "id": 12, "parent_uid": "test"})
+        call_the_api_mock.return_value = dict(
+            {"title": None, "id": 12, "parent_uid": "test"}
+        )
 
         self.assertEqual(
             dict({"title": None, "id": 12, "parent_uid": "test"}),
@@ -215,7 +217,6 @@ def test_move_folder_no_uid(self):
         with self.assertRaises(ValueError):
             folder.move_folder("")
 
-
     @patch("grafana_api.api.Api.call_the_api")
     def test_move_folder_parent_uid(self, call_the_api_mock):
         model: APIModel = APIModel(host=MagicMock(), token=MagicMock())
@@ -238,7 +239,6 @@ def test_move_folder_no_id(self, call_the_api_mock):
         with self.assertRaises(Exception):
             folder.move_folder("test")
 
-
     @patch("grafana_api.api.Api.call_the_api")
     def test_delete_folder(self, call_the_api_mock):
         model: APIModel = APIModel(host=MagicMock(), token=MagicMock())