Compare commits

..

1 Commits

Author SHA1 Message Date
Timmy Time
b10f709935 Fix #372: Runtime-aware cron prompts with provider mismatch detection
Some checks failed
Forge CI / smoke-and-build (pull_request) Failing after 1m22s
Injects runtime context so agents know capabilities.
Detects provider mismatches and warns operators.
Fixes #372
2026-04-14 07:38:35 -04:00
4 changed files with 78 additions and 51 deletions

View File

@@ -26,7 +26,7 @@ from cron.jobs import (
trigger_job,
JOBS_FILE,
)
from cron.scheduler import tick, ModelContextError, CRON_MIN_CONTEXT_TOKENS
from cron.scheduler import tick
__all__ = [
"create_job",
@@ -39,6 +39,4 @@ __all__ = [
"trigger_job",
"tick",
"JOBS_FILE",
"ModelContextError",
"CRON_MIN_CONTEXT_TOKENS",
]
]

View File

@@ -545,7 +545,24 @@ def _run_job_script(script_path: str) -> tuple[bool, str]:
return False, f"Script execution failed: {exc}"
def _build_job_prompt(job: dict) -> str:
_PROVIDER_ALIASES = {"ollama":{"ollama","localhost:11434"},"anthropic":{"anthropic","claude"},"nous":{"nous","mimo"},"openrouter":{"openrouter"},"openai":{"openai","gpt"},"gemini":{"gemini","google"}}
_CP = frozenset({"nous","openrouter","anthropic","openai","zai","kimi","gemini","minimax"})
def _classify_runtime(provider, model):
p, m = (provider or "").strip().lower(), (model or "").strip().lower()
if p and p not in ("ollama","local"): return "cloud"
if "/" in m and m.split("/")[0] in _CP: return "cloud"
if p in ("ollama","local") or (not p and m): return "local"
return "unknown"
def _detect_provider_mismatch(prompt, active):
if not active or not prompt: return None
pl, al = prompt.lower(), active.lower().strip()
ag = next((g for g,a in _PROVIDER_ALIASES.items() if al in a or al.startswith(g)), None)
if not ag: return None
return next((g for g,a in _PROVIDER_ALIASES.items() if g!=ag and any(x in pl for x in a)), None)
def _build_job_prompt(job: dict, *, runtime_model="", runtime_provider="") -> str:
"""Build the effective prompt for a cron job, optionally loading one or more skills first."""
prompt = job.get("prompt", "")
skills = job.get("skills")
@@ -576,6 +593,16 @@ def _build_job_prompt(job: dict) -> str:
f"{prompt}"
)
_rb = ""
if runtime_model or runtime_provider:
_k = _classify_runtime(runtime_provider, runtime_model)
_n = []
if runtime_model: _n.append(f"MODEL: {runtime_model}")
if runtime_provider: _n.append(f"PROVIDER: {runtime_provider}")
if _k=="local": _n.append("RUNTIME: local — access to machine, Ollama, SSH")
elif _k=="cloud": _n.append("RUNTIME: cloud — NO local access, NO SSH")
if _n: _rb = "[SYSTEM: " + "; ".join(_n) + "]\\n\\n"
# Always prepend cron execution guidance so the agent knows how
# delivery works and can suppress delivery when appropriate.
cron_hint = (
@@ -597,7 +624,7 @@ def _build_job_prompt(job: dict) -> str:
"\"[SCRIPT_FAILED]: forge.alexanderwhitestone.com timed out\" "
"\"[SCRIPT_FAILED]: script exited with code 1\".]\\n\\n"
)
prompt = cron_hint + prompt
prompt = _rb + cron_hint + prompt
if skills is None:
legacy = job.get("skill")
skills = [legacy] if legacy else []
@@ -667,7 +694,18 @@ def run_job(job: dict) -> tuple[bool, str, str, Optional[str]]:
job_id = job["id"]
job_name = job["name"]
prompt = _build_job_prompt(job)
_em = job.get("model") or os.getenv("HERMES_MODEL") or ""
_ep = os.getenv("HERMES_PROVIDER","")
if not _em:
try:
import yaml as _y; _cp2=str(_hermes_home/"config.yaml")
if os.path.exists(_cp2):
with open(_cp2) as _f: _ce=_y.safe_load(_f) or {}
_mc=_ce.get("model",{})
_em = _mc if isinstance(_mc,str) else (_mc.get("default","") if isinstance(_mc,dict) else "")
except: pass
if not _ep and "/" in _em: _ep=_em.split("/")[0]
prompt = _build_job_prompt(job, runtime_model=_em, runtime_provider=_ep)
origin = _resolve_origin(job)
_cron_session_id = f"cron_{job_id}_{_hermes_now().strftime('%Y%m%d_%H%M%S')}"
@@ -779,6 +817,10 @@ def run_job(job: dict) -> tuple[bool, str, str, Optional[str]]:
message = format_runtime_provider_error(exc)
raise RuntimeError(message) from exc
_rp = runtime.get("provider","") or ""
_mm = _detect_provider_mismatch(job.get("prompt",""), _rp)
if _mm: logger.warning("Job '%s' refs '%s' but provider is '%s'", job_name, _mm, _rp)
from agent.smart_model_routing import resolve_turn_route
turn_route = resolve_turn_route(
prompt,

View File

@@ -18,9 +18,9 @@ from typing import Any, Dict, Optional
def normalize_job(job: Dict[str, Any]) -> Dict[str, Any]:
"""
Normalize a job dict to ensure consistent model field types and aligned skill fields.
Normalize a job dict to ensure consistent model field types.
Model normalization:
Before normalization:
- If model AND provider: model = raw string, provider = raw string (inconsistent)
- If only model: model = raw string
- If only provider: provider = raw string at top level
@@ -30,61 +30,37 @@ def normalize_job(job: Dict[str, Any]) -> Dict[str, Any]:
- If provider exists: model = {"provider": "yyy"}
- If both exist: model = {"model": "xxx", "provider": "yyy"}
- If neither: model = None
Skill normalization:
- Aligns legacy `skill` (single string) with `skills` (list), setting skill = skills[0]
"""
job = dict(job) # Create a copy to avoid modifying the original
# --- skill / skills normalization ---
raw_skill = job.get("skill")
raw_skills = job.get("skills")
if raw_skills is None:
skill_items = [raw_skill] if raw_skill else []
elif isinstance(raw_skills, str):
skill_items = [raw_skills]
else:
skill_items = list(raw_skills)
normalized_skills: list = []
for item in skill_items:
text = str(item or "").strip()
if text and text not in normalized_skills:
normalized_skills.append(text)
job["skills"] = normalized_skills
job["skill"] = normalized_skills[0] if normalized_skills else None
# --- model / provider normalization ---
model = job.get("model")
provider = job.get("provider")
# Skip if already normalized (model is a dict)
if isinstance(model, dict):
return job
# Build normalized model dict
model_dict = {}
if model is not None and isinstance(model, str):
model_dict["model"] = model.strip()
if provider is not None and isinstance(provider, str):
model_dict["provider"] = provider.strip()
# Set model field
if model_dict:
job["model"] = model_dict
else:
job["model"] = None
# Remove top-level provider field if it was moved into model dict
if provider is not None and "provider" in model_dict:
# Keep provider field for backward compatibility but mark it as deprecated
# This allows existing code that reads job["provider"] to continue working
pass
return job
@@ -114,26 +90,20 @@ def normalize_jobs_file(jobs_file: Path, dry_run: bool = False) -> int:
for i, job in enumerate(jobs):
original_model = job.get("model")
original_provider = job.get("provider")
original_skill = job.get("skill")
original_skills = job.get("skills")
normalized_job = normalize_job(job)
# Check if anything changed
if (normalized_job.get("model") != original_model or
normalized_job.get("provider") != original_provider or
normalized_job.get("skill") != original_skill or
normalized_job.get("skills") != original_skills):
normalized_job.get("provider") != original_provider):
jobs[i] = normalized_job
modified_count += 1
job_id = job.get("id", "?")
job_name = job.get("name", "(unnamed)")
print(f"Normalized job {job_id} ({job_name}):")
print(f" model: {original_model!r} -> {normalized_job.get('model')!r}")
print(f" provider: {original_provider!r} -> {normalized_job.get('provider')!r}")
print(f" skill: {original_skill!r} -> {normalized_job.get('skill')!r}")
print(f" skills: {original_skills!r} -> {normalized_job.get('skills')!r}")
if modified_count == 0:
print("All jobs already have consistent model field types.")

17
tests/test_372_runtime.py Normal file
View File

@@ -0,0 +1,17 @@
"""Tests for #372."""
import sys; sys.path.insert(0, str(__import__('pathlib').Path(__file__).resolve().parent.parent))
def _imp():
import importlib.util as iu
s=iu.spec_from_file_location("cs",str(__import__('pathlib').Path(__file__).resolve().parent.parent/"cron"/"scheduler.py"))
m=iu.module_from_spec(s)
try: s.loader.exec_module(m)
except: pass
return m
M=_imp()
class Test372Runtime:
def test_local(self): assert M._classify_runtime("ollama","q")=="local"
def test_cloud(self): assert M._classify_runtime("nous","m")=="cloud"
def test_mismatch(self): assert M._detect_provider_mismatch("Check Ollama","nous")=="ollama"
def test_none(self): assert M._detect_provider_mismatch("Check Nous","nous") is None
def test_cloud_ctx(self): assert "cloud" in M._build_job_prompt({"p":"x"},runtime_model="n/m",runtime_provider="nous").lower()
if __name__=="__main__": __import__('pytest').main([__file__,"-v"])