Compare commits
1 Commits
fix/479-ha
...
dispatch/3
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d3ff0873c5 |
@@ -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,7 +545,24 @@ 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:
|
|
||||||
|
_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."""
|
"""Build the effective prompt for a cron job, optionally loading one or more skills first."""
|
||||||
prompt = job.get("prompt", "")
|
prompt = job.get("prompt", "")
|
||||||
skills = job.get("skills")
|
skills = job.get("skills")
|
||||||
@@ -576,6 +593,16 @@ def _build_job_prompt(job: dict) -> str:
|
|||||||
f"{prompt}"
|
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
|
# 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 = (
|
||||||
@@ -597,7 +624,7 @@ def _build_job_prompt(job: dict) -> str:
|
|||||||
"\"[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 = _rb + 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 +694,18 @@ 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)
|
_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)
|
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 +817,10 @@ 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
|
||||||
|
|
||||||
|
_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
|
from agent.smart_model_routing import resolve_turn_route
|
||||||
turn_route = resolve_turn_route(
|
turn_route = resolve_turn_route(
|
||||||
prompt,
|
prompt,
|
||||||
|
|||||||
17
tests/test_372_runtime.py
Normal file
17
tests/test_372_runtime.py
Normal 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"])
|
||||||
Reference in New Issue
Block a user