refactor

Author: cunla

.github/actions/test-coverage/action.yml

@@ -45,6 +45,5 @@ runs:
           ${{ env.REPORT }}
           ```
         repo-token: ${{ inputs.repoToken }}
-        repo-token-user-login: 'github-actions[bot]'
         allow-repeats: true
         update-only: true

scheduler/management/commands/import.py

@@ -38,7 +38,7 @@ def create_job_from_dict(job_dict: Dict[str, Any], update):
             target = timezone.make_naive(target)
         kwargs["scheduled_time"] = target
     model_fields = set(map(lambda field: field.attname, model._meta.get_fields()))
-    keys_to_ignore = list(filter(lambda k: k not in model_fields, kwargs.keys()))
+    keys_to_ignore = list(filter(lambda _k: _k not in model_fields, kwargs.keys()))
     for k in keys_to_ignore:
         del kwargs[k]
     scheduled_job = model.objects.create(**kwargs)

scheduler/management/commands/rqstats.py

@@ -68,7 +68,7 @@ def _print_stats_dashboard(self, statistics, prev_stats=None):
             # Deal with colors
             if prev_stats and len(prev_stats["queues"]) > ind:
                 prev = prev_stats["queues"][ind]
-                prev_vals = (prev[k] for k in KEYS)
+                prev_vals = tuple(prev[k] for k in KEYS)
                 colors = [
                     ANSI_LIGHT_GREEN if vals[i] != prev_vals[i] else ANSI_LIGHT_WHITE for i in range(len(prev_vals))
                 ]

scheduler/models/scheduled_task.py

@@ -317,7 +317,7 @@ def __str__(self):
     def save(self, **kwargs):
         schedule_job = kwargs.pop("schedule_job", True)
         update_fields = kwargs.get("update_fields", None)
-        if update_fields:
+        if update_fields is not None:
             kwargs["update_fields"] = set(update_fields).union({"modified"})
         super(BaseTask, self).save(**kwargs)
         if schedule_job:

scheduler/queues.py

@@ -1,4 +1,4 @@
-from typing import List, Dict
+from typing import List, Dict, Set
 
 import redis
 import valkey
@@ -87,7 +87,7 @@ def get_connection(queue_settings, use_strict_redis=False):
 
 
 def get_queue(
-    name="default", default_timeout=None, is_async=None, autocommit=None, connection=None, **kwargs
+        name="default", default_timeout=None, is_async=None, autocommit=None, connection=None, **kwargs
 ) -> DjangoQueue:
     """Returns an DjangoQueue using parameters defined in `SCHEDULER_QUEUES`"""
     from .settings import QUEUES
@@ -107,18 +107,18 @@ def get_queue(
     )
 
 
-def get_all_workers():
+def get_all_workers() -> Set[DjangoWorker]:
     from .settings import QUEUES
 
-    workers = set()
+    workers_set: Set[DjangoWorker] = set()
     for queue_name in QUEUES:
         connection = get_connection(QUEUES[queue_name])
         try:
-            curr_workers = set(DjangoWorker.all(connection=connection))
-            workers.update(curr_workers)
+            curr_workers: Set[DjangoWorker] = set(DjangoWorker.all(connection=connection))
+            workers_set.update(curr_workers)
         except (redis.ConnectionError, valkey.ConnectionError) as e:
             logger.error(f"Could not connect for queue {queue_name}: {e}")
-    return workers
+    return workers_set
 
 
 def _queues_share_connection_params(q1_params: Dict, q2_params: Dict):

scheduler/rq_classes.py

@@ -38,10 +38,10 @@ def register_sentry(sentry_dsn, **opts):
 
 
 def as_str(v: Union[bytes, str]) -> Optional[str]:
-    """Converts a bytes value to a string using `utf-8`.
+    """Converts a `bytes` value to a string using `utf-8`.
 
     :param v: The value (None/bytes/str)
-    :raises: ValueError: If the value is not bytes or string
+    :raises: ValueError: If the value is not `bytes` or `str`
     :returns: Either the decoded string or None
     """
     if v is None:
@@ -101,10 +101,9 @@ def _start_scheduler(
         This is specifically designed to be run by the worker when running the `work()` method.
         Instantiates the DjangoScheduler and tries to acquire a lock.
         If the lock is acquired, start scheduler.
-        If worker is on burst mode just enqueues scheduled jobs and quits,
+        If the worker is on burst mode, just enqueues scheduled jobs and quits,
         otherwise, starts the scheduler in a separate process.
 
-
         :param burst (bool, optional): Whether to work on burst mode. Defaults to False.
         :param logging_level (str, optional): Logging level to use. Defaults to "INFO".
         :param date_format (str, optional): Date Format. Defaults to DEFAULT_LOGGING_DATE_FORMAT.

scheduler/templates/admin/scheduler/jobs.html

@@ -54,7 +54,7 @@
                             <th scope="col" class="action-checkbox-column">
                                 <div class="text">
                                     <span><input type="checkbox" id="action-toggle"
-                                                 style="display: inline-block;"></span>
+                                                 style="display: inline-block;"/></span>
                                 </div>
                                 <div class="clear"></div>
                             </th>
@@ -92,7 +92,7 @@
                                 <td class="action-checkbox">
                                     <input class="action-select"
                                            name="_selected_action" type="checkbox"
-                                           value="{{ job.id }}">
+                                           value="{{ job.id }}" />
                                 </td>
                                 <th>
                                     <a href="{% url 'job_details' job.id %}">