implemented watcher and rerun logic

2026-06-25 11:31:20 -04:00
parent 21402f7ee3
commit be13849a4f
15 changed files with 871 additions and 97 deletions
@@ -87,7 +87,7 @@ def init_db(db_path: str | Path = DB_PATH) -> None:
 				config_json TEXT,
 				throttled INTEGER NOT NULL DEFAULT 0,
 				estimated_minutes INTEGER NOT NULL,
-				status TEXT NOT NULL CHECK (status IN ('pending', 'completed', 'failed', 'invalid')),
+				status TEXT NOT NULL CHECK (status IN ('pending', 'completed', 'rerun')),
 				excluded INTEGER NOT NULL DEFAULT 0,
 				raw_payload TEXT,
 				created_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
@@ -123,6 +123,13 @@ def init_db(db_path: str | Path = DB_PATH) -> None:
 				minutes INTEGER NOT NULL
 			);

+			CREATE TABLE IF NOT EXISTS graph_cache (
+				name TEXT PRIMARY KEY,
+				payload_json TEXT NOT NULL,
+				test_count INTEGER NOT NULL DEFAULT 0,
+				updated_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP
+			);
+
 			CREATE TABLE IF NOT EXISTS rerun_events (
 				id INTEGER PRIMARY KEY AUTOINCREMENT,
 				detected_date TEXT NOT NULL,
@@ -246,6 +253,52 @@ def read_settings(db_path: str | Path = DB_PATH) -> dict[str, Any]:
 	return {row["key"]: json.loads(row["value_json"]) for row in rows}


+def save_graph_cache(
+	name: str,
+	payload: dict[str, list[str]],
+	test_count: int,
+	db_path: str | Path = DB_PATH,
+) -> None:
+	with get_connection(db_path) as conn:
+		conn.execute(
+			"""
+			INSERT INTO graph_cache(name, payload_json, test_count, updated_at)
+			VALUES (?, ?, ?, CURRENT_TIMESTAMP)
+			ON CONFLICT(name) DO UPDATE SET
+				payload_json = excluded.payload_json,
+				test_count = excluded.test_count,
+				updated_at = CURRENT_TIMESTAMP
+			""",
+			(name, json.dumps(payload), int(test_count)),
+		)
+
+
+def load_graph_cache(name: str, db_path: str | Path = DB_PATH) -> dict[str, Any] | None:
+	with get_connection(db_path) as conn:
+		row = conn.execute(
+			"""
+			SELECT payload_json, test_count, updated_at
+			FROM graph_cache
+			WHERE name = ?
+			""",
+			(name,),
+		).fetchone()
+
+	if row is None:
+		return None
+
+	return {
+		"payload": json.loads(row["payload_json"] or "{}"),
+		"test_count": int(row["test_count"]),
+		"updated_at": row["updated_at"],
+	}
+
+
+def delete_graph_cache(name: str, db_path: str | Path = DB_PATH) -> None:
+	with get_connection(db_path) as conn:
+		conn.execute("DELETE FROM graph_cache WHERE name = ?", (name,))
+
+
 def _parse_rule_tokens(rule: str | None) -> list[str]:
 	if not rule:
 		return []
@@ -543,6 +596,110 @@ def mark_tests_completed(test_ids_with_device: list[tuple[str, str]], db_path: s
 		)


+def mark_overdue_as_rerun(db_path: str | Path = DB_PATH) -> int:
+	"""Mark tests from the last overnight window that are still pending as rerun.
+
+	'Last overnight window' = all pending tests scheduled before today (any shift)
+	plus today's shift 1 (1am–10am) if it has already ended (current hour >= 10).
+
+	Returns the number of tests newly marked as rerun.
+	"""
+	from datetime import date as _date, datetime as _datetime
+	now = _datetime.now()
+	today = now.date().isoformat()
+	shift1_ended = now.hour >= 10  # shift 1 ends ~10am
+
+	with get_connection(db_path) as conn:
+		version_row = conn.execute("SELECT MAX(schedule_version) AS latest FROM schedules").fetchone()
+		latest = version_row["latest"]
+		if latest is None:
+			return 0
+
+		if shift1_ended:
+			rows = conn.execute(
+				"""
+				SELECT DISTINCT s.test_id, s.device
+				FROM schedules s
+				JOIN tests t ON t.test_id = s.test_id AND t.device = s.device
+				WHERE s.schedule_version = ?
+				  AND t.status = 'pending'
+				  AND (
+				    s.scheduled_date < ?
+				    OR (s.scheduled_date = ? AND s.shift_index = 1)
+				  )
+				""",
+				(latest, today, today),
+			).fetchall()
+		else:
+			rows = conn.execute(
+				"""
+				SELECT DISTINCT s.test_id, s.device
+				FROM schedules s
+				JOIN tests t ON t.test_id = s.test_id AND t.device = s.device
+				WHERE s.schedule_version = ?
+				  AND s.scheduled_date < ?
+				  AND t.status = 'pending'
+				""",
+				(latest, today),
+			).fetchall()
+
+		if not rows:
+			return 0
+
+		conn.executemany(
+			"""
+			UPDATE tests
+			SET status = 'rerun', updated_at = CURRENT_TIMESTAMP
+			WHERE test_id = ? AND device = ? AND status = 'pending'
+			""",
+			[(r["test_id"], r["device"]) for r in rows],
+		)
+		return len(rows)
+
+
+def get_rerun_tests(db_path: str | Path = DB_PATH) -> list[dict]:
+	"""Return tests scheduled before shift 2 today that are not yet completed.
+	
+	This checks the latest schedule version and returns tests from:
+	- Yesterday's shift 3 (5pm-1am)
+	- Today's shift 1 (1am-10am)
+	
+	Once tests are rescheduled to shift 2 or later today, they no longer appear.
+	"""
+	from datetime import date as _date
+	today = _date.today().isoformat()
+	with get_connection(db_path) as conn:
+		version_row = conn.execute("SELECT MAX(schedule_version) AS latest FROM schedules").fetchone()
+		latest = version_row["latest"]
+		if latest is None:
+			return []
+		
+		rows = conn.execute(
+			"""
+			SELECT DISTINCT t.test_id, t.device, t.test_type, t.estimated_minutes
+			FROM tests t
+			JOIN schedules s ON s.test_id = t.test_id AND s.device = t.device
+			WHERE s.schedule_version = ?
+			  AND t.status != 'completed'
+			  AND (
+			    (s.scheduled_date = date(?, '-1 day') AND s.shift_index = 3)
+			    OR (s.scheduled_date = ? AND s.shift_index = 1)
+			  )
+			ORDER BY t.test_id, t.device
+			""",
+			(latest, today, today),
+		).fetchall()
+	return [
+		{
+			"test_id": r["test_id"],
+			"device": r["device"],
+			"test_type": r["test_type"],
+			"estimated_minutes": r["estimated_minutes"],
+		}
+		for r in rows
+	]
+
+
 def upsert_holidays(dates: list[str], db_path: str | Path = DB_PATH) -> None:
 	"""Replace all holidays with the provided list of YYYY-MM-DD date strings."""
 	with get_connection(db_path) as conn: