Skip to content

Commit 84b4502

Browse files
committed
refactor: separated queue views to several files
1 parent 0c91a14 commit 84b4502

File tree

8 files changed

+39
-33
lines changed

8 files changed

+39
-33
lines changed

scheduler/helpers/queues/queue_logic.py

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -173,24 +173,24 @@ def get_all_jobs(self) -> List[JobModel]:
173173
return JobModel.get_many(job_names, connection=self.connection)
174174

175175
def create_and_enqueue_job(
176-
self,
177-
func: FunctionReferenceType,
178-
args: Union[Tuple, List, None] = None,
179-
kwargs: Optional[Dict] = None,
180-
when: Optional[datetime] = None,
181-
timeout: Optional[int] = None,
182-
result_ttl: Optional[int] = None,
183-
job_info_ttl: Optional[int] = None,
184-
description: Optional[str] = None,
185-
name: Optional[str] = None,
186-
at_front: bool = False,
187-
meta: Optional[Dict] = None,
188-
on_success: Optional[Callback] = None,
189-
on_failure: Optional[Callback] = None,
190-
on_stopped: Optional[Callback] = None,
191-
task_type: Optional[str] = None,
192-
scheduled_task_id: Optional[int] = None,
193-
pipeline: Optional[ConnectionType] = None,
176+
self,
177+
func: FunctionReferenceType,
178+
args: Union[Tuple, List, None] = None,
179+
kwargs: Optional[Dict] = None,
180+
when: Optional[datetime] = None,
181+
timeout: Optional[int] = None,
182+
result_ttl: Optional[int] = None,
183+
job_info_ttl: Optional[int] = None,
184+
description: Optional[str] = None,
185+
name: Optional[str] = None,
186+
at_front: bool = False,
187+
meta: Optional[Dict] = None,
188+
on_success: Optional[Callback] = None,
189+
on_failure: Optional[Callback] = None,
190+
on_stopped: Optional[Callback] = None,
191+
task_type: Optional[str] = None,
192+
scheduled_task_id: Optional[int] = None,
193+
pipeline: Optional[ConnectionType] = None,
194194
) -> JobModel:
195195
"""Creates a job to represent the delayed function call and enqueues it.
196196
:param when: When to schedule the job (None to enqueue immediately)
@@ -311,10 +311,10 @@ def run_sync(self, job: JobModel) -> JobModel:
311311

312312
@classmethod
313313
def dequeue_any(
314-
cls,
315-
queues: List[Self],
316-
timeout: Optional[int],
317-
connection: Optional[ConnectionType] = None,
314+
cls,
315+
queues: List[Self],
316+
timeout: Optional[int],
317+
connection: Optional[ConnectionType] = None,
318318
) -> Tuple[Optional[JobModel], Optional[Self]]:
319319
"""Class method returning a Job instance at the front of the given set of Queues, where the order of the queues
320320
is important.
@@ -417,7 +417,7 @@ def delete_job(self, job_name: str, expire_job_model: bool = True) -> None:
417417
pass
418418

419419
def enqueue_job(
420-
self, job_model: JobModel, connection: Optional[ConnectionType] = None, at_front: bool = False
420+
self, job_model: JobModel, connection: Optional[ConnectionType] = None, at_front: bool = False
421421
) -> JobModel:
422422
"""Enqueues a job for delayed execution without checking dependencies.
423423

scheduler/redis_models/registry/queue_registries.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ def empty(self) -> None:
3838
JobModel.delete_many(job_names, connection=pipe)
3939
pipe.execute()
4040

41+
4142
class FinishedJobRegistry(JobNamesRegistry):
4243
_element_key_template: ClassVar[str] = ":registry:{}:finished_jobs"
4344

scheduler/tests/test_internals.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@ def test_callback_bad_arguments(self):
3232
self.assertEqual(str(cm.exception), "Callback `func` is not callable: scheduler.tests.jobs.non_existing_method")
3333
with self.assertRaises(CallbackSetupError) as cm:
3434
Callback("scheduler.tests.non_existing_module.non_existing_method")
35-
self.assertEqual(str(cm.exception), "Callback `func` is not callable: scheduler.tests.non_existing_module.non_existing_method")
35+
self.assertEqual(
36+
str(cm.exception),
37+
"Callback `func` is not callable: scheduler.tests.non_existing_module.non_existing_method",
38+
)
3639
with self.assertRaises(CallbackSetupError) as cm:
3740
Callback("non_existing_method")
3841
self.assertEqual(str(cm.exception), "Callback `func` is not callable: non_existing_method")

scheduler/tests/testtools.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def sequence_gen():
4747

4848

4949
def task_factory(
50-
task_type: TaskType, callable_name: str = "scheduler.tests.jobs.test_job", instance_only=False, **kwargs
50+
task_type: TaskType, callable_name: str = "scheduler.tests.jobs.test_job", instance_only=False, **kwargs
5151
):
5252
values = dict(
5353
name="Scheduled Job %d" % next(seq),

scheduler/views/helpers.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ def _check_next_url(request: HttpRequest, default_next_url: str) -> str:
4646
next_url = request.POST.get("next_url", default_next_url)
4747
next_url = next_url.replace("\\", "")
4848
if (
49-
not url_has_allowed_host_and_scheme(next_url, allowed_hosts=None)
50-
or urlparse(next_url).netloc
51-
or urlparse(next_url).scheme
49+
not url_has_allowed_host_and_scheme(next_url, allowed_hosts=None)
50+
or urlparse(next_url).netloc
51+
or urlparse(next_url).scheme
5252
):
5353
messages.warning(request, "Bad followup URL")
5454
next_url = default_next_url

scheduler/views/queue_job_actions.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
"""list_registry_jobs actions on multiple selected jobs"""
2+
23
from enum import Enum
34

45
from django.contrib import admin, messages

scheduler/views/queue_registry_actions.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
"""list_registry_jobs actions on all jobs in the registry"""
2+
23
from enum import Enum
34

45
from django.contrib import admin, messages

scheduler/worker/scheduler.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ def _reschedule_tasks():
3232

3333
class WorkerScheduler:
3434
def __init__(
35-
self,
36-
queues: Sequence[Queue],
37-
connection: ConnectionType,
38-
worker_name: str,
39-
interval: Optional[int] = None,
35+
self,
36+
queues: Sequence[Queue],
37+
connection: ConnectionType,
38+
worker_name: str,
39+
interval: Optional[int] = None,
4040
) -> None:
4141
interval = interval or SCHEDULER_CONFIG.SCHEDULER_INTERVAL
4242
self._queues = queues

0 commit comments

Comments
 (0)