fix(model-switch): separate picker rows for same-endpoint proxies with distinct names (salvages #67747) - #67925
Merged
Merged
Conversation
… names as separate picker rows
Collaborator
This was referenced Jul 20, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
custom_providers:entries sharing one endpoint but carrying distinct display names (aggregating proxies — LiteLLM fronting cerebras/groq/perplexity at a single URL) now get separate picker rows instead of silently merging into one. Salvages #67747 (@craigdfrench) onto current main with authorship preserved.Changes
hermes_cli/model_switch.py: section-4 group key gains a display-name-prefix dimension —(api_url, credential_identity, api_mode, headers_identity, display_prefix). Extends current main's tuple (per the sweeper's prescription on fix: group custom_providers by (endpoint, name) to support proxy setups #21544), so the credential/mode/headers safeguards fromaa283d1e4/ed4123792are intact. The em-dash suffix fold ("Ollama — A" + "Ollama — B" → one "Ollama" row) is preserved because those entries share the prefix.test_shared_url_different_display_names_are_separate_rows+test_shared_url_per_model_suffix_still_collapses(cherry-picked). Follow-up ours: dropped the PR's duplicatefetch_api_modelsmocks on 3 tests already hermetic via test(model): isolate custom-provider grouping tests from live discovery #62421'sprobe_custom_providers=False(merged as test(model): isolate custom-provider grouping tests from live discovery (salvages #62421) #67921).Credit also to @chiyema — #21544 proposed the name-discriminator concept first (May 7); its implementation predated the credential/mode/headers hardening and would have regressed it.
Validation
test_model_switch_custom_providers.py+test_provider_section3_grouping.py+test_list_picker_providers.pyproviders:(Palantir 2-entry fold) + section-4 proxy entriesInfographic