Compare commits
1 Commits
dawn/372-1
...
claude/iss
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a90162bafc |
@@ -32,6 +32,27 @@ _PROVIDER_PREFIXES: frozenset[str] = frozenset({
|
||||
"glm", "z-ai", "z.ai", "zhipu", "github", "github-copilot",
|
||||
"github-models", "kimi", "moonshot", "claude", "deep-seek",
|
||||
"opencode", "zen", "go", "vercel", "kilo", "dashscope", "aliyun", "qwen",
|
||||
# Additional cloud vendor prefixes (fixes #628)
|
||||
"cohere", "mistralai", "mistral", "meta-llama", "databricks", "together",
|
||||
"togetherai", "together-ai", "nousresearch", "moonshotai", "fireworks",
|
||||
"perplexity", "ai21", "groq", "cerebras", "nebius",
|
||||
})
|
||||
|
||||
# Vendor prefixes that appear in cloud model IDs (e.g. "openai/gpt-4").
|
||||
# Used by _classify_runtime to detect cloud runtimes from the model name
|
||||
# when no base URL is available.
|
||||
_CLOUD_MODEL_PREFIXES: frozenset[str] = frozenset({
|
||||
# Providers present before #628
|
||||
"nous", "nousresearch", "openrouter", "anthropic", "openai",
|
||||
"zai", "kimi", "moonshotai", "gemini", "google", "minimax",
|
||||
# Providers added by #628 fix
|
||||
"deepseek", "cohere", "mistralai", "mistral", "meta-llama",
|
||||
"databricks", "together", "togetherai",
|
||||
# Other common cloud vendors
|
||||
"microsoft", "amazon", "huggingface", "fireworks",
|
||||
"perplexity", "ai21", "groq", "cerebras", "nebius",
|
||||
"qwen", "alibaba", "aliyuncs", "dashscope",
|
||||
"github", "copilot",
|
||||
})
|
||||
|
||||
|
||||
@@ -253,6 +274,67 @@ def is_local_endpoint(base_url: str) -> bool:
|
||||
return False
|
||||
|
||||
|
||||
# Provider names that are definitively local (never cloud).
|
||||
_LOCAL_PROVIDER_NAMES: frozenset[str] = frozenset({
|
||||
"ollama", "custom", "local",
|
||||
})
|
||||
|
||||
# Provider names that are definitively cloud (not local).
|
||||
_CLOUD_PROVIDER_NAMES: frozenset[str] = frozenset({
|
||||
"nous", "openrouter", "anthropic", "openai", "openai-codex",
|
||||
"zai", "kimi-coding", "gemini", "minimax", "minimax-cn",
|
||||
"deepseek", "cohere", "mistral", "meta-llama", "databricks", "together",
|
||||
"huggingface", "copilot", "copilot-acp", "ai-gateway", "kilocode",
|
||||
"alibaba", "opencode-zen", "opencode-go",
|
||||
})
|
||||
|
||||
|
||||
def _classify_runtime(
|
||||
model: str = "",
|
||||
base_url: str = "",
|
||||
provider: str = "",
|
||||
) -> str:
|
||||
"""Classify a model/endpoint runtime as 'cloud' or 'local'.
|
||||
|
||||
Checks in priority order:
|
||||
1. ``base_url`` — localhost / RFC-1918 → ``"local"``; known external URL → ``"cloud"``
|
||||
2. ``provider`` name — matches a known local or cloud provider set
|
||||
3. Model vendor prefix — e.g. ``"openai/gpt-4"`` → ``"cloud"``
|
||||
4. Default — ``"cloud"`` when the runtime cannot be determined to be local
|
||||
|
||||
The cloud-prefix list covers both the providers present before issue #628
|
||||
(nous, openrouter, anthropic, openai, zai, kimi, gemini, minimax) and the
|
||||
previously missing ones (deepseek, cohere, mistral, meta-llama, databricks,
|
||||
together).
|
||||
|
||||
Returns ``"cloud"`` or ``"local"``.
|
||||
"""
|
||||
# 1. URL-based check — most reliable signal
|
||||
if base_url:
|
||||
if is_local_endpoint(base_url):
|
||||
return "local"
|
||||
return "cloud"
|
||||
|
||||
# 2. Provider name check
|
||||
provider_norm = (provider or "").strip().lower()
|
||||
if provider_norm in _LOCAL_PROVIDER_NAMES:
|
||||
return "local"
|
||||
if provider_norm in _CLOUD_PROVIDER_NAMES:
|
||||
return "cloud"
|
||||
|
||||
# 3. Model vendor prefix check (e.g. "openai/gpt-4" → vendor "openai")
|
||||
model_norm = (model or "").strip().lower()
|
||||
if "/" in model_norm:
|
||||
vendor = model_norm.split("/")[0].strip()
|
||||
if vendor in _CLOUD_MODEL_PREFIXES:
|
||||
return "cloud"
|
||||
# An unknown vendor with a slash is still likely a cloud model
|
||||
return "cloud"
|
||||
|
||||
# 4. Default — without a URL we cannot confirm local, so assume cloud
|
||||
return "cloud"
|
||||
|
||||
|
||||
def detect_local_server_type(base_url: str) -> Optional[str]:
|
||||
"""Detect which local server is running at base_url by probing known endpoints.
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@ from cron.jobs import (
|
||||
trigger_job,
|
||||
JOBS_FILE,
|
||||
)
|
||||
from cron.scheduler import tick
|
||||
from cron.scheduler import tick, ModelContextError, CRON_MIN_CONTEXT_TOKENS
|
||||
|
||||
__all__ = [
|
||||
"create_job",
|
||||
@@ -39,4 +39,6 @@ __all__ = [
|
||||
"trigger_job",
|
||||
"tick",
|
||||
"JOBS_FILE",
|
||||
]
|
||||
"ModelContextError",
|
||||
"CRON_MIN_CONTEXT_TOKENS",
|
||||
]
|
||||
|
||||
@@ -545,24 +545,7 @@ def _run_job_script(script_path: str) -> tuple[bool, str]:
|
||||
return False, f"Script execution failed: {exc}"
|
||||
|
||||
|
||||
|
||||
_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:
|
||||
def _build_job_prompt(job: dict) -> str:
|
||||
"""Build the effective prompt for a cron job, optionally loading one or more skills first."""
|
||||
prompt = job.get("prompt", "")
|
||||
skills = job.get("skills")
|
||||
@@ -591,17 +574,7 @@ def _build_job_prompt(job: dict, *, runtime_model="", runtime_provider="") -> st
|
||||
"The data-collection script failed. Report this to the user.\n\n"
|
||||
f"```\n{script_output}\n```\n\n"
|
||||
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, NO localhost")
|
||||
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.
|
||||
@@ -624,7 +597,7 @@ def _build_job_prompt(job: dict, *, runtime_model="", runtime_provider="") -> st
|
||||
"\"[SCRIPT_FAILED]: forge.alexanderwhitestone.com timed out\" "
|
||||
"\"[SCRIPT_FAILED]: script exited with code 1\".]\\n\\n"
|
||||
)
|
||||
prompt = _rb + cron_hint + prompt
|
||||
prompt = cron_hint + prompt
|
||||
if skills is None:
|
||||
legacy = job.get("skill")
|
||||
skills = [legacy] if legacy else []
|
||||
@@ -694,18 +667,7 @@ def run_job(job: dict) -> tuple[bool, str, str, Optional[str]]:
|
||||
|
||||
job_id = job["id"]
|
||||
job_name = job["name"]
|
||||
_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)
|
||||
prompt = _build_job_prompt(job)
|
||||
origin = _resolve_origin(job)
|
||||
_cron_session_id = f"cron_{job_id}_{_hermes_now().strftime('%Y%m%d_%H%M%S')}"
|
||||
|
||||
@@ -817,10 +779,6 @@ 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,
|
||||
|
||||
@@ -1,17 +0,0 @@
|
||||
"""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 Test372:
|
||||
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"])
|
||||
@@ -7,7 +7,7 @@ terminal access.
|
||||
"""
|
||||
|
||||
import pytest
|
||||
from agent.model_metadata import is_local_endpoint
|
||||
from agent.model_metadata import is_local_endpoint, _classify_runtime
|
||||
|
||||
|
||||
class TestIsLocalEndpoint:
|
||||
@@ -71,3 +71,98 @@ class TestCronDisabledToolsetsLogic:
|
||||
def test_empty_url_disables_terminal(self):
|
||||
disabled = self._build_disabled("")
|
||||
assert "terminal" in disabled
|
||||
|
||||
|
||||
class TestClassifyRuntime:
|
||||
"""Verify _classify_runtime correctly classifies runtimes as cloud or local.
|
||||
|
||||
Covers the bug fixed in #628: missing cloud model prefixes for deepseek,
|
||||
cohere, mistral, meta-llama, databricks, and together.
|
||||
"""
|
||||
|
||||
# ── URL-based classification ──────────────────────────────────────────
|
||||
|
||||
def test_localhost_url_is_local(self):
|
||||
assert _classify_runtime(base_url="http://localhost:11434/v1") == "local"
|
||||
|
||||
def test_127_loopback_is_local(self):
|
||||
assert _classify_runtime(base_url="http://127.0.0.1:8080/v1") == "local"
|
||||
|
||||
def test_rfc1918_is_local(self):
|
||||
assert _classify_runtime(base_url="http://192.168.1.10:11434/v1") == "local"
|
||||
|
||||
def test_openrouter_url_is_cloud(self):
|
||||
assert _classify_runtime(base_url="https://openrouter.ai/api/v1") == "cloud"
|
||||
|
||||
def test_anthropic_url_is_cloud(self):
|
||||
assert _classify_runtime(base_url="https://api.anthropic.com") == "cloud"
|
||||
|
||||
def test_deepseek_url_is_cloud(self):
|
||||
assert _classify_runtime(base_url="https://api.deepseek.com/v1") == "cloud"
|
||||
|
||||
# ── Provider-name classification ──────────────────────────────────────
|
||||
|
||||
def test_ollama_provider_is_local(self):
|
||||
assert _classify_runtime(provider="ollama") == "local"
|
||||
|
||||
def test_custom_provider_is_local(self):
|
||||
assert _classify_runtime(provider="custom") == "local"
|
||||
|
||||
def test_openrouter_provider_is_cloud(self):
|
||||
assert _classify_runtime(provider="openrouter") == "cloud"
|
||||
|
||||
def test_nous_provider_is_cloud(self):
|
||||
assert _classify_runtime(provider="nous") == "cloud"
|
||||
|
||||
def test_anthropic_provider_is_cloud(self):
|
||||
assert _classify_runtime(provider="anthropic") == "cloud"
|
||||
|
||||
# ── Previously-missing cloud prefixes (issue #628) ────────────────────
|
||||
|
||||
def test_deepseek_model_prefix_is_cloud(self):
|
||||
assert _classify_runtime(model="deepseek/deepseek-v2") == "cloud"
|
||||
|
||||
def test_cohere_model_prefix_is_cloud(self):
|
||||
assert _classify_runtime(model="cohere/command-r-plus") == "cloud"
|
||||
|
||||
def test_mistralai_model_prefix_is_cloud(self):
|
||||
assert _classify_runtime(model="mistralai/mistral-large-2407") == "cloud"
|
||||
|
||||
def test_meta_llama_model_prefix_is_cloud(self):
|
||||
assert _classify_runtime(model="meta-llama/llama-3.1-70b-instruct") == "cloud"
|
||||
|
||||
def test_databricks_model_prefix_is_cloud(self):
|
||||
assert _classify_runtime(model="databricks/dbrx-instruct") == "cloud"
|
||||
|
||||
def test_together_model_prefix_is_cloud(self):
|
||||
assert _classify_runtime(model="together/together-api-model") == "cloud"
|
||||
|
||||
# ── Providers that were already detected before #628 ─────────────────
|
||||
|
||||
def test_openai_model_prefix_is_cloud(self):
|
||||
assert _classify_runtime(model="openai/gpt-4.1") == "cloud"
|
||||
|
||||
def test_anthropic_model_prefix_is_cloud(self):
|
||||
assert _classify_runtime(model="anthropic/claude-opus-4.6") == "cloud"
|
||||
|
||||
def test_google_model_prefix_is_cloud(self):
|
||||
assert _classify_runtime(model="google/gemini-3-pro") == "cloud"
|
||||
|
||||
def test_minimax_model_prefix_is_cloud(self):
|
||||
assert _classify_runtime(model="minimax/minimax-m2.7") == "cloud"
|
||||
|
||||
# ── Fallback / edge cases ────────────────────────────────────────────
|
||||
|
||||
def test_no_args_defaults_to_cloud(self):
|
||||
assert _classify_runtime() == "cloud"
|
||||
|
||||
def test_empty_strings_default_to_cloud(self):
|
||||
assert _classify_runtime(model="", base_url="", provider="") == "cloud"
|
||||
|
||||
def test_url_takes_priority_over_provider(self):
|
||||
# Explicit local URL wins even if provider looks like cloud
|
||||
assert _classify_runtime(model="openai/gpt-4", base_url="http://localhost:11434/v1", provider="openai") == "local"
|
||||
|
||||
def test_bare_model_name_without_slash_defaults_to_cloud(self):
|
||||
# No slash → can't infer vendor → cloud (safe default)
|
||||
assert _classify_runtime(model="gpt-4o") == "cloud"
|
||||
|
||||
Reference in New Issue
Block a user