Skip to content

refactor: parallelize model listing for providers to speed up startup time #2151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Pratham-Mishra04 merged 1 commit into from
Mar 18, 2026
Merged

refactor: parallelize model listing for providers to speed up startup time #2151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
181 changes: 106 additions & 75 deletions transports/bifrost-http/server/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"os"
"os/signal"
"strings"
"sync"
"syscall"
"time"

Expand Down Expand Up @@ -508,9 +509,36 @@ func (s *BifrostHTTPServer) ReloadProvider(ctx context.Context, provider schemas
bfCtx.SetValue(schemas.BifrostContextKeyValidateKeys, true) // Validate keys during provider add/update
defer bfCtx.Cancel()

allModels, bifrostErr := s.Client.ListModelsRequest(bfCtx, &schemas.BifrostListModelsRequest{
Provider: provider,
})
// Getting allowed models from all provider keys (needed before model listing)
providerKeys, err := s.Config.ConfigStore.GetKeysByProvider(ctx, string(provider))
if err != nil {
return nil, fmt.Errorf("failed to update provider model catalog: failed to get keys by provider: %s", err)
}

// Run filtered and unfiltered model listing concurrently
var (
allModels *schemas.BifrostListModelsResponse
bifrostErr *schemas.BifrostError
unfilteredModels *schemas.BifrostListModelsResponse
listModelsErr *schemas.BifrostError
listWg sync.WaitGroup
)
listWg.Add(2)
go func() {
defer listWg.Done()
allModels, bifrostErr = s.Client.ListModelsRequest(bfCtx, &schemas.BifrostListModelsRequest{
Provider: provider,
})
}()
go func() {
defer listWg.Done()
unfilteredModels, listModelsErr = s.Client.ListModelsRequest(bfCtx, &schemas.BifrostListModelsRequest{
Provider: provider,
Unfiltered: true,
})
}()
listWg.Wait()
Comment thread
Pratham-Mishra04 marked this conversation as resolved.

if allModels != nil && len(allModels.KeyStatuses) > 0 && s.Config.ConfigStore != nil {
s.updateKeyStatus(ctx, allModels.KeyStatuses)
}
Expand All @@ -525,11 +553,6 @@ func (s *BifrostHTTPServer) ReloadProvider(ctx context.Context, provider schemas
Data: make([]schemas.Model, 0),
}
}
// Getting allowed models from all provider keys
providerKeys, err := s.Config.ConfigStore.GetKeysByProvider(ctx, string(provider))
if err != nil {
return nil, fmt.Errorf("failed to update provider model catalog: failed to get keys by provider: %s", err)
}
modelsInKeys := make([]schemas.Model, 0)
for _, key := range providerKeys {
for _, model := range key.Models {
Expand All @@ -543,14 +566,10 @@ func (s *BifrostHTTPServer) ReloadProvider(ctx context.Context, provider schemas
}
}
s.Config.ModelCatalog.UpsertModelDataForProvider(provider, allModels, modelsInKeys)
unfilteredModelData, listModelsErr := s.Client.ListModelsRequest(bfCtx, &schemas.BifrostListModelsRequest{
Provider: provider,
Unfiltered: true,
})
if listModelsErr != nil {
logger.Error("failed to list unfiltered models for provider %s: %v: falling back onto the static datasheet", provider, bifrost.GetErrorMessage(listModelsErr))
} else {
s.Config.ModelCatalog.UpsertUnfilteredModelDataForProvider(provider, unfilteredModelData)
s.Config.ModelCatalog.UpsertUnfilteredModelDataForProvider(provider, unfilteredModels)
}
return updatedProvider, nil
}
Expand Down Expand Up @@ -756,38 +775,44 @@ func (s *BifrostHTTPServer) ForceReloadPricing(ctx context.Context) error {
}
// Fetching keys for all providers and allowed models first
// Based on allowed models we will set the data in the model catalog
var wg sync.WaitGroup
for provider, providerConfig := range s.Config.Providers {
bfCtx := schemas.NewBifrostContext(ctx, time.Now().Add(15*time.Second))
bfCtx.SetValue(schemas.BifrostContextKeySkipPluginPipeline, true)
modelData, listModelsErr := s.Client.ListModelsRequest(bfCtx, &schemas.BifrostListModelsRequest{
Provider: provider,
})
if listModelsErr != nil {
logger.Error("failed to list models for provider %s: %v: falling back onto the static datasheet", provider, bifrost.GetErrorMessage(listModelsErr))
}
allowedModels := make([]schemas.Model, 0)
for _, key := range providerConfig.Keys {
for _, model := range key.Models {
if model == "*" {
continue
wg.Add(1)
go func(provider schemas.ModelProvider, providerConfig configstore.ProviderConfig) {
defer wg.Done()
bfCtx := schemas.NewBifrostContext(ctx, time.Now().Add(15*time.Second))
bfCtx.SetValue(schemas.BifrostContextKeySkipPluginPipeline, true)
defer bfCtx.Cancel()
modelData, listModelsErr := s.Client.ListModelsRequest(bfCtx, &schemas.BifrostListModelsRequest{
Provider: provider,
})
if listModelsErr != nil {
logger.Error("failed to list models for provider %s: %v: falling back onto the static datasheet", provider, bifrost.GetErrorMessage(listModelsErr))
}
allowedModels := make([]schemas.Model, 0)
for _, key := range providerConfig.Keys {
for _, model := range key.Models {
if model == "*" {
continue
}
allowedModels = append(allowedModels, schemas.Model{
ID: string(provider) + "/" + model,
})
}
allowedModels = append(allowedModels, schemas.Model{
ID: string(provider) + "/" + model,
})
}
}
s.Config.ModelCatalog.UpsertModelDataForProvider(provider, modelData, allowedModels)
unfilteredModelData, listModelsErr := s.Client.ListModelsRequest(bfCtx, &schemas.BifrostListModelsRequest{
Provider: provider,
Unfiltered: true,
})
if listModelsErr != nil {
logger.Error("failed to list unfiltered models for provider %s: %v: falling back onto the static datasheet", provider, bifrost.GetErrorMessage(listModelsErr))
} else {
s.Config.ModelCatalog.UpsertUnfilteredModelDataForProvider(provider, unfilteredModelData)
}
bfCtx.Cancel()
s.Config.ModelCatalog.UpsertModelDataForProvider(provider, modelData, allowedModels)
Comment thread
coderabbitai[bot] marked this conversation as resolved.
unfilteredModelData, listModelsErr := s.Client.ListModelsRequest(bfCtx, &schemas.BifrostListModelsRequest{
Provider: provider,
Unfiltered: true,
})
if listModelsErr != nil {
logger.Error("failed to list unfiltered models for provider %s: %v: falling back onto the static datasheet", provider, bifrost.GetErrorMessage(listModelsErr))
} else {
s.Config.ModelCatalog.UpsertUnfilteredModelDataForProvider(provider, unfilteredModelData)
}
}(provider, providerConfig)
}
wg.Wait()
}
return nil
}
Expand Down Expand Up @@ -1241,45 +1266,51 @@ func (s *BifrostHTTPServer) Bootstrap(ctx context.Context) error {
if s.Config.ModelCatalog != nil {
// Fetching keys for all providers and allowed models first
// Based on allowed models we will set the data in the model catalog
var wg sync.WaitGroup
for provider, providerConfig := range s.Config.Providers {
bfCtx := schemas.NewBifrostContext(ctx, time.Now().Add(15*time.Second))
bfCtx.SetValue(schemas.BifrostContextKeySkipPluginPipeline, true)

modelData, listModelsErr := s.Client.ListModelsRequest(bfCtx, &schemas.BifrostListModelsRequest{
Provider: provider,
})
if modelData != nil && len(modelData.KeyStatuses) > 0 && s.Config.ConfigStore != nil {
s.updateKeyStatus(ctx, modelData.KeyStatuses)
}
if listModelsErr != nil {
if len(listModelsErr.ExtraFields.KeyStatuses) > 0 && s.Config.ConfigStore != nil {
s.updateKeyStatus(ctx, listModelsErr.ExtraFields.KeyStatuses)
wg.Add(1)
go func(provider schemas.ModelProvider, providerConfig configstore.ProviderConfig) {
defer wg.Done()
bfCtx := schemas.NewBifrostContext(ctx, time.Now().Add(15*time.Second))
bfCtx.SetValue(schemas.BifrostContextKeySkipPluginPipeline, true)
defer bfCtx.Cancel()

modelData, listModelsErr := s.Client.ListModelsRequest(bfCtx, &schemas.BifrostListModelsRequest{
Provider: provider,
})
if modelData != nil && len(modelData.KeyStatuses) > 0 && s.Config.ConfigStore != nil {
s.updateKeyStatus(ctx, modelData.KeyStatuses)
}
logger.Error("failed to list models for provider %s: %v: falling back onto the static datasheet", provider, bifrost.GetErrorMessage(listModelsErr))
}
allowedModels := make([]schemas.Model, 0)
for _, key := range providerConfig.Keys {
for _, model := range key.Models {
if model == "*" {
continue
if listModelsErr != nil {
if len(listModelsErr.ExtraFields.KeyStatuses) > 0 && s.Config.ConfigStore != nil {
s.updateKeyStatus(ctx, listModelsErr.ExtraFields.KeyStatuses)
}
allowedModels = append(allowedModels, schemas.Model{
ID: string(provider) + "/" + model,
})
logger.Error("failed to list models for provider %s: %v: falling back onto the static datasheet", provider, bifrost.GetErrorMessage(listModelsErr))
}
}
s.Config.ModelCatalog.UpsertModelDataForProvider(provider, modelData, allowedModels)
unfilteredModelData, listModelsErr := s.Client.ListModelsRequest(bfCtx, &schemas.BifrostListModelsRequest{
Provider: provider,
Unfiltered: true,
})
if listModelsErr != nil {
logger.Error("failed to list unfiltered models for provider %s: %v: falling back onto the static datasheet", provider, bifrost.GetErrorMessage(listModelsErr))
} else {
s.Config.ModelCatalog.UpsertUnfilteredModelDataForProvider(provider, unfilteredModelData)
}
bfCtx.Cancel()
allowedModels := make([]schemas.Model, 0)
for _, key := range providerConfig.Keys {
for _, model := range key.Models {
if model == "*" {
continue
}
allowedModels = append(allowedModels, schemas.Model{
ID: string(provider) + "/" + model,
})
}
}
s.Config.ModelCatalog.UpsertModelDataForProvider(provider, modelData, allowedModels)
unfilteredModelData, listModelsErr := s.Client.ListModelsRequest(bfCtx, &schemas.BifrostListModelsRequest{
Provider: provider,
Unfiltered: true,
})
if listModelsErr != nil {
logger.Error("failed to list unfiltered models for provider %s: %v: falling back onto the static datasheet", provider, bifrost.GetErrorMessage(listModelsErr))
} else {
s.Config.ModelCatalog.UpsertUnfilteredModelDataForProvider(provider, unfilteredModelData)
}
}(provider, providerConfig)
}
wg.Wait()
}

logger.Info("models added to catalog")
Expand Down
3 changes: 2 additions & 1 deletion transports/changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
- feat: virtual key MCP configs now act as an execution-time allow-list — tools not permitted by the VK are blocked at inference and MCP tool execution
- refactor: standardize empty array conventions in bifrost. Empty array means no tools/keys are allowed, ["*"] means all tools/keys are allowed.
- feat: add support for request level extra headers in MCP tool execution.
- fix: add support for `x-bf-mcp-include-clients` and `x-bf-mcp-include-tools` request headers to filter MCP tools/list response when using bifrost as an MCP gateway.
- fix: add support for `x-bf-mcp-include-clients` and `x-bf-mcp-include-tools` request headers to filter MCP tools/list response when using bifrost as an MCP gateway.
- refactor: parallelize model listing for providers to speed up startup time.