mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-07-12 13:52:15 +00:00
fix(auxiliary_client): demote the 2 sibling routing fall-throughs too (review)
Phase 2c review flagged that only 2 of the 4 structurally-identical
resolve_provider_client routing dead-ends were demoted. Complete the bug-class:
also demote+dedup the external-process ('not directly supported') and OAuth
('not directly supported, try auto') fall-throughs, keyed by provider name, so
none of the four dead-ends spam WARNING on a retry loop.
Add direct tests for the unhandled-auth_type and OAuth dedup paths via a
monkeypatched PROVIDER_REGISTRY (the review noted these were unverified).
Mutation-checked: reverting either sibling demotion fails its test.
This commit is contained in:
parent
c0d3ceb17e
commit
9cf47fef54
2 changed files with 79 additions and 4 deletions
|
|
@ -121,6 +121,11 @@ logger = logging.getLogger(__name__)
|
|||
# them independently.
|
||||
_LOGGED_UNKNOWN_PROVIDER_KEYS: set = set()
|
||||
_LOGGED_UNHANDLED_AUTHTYPE_KEYS: set = set()
|
||||
# Same treatment for the two "registered provider, unsupported sub-branch"
|
||||
# routing dead-ends — external-process and OAuth providers that fall through
|
||||
# with no matching handler. Keyed by provider name.
|
||||
_LOGGED_UNSUPPORTED_EXTPROC_KEYS: set = set()
|
||||
_LOGGED_UNSUPPORTED_OAUTH_KEYS: set = set()
|
||||
|
||||
|
||||
def _openai_http_client_kwargs(
|
||||
|
|
@ -4495,8 +4500,10 @@ def resolve_provider_client(
|
|||
logger.debug("resolve_provider_client: %s (%s)", provider, final_model)
|
||||
return (_to_async_client(client, final_model, is_vision=is_vision) if async_mode
|
||||
else (client, final_model))
|
||||
logger.warning("resolve_provider_client: external-process provider %s not "
|
||||
"directly supported", provider)
|
||||
if provider not in _LOGGED_UNSUPPORTED_EXTPROC_KEYS:
|
||||
_LOGGED_UNSUPPORTED_EXTPROC_KEYS.add(provider)
|
||||
logger.debug("resolve_provider_client: external-process provider %s not "
|
||||
"directly supported", provider)
|
||||
return None, None
|
||||
|
||||
elif pconfig.auth_type == "aws_sdk":
|
||||
|
|
@ -4541,8 +4548,10 @@ def resolve_provider_client(
|
|||
if provider == "xai-oauth":
|
||||
return resolve_provider_client("xai-oauth", model, async_mode)
|
||||
# Other OAuth providers not directly supported
|
||||
logger.warning("resolve_provider_client: OAuth provider %s not "
|
||||
"directly supported, try 'auto'", provider)
|
||||
if provider not in _LOGGED_UNSUPPORTED_OAUTH_KEYS:
|
||||
_LOGGED_UNSUPPORTED_OAUTH_KEYS.add(provider)
|
||||
logger.debug("resolve_provider_client: OAuth provider %s not "
|
||||
"directly supported, try 'auto'", provider)
|
||||
return None, None
|
||||
|
||||
# Demoted from logger.warning to debug; dedup keyed on (auth_type,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue