Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: stable tasks ordering + minor polishing #129

Merged
merged 1 commit into from
Mar 13, 2024
Merged

feat: stable tasks ordering + minor polishing #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/submit_topas_input.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@


yac = Yascheduler()
result = yac.queue_submit_task(LABEL, {"calc.inp": PATTERN_REQUEST, "structure.inc": ""}, "topas")
result = yac.queue_submit_task(LABEL, {"calc.inp": PATTERN_REQUEST, "structure.inc": "", "input.xy: ""}, "topas")
print(LABEL)
print(result)
10 changes: 5 additions & 5 deletions yascheduler/db.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

@unique
class TaskStatus(int, Enum):
"""Tast status enum"""
"""Task possible states enum"""

TO_DO = 0
RUNNING = 1
Expand Down Expand Up @@ -243,7 +243,7 @@ async def get_task_ids_by_ip_and_status(
) -> Sequence[int]:
"""Get task ids by ip and status"""
rows = await self.run(
"SELECT task_id FROM yascheduler_tasks WHERE ip=:ip AND status=:status;",
"SELECT task_id FROM yascheduler_tasks WHERE ip=:ip AND status=:status ORDER BY task_id;",
ip=ip_addr,
status=status.value,
)
Expand All @@ -254,7 +254,7 @@ async def get_tasks_by_jobs(self, jobs: Sequence[int]) -> Sequence[TaskModel]:
rows = await self.run(
"""SELECT task_id, label, ip, status, metadata
FROM yascheduler_tasks
WHERE task_id IN (SELECT unnest(CAST (:task_ids AS int[])));""",
WHERE task_id IN (SELECT unnest(CAST (:task_ids AS int[]))) ORDER BY task_id;""",
task_ids=jobs,
)
return [TaskModel(*x) for x in (rows or [])]
Expand All @@ -266,7 +266,7 @@ async def get_tasks_by_status(
rows = await self.run(
"""SELECT task_id, label, ip, status, metadata
FROM yascheduler_tasks
WHERE status IN (SELECT unnest(CAST (:statuses AS int[])))
WHERE status IN (SELECT unnest(CAST (:statuses AS int[]))) ORDER BY task_id
LIMIT :lim;""",
statuses=[x.value for x in statuses],
lim=limit,
Expand All @@ -282,7 +282,7 @@ async def get_tasks_with_cloud_by_id_status(
FROM yascheduler_tasks AS t
JOIN yascheduler_nodes AS n ON n.ip=t.ip
WHERE status=:status AND
task_id IN (SELECT unnest(CAST (:ids AS int[])));""",
task_id IN (SELECT unnest(CAST (:ids AS int[]))) ORDER BY task_id;""",
ids=ids,
status=status.value,
)
Expand Down
2 changes: 1 addition & 1 deletion yascheduler/scheduler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ async def do_task_webhook(
if not url:
return
async with self.webhook_sem:
self.log.info(f"Executing webhook to {url}")
self.log.info(f"Executing webhook of type {status.value} to {url}")
payload = WebhookPayload(
task_id, status.value, metadata.get("webhook_custom_params", {})
)
Expand Down
Loading