Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 51 additions & 2 deletions spoon_ai/llm/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,20 @@
re.compile(r"^sk[-_a-z0-9]*your[-_a-z0-9]*$"),
]

CYPHER_PROXY_TRUTHY = {"1", "true", "yes", "on"}


def _cypher_llm_proxy_enabled() -> bool:
return os.getenv("CYPHER_LLM_PROXY_ENABLED", "").strip().lower() in CYPHER_PROXY_TRUTHY


def _first_non_empty_env(*names: str) -> str | None:
for name in names:
value = os.getenv(name)
if value and value.strip():
return value.strip()
return None


@dataclass
class ProviderConfig:
Expand Down Expand Up @@ -244,6 +258,30 @@ def _get_provider_config_dict(self, provider_name: str) -> dict[str, Any]:
else:
config[config_key] = env_value.strip()

if provider_name == 'openrouter':
if 'base_url' not in config:
proxy_base_url = _first_non_empty_env(
'SPOON_BOT_DEFAULT_BASE_URL',
'CYPHER_LLM_PROXY_BASE_URL',
)
if proxy_base_url:
if self._is_placeholder_value(proxy_base_url):
raise ConfigurationError(
"SPOON_BOT_DEFAULT_BASE_URL is set to a placeholder value. "
"Please provide a valid proxy URL.",
config_key=provider_name,
)
config['base_url'] = proxy_base_url
logger.info("Using Cypher proxy base URL for openrouter: %s", proxy_base_url)

if _cypher_llm_proxy_enabled():
proxy_token = _first_non_empty_env(
'CYPHER_LLM_PROXY_TOKEN',
'SPOON_BOT_LLM_PROXY_TOKEN',
)
if proxy_token and not self._is_placeholder_value(proxy_token):
config['api_key'] = proxy_token
logger.info("Using Cypher LLM proxy token for openrouter")
# 2.1. Fallback to generic environment variables for backward compatibility
if 'base_url' not in config:
generic_base_url = os.getenv('BASE_URL')
Expand Down Expand Up @@ -402,12 +440,17 @@ def get_default_provider(self) -> str:
return provider

# 2. Check environment variable for explicit preference
env_provider = os.getenv("LLM_PROVIDER") or os.getenv("DEFAULT_LLM_PROVIDER")
env_provider = _first_non_empty_env(
"LLM_PROVIDER",
"DEFAULT_LLM_PROVIDER",
"SPOON_BOT_DEFAULT_PROVIDER",
"SPOON_PROVIDER",
)
if env_provider:
normalized = env_provider.strip().lower()
if normalized:
logger.info(
"Using provider from environment (LLM_PROVIDER/DEFAULT_LLM_PROVIDER): %s",
"Using provider from environment: %s",
normalized,
)
return normalized
Expand Down Expand Up @@ -542,6 +585,12 @@ def list_configured_providers(self) -> list[str]:
continue
candidates.add(provider)

if _cypher_llm_proxy_enabled() and _first_non_empty_env(
'CYPHER_LLM_PROXY_TOKEN',
'SPOON_BOT_LLM_PROXY_TOKEN',
):
candidates.add('openrouter')

# Only consider a provider "configured" if it can supply a valid api_key
# after applying the full resolution logic (config cache -> env -> defaults).
for provider in candidates:
Expand Down
21 changes: 21 additions & 0 deletions tests/test_cypher_proxy_config.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
from __future__ import annotations

from spoon_ai.llm.config import ConfigurationManager


def test_cypher_proxy_token_configures_openrouter_without_provider_key(monkeypatch):
monkeypatch.setenv("CYPHER_LLM_PROXY_ENABLED", "true")
monkeypatch.setenv("CYPHER_LLM_PROXY_TOKEN", "cypher_sbx_v1_test")
monkeypatch.setenv("SPOON_BOT_DEFAULT_PROVIDER", "openrouter")
monkeypatch.setenv("SPOON_BOT_DEFAULT_BASE_URL", "https://api.cypher.local/api/v1/llm-proxy/openrouter/api/v1")
monkeypatch.setenv("OPENROUTER_API_KEY", "sk-real-provider-key")
monkeypatch.delenv("OPENROUTER_BASE_URL", raising=False)

manager = ConfigurationManager()

config = manager._get_provider_config_dict("openrouter")
assert config["api_key"] == "cypher_sbx_v1_test"
assert config["base_url"] == "https://api.cypher.local/api/v1/llm-proxy/openrouter/api/v1"
assert manager.get_default_provider() == "openrouter"
assert "openrouter" in manager.get_available_providers_by_priority()
assert "openrouter" in manager.list_configured_providers()
Loading