;
canEditMembership: boolean;
@@ -57,7 +57,7 @@ export function MembershipSection({
membershipManagedByLabel,
currentProvider,
selectedEntries,
- readyExtraProviders,
+ selectableExtraProviders,
selectedExtras,
quotaByName,
canEditMembership,
@@ -91,9 +91,9 @@ export function MembershipSection({
{t("chatgptOAuthRouting.loadingAccounts")}
- ) : readyExtraProviders.length > 0 ? (
+ ) : selectableExtraProviders.length > 0 ? (
- {readyExtraProviders.map((provider) => {
+ {selectableExtraProviders.map((provider) => {
const selected = selectedExtras.has(provider.name);
const failureKind = getQuotaFailureKind(quotaByName?.get(provider.name));
return (
diff --git a/ui/web/src/pages/agents/agent-detail/config-sections/chatgpt-oauth-routing-section.tsx b/ui/web/src/pages/agents/agent-detail/config-sections/chatgpt-oauth-routing-section.tsx
index 59e232b0..8e14894b 100644
--- a/ui/web/src/pages/agents/agent-detail/config-sections/chatgpt-oauth-routing-section.tsx
+++ b/ui/web/src/pages/agents/agent-detail/config-sections/chatgpt-oauth-routing-section.tsx
@@ -103,13 +103,15 @@ export function ChatGPTOAuthRoutingSection({
if (!currentOAuthProvider) return null;
const allExtraProviders = oauthProviders.filter((p) => p.name !== currentProvider);
- const readyExtraProviders = allExtraProviders.filter(
- (p) => getAvailabilityFromMap(p, statusByName) === "ready",
+ const selectedExtras = new Set(value.extra_provider_names ?? []);
+ const selectableExtraProviders = allExtraProviders.filter(
+ (p) =>
+ selectedExtras.has(p.name) ||
+ getAvailabilityFromMap(p, statusByName) === "ready",
);
const mode = value.override_mode === "inherit" ? "inherit" : "custom";
const providerDefaultsAvailable =
defaultRouting != null && defaultRouting.extraProviderNames.length > 0;
- const selectedExtras = new Set(value.extra_provider_names ?? []);
const selectedEntries = entries.map((entry) => ({
...entry,
@@ -214,7 +216,7 @@ export function ChatGPTOAuthRoutingSection({
type="button"
variant={mode === "inherit" ? "default" : "outline"}
onClick={() => setMode("inherit")}
- disabled={!canManageProviders || !providerDefaultsAvailable}
+ disabled={!canManageProviders}
className="h-9 [@media(max-height:760px)]:h-8"
>
{t("chatgptOAuthRouting.mode.inherit")}
@@ -277,7 +279,7 @@ export function ChatGPTOAuthRoutingSection({
membershipManagedByLabel={membershipManagedByLabel}
currentProvider={currentProvider}
selectedEntries={selectedEntries}
- readyExtraProviders={readyExtraProviders}
+ selectableExtraProviders={selectableExtraProviders}
selectedExtras={selectedExtras}
quotaByName={quotaByName}
canEditMembership={canEditMembership}
diff --git a/ui/web/src/pages/providers/provider-detail/provider-overview.tsx b/ui/web/src/pages/providers/provider-detail/provider-overview.tsx
index 616faabe..fdba8d5c 100644
--- a/ui/web/src/pages/providers/provider-detail/provider-overview.tsx
+++ b/ui/web/src/pages/providers/provider-detail/provider-overview.tsx
@@ -171,6 +171,19 @@ export function ProviderOverview({ provider, onUpdate }: ProviderOverviewProps)
strategy: initialRouting?.strategy ?? "primary_first",
extra_provider_names: initialRouting?.extraProviderNames ?? [],
});
+ const selectedPoolProviderNames = useMemo(
+ () =>
+ canEditPoolRouting
+ ? Array.from(
+ new Set(
+ [provider.name, ...(poolRouting.extra_provider_names ?? [])]
+ .filter(Boolean)
+ .filter((name) => name === provider.name || providerByName.has(name)),
+ ),
+ )
+ : [provider.name],
+ [canEditPoolRouting, poolRouting.extra_provider_names, provider.name, providerByName],
+ );
const initEmb = getEmbeddingSettings(provider.settings);
const [embEnabled, setEmbEnabled] = useState(initEmb?.enabled ?? false);
@@ -253,13 +266,9 @@ export function ProviderOverview({ provider, onUpdate }: ProviderOverviewProps)
const quotaProviderNames = useMemo(
() => {
if (!isOAuth) return [];
- const candidateNames = [
- provider.name,
- ...(canEditPoolRouting ? poolRouting.extra_provider_names ?? [] : []),
- ];
return Array.from(
new Set(
- candidateNames.filter((providerName) => {
+ selectedPoolProviderNames.filter((providerName) => {
if (!providerName) return false;
const item = providerByName.get(providerName);
return (
@@ -270,11 +279,9 @@ export function ProviderOverview({ provider, onUpdate }: ProviderOverviewProps)
);
},
[
- canEditPoolRouting,
isOAuth,
- poolRouting.extra_provider_names,
- provider.name,
providerByName,
+ selectedPoolProviderNames,
statusByName,
],
);
@@ -285,7 +292,7 @@ export function ProviderOverview({ provider, onUpdate }: ProviderOverviewProps)
} = useChatGPTOAuthProviderQuotas(quotaProviderNames, isOAuth);
const poolEntries = useMemo(() => {
if (!canEditPoolRouting) return [];
- return quotaProviderNames.map((providerName) => {
+ return selectedPoolProviderNames.map((providerName) => {
const item = providerByName.get(providerName);
return {
name: providerName,
@@ -305,10 +312,10 @@ export function ProviderOverview({ provider, onUpdate }: ProviderOverviewProps)
quota: quotaByName.get(providerName),
};
});
- }, [canEditPoolRouting, provider.name, providerByName, quotaByName, quotaProviderNames, statusByName]);
+ }, [canEditPoolRouting, provider.name, providerByName, quotaByName, selectedPoolProviderNames, statusByName]);
// Provider-scoped pool activity (only for pool owners)
- const isPoolOwner = canEditPoolRouting && poolEntries.length > 0;
+ const isPoolOwner = canEditPoolRouting && selectedPoolProviderNames.length > 1;
const {
data: poolActivity,
isFetching: poolActivityFetching,
+ 
+ 
+ 
+