fix:formatting

Author: cunla

scheduler/admin/task_admin.py

@@ -48,22 +48,12 @@ class TaskAdmin(admin.ModelAdmin):
     """TaskAdmin admin view for all task models."""
 
     class Media:
-        js = (
-            "admin/js/jquery.init.js",
-            "admin/js/select-fields.js",
-        )
+        js = ("admin/js/jquery.init.js", "admin/js/select-fields.js")
 
     save_on_top = True
     change_form_template = "admin/scheduler/change_form.html"
-    actions = [
-        "disable_selected",
-        "enable_selected",
-        "enqueue_job_now",
-    ]
-    inlines = [
-        JobArgInline,
-        JobKwargInline,
-    ]
+    actions = ["disable_selected", "enable_selected", "enqueue_job_now"]
+    inlines = [JobArgInline, JobKwargInline]
     list_filter = ("enabled", "task_type", "queue")
     list_display = (
         "enabled",

scheduler/decorators.py

@@ -2,12 +2,12 @@
 from typing import Any, Callable, Dict, Optional, Union, List
 
 from scheduler.helpers.callback import Callback
-from scheduler.types import ConnectionType
+from scheduler.types import ConnectionType, FunctionReferenceType
 
 JOB_METHODS_LIST: List[str] = list()
 
 
-class job:
+class _job:
     def __init__(
         self,
         queue: Union["Queue", str, None] = None,  # noqa: F821
@@ -96,3 +96,21 @@ def delay(*args, **kwargs):
         JOB_METHODS_LIST.append(f"{f.__module__}.{f.__name__}")
         f.delay = delay
         return f
+
+
+def job(
+    func_or_queue: Union[FunctionReferenceType, "Queue", str],
+    *args: Any,
+    **kwargs: Any,
+) -> _job:
+    if callable(func_or_queue):
+        func = func_or_queue
+        queue_name: str = "default"
+    else:
+        func = None
+        queue_name = func_or_queue
+
+    decorator = _job(queue_name, *args, **kwargs)
+    if func:
+        return decorator(func)
+    return decorator

scheduler/helpers/queues/getters.py

@@ -1,13 +1,7 @@
 from typing import Set
 
 from scheduler.redis_models.worker import WorkerModel
-from scheduler.settings import (
-    SCHEDULER_CONFIG,
-    get_queue_names,
-    get_queue_configuration,
-    QueueConfiguration,
-    logger,
-)
+from scheduler.settings import SCHEDULER_CONFIG, get_queue_names, get_queue_configuration, QueueConfiguration, logger
 from scheduler.types import ConnectionErrorTypes, BrokerMetaData, Broker
 from .queue_logic import Queue
 

scheduler/tests/test_mgmt_commands/test_import.py

@@ -77,11 +77,7 @@ def test_import__should_schedule_job_reset(self):
         self.tmpfile.write(res)
         self.tmpfile.flush()
         # act
-        call_command(
-            "import",
-            filename=self.tmpfile.name,
-            reset=True,
-        )
+        call_command("import", filename=self.tmpfile.name, reset=True)
         # assert
         self.assertEqual(1, Task.objects.filter(task_type=TaskType.ONCE).count())
         db_job = Task.objects.filter(task_type=TaskType.ONCE).first()
@@ -102,11 +98,7 @@ def test_import__should_schedule_job_update_existing(self):
         self.tmpfile.write(res)
         self.tmpfile.flush()
         # act
-        call_command(
-            "import",
-            filename=self.tmpfile.name,
-            update=True,
-        )
+        call_command("import", filename=self.tmpfile.name, update=True)
         # assert
         self.assertEqual(2, Task.objects.filter(task_type=TaskType.ONCE).count())
         db_job = Task.objects.filter(task_type=TaskType.ONCE).get(name=tasks[0].name)
@@ -122,10 +114,7 @@ def test_import__should_schedule_job_without_update_existing(self):
         self.tmpfile.write(res)
         self.tmpfile.flush()
         # act
-        call_command(
-            "import",
-            filename=self.tmpfile.name,
-        )
+        call_command("import", filename=self.tmpfile.name)
         # assert
         self.assertEqual(2, Task.objects.filter(task_type=TaskType.ONCE).count())
         db_job = Task.objects.get(name=tasks[0].name)

scheduler/tests/test_mgmt_commands/test_scheduler_worker.py

@@ -47,11 +47,7 @@ def test_scheduler_worker__with_scheduler(self, mock_create_worker):
         # Create a worker to execute these jobs
         call_command("scheduler_worker", "default", "--burst")
         mock_create_worker.assert_called_once_with(
-            "default",
-            name=None,
-            fork_job_execution=True,
-            burst=True,
-            with_scheduler=True,
+            "default", name=None, fork_job_execution=True, burst=True, with_scheduler=True
         )
 
     def test_scheduler_worker__run_jobs(self):

scheduler/tests/test_task_types/test_task_model.py

@@ -111,9 +111,7 @@ def test_is_schedulable_disabled(self):
             self.assertFalse(task.enabled)
 
         def test_schedule(self):
-            task = task_factory(
-                self.task_type,
-            )
+            task = task_factory(self.task_type)
             self.assertTrue(task.is_scheduled())
             self.assertIsNotNone(task.job_name)
 

scheduler/tests/test_views/test_job_details.py

@@ -41,9 +41,7 @@ def test_scheduled_job_details(self):
 
         url = reverse(
             "job_details",
-            args=[
-                job.name,
-            ],
+            args=[job.name],
         )
         res = self.client.get(url, follow=True)
         self.assertIn("job", res.context)

scheduler/tests/test_views/test_queue_actions.py

@@ -21,11 +21,7 @@ def test_job_list_action_delete_jobs__with_bad_next_url(self):
         # remove those jobs using view
         res = self.client.post(
             reverse("queue_job_actions", args=[queue.name]),
-            {
-                "action": "delete",
-                "job_names": job_names,
-                "next_url": "bad_url",
-            },
+            {"action": "delete", "job_names": job_names, "next_url": "bad_url"},
             follow=True,
         )
         assert_message_in_response(res, "Bad followup URL")
@@ -46,9 +42,7 @@ def test_job_list_action_delete_jobs(self):
 
         # remove those jobs using view
         res = self.client.post(
-            reverse("queue_job_actions", args=[queue.name]),
-            {"action": "delete", "job_names": job_names},
-            follow=True,
+            reverse("queue_job_actions", args=[queue.name]), {"action": "delete", "job_names": job_names}, follow=True
         )
 
         # check if jobs are removed

scheduler/tests/test_worker/test_scheduler.py

@@ -27,13 +27,7 @@ def test_scheduler_schedules_tasks(self):
             self.assertNotIn(task.job_name, task.rqueue.queued_job_registry)
             self.assertIn(task.job_name, task.rqueue.scheduled_job_registry)
 
-            scheduler = WorkerScheduler(
-                [
-                    task.rqueue,
-                ],
-                worker_name="fake-worker",
-                connection=task.rqueue.connection,
-            )
+            scheduler = WorkerScheduler([task.rqueue], worker_name="fake-worker", connection=task.rqueue.connection)
 
             # act
             traveller.move_to(50)

scheduler/tests/testtools.py

@@ -74,11 +74,7 @@ def task_factory(
             )
         )
     elif task_type == TaskType.CRON:
-        values.update(
-            dict(
-                cron_string="0 0 * * *",
-            )
-        )
+        values.update(dict(cron_string="0 0 * * *"))
     values.update(kwargs)
     if instance_only:
         instance = Task(task_type=task_type, **values)

scheduler/types/settings_types.py

@@ -40,7 +40,7 @@ class SchedulerConfiguration:
     DEFAULT_MAINTENANCE_TASK_INTERVAL: int = 10 * 60  # The interval to run maintenance tasks in seconds. 10 minutes.
     DEFAULT_JOB_MONITORING_INTERVAL: int = 30  # The interval to monitor jobs in seconds.
     SCHEDULER_FALLBACK_PERIOD_SECS: int = 120  # Period (secs) to wait before requiring to reacquire locks
-    DEATH_PENALTY_CLASS: Type["BaseDeathPenalty"] = UnixSignalDeathPenalty
+    DEATH_PENALTY_CLASS: Type[BaseDeathPenalty] = UnixSignalDeathPenalty
 
 
 @dataclass(slots=True, frozen=True, kw_only=True)

scheduler/views/__init__.py

@@ -16,11 +16,5 @@
 from .job_views import job_detail, job_action
 from .queue_job_actions import queue_job_actions, queue_confirm_job_action
 from .queue_registry_actions import queue_registry_actions
-from .queue_views import (
-    stats,
-    stats_json,
-    queue_workers,
-    list_registry_jobs,
-    get_statistics,
-)
+from .queue_views import stats, stats_json, queue_workers, list_registry_jobs, get_statistics
 from .worker_views import workers_list, worker_details

scheduler/worker/worker.py

@@ -22,13 +22,7 @@
 from scheduler.redis_models import WorkerModel, JobModel, JobStatus, DequeueTimeout
 from scheduler.settings import SCHEDULER_CONFIG, logger, get_queue_configuration
 from scheduler.types import Broker, Self
-from scheduler.types import (
-    ConnectionType,
-    TimeoutErrorTypes,
-    ConnectionErrorTypes,
-    WatchErrorTypes,
-    ResponseErrorTypes,
-)
+from scheduler.types import ConnectionType, TimeoutErrorTypes, ConnectionErrorTypes, WatchErrorTypes, ResponseErrorTypes
 from .commands import WorkerCommandsChannelListener
 from .scheduler import WorkerScheduler, SchedulerStatus
 from ..redis_models.lock import QueueLock
@@ -42,10 +36,7 @@
 from contextlib import suppress
 
 from scheduler.helpers.queues import Queue, perform_job
-from scheduler.timeouts import (
-    JobExecutionMonitorTimeoutException,
-    JobTimeoutException,
-)
+from scheduler.timeouts import JobExecutionMonitorTimeoutException, JobTimeoutException
 from scheduler.helpers.utils import utcnow, current_timestamp
 
 try:

testproject/testproject/settings.py

@@ -1,6 +1,5 @@
 import os
 
-
 from scheduler.types import QueueConfiguration
 
 BROKER_PORT = os.getenv("BROKER_PORT", "6379")
@@ -23,7 +22,7 @@
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 
-ALLOWED_HOSTS = []
+ALLOWED_HOSTS = ["*"]
 
 # Application definition