Skip to content

πŸ™Œ OpenHands: AI-Driven Development

fix(enterprise): Apply deployment LLM proxy URL override in /api/v1/users/me (#13980)

Xingyao Wang2068694ea0fb
diff --git a/enterprise/server/routes/users_v1.py b/enterprise/server/routes/users_v1.py
index 902643ade1..6bc7cb7e41 100644
--- a/enterprise/server/routes/users_v1.py
+++ b/enterprise/server/routes/users_v1.py
@@ -12,7 +12,10 @@ from fastapi.responses import JSONResponse
from server.auth.saas_user_auth import SaasUserAuth
from server.models.user_models import SaasUserInfo
-from openhands.app_server.config import depends_user_context
+from openhands.app_server.config import (
+ depends_user_context,
+ resolve_provider_llm_base_url,
+)
from openhands.app_server.sandbox.session_auth import validate_session_key_ownership
from openhands.app_server.user.auth_user_context import AuthUserContext
from openhands.app_server.user.user_context import UserContext
@@ -42,8 +45,9 @@ def _inject_sdk_compat_fields(
"""
agent_settings = content.get('agent_settings') or {}
llm = agent_settings.get('llm') or {}
- content['llm_model'] = llm.get('model')
- content['llm_base_url'] = llm.get('base_url')
+ model = llm.get('model')
+ content['llm_model'] = model
+ content['llm_base_url'] = resolve_provider_llm_base_url(model, llm.get('base_url'))
if include_api_key:
content['llm_api_key'] = llm.get('api_key')
content['mcp_config'] = agent_settings.get('mcp_config')
diff --git a/openhands/app_server/app_conversation/live_status_app_conversation_service.py b/openhands/app_server/app_conversation/live_status_app_conversation_service.py
index bde771207c..bce1a0eab6 100644
--- a/openhands/app_server/app_conversation/live_status_app_conversation_service.py
+++ b/openhands/app_server/app_conversation/live_status_app_conversation_service.py
@@ -52,7 +52,10 @@ from openhands.app_server.app_conversation.hook_loader import (
from openhands.app_server.app_conversation.sql_app_conversation_info_service import (
SQLAppConversationInfoService,
)
-from openhands.app_server.config import get_event_callback_service
+from openhands.app_server.config import (
+ get_event_callback_service,
+ resolve_provider_llm_base_url,
+)
from openhands.app_server.errors import SandboxError
from openhands.app_server.event.event_service import EventService
from openhands.app_server.event_callback.event_callback_models import EventCallback
@@ -890,24 +893,12 @@ class LiveStatusAppConversationService(AppConversationServiceBase):
or user.agent_settings.llm.model
or LLM.model_fields['model'].default
)
- base_url = user.agent_settings.llm.base_url
- if model and (
- model.startswith('openhands/') or model.startswith('litellm_proxy/')
- ):
- # The SDK auto-fills base_url with the default public proxy for
- # openhands/ models. We need to distinguish "user explicitly set a
- # custom URL" from "SDK auto-filled the default".
- #
- # Priority: user-explicit URL > deployment provider URL > SDK default
- _SDK_DEFAULT_PROXY = 'https://llm-proxy.app.all-hands.dev/'
- user_set_custom = base_url and base_url.rstrip(
- '/'
- ) != _SDK_DEFAULT_PROXY.rstrip('/')
- if user_set_custom:
- pass # keep user's explicit base_url
- elif self.openhands_provider_base_url:
- base_url = self.openhands_provider_base_url
- # else: keep the SDK default
+
+ base_url = resolve_provider_llm_base_url(
+ model,
+ user.agent_settings.llm.base_url,
+ provider_base_url=self.openhands_provider_base_url,
+ )
return LLM(
model=model,
diff --git a/openhands/app_server/config.py b/openhands/app_server/config.py
index d081dce40a..cb66158242 100644
--- a/openhands/app_server/config.py
+++ b/openhands/app_server/config.py
@@ -112,6 +112,50 @@ def get_openhands_provider_base_url() -> str | None:
return os.getenv('OPENHANDS_PROVIDER_BASE_URL') or os.getenv('LLM_BASE_URL') or None
+# The SDK auto-fills this URL as the default for openhands/ and litellm_proxy/
+# models. Deployments (e.g. staging) may use a different LLM proxy, configured
+# via OPENHANDS_PROVIDER_BASE_URL.
+_SDK_DEFAULT_PROXY = 'https://llm-proxy.app.all-hands.dev/'
+
+
+def resolve_provider_llm_base_url(
+ model: str | None,
+ base_url: str | None,
+ provider_base_url: str | None = None,
+) -> str | None:
+ """Apply deployment-specific LLM proxy override when needed.
+
+ When the model uses ``openhands/`` or ``litellm_proxy/`` prefix and the
+ stored ``base_url`` is the SDK default, replace it with the deployment's
+ provider URL.
+
+ Priority: user-explicit URL > deployment provider URL > SDK default.
+
+ Args:
+ model: LLM model name (e.g. ``litellm_proxy/gpt-4``).
+ base_url: The base URL from user/org settings.
+ provider_base_url: Deployment provider URL. Falls back to
+ ``get_openhands_provider_base_url()`` when *None*.
+ """
+ if not model or not (
+ model.startswith('openhands/') or model.startswith('litellm_proxy/')
+ ):
+ return base_url
+
+ user_set_custom = base_url and base_url.rstrip('/') != _SDK_DEFAULT_PROXY.rstrip(
+ '/'
+ )
+ if user_set_custom:
+ return base_url
+
+ if provider_base_url is None:
+ provider_base_url = get_openhands_provider_base_url()
+ if provider_base_url:
+ return provider_base_url
+
+ return base_url
+
+
def _get_default_lifespan():
# Check legacy parameters for saas mode. If we are in SAAS mode do not apply
# OpenHands alembic migrations
diff --git a/tests/unit/app_server/test_resolve_provider_llm_base_url.py b/tests/unit/app_server/test_resolve_provider_llm_base_url.py
new file mode 100644
index 0000000000..f9a4b0ae12
--- /dev/null
+++ b/tests/unit/app_server/test_resolve_provider_llm_base_url.py
@@ -0,0 +1,193 @@
+"""Tests for resolve_provider_llm_base_url in openhands.app_server.config."""
+
+from openhands.app_server.config import (
+ _SDK_DEFAULT_PROXY,
+ resolve_provider_llm_base_url,
+)
+
+SDK_DEFAULT = _SDK_DEFAULT_PROXY # 'https://llm-proxy.app.all-hands.dev/'
+STAGING_URL = 'https://llm-proxy.staging.all-hands.dev/'
+CUSTOM_URL = 'https://my-own-proxy.example.com/v1'
+
+
+class TestOpenHandsPrefixWithProviderUrl:
+ """openhands/ prefix + SDK default URL + provider URL set β†’ returns provider URL."""
+
+ def test_openhands_prefix_replaces_sdk_default(self):
+ result = resolve_provider_llm_base_url(
+ model='openhands/gpt-4',
+ base_url=SDK_DEFAULT,
+ provider_base_url=STAGING_URL,
+ )
+ assert result == STAGING_URL
+
+ def test_openhands_prefix_sdk_default_no_trailing_slash(self):
+ result = resolve_provider_llm_base_url(
+ model='openhands/gpt-4',
+ base_url=SDK_DEFAULT.rstrip('/'),
+ provider_base_url=STAGING_URL,
+ )
+ assert result == STAGING_URL
+
+
+class TestOpenHandsPrefixWithCustomUrl:
+ """openhands/ prefix + custom URL (not SDK default) β†’ returns custom URL."""
+
+ def test_custom_url_preserved(self):
+ result = resolve_provider_llm_base_url(
+ model='openhands/gpt-4',
+ base_url=CUSTOM_URL,
+ provider_base_url=STAGING_URL,
+ )
+ assert result == CUSTOM_URL
+
+ def test_custom_url_preserved_no_provider(self):
+ result = resolve_provider_llm_base_url(
+ model='openhands/gpt-4',
+ base_url=CUSTOM_URL,
+ provider_base_url=None,
+ )
+ assert result == CUSTOM_URL
+
+
+class TestOpenHandsPrefixNoProviderUrl:
+ """openhands/ prefix + SDK default URL + no provider URL β†’ returns SDK default."""
+
+ def test_sdk_default_returned_when_no_provider(self):
+ result = resolve_provider_llm_base_url(
+ model='openhands/gpt-4',
+ base_url=SDK_DEFAULT,
+ provider_base_url='', # empty string = falsy
+ )
+ assert result == SDK_DEFAULT
+
+ def test_sdk_default_returned_when_provider_none_and_env_unset(self, monkeypatch):
+ monkeypatch.delenv('OPENHANDS_PROVIDER_BASE_URL', raising=False)
+ monkeypatch.delenv('LLM_BASE_URL', raising=False)
+ result = resolve_provider_llm_base_url(
+ model='openhands/gpt-4',
+ base_url=SDK_DEFAULT,
+ # provider_base_url defaults to None β†’ falls back to env lookup
+ )
+ assert result == SDK_DEFAULT
+
+
+class TestNonMatchingModelPrefix:
+ """Model without openhands/ or litellm_proxy/ prefix β†’ returns base_url unchanged."""
+
+ def test_plain_model_returns_base_url(self):
+ result = resolve_provider_llm_base_url(
+ model='gpt-4',
+ base_url='https://api.openai.com/v1',
+ provider_base_url=STAGING_URL,
+ )
+ assert result == 'https://api.openai.com/v1'
+
+ def test_anthropic_model_returns_base_url(self):
+ result = resolve_provider_llm_base_url(
+ model='anthropic/claude-3-opus',
+ base_url='https://api.anthropic.com',
+ provider_base_url=STAGING_URL,
+ )
+ assert result == 'https://api.anthropic.com'
+
+ def test_none_base_url_passthrough(self):
+ result = resolve_provider_llm_base_url(
+ model='gpt-4',
+ base_url=None,
+ provider_base_url=STAGING_URL,
+ )
+ assert result is None
+
+
+class TestLitellmProxyPrefix:
+ """litellm_proxy/ prefix behaves identically to openhands/ prefix."""
+
+ def test_replaces_sdk_default(self):
+ result = resolve_provider_llm_base_url(
+ model='litellm_proxy/gpt-4',
+ base_url=SDK_DEFAULT,
+ provider_base_url=STAGING_URL,
+ )
+ assert result == STAGING_URL
+
+ def test_custom_url_preserved(self):
+ result = resolve_provider_llm_base_url(
+ model='litellm_proxy/gpt-4',
+ base_url=CUSTOM_URL,
+ provider_base_url=STAGING_URL,
+ )
+ assert result == CUSTOM_URL
+
+ def test_sdk_default_returned_when_no_provider(self):
+ result = resolve_provider_llm_base_url(
+ model='litellm_proxy/gpt-4',
+ base_url=SDK_DEFAULT,
+ provider_base_url='',
+ )
+ assert result == SDK_DEFAULT
+
+
+class TestEdgeCases:
+ """Edge cases: None values, empty strings, trailing slash normalization."""
+
+ def test_none_model_returns_base_url(self):
+ result = resolve_provider_llm_base_url(
+ model=None,
+ base_url=SDK_DEFAULT,
+ provider_base_url=STAGING_URL,
+ )
+ assert result == SDK_DEFAULT
+
+ def test_empty_model_returns_base_url(self):
+ result = resolve_provider_llm_base_url(
+ model='',
+ base_url=SDK_DEFAULT,
+ provider_base_url=STAGING_URL,
+ )
+ assert result == SDK_DEFAULT
+
+ def test_none_base_url_with_openhands_model_and_provider(self):
+ result = resolve_provider_llm_base_url(
+ model='openhands/gpt-4',
+ base_url=None,
+ provider_base_url=STAGING_URL,
+ )
+ assert result == STAGING_URL
+
+ def test_none_base_url_with_openhands_model_no_provider(self, monkeypatch):
+ monkeypatch.delenv('OPENHANDS_PROVIDER_BASE_URL', raising=False)
+ monkeypatch.delenv('LLM_BASE_URL', raising=False)
+ result = resolve_provider_llm_base_url(
+ model='openhands/gpt-4',
+ base_url=None,
+ )
+ assert result is None
+
+ def test_trailing_slash_normalization(self):
+ """SDK default with and without trailing slash should both be detected."""
+ for url in [SDK_DEFAULT, SDK_DEFAULT.rstrip('/')]:
+ result = resolve_provider_llm_base_url(
+ model='openhands/gpt-4',
+ base_url=url,
+ provider_base_url=STAGING_URL,
+ )
+ assert result == STAGING_URL, f'Failed for base_url={url!r}'
+
+ def test_env_fallback_when_provider_base_url_is_none(self, monkeypatch):
+ monkeypatch.setenv('OPENHANDS_PROVIDER_BASE_URL', STAGING_URL)
+ result = resolve_provider_llm_base_url(
+ model='openhands/gpt-4',
+ base_url=SDK_DEFAULT,
+ # provider_base_url defaults to None β†’ env lookup
+ )
+ assert result == STAGING_URL
+
+ def test_llm_base_url_env_fallback(self, monkeypatch):
+ monkeypatch.delenv('OPENHANDS_PROVIDER_BASE_URL', raising=False)
+ monkeypatch.setenv('LLM_BASE_URL', STAGING_URL)
+ result = resolve_provider_llm_base_url(
+ model='openhands/gpt-4',
+ base_url=SDK_DEFAULT,
+ )
+ assert result == STAGING_URL