Skip to content

Commit b8015db

Browse files
authored
Merge branch 'anomalyco:dev' into dev
2 parents 5a53f8b + 224548d commit b8015db

2 files changed

Lines changed: 7 additions & 14 deletions

File tree

packages/app/src/components/dialog-select-server.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ export function DialogSelectServer() {
504504

505505
return (
506506
<Dialog title={formTitle()}>
507-
<div class="flex flex-col gap-2">
507+
<div class="flex flex-1 min-h-0 flex-col gap-2">
508508
<Show
509509
when={!isFormMode()}
510510
fallback={
@@ -539,7 +539,7 @@ export function DialogSelectServer() {
539539
if (x) void select(x)
540540
}}
541541
divider={true}
542-
class="px-5 [&_[data-slot=list-search-wrapper]]:w-full [&_[data-slot=list-scroll]]h-[300px] [&_[data-slot=list-scroll]]:overflow-y-auto [&_[data-slot=list-items]]:bg-surface-base [&_[data-slot=list-items]]:rounded-md [&_[data-slot=list-item]]:min-h-14 [&_[data-slot=list-item]]:p-3 [&_[data-slot=list-item]]:!bg-transparent"
542+
class="flex-1 min-h-0 px-5 [&_[data-slot=list-search-wrapper]]:w-full [&_[data-slot=list-scroll]]:flex-1 [&_[data-slot=list-scroll]]:overflow-y-auto [&_[data-slot=list-items]]:bg-surface-base [&_[data-slot=list-items]]:rounded-md [&_[data-slot=list-item]]:min-h-14 [&_[data-slot=list-item]]:p-3 [&_[data-slot=list-item]]:!bg-transparent"
543543
>
544544
{(i) => {
545545
const key = ServerConnection.key(i)
@@ -619,7 +619,7 @@ export function DialogSelectServer() {
619619
</List>
620620
</Show>
621621

622-
<div class="px-5 pb-5">
622+
<div class="shrink-0 px-5 pb-5">
623623
<Show
624624
when={isFormMode()}
625625
fallback={

packages/console/app/src/routes/zen/util/handler.ts

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -448,35 +448,28 @@ export async function handler(
448448
return modelInfo.providers.find((provider) => provider.id === modelInfo.byokProvider)
449449
}
450450

451-
// Filter out TPM limited providers
452-
const allProviders = modelInfo.providers.filter((provider) => {
453-
if (!provider.tpmLimit) return true
454-
const usage = modelTpmLimits?.[`${provider.id}/${provider.model}`] ?? 0
455-
return usage < provider.tpmLimit * 1_000_000
456-
})
457-
458451
// Always use the same provider for the same session
459452
if (stickyProvider) {
460-
const provider = allProviders.find((provider) => provider.id === stickyProvider)
453+
const provider = modelInfo.providers.find((provider) => provider.id === stickyProvider)
461454
if (provider) return provider
462455
}
463456

464457
if (trialProviders) {
465458
const trialProvider = trialProviders[Math.floor(Math.random() * trialProviders.length)]
466-
const provider = allProviders.find((provider) => provider.id === trialProvider)
459+
const provider = modelInfo.providers.find((provider) => provider.id === trialProvider)
467460
if (provider) return provider
468461
}
469462

470463
if (retry.retryCount !== MAX_FAILOVER_RETRIES) {
471464
let topPriority = Infinity
472-
const providers = allProviders
465+
const providers = modelInfo.providers
473466
.filter((provider) => !provider.disabled)
474467
.filter((provider) => provider.weight !== 0)
475468
.filter((provider) => !retry.excludeProviders.includes(provider.id))
476469
.filter((provider) => {
477470
if (!provider.tpmLimit) return true
478471
const usage = modelTpmLimits?.[`${provider.id}/${provider.model}`] ?? 0
479-
return usage < provider.tpmLimit * 1_000_000 * 0.8
472+
return usage < provider.tpmLimit * 1_000_000
480473
})
481474
.map((provider) => {
482475
topPriority = Math.min(topPriority, provider.priority)

0 commit comments

Comments
 (0)