f284a05f1d
providers.bedrock: {stale_timeout_seconds: 600} is the documented way to tune a
built-in provider's per-call timeout (agent/turn_recovery.py,
agent/thinking_timeout_guidance.py). resolve_user_provider() treated ANY dict
under providers.<name> as a full custom-endpoint definition, even with no
api/url/base_url — producing an empty openai_chat/api_key stub that shadowed
the real built-in overlay (bedrock_converse transport, aws_sdk auth).
For Bedrock this routed every /model switch through the generic
custom-endpoint /models probe against the Bedrock runtime host, which has no
such endpoint: the switch intermittently failed with "could not reach this
custom endpoint's model listing" depending on how fast the (irrelevant) probe
timed out.
resolve_user_provider() now requires a real endpoint (api/url/base_url) before
resolving an entry; a tuning-only block falls through to resolve_provider_full's
next rung, which picks up the built-in overlay correctly.
34 lines
1.9 KiB
Python
34 lines
1.9 KiB
Python
"""Regression for #110402: a ``providers.<name>`` block with no endpoint (only tuning keys like
|
|
``stale_timeout_seconds``/``request_timeout_seconds``) must not shadow a BUILT-IN provider of the
|
|
same name. ``providers.bedrock: {stale_timeout_seconds: 600}`` is the documented way to tune a
|
|
built-in's per-call timeout (agent/turn_recovery.py, agent/thinking_timeout_guidance.py); it is not
|
|
a custom-endpoint definition and must fall through to the real Bedrock overlay (aws_sdk auth,
|
|
bedrock_converse transport) instead of resolving to an empty ``openai_chat``/``api_key`` stub that
|
|
routes Bedrock through the generic custom-endpoint ``/models`` probe.
|
|
"""
|
|
|
|
from hermes_cli.providers import resolve_provider_full, resolve_user_provider
|
|
|
|
|
|
def test_timeout_only_entry_does_not_resolve_as_a_custom_provider():
|
|
"""A providers.<name> block with only tuning keys is not a provider definition."""
|
|
user_providers = {"bedrock": {"stale_timeout_seconds": 600, "request_timeout_seconds": 1800}}
|
|
assert resolve_user_provider("bedrock", user_providers) is None
|
|
|
|
|
|
def test_timeout_only_bedrock_entry_falls_through_to_the_builtin_overlay():
|
|
"""resolve_provider_full must still resolve Bedrock's real transport/auth_type, not a stub."""
|
|
user_providers = {"bedrock": {"stale_timeout_seconds": 600, "request_timeout_seconds": 1800}}
|
|
pdef = resolve_provider_full("bedrock", user_providers, None)
|
|
assert pdef is not None
|
|
assert pdef.transport == "bedrock_converse"
|
|
assert pdef.auth_type == "aws_sdk"
|
|
|
|
|
|
def test_entry_with_an_endpoint_still_resolves_as_a_custom_provider():
|
|
"""A real endpoint-bearing providers.<name> block keeps resolving (no over-correction)."""
|
|
user_providers = {"local-ollama": {"api": "http://localhost:11434/v1", "name": "Local Ollama"}}
|
|
pdef = resolve_user_provider("local-ollama", user_providers)
|
|
assert pdef is not None
|
|
assert pdef.base_url == "http://localhost:11434/v1"
|