Compare commits
1 Commits
burn/456-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.
|
||||
|
||||
|
||||
@@ -13,7 +13,6 @@ import concurrent.futures
|
||||
import json
|
||||
import logging
|
||||
import os
|
||||
import re
|
||||
import subprocess
|
||||
import sys
|
||||
|
||||
@@ -42,76 +41,6 @@ from agent.model_metadata import is_local_endpoint
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
# =====================================================================
|
||||
# Cloud Context Warning
|
||||
# =====================================================================
|
||||
# When a cron job prompt references local services (localhost, Ollama, etc.)
|
||||
# but the runtime endpoint is cloud, inject a warning so the agent knows
|
||||
# it cannot reach those services and reports the limitation instead of
|
||||
# wasting iterations on doomed connection attempts. (#378)
|
||||
|
||||
_LOCAL_SERVICE_PATTERNS = [
|
||||
re.compile(r'localhost:\d+', re.IGNORECASE),
|
||||
re.compile(r'127\.0\.0\.1:\d+', re.IGNORECASE),
|
||||
re.compile(r'\bollama\b.*\b(respond|check|ping|poll|alive|health)\b', re.IGNORECASE),
|
||||
re.compile(r'\b(check|ping|curl|poll)\s+(the\s+)?(local|localhost|ollama)', re.IGNORECASE),
|
||||
re.compile(r'\bcurl\s+(localhost|127\.)', re.IGNORECASE),
|
||||
re.compile(r'RFC-?1918', re.IGNORECASE),
|
||||
re.compile(r'10\.\d+\.\d+\.\d+:\d+'),
|
||||
re.compile(r'192\.168\.\d+\.\d+:\d+'),
|
||||
re.compile(r'172\.(1[6-9]|2\d|3[01])\.\d+\.\d+:\d+'),
|
||||
]
|
||||
|
||||
_CLOUD_CONTEXT_NOTE = (
|
||||
"[SYSTEM NOTE — CLOUD RUNTIME] You are running on a cloud inference "
|
||||
"endpoint ({provider}) that CANNOT reach localhost or private network "
|
||||
"addresses. The following local service references were detected in your "
|
||||
"prompt but are UNREACHABLE from this runtime:\n"
|
||||
" {refs}\n"
|
||||
"Do NOT attempt curl, ping, SSH, or any network calls to these services. "
|
||||
"Instead, report to the user that this job needs a local inference "
|
||||
"endpoint to check local services. This is a configuration issue, "
|
||||
"not a task failure.]\n\n"
|
||||
)
|
||||
|
||||
|
||||
def _detect_local_service_refs(prompt: str) -> list[str]:
|
||||
"""Detect references to local services in a prompt.
|
||||
|
||||
Returns list of matched reference strings.
|
||||
"""
|
||||
refs = []
|
||||
for pattern in _LOCAL_SERVICE_PATTERNS:
|
||||
matches = pattern.findall(prompt)
|
||||
refs.extend(matches)
|
||||
return refs
|
||||
|
||||
|
||||
def _inject_cloud_context(prompt: str, base_url: str, provider: str) -> str:
|
||||
"""Inject cloud-context warning if prompt refs localhost but endpoint is cloud.
|
||||
|
||||
Returns the prompt with a warning prepended if local service refs are
|
||||
detected and the endpoint is not local. Otherwise returns prompt unchanged.
|
||||
"""
|
||||
if is_local_endpoint(base_url):
|
||||
return prompt # local endpoint can reach localhost, no warning needed
|
||||
|
||||
refs = _detect_local_service_refs(prompt)
|
||||
if not refs:
|
||||
return prompt # no local service references, no warning needed
|
||||
|
||||
# Deduplicate and format refs
|
||||
unique_refs = list(dict.fromkeys(refs)) # preserve order, remove dupes
|
||||
refs_str = "\n ".join(f"- {r}" for r in unique_refs[:10])
|
||||
|
||||
warning = _CLOUD_CONTEXT_NOTE.format(
|
||||
provider=provider or "cloud",
|
||||
refs=refs_str,
|
||||
)
|
||||
|
||||
# Inject after the cron hint but before the user prompt
|
||||
return warning + prompt
|
||||
|
||||
|
||||
# =====================================================================
|
||||
# Deploy Sync Guard
|
||||
@@ -881,10 +810,6 @@ def run_job(job: dict) -> tuple[bool, str, str, Optional[str]]:
|
||||
job_name,
|
||||
turn_route["runtime"].get("provider", "unknown"),
|
||||
)
|
||||
|
||||
# Inject cloud-context warning if prompt references localhost
|
||||
_cloud_provider = turn_route["runtime"].get("provider", "cloud")
|
||||
prompt = _inject_cloud_context(prompt, _runtime_base_url, _cloud_provider)
|
||||
if job.get("requires_local_infra") and _is_cloud:
|
||||
logger.warning(
|
||||
"Job '%s': requires_local_infra=true but running on cloud provider — "
|
||||
|
||||
@@ -1,113 +0,0 @@
|
||||
"""Tests for cron cloud-context warning injection (#456/#378)."""
|
||||
|
||||
import re
|
||||
import sys
|
||||
from unittest.mock import MagicMock
|
||||
from pathlib import Path
|
||||
|
||||
import pytest
|
||||
|
||||
# Import the functions directly from the file without going through cron/__init__.py
|
||||
import importlib.util
|
||||
spec = importlib.util.spec_from_file_location(
|
||||
"cron.scheduler_test",
|
||||
Path(__file__).parent.parent / "cron" / "scheduler.py",
|
||||
)
|
||||
_sched = importlib.util.module_from_spec(spec)
|
||||
|
||||
# Stub out dependencies the scheduler imports
|
||||
sys.modules.setdefault("cron", MagicMock())
|
||||
sys.modules.setdefault("cron.jobs", MagicMock())
|
||||
|
||||
try:
|
||||
spec.loader.exec_module(_sched)
|
||||
except Exception:
|
||||
# If the full scheduler can't load, at least test the standalone functions
|
||||
pass
|
||||
|
||||
# Extract the functions we need
|
||||
_detect_local_service_refs = _sched._detect_local_service_refs
|
||||
_inject_cloud_context = _sched._inject_cloud_context
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Detection
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
class TestDetectLocalRefs:
|
||||
def test_localhost_port(self):
|
||||
refs = _detect_local_service_refs("Check localhost:11434 is up")
|
||||
assert any("localhost:11434" in r for r in refs)
|
||||
|
||||
def test_127_0_0_1(self):
|
||||
refs = _detect_local_service_refs("curl 127.0.0.1:8080/health")
|
||||
assert any("127.0.0.1:8080" in r for r in refs)
|
||||
|
||||
def test_ollama_check(self):
|
||||
refs = _detect_local_service_refs("Check Ollama is responding")
|
||||
assert len(refs) > 0
|
||||
|
||||
def test_curl_localhost(self):
|
||||
refs = _detect_local_service_refs("curl localhost:3000/api")
|
||||
assert any("localhost:3000" in r for r in refs)
|
||||
|
||||
def test_private_10_x(self):
|
||||
refs = _detect_local_service_refs("ping 10.0.0.5:9090")
|
||||
assert any("10.0.0.5:9090" in r for r in refs)
|
||||
|
||||
def test_private_192_168(self):
|
||||
refs = _detect_local_service_refs("connect to 192.168.1.100:5432")
|
||||
assert any("192.168.1.100:5432" in r for r in refs)
|
||||
|
||||
def test_rfc1918(self):
|
||||
refs = _detect_local_service_refs("This is an RFC-1918 address")
|
||||
assert any("RFC-1918" in r for r in refs)
|
||||
|
||||
def test_no_match(self):
|
||||
refs = _detect_local_service_refs("Check forge.alexanderwhitestone.com is up")
|
||||
assert len(refs) == 0
|
||||
|
||||
def test_multiple_matches(self):
|
||||
refs = _detect_local_service_refs("Check localhost:11434 and curl 127.0.0.1:8080")
|
||||
assert len(refs) >= 2
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Injection
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
class TestInjectCloudContext:
|
||||
def test_skips_local_endpoint(self):
|
||||
prompt = "Check localhost:11434"
|
||||
result = _inject_cloud_context(prompt, "http://localhost:11434/v1", "ollama")
|
||||
assert result == prompt # no injection for local endpoint
|
||||
|
||||
def test_skips_no_refs(self):
|
||||
prompt = "Check forge.alexanderwhitestone.com"
|
||||
result = _inject_cloud_context(prompt, "https://openrouter.ai/api/v1", "openrouter")
|
||||
assert result == prompt # no local refs, no injection
|
||||
|
||||
def test_injects_on_cloud_with_refs(self):
|
||||
prompt = "Check Ollama is responding on localhost:11434"
|
||||
result = _inject_cloud_context(prompt, "https://openrouter.ai/api/v1", "openrouter")
|
||||
assert "CLOUD RUNTIME" in result
|
||||
assert "openrouter" in result
|
||||
assert "localhost:11434" in result
|
||||
assert "Do NOT attempt curl" in result
|
||||
assert result.startswith("[SYSTEM NOTE") # warning prepended
|
||||
|
||||
def test_preserves_original_prompt(self):
|
||||
original = "Check localhost:11434 health endpoint"
|
||||
result = _inject_cloud_context(original, "https://api.openai.com/v1", "openai")
|
||||
assert original in result # original prompt preserved in the output
|
||||
|
||||
def test_deduplicates_refs(self):
|
||||
prompt = "Check localhost:11434 then curl localhost:11434 again"
|
||||
result = _inject_cloud_context(prompt, "https://openrouter.ai/api/v1", "openrouter")
|
||||
# Should not list the same ref twice
|
||||
assert result.count("localhost:11434") >= 1 # at least once in refs
|
||||
|
||||
def test_includes_provider_name(self):
|
||||
prompt = "Check localhost:11434"
|
||||
result = _inject_cloud_context(prompt, "https://nous.ai/v1", "nous")
|
||||
assert "nous" in result
|
||||
@@ -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