refactor(tasks): Group JSON properties by relevance

app.py

@@ -36,7 +36,7 @@ def get_place_in_queue(task_id):
 
 def calculate_eta(task_id):
     total_durations = list(task["completed_at"] - task["started_at"]
-                           for task in tasks.values() if "completed_at" in task)
+                           for task in tasks.values() if "completed_at" in task and task["status"] == "completed")
 
     initial_place_in_queue = tasks[task_id]["initial_place_in_queue"]
 
@@ -91,10 +91,17 @@ def create_task(background_tasks: BackgroundTasks, new_task: NewTask):
 
     tasks[task_id] = {
         "task_id": task_id,
-        "created_at": created_at,
-        "prompt": new_task.prompt,
         "status": "queued",
+        "created_at": created_at,
+        "started_at": None,
+        "completed_at": None,
+        "initial_place_in_queue": None,
+        "place_in_queue": None,
         "poll_count": 0,
+        "last_poll": None,
+        "eta": None,
+        "prompt": new_task.prompt,
+        "value": None,
     }
 
     tasks[task_id]["initial_place_in_queue"] = get_place_in_queue(task_id)

static/js/network.js

@@ -36,11 +36,7 @@ const longPollTask = async (task, interval = 5_000, max) => {
 
   task = await pollTask(task);
 
-  if (task.status === 'completed' || (max && task.poll_count > max)) {
-    return task;
-  }
-
-  if (task.status === 'failed') {
+  if (task.status === 'completed' || task.status === 'failed' || (max && task.poll_count > max)) {
     return task;
   }