Compare commits
1 Commits
feat/334-p
...
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.
|
||||
|
||||
|
||||
@@ -376,7 +376,6 @@ def create_job(
|
||||
provider: Optional[str] = None,
|
||||
base_url: Optional[str] = None,
|
||||
script: Optional[str] = None,
|
||||
profile: Optional[str] = None,
|
||||
) -> Dict[str, Any]:
|
||||
"""
|
||||
Create a new cron job.
|
||||
@@ -396,9 +395,6 @@ def create_job(
|
||||
script: Optional path to a Python script whose stdout is injected into the
|
||||
prompt each run. The script runs before the agent turn, and its output
|
||||
is prepended as context. Useful for data collection / change detection.
|
||||
profile: Optional profile name for profile-scoped execution. When set, the job
|
||||
runs with that profile's config.yaml and .env, and HERMES_ACTIVE_PROFILE
|
||||
is set. Enables parallel execution without cross-contamination.
|
||||
|
||||
Returns:
|
||||
The created job dict
|
||||
@@ -429,8 +425,6 @@ def create_job(
|
||||
normalized_base_url = normalized_base_url or None
|
||||
normalized_script = str(script).strip() if isinstance(script, str) else None
|
||||
normalized_script = normalized_script or None
|
||||
normalized_profile = str(profile).strip() if isinstance(profile, str) else None
|
||||
normalized_profile = normalized_profile or None
|
||||
|
||||
label_source = (prompt or (normalized_skills[0] if normalized_skills else None)) or "cron job"
|
||||
job = {
|
||||
@@ -461,8 +455,6 @@ def create_job(
|
||||
# Delivery configuration
|
||||
"deliver": deliver,
|
||||
"origin": origin, # Tracks where job was created for "origin" delivery
|
||||
# Profile configuration
|
||||
"profile": normalized_profile, # Profile for scoped execution
|
||||
}
|
||||
|
||||
jobs = load_jobs()
|
||||
|
||||
@@ -682,26 +682,6 @@ def run_job(job: dict) -> tuple[bool, str, str, Optional[str]]:
|
||||
os.environ["HERMES_SESSION_CHAT_ID"] = str(origin["chat_id"])
|
||||
if origin.get("chat_name"):
|
||||
os.environ["HERMES_SESSION_CHAT_NAME"] = origin["chat_name"]
|
||||
|
||||
# Profile-scoped execution: load profile-specific config
|
||||
profile = job.get("profile")
|
||||
if profile:
|
||||
os.environ["HERMES_ACTIVE_PROFILE"] = profile
|
||||
profile_dir = _hermes_home / "profiles" / profile
|
||||
if profile_dir.exists():
|
||||
# Load profile-specific .env
|
||||
profile_env = profile_dir / ".env"
|
||||
if profile_env.exists():
|
||||
try:
|
||||
load_dotenv(str(profile_env), override=True, encoding="utf-8")
|
||||
logger.info("Job '%s': Loaded profile .env from %s", job_id, profile_env)
|
||||
except Exception as e:
|
||||
logger.warning("Job '%s': Failed to load profile .env: %s", job_id, e)
|
||||
|
||||
# Profile config will be loaded later in the config section
|
||||
logger.info("Job '%s': Running with profile '%s'", job_id, profile)
|
||||
else:
|
||||
logger.warning("Job '%s': Profile directory not found: %s", job_id, profile_dir)
|
||||
# Re-read .env and config.yaml fresh every run so provider/key
|
||||
# changes take effect without a gateway restart.
|
||||
from dotenv import load_dotenv
|
||||
@@ -720,21 +700,10 @@ def run_job(job: dict) -> tuple[bool, str, str, Optional[str]]:
|
||||
model = job.get("model") or os.getenv("HERMES_MODEL") or ""
|
||||
|
||||
# Load config.yaml for model, reasoning, prefill, toolsets, provider routing
|
||||
# If profile is set, load profile-specific config
|
||||
_cfg = {}
|
||||
try:
|
||||
import yaml
|
||||
profile = job.get("profile")
|
||||
if profile:
|
||||
profile_cfg_path = _hermes_home / "profiles" / profile / "config.yaml"
|
||||
if profile_cfg_path.exists():
|
||||
_cfg_path = str(profile_cfg_path)
|
||||
logger.info("Job '%s': Loading profile config from %s", job_id, _cfg_path)
|
||||
else:
|
||||
_cfg_path = str(_hermes_home / "config.yaml")
|
||||
logger.debug("Job '%s': Profile config not found, using default: %s", job_id, _cfg_path)
|
||||
else:
|
||||
_cfg_path = str(_hermes_home / "config.yaml")
|
||||
_cfg_path = str(_hermes_home / "config.yaml")
|
||||
if os.path.exists(_cfg_path):
|
||||
with open(_cfg_path) as _f:
|
||||
_cfg = yaml.safe_load(_f) or {}
|
||||
|
||||
@@ -90,10 +90,6 @@ def cron_list(show_all: bool = False):
|
||||
print(f" Deliver: {deliver_str}")
|
||||
if skills:
|
||||
print(f" Skills: {', '.join(skills)}")
|
||||
# Show profile if set
|
||||
profile = job.get("profile")
|
||||
if profile:
|
||||
print(color(f" Profile: {profile}", Colors.MAGENTA))
|
||||
script = job.get("script")
|
||||
if script:
|
||||
print(f" Script: {script}")
|
||||
|
||||
@@ -4550,10 +4550,6 @@ For more help on a command:
|
||||
cron_create.add_argument("--repeat", type=int, help="Optional repeat count")
|
||||
cron_create.add_argument("--skill", dest="skills", action="append", help="Attach a skill. Repeat to add multiple skills.")
|
||||
cron_create.add_argument("--script", help="Path to a Python script whose stdout is injected into the prompt each run")
|
||||
cron_create.add_argument(
|
||||
"--profile", "-p",
|
||||
help="Profile name for profile-scoped execution (loads profile's config.yaml and .env)"
|
||||
)
|
||||
|
||||
# cron edit
|
||||
cron_edit = cron_subparsers.add_parser("edit", help="Edit an existing scheduled job")
|
||||
@@ -4568,10 +4564,6 @@ For more help on a command:
|
||||
cron_edit.add_argument("--remove-skill", dest="remove_skills", action="append", help="Remove a specific attached skill. Repeatable.")
|
||||
cron_edit.add_argument("--clear-skills", action="store_true", help="Remove all attached skills from the job")
|
||||
cron_edit.add_argument("--script", help="Path to a Python script whose stdout is injected into the prompt each run. Pass empty string to clear.")
|
||||
cron_edit.add_argument(
|
||||
"--profile", "-p",
|
||||
help="Set profile for profile-scoped execution"
|
||||
)
|
||||
|
||||
# lifecycle actions
|
||||
cron_pause = cron_subparsers.add_parser("pause", help="Pause a scheduled job")
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -233,7 +233,6 @@ def cronjob(
|
||||
base_url: Optional[str] = None,
|
||||
reason: Optional[str] = None,
|
||||
script: Optional[str] = None,
|
||||
profile: Optional[str] = None,
|
||||
task_id: str = None,
|
||||
) -> str:
|
||||
"""Unified cron job management tool."""
|
||||
@@ -271,7 +270,6 @@ def cronjob(
|
||||
provider=_normalize_optional_job_value(provider),
|
||||
base_url=_normalize_optional_job_value(base_url, strip_trailing_slash=True),
|
||||
script=_normalize_optional_job_value(script),
|
||||
profile=_normalize_optional_job_value(profile),
|
||||
)
|
||||
return json.dumps(
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user