rommapp/romm
1
0
Fork 0
mirror of https://github.com/rommapp/romm.git synced 2026-02-18 00:27:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

don't fail on old tasks

Browse Source
This commit is contained in:
Georges-Antoine Assi
2025-10-27 11:07:19 -04:00
parent 87cf48e7ef
commit 9b636a9d0c
11 changed files with 45 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
backend/endpoints/responses/__init__.py
View File

@@ -75,7 +75,8 @@ class TaskExecutionResponse(TypedDict):
task_name: str
task_id: str
status: JobStatus
queued_at: str
created_at: str
enqueued_at: str | None
class BaseTaskStatusResponse(TaskExecutionResponse):

17
backend/endpoints/tasks.py
View File

@@ -121,15 +121,17 @@ def _build_task_status_response(
task_type = job_meta.get("task_type")
# Convert datetime objects to ISO format strings
queued_at = job.created_at.isoformat() if job.created_at else None
created_at = job.created_at.isoformat() if job.created_at else None
started_at = job.started_at.isoformat() if job.started_at else None
ended_at = job.ended_at.isoformat() if job.ended_at else None
enqueued_at = job.enqueued_at.isoformat() if job.enqueued_at else None
common_data = {
"task_name": task_name,
"task_id": job.get_id(),
"status": job.get_status(),
"queued_at": queued_at or "",
"created_at": created_at or "",
"enqueued_at": enqueued_at,
"started_at": started_at,
"ended_at": ended_at,
}
@@ -275,7 +277,10 @@ async def get_tasks_status(request: Request) -> list[TaskStatusResponse]:
job = Job.fetch(job_id, connection=redis_client)
all_tasks.append(_build_task_status_response(job))
all_tasks.sort(key=lambda x: x["started_at"] or x["queued_at"], reverse=True)
all_tasks.sort(
key=lambda x: x["started_at"] or x["enqueued_at"] or x["created_at"],
reverse=True,
)
return all_tasks
@@ -344,7 +349,8 @@ async def run_all_tasks(request: Request) -> list[TaskExecutionResponse]:
task_name=task_name,
task_id=job.get_id(),
status=job.get_status() or JobStatus.QUEUED,
queued_at=datetime.now(timezone.utc).isoformat(),
created_at=datetime.now(timezone.utc).isoformat(),
enqueued_at=None,
)
for (task_name, job) in jobs
]
@@ -390,5 +396,6 @@ async def run_single_task(request: Request, task_name: str) -> TaskExecutionResp
"task_name": task_instance.title,
"task_id": job.get_id(),
"status": job.get_status() or JobStatus.QUEUED,
"queued_at": datetime.now(timezone.utc).isoformat(),
"created_at": datetime.now(timezone.utc).isoformat(),
"enqueued_at": None,
}

3
backend/tests/endpoints/test_tasks.py
View File

@@ -370,7 +370,8 @@ class TestRunSingleTask:
assert data["task_name"] == "Test Task"
assert data["task_id"] == "1"
assert data["status"] == "queued"
assert "queued_at" in data
assert "created_at" in data
assert "enqueued_at" in data
mock_queue.assert_called_once()

3
frontend/src/__generated__/models/CleanupTaskStatusResponse.ts generated
View File

@@ -8,7 +8,8 @@ export type CleanupTaskStatusResponse = {
task_name: string;
task_id: string;
status: JobStatus;
queued_at: string;
created_at: string;
enqueued_at: (string | null);
started_at: (string | null);
ended_at: (string | null);
task_type: string;

3
frontend/src/__generated__/models/ConversionTaskStatusResponse.ts generated
View File

@@ -8,7 +8,8 @@ export type ConversionTaskStatusResponse = {
task_name: string;
task_id: string;
status: JobStatus;
queued_at: string;
created_at: string;
enqueued_at: (string | null);
started_at: (string | null);
ended_at: (string | null);
task_type: string;

3
frontend/src/__generated__/models/GenericTaskStatusResponse.ts generated
View File

@@ -8,7 +8,8 @@ export type GenericTaskStatusResponse = {
task_name: string;
task_id: string;
status: JobStatus;
queued_at: string;
created_at: string;
enqueued_at: (string | null);
started_at: (string | null);
ended_at: (string | null);
task_type: string;

3
frontend/src/__generated__/models/ScanTaskStatusResponse.ts generated
View File

@@ -8,7 +8,8 @@ export type ScanTaskStatusResponse = {
task_name: string;
task_id: string;
status: JobStatus;
queued_at: string;
created_at: string;
enqueued_at: (string | null);
started_at: (string | null);
ended_at: (string | null);
task_type: string;

3
frontend/src/__generated__/models/TaskExecutionResponse.ts generated
View File

@@ -7,6 +7,7 @@ export type TaskExecutionResponse = {
task_name: string;
task_id: string;
status: JobStatus;
queued_at: string;
created_at: string;
enqueued_at: (string | null);
};

3
frontend/src/__generated__/models/UpdateTaskStatusResponse.ts generated
View File

@@ -8,7 +8,8 @@ export type UpdateTaskStatusResponse = {
task_name: string;
task_id: string;
status: JobStatus;
queued_at: string;
created_at: string;
enqueued_at: (string | null);
started_at: (string | null);
ended_at: (string | null);
task_type: string;

3
frontend/src/__generated__/models/WatcherTaskStatusResponse.ts generated
View File

@@ -8,7 +8,8 @@ export type WatcherTaskStatusResponse = {
task_name: string;
task_id: string;
status: JobStatus;
queued_at: string;
created_at: string;
enqueued_at: (string | null);
started_at: (string | null);
ended_at: (string | null);
task_type: string;

17
frontend/src/components/Settings/Administration/RunningTaskItem.vue
View File

@@ -20,17 +20,26 @@ const statusIconColor = computed(() => {
const taskDuration = computed(() => {
if (!props.task.started_at) return null;
if (!props.task.ended_at && props.task.status === "failed") return null;
if (
props.task.ended_at &&
new Date(props.task.started_at) >= new Date(props.task.ended_at)
) {
return null;
}
const duration = intervalToDuration({
start: new Date(props.task.started_at),
end: props.task.ended_at ? new Date(props.task.ended_at) : new Date(),
});
return formatDuration(duration);
});
const taskDistanceFromNow = computed(() => {
return formatDistanceToNow(
new Date(props.task.started_at || props.task.queued_at),
new Date(
props.task.started_at || props.task.enqueued_at || props.task.created_at,
),
{ addSuffix: true },
);
});
@@ -71,7 +80,11 @@ const taskDistanceFromNow = computed(() => {
size="small"
variant="tonal"
class="text-caption"
:title="formatTimestamp(task.started_at || task.queued_at)"
:title="
formatTimestamp(
task.started_at || task.enqueued_at || task.created_at,
)
"
>
{{ taskDistanceFromNow }}
</v-chip>