Merge pull request #101 from GabrielSalla/add-ruff-rules

Add ruff rules

Author: GabrielSalla

pyproject.toml

@@ -53,7 +53,7 @@ slack-bolt = "^1.22.0"
 
 [tool.ruff]
 include = ["src/**/*.py", "tests/**/*.py", "internal_monitors/**/*.py", "sample_monitors/**/*.py", "tools/**/*.py"]
-lint.extend-select = ["E", "W", "F", "Q", "I", "RET"]
+lint.extend-select = ["E", "W", "F", "Q", "I", "RET", "C4", "PERF"]
 line-length = 100
 
 [tool.ruff.lint.isort]

src/components/monitors_loader/monitors_loader.py

@@ -236,7 +236,7 @@ async def _get_monitors_to_load(
         monitors_ids=list(monitors.keys()),
         reference_timestamp=reference_timestamp,
     )
-    code_modules = [code_module for code_module in updated_code_modules]
+    code_modules = list(updated_code_modules)
 
     # Add monitors that are enabled but aren't in the registry
     registry_monitors_ids = set(registry.get_monitors_ids())

tests/components/controller/test_controller.py

@@ -361,37 +361,35 @@ async def test_run(monkeypatch, clear_queue, clear_database):
     # Assert the tasks were queued
     queue_items_set = set(get_queue_items())
 
-    assert queue_items_set == set(
-        [
-            json.dumps(
-                {
-                    "type": "process_monitor",
-                    "payload": {
-                        "monitor_id": monitors_instances[0].id,
-                        "tasks": ["search", "update"],
-                    },
-                }
-            ),
-            json.dumps(
-                {
-                    "type": "process_monitor",
-                    "payload": {
-                        "monitor_id": monitors_instances[1].id,
-                        "tasks": ["search", "update"],
-                    },
-                }
-            ),
-            json.dumps(
-                {
-                    "type": "process_monitor",
-                    "payload": {
-                        "monitor_id": monitors_instances[2].id,
-                        "tasks": ["search", "update"],
-                    },
-                }
-            ),
-        ]
-    )
+    assert queue_items_set == {
+        json.dumps(
+            {
+                "type": "process_monitor",
+                "payload": {
+                    "monitor_id": monitors_instances[0].id,
+                    "tasks": ["search", "update"],
+                },
+            }
+        ),
+        json.dumps(
+            {
+                "type": "process_monitor",
+                "payload": {
+                    "monitor_id": monitors_instances[1].id,
+                    "tasks": ["search", "update"],
+                },
+            }
+        ),
+        json.dumps(
+            {
+                "type": "process_monitor",
+                "payload": {
+                    "monitor_id": monitors_instances[2].id,
+                    "tasks": ["search", "update"],
+                },
+            }
+        ),
+    }
 
 
 async def test_run_no_sleep(mocker, monkeypatch):

tests/components/executor/test_monitor_handler.py

@@ -470,8 +470,8 @@ async def search_function():
     )
     assert len(issues) == number_of_issues
     assert all(issue.monitor_id == sample_monitor.id for issue in issues)
-    issues_ids = set(issue.id for issue in issues)
-    monitors_issues_ids = set(issue.id for issue in sample_monitor.active_issues)
+    issues_ids = {issue.id for issue in issues}
+    monitors_issues_ids = {issue.id for issue in sample_monitor.active_issues}
     assert monitors_issues_ids == issues_ids
 
 

tests/components/monitors_loader/test_monitors_loader.py

@@ -255,9 +255,7 @@ async def test_get_monitors_files_from_path():
     monitors_files = list(monitors_loader._get_monitors_files_from_path("tests/sample_monitors"))
 
     assert len(monitors_files) == 3
-    monitors_files = list(
-        sorted(monitors_files, key=lambda monitor_files: monitor_files.monitor_name)
-    )
+    monitors_files = sorted(monitors_files, key=lambda monitor_files: monitor_files.monitor_name)
     assert monitors_files == [
         monitors_loader.MonitorFiles(
             monitor_name="monitor_1",
@@ -287,12 +285,10 @@ async def test_get_monitors_files_from_path_with_additional_files():
     )
 
     assert len(monitors_files) == 2
-    monitors_files = list(
-        sorted(monitors_files, key=lambda monitor_files: monitor_files.monitor_name)
-    )
+    monitors_files = sorted(monitors_files, key=lambda monitor_files: monitor_files.monitor_name)
     for monitor_files in monitors_files:
-        monitor_files.additional_files = list(
-            sorted(monitor_files.additional_files, key=lambda additional_file: additional_file.name)
+        monitor_files.additional_files = sorted(
+            monitor_files.additional_files, key=lambda additional_file: additional_file.name
         )
     assert monitors_files == [
         monitors_loader.MonitorFiles(

tests/plugins/slack/notifications/test_slack_notification.py

@@ -532,7 +532,7 @@ async def test_build_attachments(
     call_args = slack_build_attachments_spy.call_args
 
     # Assert there are no 'None' or '[]' blocks
-    assert all([block for block in call_args[0]])
+    assert all(block for block in call_args[0])
     assert call_args[1]["attachment_color"] is not None
     assert call_args[1]["fallback"] is not None
 

tests/plugins/test_services.py

@@ -78,7 +78,7 @@ async def other(controller_enabled, executor_enabled):
         ("service_type1", "service_type2"),
         ("service_type1",),
         ("service_type2",),
-        tuple(),
+        (),
     ],
 )
 async def test_plugin_service_run_multiple_services(caplog, mocker, enabled_services):