Skip to content

Your lightweight open-source personal agent.

fix: compare request scopes at their actual routing boundary

Xubin Rena5e6952cf9dc
diff --git a/nanobot/agent/model_runtime.py b/nanobot/agent/model_runtime.py
index 54251b7e5..6304c661e 100644
--- a/nanobot/agent/model_runtime.py
+++ b/nanobot/agent/model_runtime.py
@@ -255,5 +255,8 @@ class ModelRuntimeResolver:
base = config.resolve_preset(self.model_preset)
preset = base.model_copy(update={"model": model, "provider": "auto"})
- preset = isolate_request_overrides(config, base, preset)
+ preset = isolate_request_overrides(
+ preset, previous_provider=config.get_provider_name(preset=base),
+ provider=config.get_provider_name(preset=preset),
+ )
return self.resolve_snapshot(build_provider_snapshot(config, preset=preset))
diff --git a/nanobot/providers/request_overrides.py b/nanobot/providers/request_overrides.py
index 7eac9c941..daf35a0b5 100644
--- a/nanobot/providers/request_overrides.py
+++ b/nanobot/providers/request_overrides.py
@@ -2,27 +2,14 @@
from copy import deepcopy
-from nanobot.config.schema import Config, ModelPresetConfig, ProviderConfig, RequestOverrides
+from nanobot.config.schema import ModelPresetConfig, ProviderConfig, RequestOverrides
def isolate_request_overrides(
- config: Config, previous: ModelPresetConfig, candidate: ModelPresetConfig,
+ candidate: ModelPresetConfig, *, previous_provider: str | None, provider: str | None,
) -> ModelPresetConfig:
"""Keep inherited request settings only within the same configured connection."""
- from nanobot.config.loader import resolve_config_env_vars, resolve_env_refs
-
- if not any((previous.extra_headers, previous.extra_query, previous.extra_body)):
- return candidate
- routing = resolve_config_env_vars(config)
-
- def connection_name(preset: ModelPresetConfig) -> str | None:
- model, provider = resolve_env_refs(preset.model), resolve_env_refs(preset.provider)
- if not model or not provider:
- return None
- return routing.get_provider_name(model, preset=preset.model_copy(update={"provider": provider}))
-
- previous_name = connection_name(previous)
- if previous_name is not None and previous_name == connection_name(candidate):
+ if previous_provider is not None and previous_provider == provider:
return candidate
return candidate.model_copy(update={
"extra_headers": None, "extra_query": None, "extra_body": None,
diff --git a/nanobot/providers/routing.py b/nanobot/providers/routing.py
index 1785b7d2d..c9540a31b 100644
--- a/nanobot/providers/routing.py
+++ b/nanobot/providers/routing.py
@@ -100,7 +100,11 @@ def resolve_provider_route(
) -> ProviderRoute:
"""Resolve and validate provider configuration without constructing a client."""
if model is not None:
- preset = isolate_request_overrides(config, preset, preset.model_copy(update={"model": model}))
+ preset = isolate_request_overrides(
+ preset.model_copy(update={"model": model}),
+ previous_provider=config.get_provider_name(preset=preset),
+ provider=config.get_provider_name(model, preset=preset),
+ )
model = model or preset.model
provider_name = config.get_provider_name(model, preset=preset)
provider_config = config.get_provider(model, preset=preset)
diff --git a/nanobot/webui/settings_models.py b/nanobot/webui/settings_models.py
index 7092f60e7..0c5dd2389 100644
--- a/nanobot/webui/settings_models.py
+++ b/nanobot/webui/settings_models.py
@@ -1240,7 +1240,11 @@ def update_model_configuration(
if preset is None:
raise WebUISettingsError("unknown model configuration")
- previous = preset.model_copy(deep=True)
+ has_request_settings = any((preset.extra_headers, preset.extra_query, preset.extra_body))
+ previous_provider = None
+ if has_request_settings:
+ resolved_config = resolve_config_env_vars(config)
+ previous_provider = resolved_config.get_provider_name(preset=resolved_config.model_presets[name])
changed = False
identity_changed = False
new_name_value = query_first_alias(query, "new_name", "newName")
@@ -1309,9 +1313,14 @@ def update_model_configuration(
changed = True
elif identity_changed:
preset.api = None
- candidate = _preset_with_request_updates(
- config, isolate_request_overrides(config, previous, preset), query,
- )
+ candidate = preset
+ if has_request_settings:
+ resolved_config = resolve_config_env_vars(config)
+ candidate = isolate_request_overrides(
+ preset, previous_provider=previous_provider,
+ provider=resolved_config.get_provider_name(preset=resolved_config.model_presets[name]),
+ )
+ candidate = _preset_with_request_updates(config, candidate, query)
if candidate != preset:
config.model_presets[name] = candidate
changed = True
diff --git a/tests/providers/test_model_api_presets.py b/tests/providers/test_model_api_presets.py
index 83aab8dc1..722732e29 100644
--- a/tests/providers/test_model_api_presets.py
+++ b/tests/providers/test_model_api_presets.py
@@ -51,7 +51,10 @@ def _config() -> Config:
@pytest.mark.parametrize("entrypoint", ["sdk", "factory"])
@pytest.mark.parametrize("target", ["tenant_a", "tenant_b"])
-async def test_model_override_keeps_request_settings_within_connection(bind_transport, entrypoint, target):
[email protected]("literal_env_syntax", [False, True])
+async def test_model_override_keeps_request_settings_within_connection(
+ bind_transport, entrypoint, target, literal_env_syntax, monkeypatch,
+):
from nanobot.agent.model_runtime import ModelRuntimeResolver
from nanobot.providers.factory import build_provider_snapshot
from nanobot.utils.llm_runtime import runtime_from_provider_snapshot
@@ -62,7 +65,7 @@ async def test_model_override_keeps_request_settings_within_connection(bind_tran
"apiBase": "https://shared-gateway.test/v1", "apiKey": "fixture",
"extraHeaders": {"X-Connection": name},
"extraQuery": {"connection": name}, "extraBody": {"connection": name},
- } for name in ("tenant_a", "tenant_b")},
+ } for name in (target, "tenant_b" if target == "tenant_a" else "tenant_a")},
"modelPresets": {"primary": {
"provider": "auto", "model": "tenant_a/old-model", "temperature": 0.3,
"extraHeaders": {"X-Tenant-Token": "source-secret"},
@@ -72,6 +75,11 @@ async def test_model_override_keeps_request_settings_within_connection(bind_tran
})
before = config.model_dump()
model = f"{target}/new-model"
+ if literal_env_syntax:
+ # SDK/factory arguments are model IDs, not configuration templates.
+ # Auto routing of this literal uses the first configured connection.
+ monkeypatch.setenv("NANOBOT_TEST_CALL_MODEL", "tenant_a/env-model")
+ model = "${NANOBOT_TEST_CALL_MODEL}"
if entrypoint == "sdk":
resolver = ModelRuntimeResolver(runtime_from_provider_snapshot(build_provider_snapshot(config)))
runtime = resolver.resolve_override(model=model, model_preset=None, config=config)