Compare commits
1 Commits
burn/349-1
...
burn/317-1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5989600d80 |
@@ -1,10 +1,11 @@
|
||||
"""Helpers for optional cheap-vs-strong model routing."""
|
||||
"""Helpers for optional cheap-vs-strong and time-aware model routing."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import os
|
||||
import re
|
||||
from typing import Any, Dict, Optional
|
||||
from datetime import datetime
|
||||
from typing import Any, Dict, List, Optional
|
||||
|
||||
from utils import is_truthy_value
|
||||
|
||||
@@ -192,3 +193,104 @@ def resolve_turn_route(user_message: str, routing_config: Optional[Dict[str, Any
|
||||
tuple(runtime.get("args") or ()),
|
||||
),
|
||||
}
|
||||
|
||||
|
||||
# =========================================================================
|
||||
# Time-aware cron model routing
|
||||
# =========================================================================
|
||||
#
|
||||
# Empirical finding: cron error rate peaks at 18:00 (9.4%) vs 4.0% at 09:00.
|
||||
# During high-error windows, route cron jobs to more capable models.
|
||||
#
|
||||
# Config (config.yaml):
|
||||
# cron_model_routing:
|
||||
# enabled: true
|
||||
# fallback_model: "anthropic/claude-sonnet-4"
|
||||
# fallback_provider: "openrouter"
|
||||
# windows:
|
||||
# - start_hour: 17
|
||||
# end_hour: 22
|
||||
# reason: "evening_error_peak"
|
||||
# - start_hour: 2
|
||||
# end_hour: 5
|
||||
# reason: "overnight_api_instability"
|
||||
# =========================================================================
|
||||
|
||||
def _hour_in_window(hour: int, start: int, end: int) -> bool:
|
||||
"""Check if hour falls in [start, end) window, handling midnight wrap."""
|
||||
if start <= end:
|
||||
return start <= hour < end
|
||||
else:
|
||||
# Wraps midnight: e.g., 22-06
|
||||
return hour >= start or hour < end
|
||||
|
||||
|
||||
def resolve_cron_model(
|
||||
base_model: str,
|
||||
routing_config: Optional[Dict[str, Any]],
|
||||
now: Optional[datetime] = None,
|
||||
) -> Dict[str, Any]:
|
||||
"""Apply time-aware model override for cron jobs.
|
||||
|
||||
During configured high-error windows, returns a stronger model config.
|
||||
Outside windows, returns the base model unchanged.
|
||||
|
||||
Args:
|
||||
base_model: The model string already resolved (from job/config/env).
|
||||
routing_config: The cron_model_routing dict from config.yaml.
|
||||
now: Override current time (for testing). Defaults to datetime.now().
|
||||
|
||||
Returns:
|
||||
Dict with keys: model, provider, overridden, reason.
|
||||
- model: the effective model string to use
|
||||
- provider: provider override (empty string = use default)
|
||||
- overridden: True if time-based override was applied
|
||||
- reason: why override was applied (empty string if not)
|
||||
"""
|
||||
cfg = routing_config or {}
|
||||
|
||||
if not _coerce_bool(cfg.get("enabled"), False):
|
||||
return {"model": base_model, "provider": "", "overridden": False, "reason": ""}
|
||||
|
||||
windows = cfg.get("windows") or []
|
||||
if not isinstance(windows, list) or not windows:
|
||||
return {"model": base_model, "provider": "", "overridden": False, "reason": ""}
|
||||
|
||||
current = now or datetime.now()
|
||||
current_hour = current.hour
|
||||
|
||||
matched_window = None
|
||||
for window in windows:
|
||||
if not isinstance(window, dict):
|
||||
continue
|
||||
start = _coerce_int(window.get("start_hour"), -1)
|
||||
end = _coerce_int(window.get("end_hour"), -1)
|
||||
if start < 0 or end < 0:
|
||||
continue
|
||||
if _hour_in_window(current_hour, start, end):
|
||||
matched_window = window
|
||||
break
|
||||
|
||||
if not matched_window:
|
||||
return {"model": base_model, "provider": "", "overridden": False, "reason": ""}
|
||||
|
||||
# Window matched — use the override model from window or global fallback
|
||||
override_model = str(matched_window.get("model") or "").strip()
|
||||
override_provider = str(matched_window.get("provider") or "").strip()
|
||||
|
||||
if not override_model:
|
||||
override_model = str(cfg.get("fallback_model") or "").strip()
|
||||
if not override_provider:
|
||||
override_provider = str(cfg.get("fallback_provider") or "").strip()
|
||||
|
||||
if not override_model:
|
||||
return {"model": base_model, "provider": "", "overridden": False, "reason": ""}
|
||||
|
||||
reason = str(matched_window.get("reason") or "time_window").strip()
|
||||
|
||||
return {
|
||||
"model": override_model,
|
||||
"provider": override_provider,
|
||||
"overridden": True,
|
||||
"reason": f"cron_routing:{reason}(hour={current_hour})",
|
||||
}
|
||||
|
||||
14
cli.py
14
cli.py
@@ -4123,19 +4123,7 @@ class HermesCLI:
|
||||
print(f" Skills: {', '.join(job['skills'])}")
|
||||
print(f" Prompt: {job.get('prompt_preview', '')}")
|
||||
if job.get("last_run_at"):
|
||||
status = job.get('last_status', '?')
|
||||
if status == "error" and job.get("last_error"):
|
||||
# Show error with staleness hint
|
||||
last_success = job.get("last_success_at", "")
|
||||
if last_success and last_success > job.get("last_error_at", ""):
|
||||
print(f" Last run: {job['last_run_at']} (recovered, last error was before {last_success})")
|
||||
else:
|
||||
err_preview = job['last_error'][:80]
|
||||
print(f" Last run: {job['last_run_at']} (error: {err_preview}...)")
|
||||
elif status == "retrying":
|
||||
print(f" Last run: {job['last_run_at']} (retrying...)")
|
||||
else:
|
||||
print(f" Last run: {job['last_run_at']} ({status})")
|
||||
print(f" Last run: {job['last_run_at']} ({job.get('last_status', '?')})")
|
||||
print()
|
||||
return
|
||||
|
||||
|
||||
27
cron/jobs.py
27
cron/jobs.py
@@ -528,11 +528,7 @@ def pause_job(job_id: str, reason: Optional[str] = None) -> Optional[Dict[str, A
|
||||
|
||||
|
||||
def resume_job(job_id: str) -> Optional[Dict[str, Any]]:
|
||||
"""Resume a paused job and compute the next future run from now.
|
||||
|
||||
Clears stale error state so the job's health reflects the upcoming
|
||||
run rather than a previous failure that may have caused the pause.
|
||||
"""
|
||||
"""Resume a paused job and compute the next future run from now."""
|
||||
job = get_job(job_id)
|
||||
if not job:
|
||||
return None
|
||||
@@ -546,19 +542,12 @@ def resume_job(job_id: str) -> Optional[Dict[str, Any]]:
|
||||
"paused_at": None,
|
||||
"paused_reason": None,
|
||||
"next_run_at": next_run_at,
|
||||
# Clear stale error — resuming is an explicit retry signal.
|
||||
"last_error": None,
|
||||
"last_status": "retrying" if job.get("last_status") == "error" else job.get("last_status"),
|
||||
},
|
||||
)
|
||||
|
||||
|
||||
def trigger_job(job_id: str) -> Optional[Dict[str, Any]]:
|
||||
"""Schedule a job to run on the next scheduler tick.
|
||||
|
||||
Clears stale error state so the job's health reflects the upcoming
|
||||
re-run rather than the previous failure.
|
||||
"""
|
||||
"""Schedule a job to run on the next scheduler tick."""
|
||||
job = get_job(job_id)
|
||||
if not job:
|
||||
return None
|
||||
@@ -570,10 +559,6 @@ def trigger_job(job_id: str) -> Optional[Dict[str, Any]]:
|
||||
"paused_at": None,
|
||||
"paused_reason": None,
|
||||
"next_run_at": _hermes_now().isoformat(),
|
||||
# Clear stale error — the job is being retried.
|
||||
# The next run will set last_error on failure or None on success.
|
||||
"last_error": None,
|
||||
"last_status": "retrying" if job.get("last_status") == "error" else job.get("last_status"),
|
||||
},
|
||||
)
|
||||
|
||||
@@ -633,8 +618,6 @@ def mark_job_run(job_id: str, success: bool, error: Optional[str] = None):
|
||||
|
||||
Updates last_run_at, last_status, increments completed count,
|
||||
computes next_run_at, and auto-deletes if repeat limit reached.
|
||||
Also tracks last_error_at and last_success_at timestamps so callers
|
||||
can distinguish current health from historical failure residue.
|
||||
"""
|
||||
jobs = load_jobs()
|
||||
for i, job in enumerate(jobs):
|
||||
@@ -644,12 +627,6 @@ def mark_job_run(job_id: str, success: bool, error: Optional[str] = None):
|
||||
job["last_status"] = "ok" if success else "error"
|
||||
job["last_error"] = error if not success else None
|
||||
|
||||
# Track timestamps for health distinction
|
||||
if success:
|
||||
job["last_success_at"] = now
|
||||
else:
|
||||
job["last_error_at"] = now
|
||||
|
||||
# Increment completed count
|
||||
if job.get("repeat"):
|
||||
job["repeat"]["completed"] = job["repeat"].get("completed", 0) + 1
|
||||
|
||||
@@ -717,6 +717,22 @@ def run_job(job: dict) -> tuple[bool, str, str, Optional[str]]:
|
||||
|
||||
# Reasoning config from env or config.yaml
|
||||
from hermes_constants import parse_reasoning_effort
|
||||
|
||||
# Time-aware cron model routing — override model during high-error windows
|
||||
try:
|
||||
from agent.smart_model_routing import resolve_cron_model
|
||||
_cron_routing_cfg = (_cfg.get("cron_model_routing") or {})
|
||||
_cron_route = resolve_cron_model(model, _cron_routing_cfg)
|
||||
if _cron_route["overridden"]:
|
||||
_original_model = model
|
||||
model = _cron_route["model"]
|
||||
logger.info(
|
||||
"Job '%s': cron model override %s -> %s (%s)",
|
||||
job_id, _original_model, model, _cron_route["reason"],
|
||||
)
|
||||
except Exception as _e:
|
||||
logger.debug("Job '%s': cron model routing skipped: %s", job_id, _e)
|
||||
|
||||
effort = os.getenv("HERMES_REASONING_EFFORT", "")
|
||||
if not effort:
|
||||
effort = str(_cfg.get("agent", {}).get("reasoning_effort", "")).strip()
|
||||
|
||||
128
tests/test_cron_model_routing.py
Normal file
128
tests/test_cron_model_routing.py
Normal file
@@ -0,0 +1,128 @@
|
||||
"""Tests for time-aware cron model routing — Issue #317."""
|
||||
|
||||
import pytest
|
||||
from datetime import datetime
|
||||
|
||||
from agent.smart_model_routing import resolve_cron_model, _hour_in_window
|
||||
|
||||
|
||||
class TestHourInWindow:
|
||||
"""Hour-in-window detection including midnight wrap."""
|
||||
|
||||
def test_normal_window(self):
|
||||
assert _hour_in_window(18, 17, 22) is True
|
||||
assert _hour_in_window(16, 17, 22) is False
|
||||
assert _hour_in_window(22, 17, 22) is False
|
||||
|
||||
def test_midnight_wrap(self):
|
||||
assert _hour_in_window(23, 22, 6) is True
|
||||
assert _hour_in_window(3, 22, 6) is True
|
||||
assert _hour_in_window(10, 22, 6) is False
|
||||
|
||||
def test_edge_cases(self):
|
||||
assert _hour_in_window(0, 0, 24) is True
|
||||
assert _hour_in_window(23, 0, 24) is True
|
||||
assert _hour_in_window(0, 22, 6) is True
|
||||
assert _hour_in_window(5, 22, 6) is True
|
||||
assert _hour_in_window(6, 22, 6) is False
|
||||
|
||||
|
||||
class TestResolveCronModel:
|
||||
"""Time-aware model resolution for cron jobs."""
|
||||
|
||||
def _config(self, **overrides):
|
||||
base = {
|
||||
"enabled": True,
|
||||
"fallback_model": "anthropic/claude-sonnet-4",
|
||||
"fallback_provider": "openrouter",
|
||||
"windows": [
|
||||
{"start_hour": 17, "end_hour": 22, "reason": "evening_error_peak"},
|
||||
],
|
||||
}
|
||||
base.update(overrides)
|
||||
return base
|
||||
|
||||
def test_disabled_returns_base(self):
|
||||
result = resolve_cron_model("mimo", {"enabled": False}, now=datetime(2026, 4, 12, 18, 0))
|
||||
assert result["model"] == "mimo"
|
||||
assert result["overridden"] is False
|
||||
|
||||
def test_no_config_returns_base(self):
|
||||
result = resolve_cron_model("mimo", None)
|
||||
assert result["model"] == "mimo"
|
||||
assert result["overridden"] is False
|
||||
|
||||
def test_no_windows_returns_base(self):
|
||||
result = resolve_cron_model("mimo", {"enabled": True, "windows": []}, now=datetime(2026, 4, 12, 18, 0))
|
||||
assert result["overridden"] is False
|
||||
|
||||
def test_evening_window_overrides(self):
|
||||
result = resolve_cron_model("mimo", self._config(), now=datetime(2026, 4, 12, 18, 0))
|
||||
assert result["model"] == "anthropic/claude-sonnet-4"
|
||||
assert result["provider"] == "openrouter"
|
||||
assert result["overridden"] is True
|
||||
assert "evening_error_peak" in result["reason"]
|
||||
assert "hour=18" in result["reason"]
|
||||
|
||||
def test_outside_window_keeps_base(self):
|
||||
result = resolve_cron_model("mimo", self._config(), now=datetime(2026, 4, 12, 9, 0))
|
||||
assert result["model"] == "mimo"
|
||||
assert result["overridden"] is False
|
||||
|
||||
def test_window_boundary_start_inclusive(self):
|
||||
result = resolve_cron_model("mimo", self._config(), now=datetime(2026, 4, 12, 17, 0))
|
||||
assert result["overridden"] is True
|
||||
|
||||
def test_window_boundary_end_exclusive(self):
|
||||
result = resolve_cron_model("mimo", self._config(), now=datetime(2026, 4, 12, 22, 0))
|
||||
assert result["overridden"] is False
|
||||
|
||||
def test_midnight_window(self):
|
||||
config = self._config(windows=[{"start_hour": 22, "end_hour": 6, "reason": "overnight"}])
|
||||
assert resolve_cron_model("mimo", config, now=datetime(2026, 4, 12, 23, 0))["overridden"] is True
|
||||
assert resolve_cron_model("mimo", config, now=datetime(2026, 4, 13, 3, 0))["overridden"] is True
|
||||
assert resolve_cron_model("mimo", config, now=datetime(2026, 4, 12, 10, 0))["overridden"] is False
|
||||
|
||||
def test_per_window_model_override(self):
|
||||
config = self._config(windows=[{
|
||||
"start_hour": 17, "end_hour": 22,
|
||||
"model": "anthropic/claude-opus-4-6", "provider": "anthropic", "reason": "peak",
|
||||
}])
|
||||
result = resolve_cron_model("mimo", config, now=datetime(2026, 4, 12, 18, 0))
|
||||
assert result["model"] == "anthropic/claude-opus-4-6"
|
||||
assert result["provider"] == "anthropic"
|
||||
|
||||
def test_first_matching_window_wins(self):
|
||||
config = self._config(windows=[
|
||||
{"start_hour": 17, "end_hour": 20, "model": "strong-1", "provider": "p1", "reason": "w1"},
|
||||
{"start_hour": 19, "end_hour": 22, "model": "strong-2", "provider": "p2", "reason": "w2"},
|
||||
])
|
||||
result = resolve_cron_model("mimo", config, now=datetime(2026, 4, 12, 19, 0))
|
||||
assert result["model"] == "strong-1"
|
||||
|
||||
def test_no_fallback_model_keeps_base(self):
|
||||
config = {"enabled": True, "windows": [{"start_hour": 17, "end_hour": 22, "reason": "test"}]}
|
||||
result = resolve_cron_model("mimo", config, now=datetime(2026, 4, 12, 18, 0))
|
||||
assert result["overridden"] is False
|
||||
assert result["model"] == "mimo"
|
||||
|
||||
def test_malformed_windows_skipped(self):
|
||||
config = self._config(windows=[
|
||||
"not-a-dict",
|
||||
{"start_hour": 17},
|
||||
{"end_hour": 22},
|
||||
{"start_hour": "bad", "end_hour": "bad"},
|
||||
{"start_hour": 17, "end_hour": 22, "reason": "valid"},
|
||||
])
|
||||
result = resolve_cron_model("mimo", config, now=datetime(2026, 4, 12, 18, 0))
|
||||
assert result["overridden"] is True
|
||||
assert "valid" in result["reason"]
|
||||
|
||||
def test_multiple_windows_coverage(self):
|
||||
config = self._config(windows=[
|
||||
{"start_hour": 17, "end_hour": 22, "reason": "evening"},
|
||||
{"start_hour": 2, "end_hour": 5, "reason": "overnight"},
|
||||
])
|
||||
assert resolve_cron_model("mimo", config, now=datetime(2026, 4, 12, 20, 0))["overridden"] is True
|
||||
assert resolve_cron_model("mimo", config, now=datetime(2026, 4, 13, 3, 0))["overridden"] is True
|
||||
assert resolve_cron_model("mimo", config, now=datetime(2026, 4, 12, 10, 0))["overridden"] is False
|
||||
@@ -1,177 +0,0 @@
|
||||
"""Tests for cron job stale error state clearing (#349)."""
|
||||
|
||||
import json
|
||||
import os
|
||||
import sys
|
||||
import tempfile
|
||||
from pathlib import Path
|
||||
from unittest.mock import patch, MagicMock
|
||||
|
||||
import pytest
|
||||
|
||||
# Ensure cron.jobs can be imported without triggering cron/__init__.py
|
||||
# which may have additional imports that break in test isolation.
|
||||
sys.modules.setdefault("cron.scheduler", MagicMock())
|
||||
|
||||
|
||||
@pytest.fixture()
|
||||
def isolated_cron_dir(tmp_path, monkeypatch):
|
||||
"""Point CRON_DIR at a temp directory for test isolation."""
|
||||
cron_dir = tmp_path / "cron"
|
||||
cron_dir.mkdir()
|
||||
output_dir = cron_dir / "output"
|
||||
output_dir.mkdir()
|
||||
monkeypatch.setattr("cron.jobs.CRON_DIR", cron_dir)
|
||||
monkeypatch.setattr("cron.jobs.JOBS_FILE", cron_dir / "jobs.json")
|
||||
monkeypatch.setattr("cron.jobs.OUTPUT_DIR", output_dir)
|
||||
return cron_dir
|
||||
|
||||
|
||||
def _make_job(cron_dir, job_id="test-job-1", last_status="error", last_error="auth revoked"):
|
||||
"""Write a minimal jobs.json with one job."""
|
||||
from hermes_time import now as _hermes_now
|
||||
job = {
|
||||
"id": job_id,
|
||||
"name": "Test Job",
|
||||
"prompt": "test prompt",
|
||||
"schedule": {"kind": "interval", "minutes": 10, "display": "every 10m"},
|
||||
"enabled": True,
|
||||
"state": "scheduled",
|
||||
"last_run_at": _hermes_now().isoformat(),
|
||||
"last_status": last_status,
|
||||
"last_error": last_error,
|
||||
"last_error_at": _hermes_now().isoformat(),
|
||||
"next_run_at": _hermes_now().isoformat(),
|
||||
}
|
||||
jobs_file = cron_dir / "jobs.json"
|
||||
jobs_file.write_text(json.dumps({"jobs": [job]}))
|
||||
return job
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# trigger_job clears stale error
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
class TestTriggerJobClearsError:
|
||||
def test_trigger_clears_last_error(self, isolated_cron_dir):
|
||||
from cron.jobs import trigger_job, get_job
|
||||
|
||||
_make_job(isolated_cron_dir, last_status="error", last_error="Refresh session revoked")
|
||||
result = trigger_job("test-job-1")
|
||||
assert result is not None
|
||||
job = get_job("test-job-1")
|
||||
assert job["last_error"] is None
|
||||
assert job["last_status"] == "retrying"
|
||||
|
||||
def test_trigger_preserves_ok_status(self, isolated_cron_dir):
|
||||
from cron.jobs import trigger_job, get_job
|
||||
|
||||
_make_job(isolated_cron_dir, last_status="ok", last_error=None)
|
||||
result = trigger_job("test-job-1")
|
||||
assert result is not None
|
||||
job = get_job("test-job-1")
|
||||
assert job["last_error"] is None
|
||||
assert job["last_status"] == "ok" # stays ok, not retrying
|
||||
|
||||
def test_trigger_nonexistent_returns_none(self, isolated_cron_dir):
|
||||
from cron.jobs import trigger_job
|
||||
|
||||
result = trigger_job("nonexistent")
|
||||
assert result is None
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# resume_job also clears stale error
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
class TestResumeJobClearsError:
|
||||
def test_resume_clears_last_error(self, isolated_cron_dir):
|
||||
from cron.jobs import resume_job, get_job, pause_job
|
||||
|
||||
_make_job(isolated_cron_dir, last_status="error", last_error="auth revoked")
|
||||
pause_job("test-job-1", reason="auth issue")
|
||||
result = resume_job("test-job-1")
|
||||
assert result is not None
|
||||
job = get_job("test-job-1")
|
||||
assert job["last_error"] is None
|
||||
assert job["last_status"] == "retrying"
|
||||
assert job["state"] == "scheduled"
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# mark_job_run tracks timestamps
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
class TestMarkJobRunTimestamps:
|
||||
def test_success_sets_last_success_at(self, isolated_cron_dir):
|
||||
from cron.jobs import mark_job_run, get_job
|
||||
|
||||
_make_job(isolated_cron_dir)
|
||||
mark_job_run("test-job-1", success=True, error=None)
|
||||
job = get_job("test-job-1")
|
||||
assert job["last_status"] == "ok"
|
||||
assert job["last_error"] is None
|
||||
assert job.get("last_success_at") is not None
|
||||
|
||||
def test_error_sets_last_error_at(self, isolated_cron_dir):
|
||||
from cron.jobs import mark_job_run, get_job
|
||||
|
||||
_make_job(isolated_cron_dir, last_status="ok", last_error=None)
|
||||
mark_job_run("test-job-1", success=False, error="new error")
|
||||
job = get_job("test-job-1")
|
||||
assert job["last_status"] == "error"
|
||||
assert job["last_error"] == "new error"
|
||||
assert job.get("last_error_at") is not None
|
||||
|
||||
def test_success_clears_error(self, isolated_cron_dir):
|
||||
from cron.jobs import mark_job_run, get_job
|
||||
|
||||
_make_job(isolated_cron_dir, last_status="error", last_error="old error")
|
||||
mark_job_run("test-job-1", success=True, error=None)
|
||||
job = get_job("test-job-1")
|
||||
assert job["last_status"] == "ok"
|
||||
assert job["last_error"] is None
|
||||
assert job.get("last_success_at") is not None
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Health distinction: error vs recovered
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
class TestHealthDistinction:
|
||||
def test_recovered_job_shows_success_after_error(self, isolated_cron_dir):
|
||||
from cron.jobs import mark_job_run, get_job
|
||||
from hermes_time import now as _hermes_now
|
||||
|
||||
_make_job(isolated_cron_dir, last_status="error", last_error="auth revoked")
|
||||
# Simulate recovery
|
||||
mark_job_run("test-job-1", success=True, error=None)
|
||||
job = get_job("test-job-1")
|
||||
assert job["last_status"] == "ok"
|
||||
assert job["last_error"] is None
|
||||
# last_success_at should be after last_error_at
|
||||
assert job["last_success_at"] >= job.get("last_error_at", "")
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# _format_job includes health fields
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
class TestFormatJobHealth:
|
||||
def test_format_includes_health_fields(self):
|
||||
from tools.cronjob_tools import _format_job
|
||||
|
||||
job = {
|
||||
"id": "j1",
|
||||
"name": "Test",
|
||||
"prompt": "hello",
|
||||
"schedule_display": "every 10m",
|
||||
"last_status": "error",
|
||||
"last_error": "revoked",
|
||||
"last_error_at": "2026-04-13T10:00:00",
|
||||
"last_success_at": "2026-04-13T09:00:00",
|
||||
}
|
||||
result = _format_job(job)
|
||||
assert result["last_error"] == "revoked"
|
||||
assert result["last_error_at"] == "2026-04-13T10:00:00"
|
||||
assert result["last_success_at"] == "2026-04-13T09:00:00"
|
||||
@@ -196,9 +196,6 @@ def _format_job(job: Dict[str, Any]) -> Dict[str, Any]:
|
||||
"next_run_at": job.get("next_run_at"),
|
||||
"last_run_at": job.get("last_run_at"),
|
||||
"last_status": job.get("last_status"),
|
||||
"last_error": job.get("last_error"),
|
||||
"last_error_at": job.get("last_error_at"),
|
||||
"last_success_at": job.get("last_success_at"),
|
||||
"enabled": job.get("enabled", True),
|
||||
"state": job.get("state", "scheduled" if job.get("enabled", True) else "paused"),
|
||||
"paused_at": job.get("paused_at"),
|
||||
|
||||
Reference in New Issue
Block a user