Compare commits
1 Commits
claude/iss
...
queue/372-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9919114541 |
@@ -26,7 +26,7 @@ from cron.jobs import (
|
|||||||
trigger_job,
|
trigger_job,
|
||||||
JOBS_FILE,
|
JOBS_FILE,
|
||||||
)
|
)
|
||||||
from cron.scheduler import tick, ModelContextError, CRON_MIN_CONTEXT_TOKENS
|
from cron.scheduler import tick
|
||||||
|
|
||||||
__all__ = [
|
__all__ = [
|
||||||
"create_job",
|
"create_job",
|
||||||
@@ -39,6 +39,4 @@ __all__ = [
|
|||||||
"trigger_job",
|
"trigger_job",
|
||||||
"tick",
|
"tick",
|
||||||
"JOBS_FILE",
|
"JOBS_FILE",
|
||||||
"ModelContextError",
|
|
||||||
"CRON_MIN_CONTEXT_TOKENS",
|
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -545,8 +545,75 @@ def _run_job_script(script_path: str) -> tuple[bool, str]:
|
|||||||
return False, f"Script execution failed: {exc}"
|
return False, f"Script execution failed: {exc}"
|
||||||
|
|
||||||
|
|
||||||
def _build_job_prompt(job: dict) -> str:
|
# ---------------------------------------------------------------------------
|
||||||
"""Build the effective prompt for a cron job, optionally loading one or more skills first."""
|
# Runtime classification & provider mismatch detection
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
_PROVIDER_ALIASES: dict[str, set[str]] = {
|
||||||
|
"ollama": {"ollama", "local ollama", "localhost:11434"},
|
||||||
|
"anthropic": {"anthropic", "claude", "sonnet", "opus", "haiku"},
|
||||||
|
"nous": {"nous", "mimo", "nousresearch"},
|
||||||
|
"openrouter": {"openrouter"},
|
||||||
|
"kimi": {"kimi", "moonshot"},
|
||||||
|
"openai": {"openai", "gpt", "codex"},
|
||||||
|
"gemini": {"gemini", "google"},
|
||||||
|
}
|
||||||
|
|
||||||
|
_CLOUD_PREFIXES = frozenset({"nous", "openrouter", "anthropic", "openai", "zai", "kimi", "gemini", "minimax"})
|
||||||
|
|
||||||
|
|
||||||
|
def _classify_runtime(provider: str, model: str) -> str:
|
||||||
|
"""Return 'local' | 'cloud' | 'unknown'."""
|
||||||
|
p = (provider or "").strip().lower()
|
||||||
|
m = (model or "").strip().lower()
|
||||||
|
if p and p not in ("ollama", "local"):
|
||||||
|
return "cloud"
|
||||||
|
if "/" in m and m.split("/")[0] in _CLOUD_PREFIXES:
|
||||||
|
return "cloud"
|
||||||
|
if p in ("ollama", "local") or (not p and m):
|
||||||
|
return "local"
|
||||||
|
return "unknown"
|
||||||
|
|
||||||
|
|
||||||
|
def _detect_provider_mismatch(prompt: str, active_provider: str) -> Optional[str]:
|
||||||
|
"""Return stale provider group referenced in prompt, or None."""
|
||||||
|
if not active_provider or not prompt:
|
||||||
|
return None
|
||||||
|
prompt_lower = prompt.lower()
|
||||||
|
active_lower = active_provider.lower().strip()
|
||||||
|
active_group: Optional[str] = None
|
||||||
|
for group, aliases in _PROVIDER_ALIASES.items():
|
||||||
|
if active_lower in aliases or active_lower.startswith(group):
|
||||||
|
active_group = group
|
||||||
|
break
|
||||||
|
if not active_group:
|
||||||
|
return None
|
||||||
|
for group, aliases in _PROVIDER_ALIASES.items():
|
||||||
|
if group == active_group:
|
||||||
|
continue
|
||||||
|
for alias in aliases:
|
||||||
|
if alias in prompt_lower:
|
||||||
|
return group
|
||||||
|
return None
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Prompt builder
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
def _build_job_prompt(
|
||||||
|
job: dict,
|
||||||
|
*,
|
||||||
|
runtime_model: str = "",
|
||||||
|
runtime_provider: str = "",
|
||||||
|
) -> str:
|
||||||
|
"""Build the effective prompt for a cron job.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
job: The cron job dict.
|
||||||
|
runtime_model: Resolved model name (e.g. "xiaomi/mimo-v2-pro").
|
||||||
|
runtime_provider: Resolved provider name (e.g. "nous", "openrouter").
|
||||||
|
"""
|
||||||
prompt = job.get("prompt", "")
|
prompt = job.get("prompt", "")
|
||||||
skills = job.get("skills")
|
skills = job.get("skills")
|
||||||
|
|
||||||
@@ -576,6 +643,33 @@ def _build_job_prompt(job: dict) -> str:
|
|||||||
f"{prompt}"
|
f"{prompt}"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# Runtime context injection — tells the agent what it can actually do.
|
||||||
|
_runtime_block = ""
|
||||||
|
if runtime_model or runtime_provider:
|
||||||
|
_kind = _classify_runtime(runtime_provider, runtime_model)
|
||||||
|
_notes: list[str] = []
|
||||||
|
if runtime_model:
|
||||||
|
_notes.append(f"MODEL: {runtime_model}")
|
||||||
|
if runtime_provider:
|
||||||
|
_notes.append(f"PROVIDER: {runtime_provider}")
|
||||||
|
if _kind == "local":
|
||||||
|
_notes.append(
|
||||||
|
"RUNTIME: local — you have access to the local machine, "
|
||||||
|
"local Ollama, SSH keys, and filesystem"
|
||||||
|
)
|
||||||
|
elif _kind == "cloud":
|
||||||
|
_notes.append(
|
||||||
|
"RUNTIME: cloud API — you do NOT have local machine access. "
|
||||||
|
"Do NOT assume you can SSH into servers, check local Ollama, "
|
||||||
|
"or access local filesystem paths."
|
||||||
|
)
|
||||||
|
if _notes:
|
||||||
|
_runtime_block = (
|
||||||
|
"[SYSTEM: RUNTIME CONTEXT — "
|
||||||
|
+ "; ".join(_notes)
|
||||||
|
+ ". Adjust your approach based on these capabilities.]\\n\\n"
|
||||||
|
)
|
||||||
|
|
||||||
# Always prepend cron execution guidance so the agent knows how
|
# Always prepend cron execution guidance so the agent knows how
|
||||||
# delivery works and can suppress delivery when appropriate.
|
# delivery works and can suppress delivery when appropriate.
|
||||||
cron_hint = (
|
cron_hint = (
|
||||||
@@ -595,9 +689,9 @@ def _build_job_prompt(job: dict) -> str:
|
|||||||
"response. This is critical — without this marker the system cannot "
|
"response. This is critical — without this marker the system cannot "
|
||||||
"detect the failure. Examples: "
|
"detect the failure. Examples: "
|
||||||
"\"[SCRIPT_FAILED]: forge.alexanderwhitestone.com timed out\" "
|
"\"[SCRIPT_FAILED]: forge.alexanderwhitestone.com timed out\" "
|
||||||
"\"[SCRIPT_FAILED]: script exited with code 1\".]\\n\\n"
|
"\\\"[SCRIPT_FAILED]: script exited with code 1\\\".]\\\\n\\\\n"
|
||||||
)
|
)
|
||||||
prompt = cron_hint + prompt
|
prompt = _runtime_block + cron_hint + prompt
|
||||||
if skills is None:
|
if skills is None:
|
||||||
legacy = job.get("skill")
|
legacy = job.get("skill")
|
||||||
skills = [legacy] if legacy else []
|
skills = [legacy] if legacy else []
|
||||||
@@ -667,7 +761,32 @@ def run_job(job: dict) -> tuple[bool, str, str, Optional[str]]:
|
|||||||
|
|
||||||
job_id = job["id"]
|
job_id = job["id"]
|
||||||
job_name = job["name"]
|
job_name = job["name"]
|
||||||
prompt = _build_job_prompt(job)
|
|
||||||
|
# Early model/provider resolution for runtime context injection
|
||||||
|
_early_model = job.get("model") or os.getenv("HERMES_MODEL") or ""
|
||||||
|
_early_provider = os.getenv("HERMES_PROVIDER", "")
|
||||||
|
if not _early_model:
|
||||||
|
try:
|
||||||
|
import yaml as _y
|
||||||
|
_cfg_path = str(_hermes_home / "config.yaml")
|
||||||
|
if os.path.exists(_cfg_path):
|
||||||
|
with open(_cfg_path) as _f:
|
||||||
|
_cfg_early = _y.safe_load(_f) or {}
|
||||||
|
_mc = _cfg_early.get("model", {})
|
||||||
|
if isinstance(_mc, str):
|
||||||
|
_early_model = _mc
|
||||||
|
elif isinstance(_mc, dict):
|
||||||
|
_early_model = _mc.get("default", "")
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
if not _early_provider and "/" in _early_model:
|
||||||
|
_early_provider = _early_model.split("/")[0]
|
||||||
|
|
||||||
|
prompt = _build_job_prompt(
|
||||||
|
job,
|
||||||
|
runtime_model=_early_model,
|
||||||
|
runtime_provider=_early_provider,
|
||||||
|
)
|
||||||
origin = _resolve_origin(job)
|
origin = _resolve_origin(job)
|
||||||
_cron_session_id = f"cron_{job_id}_{_hermes_now().strftime('%Y%m%d_%H%M%S')}"
|
_cron_session_id = f"cron_{job_id}_{_hermes_now().strftime('%Y%m%d_%H%M%S')}"
|
||||||
|
|
||||||
@@ -779,6 +898,17 @@ def run_job(job: dict) -> tuple[bool, str, str, Optional[str]]:
|
|||||||
message = format_runtime_provider_error(exc)
|
message = format_runtime_provider_error(exc)
|
||||||
raise RuntimeError(message) from exc
|
raise RuntimeError(message) from exc
|
||||||
|
|
||||||
|
# Provider mismatch warning
|
||||||
|
_resolved_provider = runtime.get("provider", "") or ""
|
||||||
|
_raw_prompt = job.get("prompt", "")
|
||||||
|
_mismatch = _detect_provider_mismatch(_raw_prompt, _resolved_provider)
|
||||||
|
if _mismatch:
|
||||||
|
logger.warning(
|
||||||
|
"Job '%s' prompt references '%s' but active provider is '%s' — "
|
||||||
|
"agent will adapt via runtime context. Consider updating prompt.",
|
||||||
|
job_name, _mismatch, _resolved_provider,
|
||||||
|
)
|
||||||
|
|
||||||
from agent.smart_model_routing import resolve_turn_route
|
from agent.smart_model_routing import resolve_turn_route
|
||||||
turn_route = resolve_turn_route(
|
turn_route = resolve_turn_route(
|
||||||
prompt,
|
prompt,
|
||||||
|
|||||||
64
tests/test_cron_runtime_context.py
Normal file
64
tests/test_cron_runtime_context.py
Normal file
@@ -0,0 +1,64 @@
|
|||||||
|
"""Tests for cron scheduler: provider mismatch detection, runtime classification."""
|
||||||
|
|
||||||
|
import sys
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
sys.path.insert(0, str(Path(__file__).resolve().parent.parent))
|
||||||
|
|
||||||
|
|
||||||
|
def _import_scheduler():
|
||||||
|
import importlib.util
|
||||||
|
spec = importlib.util.spec_from_file_location(
|
||||||
|
"cron.scheduler", str(Path(__file__).resolve().parent.parent / "cron" / "scheduler.py"),
|
||||||
|
)
|
||||||
|
mod = importlib.util.module_from_spec(spec)
|
||||||
|
try:
|
||||||
|
spec.loader.exec_module(mod)
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
return mod
|
||||||
|
|
||||||
|
|
||||||
|
_sched = _import_scheduler()
|
||||||
|
_classify_runtime = _sched._classify_runtime
|
||||||
|
_detect_provider_mismatch = _sched._detect_provider_mismatch
|
||||||
|
_build_job_prompt = _sched._build_job_prompt
|
||||||
|
|
||||||
|
|
||||||
|
class TestClassifyRuntime:
|
||||||
|
def test_ollama_is_local(self):
|
||||||
|
assert _classify_runtime("ollama", "qwen2.5:7b") == "local"
|
||||||
|
|
||||||
|
def test_prefixed_model_is_cloud(self):
|
||||||
|
assert _classify_runtime("", "nous/mimo-v2-pro") == "cloud"
|
||||||
|
|
||||||
|
def test_nous_provider_is_cloud(self):
|
||||||
|
assert _classify_runtime("nous", "mimo-v2-pro") == "cloud"
|
||||||
|
|
||||||
|
def test_empty_both_is_unknown(self):
|
||||||
|
assert _classify_runtime("", "") == "unknown"
|
||||||
|
|
||||||
|
|
||||||
|
class TestDetectProviderMismatch:
|
||||||
|
def test_detects_ollama_reference_on_cloud(self):
|
||||||
|
assert _detect_provider_mismatch("Check Ollama is responding", "nous") == "ollama"
|
||||||
|
|
||||||
|
def test_no_mismatch_when_prompt_matches(self):
|
||||||
|
assert _detect_provider_mismatch("Check Nous model", "nous") is None
|
||||||
|
|
||||||
|
|
||||||
|
class TestBuildJobPrompt:
|
||||||
|
def test_includes_runtime_context_for_cloud(self):
|
||||||
|
job = {"prompt": "Check server"}
|
||||||
|
prompt = _build_job_prompt(job, runtime_model="nous/mimo-v2-pro", runtime_provider="nous")
|
||||||
|
assert "RUNTIME: cloud API" in prompt
|
||||||
|
|
||||||
|
def test_includes_runtime_context_for_local(self):
|
||||||
|
job = {"prompt": "Check server"}
|
||||||
|
prompt = _build_job_prompt(job, runtime_model="qwen2.5:7b", runtime_provider="ollama")
|
||||||
|
assert "RUNTIME: local" in prompt
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
import pytest
|
||||||
|
pytest.main([__file__, "-v"])
|
||||||
Reference in New Issue
Block a user