Ruff rules for comprehensions and performance (#310)

Author: cclauss

scheduler/admin/task_admin.py

@@ -27,21 +27,21 @@ def get_job_executions_for_task(queue_name: str, scheduled_task: Task) -> List[J
     )
 
     res = sorted(
-        list(filter(lambda j: job_execution_of(j, scheduled_task), job_list)), key=lambda j: j.created_at, reverse=True
+        filter(lambda j: job_execution_of(j, scheduled_task), job_list), key=lambda j: j.created_at, reverse=True
     )
     return res
 
 
 class JobArgInline(GenericStackedInline):
     model = TaskArg
     extra = 0
-    fieldsets = ((None, dict(fields=("arg_type", "val"))),)
+    fieldsets = ((None, {"fields": ("arg_type", "val")}),)
 
 
 class JobKwargInline(GenericStackedInline):
     model = TaskKwarg
     extra = 0
-    fieldsets = ((None, dict(fields=("key", ("arg_type", "val")))),)
+    fieldsets = ((None, {"fields": ("key", ("arg_type", "val"))}),)
 
 
 def get_message_bit(rows_updated: int) -> str:
@@ -86,40 +86,40 @@ class Media:
     fieldsets = (
         (
             None,
-            dict(
-                fields=(
+            {
+                "fields": (
                     "name",
                     "callable",
                     ("enabled", "timeout", "result_ttl"),
                     "task_type",
                 )
-            ),
+            },
         ),
         (
             None,
-            dict(fields=("scheduled_time",), classes=("tasktype-OnceTaskType",)),
+            {"fields": ("scheduled_time",), "classes": ("tasktype-OnceTaskType",)},
         ),
         (
             None,
-            dict(fields=("cron_string",), classes=("tasktype-CronTaskType",)),
+            {"fields": ("cron_string",), "classes": ("tasktype-CronTaskType",)},
         ),
         (
             None,
-            dict(
-                fields=(
+            {
+                "fields": (
                     (
                         "interval",
                         "interval_unit",
                     ),
                     "repeat",
                 ),
-                classes=("tasktype-RepeatableTaskType",),
-            ),
+                "classes": ("tasktype-RepeatableTaskType",),
+            },
         ),
-        (_("Queue settings"), dict(fields=(("queue", "at_front"), "job_name"))),
+        (_("Queue settings"), {"fields": (("queue", "at_front"), "job_name")}),
         (
             _("Previous runs info"),
-            dict(fields=(("successful_runs", "last_successful_run"), ("failed_runs", "last_failed_run"))),
+            {"fields": (("successful_runs", "last_successful_run"), ("failed_runs", "last_failed_run"))},
         ),
     )
 
@@ -157,7 +157,7 @@ def change_view(self, request: HttpRequest, object_id, form_url="", extra_contex
             execution_list = get_job_executions_for_task(obj.queue, obj)
         except ConnectionErrorTypes as e:
             logger.warn(f"Could not get job executions: {e}")
-            execution_list = list()
+            execution_list = []
         paginator = self.get_paginator(request, execution_list, SCHEDULER_CONFIG.EXECUTIONS_IN_PAGE)
         page_number = request.GET.get("p", 1)
         page_obj = paginator.get_page(page_number)

scheduler/decorators.py

@@ -4,7 +4,7 @@
 from scheduler.helpers.callback import Callback
 from scheduler.types import ConnectionType
 
-JOB_METHODS_LIST: List[str] = list()
+JOB_METHODS_LIST: List[str] = []
 
 
 class job:

scheduler/helpers/queues/queue_logic.py

@@ -63,14 +63,14 @@ def queue_perform_job(job_model: JobModel, connection: ConnectionType) -> Any:
 
 
 class Queue:
-    REGISTRIES = dict(
-        finished="finished_job_registry",
-        failed="failed_job_registry",
-        scheduled="scheduled_job_registry",
-        active="active_job_registry",
-        canceled="canceled_job_registry",
-        queued="queued_job_registry",
-    )
+    REGISTRIES = {
+        "finished": "finished_job_registry",
+        "failed": "failed_job_registry",
+        "scheduled": "scheduled_job_registry",
+        "active": "active_job_registry",
+        "canceled": "canceled_job_registry",
+        "queued": "queued_job_registry",
+    }
 
     def __init__(self, connection: ConnectionType, name: str, is_async: bool = True) -> None:
         """Initializes a Queue object.
@@ -150,7 +150,7 @@ def get_registry(self, name: str) -> JobNamesRegistry:
         raise NoSuchRegistryError(f"Unknown registry name {name}")
 
     def get_all_job_names(self) -> List[str]:
-        all_job_names = list()
+        all_job_names = []
         all_job_names.extend(self.queued_job_registry.all(self.connection))
         all_job_names.extend(self.finished_job_registry.all(self.connection))
         all_job_names.extend(self.active_job_registry.all(self.connection))

scheduler/management/commands/export.py

@@ -40,13 +40,11 @@ def add_arguments(self, parser: CommandParser) -> None:
 
     def handle(self, *args: Any, **options: Any) -> None:
         file = open(options.get("filename"), "w") if options.get("filename") else sys.stdout
-        res = list()
 
         tasks = Task.objects.all()
         if options.get("enabled"):
             tasks = tasks.filter(enabled=True)
-        for task in tasks:
-            res.append(task.to_dict())
+        res = [task.to_dict() for task in tasks]
 
         if options.get("format") == "json":
             import json

scheduler/management/commands/import.py

@@ -52,9 +52,7 @@ def create_task_from_dict(task_dict: Dict[str, Any], update: bool) -> Optional[T
         if not settings.USE_TZ and not timezone.is_naive(target):
             target = timezone.make_naive(target)
         kwargs["scheduled_time"] = target
-    model_fields = set(
-        map(lambda field: field.attname, filter(lambda field: hasattr(field, "attname"), Task._meta.get_fields()))
-    )
+    model_fields = {field.attname for field in filter(lambda field: hasattr(field, "attname"), Task._meta.get_fields())}
     keys_to_ignore = list(filter(lambda _k: _k not in model_fields, kwargs.keys()))
     for k in keys_to_ignore:
         del kwargs[k]
@@ -116,7 +114,7 @@ def add_arguments(self, parser: CommandParser) -> None:
 
     def handle(self, *args: Any, **options: Any) -> None:
         file = open(options.get("filename")) if options.get("filename") else sys.stdin  # type: ignore[arg-type]
-        jobs = list()
+        jobs = []
         if options.get("format") == "json":
             import json
 

scheduler/management/commands/scheduler_stats.py

@@ -66,7 +66,7 @@ def _print_stats_dashboard(
         click.echo(f"| {'Name':<16} |    Queued |    Active |  Finished |  Canceled |   Workers |")
         self._print_separator()
         for ind, queue in enumerate(statistics["queues"]):
-            vals = list((queue[k] for k in KEYS))
+            vals = [queue[k] for k in KEYS]
             # Deal with colors
             if not with_color:
                 colors = ["" for _ in KEYS]

scheduler/management/commands/scheduler_worker.py

@@ -150,7 +150,7 @@ def handle(self, **options: Any) -> None:
 
             # Check whether sentry is enabled
             if options.get("sentry_dsn") is not None:
-                sentry_opts = dict(ca_certs=options.get("sentry_ca_certs"), debug=options.get("sentry_debug"))
+                sentry_opts = {"ca_certs": options.get("sentry_ca_certs"), "debug": options.get("sentry_debug")}
                 dsn: str = options.get("sentry_dsn")  # type: ignore
                 register_sentry(dsn, **sentry_opts)
 

scheduler/models/task.py

@@ -191,7 +191,7 @@ def is_scheduled(self) -> bool:
             self.rqueue.queued_job_registry.exists(pipeline, self.job_name)
             self.rqueue.active_job_registry.exists(pipeline, self.job_name)
             results = pipeline.execute()
-            res = any([item is not None for item in results])
+            res = any(item is not None for item in results)
 
         # If the job_name is not scheduled/queued/started,
         # update the job_id to None. (The job_id belongs to a previous run which is completed)
@@ -230,14 +230,14 @@ def _enqueue_args(self) -> Dict[str, Any]:
         - Set job-id to proper format
         - set job meta
         """
-        res = dict(
-            meta=dict(),
-            task_type=self.task_type,
-            scheduled_task_id=self.id,
-            on_success=Callback(success_callback),
-            on_failure=Callback(failure_callback),
-            name=self._next_job_id(),
-        )
+        res = {
+            "meta": {},
+            "task_type": self.task_type,
+            "scheduled_task_id": self.id,
+            "on_success": Callback(success_callback),
+            "on_failure": Callback(failure_callback),
+            "name": self._next_job_id(),
+        }
         if self.at_front:
             res["at_front"] = self.at_front
         if self.timeout:
@@ -287,29 +287,29 @@ def _schedule_time(self) -> datetime:
     def to_dict(self) -> Dict[str, Any]:
         """Export model to dictionary, so it can be saved as external file backup"""
         interval_unit = str(self.interval_unit) if self.interval_unit else None
-        res = dict(
-            model=str(self.task_type),
-            name=self.name,
-            callable=self.callable,
-            callable_args=[dict(arg_type=arg.arg_type, val=arg.val) for arg in self.callable_args.all()],
-            callable_kwargs=[
-                dict(arg_type=arg.arg_type, key=arg.key, val=arg.val) for arg in self.callable_kwargs.all()
+        res = {
+            "model": str(self.task_type),
+            "name": self.name,
+            "callable": self.callable,
+            "callable_args": [{"arg_type": arg.arg_type, "val": arg.val} for arg in self.callable_args.all()],
+            "callable_kwargs": [
+                {"arg_type": arg.arg_type, "key": arg.key, "val": arg.val} for arg in self.callable_kwargs.all()
             ],
-            enabled=self.enabled,
-            queue=self.queue,
-            repeat=getattr(self, "repeat", None),
-            at_front=self.at_front,
-            timeout=self.timeout,
-            result_ttl=self.result_ttl,
-            cron_string=getattr(self, "cron_string", None),
-            scheduled_time=self._schedule_time().isoformat(),
-            interval=getattr(self, "interval", None),
-            interval_unit=interval_unit,
-            successful_runs=getattr(self, "successful_runs", None),
-            failed_runs=getattr(self, "failed_runs", None),
-            last_successful_run=getattr(self, "last_successful_run", None),
-            last_failed_run=getattr(self, "last_failed_run", None),
-        )
+            "enabled": self.enabled,
+            "queue": self.queue,
+            "repeat": getattr(self, "repeat", None),
+            "at_front": self.at_front,
+            "timeout": self.timeout,
+            "result_ttl": self.result_ttl,
+            "cron_string": getattr(self, "cron_string", None),
+            "scheduled_time": self._schedule_time().isoformat(),
+            "interval": getattr(self, "interval", None),
+            "interval_unit": interval_unit,
+            "successful_runs": getattr(self, "successful_runs", None),
+            "failed_runs": getattr(self, "failed_runs", None),
+            "last_successful_run": getattr(self, "last_successful_run", None),
+            "last_failed_run": getattr(self, "last_failed_run", None),
+        }
         return res
 
     def get_absolute_url(self) -> str:

scheduler/settings.py

@@ -13,7 +13,7 @@
 
 logger = logging.getLogger("scheduler")
 
-_QUEUES: Dict[str, QueueConfiguration] = dict()
+_QUEUES: Dict[str, QueueConfiguration] = {}
 SCHEDULER_CONFIG: SchedulerConfiguration = SchedulerConfiguration()
 
 

scheduler/tests/test_mgmt_commands/test_export.py

@@ -22,7 +22,7 @@ def tearDown(self) -> None:
         os.remove(self.tmpfile.name)
 
     def test_export__should_export_job(self):
-        tasks = list()
+        tasks = []
         tasks.append(task_factory(TaskType.ONCE, enabled=True))
         tasks.append(task_factory(TaskType.REPEATABLE, enabled=True))
 
@@ -35,7 +35,7 @@ def test_export__should_export_job(self):
         self.assertEqual(result[1], tasks[1].to_dict())
 
     def test_export__should_export_enabled_jobs_only(self):
-        tasks = list()
+        tasks = []
         tasks.append(task_factory(TaskType.ONCE, enabled=True))
         tasks.append(task_factory(TaskType.REPEATABLE, enabled=False))
 
@@ -47,7 +47,7 @@ def test_export__should_export_enabled_jobs_only(self):
         self.assertEqual(result[0], tasks[0].to_dict())
 
     def test_export__should_export_job_yaml_without_yaml_lib(self):
-        tasks = list()
+        tasks = []
         tasks.append(task_factory(TaskType.ONCE, enabled=True))
         tasks.append(task_factory(TaskType.REPEATABLE, enabled=True))
 
@@ -58,7 +58,7 @@ def test_export__should_export_job_yaml_without_yaml_lib(self):
             self.assertEqual(cm.exception.code, 1)
 
     def test_export__should_export_job_yaml_green(self):
-        tasks = list()
+        tasks = []
         tasks.append(task_factory(TaskType.ONCE, enabled=True))
         tasks.append(task_factory(TaskType.REPEATABLE, enabled=True))
         tasks.append(task_factory(TaskType.CRON, enabled=True))