fix: set fixed index 0 for stream responses and remove nil check for usage (#983)

Fixed inconsistencies in stream response handling for Anthropic and Bedrock providers by standardizing index values and removing unnecessary conditional checks.

- Removed conditional check for `usage` in Anthropic response handling, ensuring usage is always assigned
- Changed dynamic index values to fixed `0` index in stream responses for both Anthropic and Bedrock providers
- Removed unnecessary content block index handling in Bedrock provider

- [x] Bug fix
- [ ] Feature
- [x] Refactor
- [ ] Documentation
- [ ] Chore/CI

- [x] Core (Go)
- [ ] Transports (HTTP)
- [x] Providers/Integrations
- [ ] Plugins
- [ ] UI (Next.js)
- [ ] Docs

Test streaming responses from Anthropic and Bedrock providers to ensure proper index values and usage information:

```sh
go version
go test ./core/providers/anthropic/...
go test ./core/providers/bedrock/...
```

- [ ] Yes
- [x] No

Fixes inconsistencies in stream response handling across providers.

No security implications.

- [x] I read `docs/contributing/README.md` and followed the guidelines
- [x] I added/updated tests where appropriate
- [ ] I updated documentation where needed
- [x] I verified builds succeed (Go and UI)
- [x] I verified the CI pipeline passes locally if applicable

Author: akshaydeo

core/bifrost.go

@@ -2504,12 +2504,22 @@ func (bifrost *Bifrost) selectKeyFromProviderForModel(ctx *context.Context, requ
 	if requestType == schemas.ListModelsRequest {
 		// Skip deployment check but still check if the key has a value
 		for _, k := range keys {
+			// Skip disabled keys
+			if k.Enabled != nil && !*k.Enabled {
+				continue
+			}
+
 			if strings.TrimSpace(k.Value) != "" || canProviderKeyValueBeEmpty(baseProviderType) {
 				supportedKeys = append(supportedKeys, k)
 			}
 		}
 	} else {
 		for _, key := range keys {
+			// Skip disabled keys
+			if key.Enabled != nil && !*key.Enabled {
+				continue
+			}
+
 			modelSupported := (slices.Contains(key.Models, model) && (strings.TrimSpace(key.Value) != "" || canProviderKeyValueBeEmpty(baseProviderType))) || len(key.Models) == 0
 
 			// Additional deployment checks for Azure, Bedrock and Vertex

core/changelog.md

@@ -1 +1,2 @@
-fix: vertex and bedrock usage aggregation improvements for streaming
+fix: vertex and bedrock usage aggregation improvements for streaming
+fix: choice index fixed to 0 for anthropic and bedrock streaming

core/providers/anthropic/anthropic.go

@@ -931,9 +931,7 @@ func HandleAnthropicResponsesStream(
 						if response.Response == nil {
 							response.Response = &schemas.BifrostResponsesResponse{}
 						}
-						if usage != nil {
-							response.Response.Usage = usage
-						}
+						response.Response.Usage = usage
 						response.ExtraFields.Latency = time.Since(startTime).Milliseconds()
 						ctx = context.WithValue(ctx, schemas.BifrostContextKeyStreamEndIndicator, true)
 						providerUtils.ProcessAndSendResponse(ctx, postHookRunner, providerUtils.GetBifrostResponseForStreamResponse(nil, nil, response, nil, nil), responseChan)

core/providers/anthropic/chat.go

@@ -725,7 +725,7 @@ func (chunk *AnthropicStreamEvent) ToBifrostChatCompletionStream() (*schemas.Bif
 				Object: "chat.completion.chunk",
 				Choices: []schemas.BifrostResponseChoice{
 					{
-						Index: *chunk.Index,
+						Index: 0,
 						ChatStreamResponseChoice: &schemas.ChatStreamResponseChoice{
 							Delta: &schemas.ChatStreamResponseChoiceDelta{
 								ToolCalls: []schemas.ChatAssistantMessageToolCall{
@@ -760,7 +760,7 @@ func (chunk *AnthropicStreamEvent) ToBifrostChatCompletionStream() (*schemas.Bif
 						Object: "chat.completion.chunk",
 						Choices: []schemas.BifrostResponseChoice{
 							{
-								Index: *chunk.Index,
+								Index: 0,
 								ChatStreamResponseChoice: &schemas.ChatStreamResponseChoice{
 									Delta: &schemas.ChatStreamResponseChoiceDelta{
 										Content: chunk.Delta.Text,
@@ -781,7 +781,7 @@ func (chunk *AnthropicStreamEvent) ToBifrostChatCompletionStream() (*schemas.Bif
 						Object: "chat.completion.chunk",
 						Choices: []schemas.BifrostResponseChoice{
 							{
-								Index: *chunk.Index,
+								Index: 0,
 								ChatStreamResponseChoice: &schemas.ChatStreamResponseChoice{
 									Delta: &schemas.ChatStreamResponseChoiceDelta{
 										ToolCalls: []schemas.ChatAssistantMessageToolCall{
@@ -809,7 +809,7 @@ func (chunk *AnthropicStreamEvent) ToBifrostChatCompletionStream() (*schemas.Bif
 						Object: "chat.completion.chunk",
 						Choices: []schemas.BifrostResponseChoice{
 							{
-								Index: *chunk.Index,
+								Index: 0,
 								ChatStreamResponseChoice: &schemas.ChatStreamResponseChoice{
 									Delta: &schemas.ChatStreamResponseChoiceDelta{
 										Thought: chunk.Delta.Thinking,

core/providers/bedrock/chat.go

@@ -187,12 +187,6 @@ func (chunk *BedrockStreamEvent) ToBifrostChatCompletionStream() (*schemas.Bifro
 		return streamResponse, nil, false
 
 	case chunk.Start != nil && chunk.Start.ToolUse != nil:
-		// Handle tool use start event
-		contentBlockIndex := 0
-		if chunk.ContentBlockIndex != nil {
-			contentBlockIndex = *chunk.ContentBlockIndex
-		}
-
 		toolUseStart := chunk.Start.ToolUse
 
 		// Create tool call structure for start event
@@ -206,7 +200,7 @@ func (chunk *BedrockStreamEvent) ToBifrostChatCompletionStream() (*schemas.Bifro
 			Object: "chat.completion.chunk",
 			Choices: []schemas.BifrostResponseChoice{
 				{
-					Index: contentBlockIndex,
+					Index: 0,
 					ChatStreamResponseChoice: &schemas.ChatStreamResponseChoice{
 						Delta: &schemas.ChatStreamResponseChoiceDelta{
 							ToolCalls: []schemas.ChatAssistantMessageToolCall{toolCall},
@@ -218,10 +212,7 @@ func (chunk *BedrockStreamEvent) ToBifrostChatCompletionStream() (*schemas.Bifro
 
 		return streamResponse, nil, false
 
-	case chunk.ContentBlockIndex != nil && chunk.Delta != nil:
-		// Handle contentBlockDelta event
-		contentBlockIndex := *chunk.ContentBlockIndex
-
+	case chunk.Delta != nil:
 		switch {
 		case chunk.Delta.Text != nil:
 			// Handle text delta
@@ -231,7 +222,7 @@ func (chunk *BedrockStreamEvent) ToBifrostChatCompletionStream() (*schemas.Bifro
 					Object: "chat.completion.chunk",
 					Choices: []schemas.BifrostResponseChoice{
 						{
-							Index: contentBlockIndex,
+							Index: 0,
 							ChatStreamResponseChoice: &schemas.ChatStreamResponseChoice{
 								Delta: &schemas.ChatStreamResponseChoiceDelta{
 									Content: &text,
@@ -260,7 +251,7 @@ func (chunk *BedrockStreamEvent) ToBifrostChatCompletionStream() (*schemas.Bifro
 				Object: "chat.completion.chunk",
 				Choices: []schemas.BifrostResponseChoice{
 					{
-						Index: contentBlockIndex,
+						Index: 0,
 						ChatStreamResponseChoice: &schemas.ChatStreamResponseChoice{
 							Delta: &schemas.ChatStreamResponseChoiceDelta{
 								ToolCalls: []schemas.ChatAssistantMessageToolCall{toolCall},

core/schemas/account.go

@@ -14,6 +14,7 @@ type Key struct {
 	AzureKeyConfig   *AzureKeyConfig   `json:"azure_key_config,omitempty"`   // Azure-specific key configuration
 	VertexKeyConfig  *VertexKeyConfig  `json:"vertex_key_config,omitempty"`  // Vertex-specific key configuration
 	BedrockKeyConfig *BedrockKeyConfig `json:"bedrock_key_config,omitempty"` // AWS Bedrock-specific key configuration
+	Enabled          *bool             `json:"enabled,omitempty"`            // Whether the key is active (default: true)
 }
 
 // AzureKeyConfig represents the Azure-specific configuration.

framework/configstore/migrations.go

@@ -79,6 +79,9 @@ func triggerMigrations(ctx context.Context, db *gorm.DB) error {
 	if err := migrationAddLogRetentionDaysColumn(ctx, db); err != nil {
 		return err
 	}
+	if err := migrationAddEnabledColumnToKeyTable(ctx, db); err != nil {
+		return err
+	}
 	if err := migrationAddBatchAndCachePricingColumns(ctx, db); err != nil {
 		return err
 	}
@@ -1079,6 +1082,49 @@ func migrationAddLogRetentionDaysColumn(ctx context.Context, db *gorm.DB) error
 	return nil
 }
 
+// migrationAddEnabledColumnToKeyTable adds the enabled column to the config_keys table
+func migrationAddEnabledColumnToKeyTable(ctx context.Context, db *gorm.DB) error {
+	m := migrator.New(db, migrator.DefaultOptions, []*migrator.Migration{{
+		ID: "add_enabled_column_to_key_table",
+		Migrate: func(tx *gorm.DB) error {
+			tx = tx.WithContext(ctx)
+			mg := tx.Migrator()
+
+			// Check if column already exists
+			if !mg.HasColumn(&tables.TableKey{}, "enabled") {
+				// Add the column
+				if err := mg.AddColumn(&tables.TableKey{}, "enabled"); err != nil {
+					return fmt.Errorf("failed to add enabled column: %w", err)
+				}
+
+				// Set default = true for existing rows
+				if err := tx.Exec("UPDATE config_keys SET enabled = TRUE WHERE enabled IS NULL").Error; err != nil {
+					return fmt.Errorf("failed to backfill enabled column: %w", err)
+				}
+			}
+
+			return nil
+		},
+		Rollback: func(tx *gorm.DB) error {
+			tx = tx.WithContext(ctx)
+			mg := tx.Migrator()
+
+			if mg.HasColumn(&tables.TableKey{}, "enabled") {
+				if err := mg.DropColumn(&tables.TableKey{}, "enabled"); err != nil {
+					return fmt.Errorf("failed to drop enabled column: %w", err)
+				}
+			}
+
+			return nil
+		},
+	}})
+
+	if err := m.Migrate(); err != nil {
+		return fmt.Errorf("error running enabled column migration: %s", err.Error())
+	}
+	return nil
+}
+
 // migrationAddBatchAndCachePricingColumns adds the cache_read_input_token_cost, cache_creation_input_token_cost, input_cost_per_token_batches, and output_cost_per_token_batches columns to the model_pricing table
 func migrationAddBatchAndCachePricingColumns(ctx context.Context, db *gorm.DB) error {
 	m := migrator.New(db, migrator.DefaultOptions, []*migrator.Migration{{
@@ -1137,18 +1183,18 @@ func migrationMoveKeysToProviderConfig(ctx context.Context, db *gorm.DB) error {
 			tx = tx.WithContext(ctx)
 			gormMigrator := tx.Migrator()
 
-		// Step 1: Create the new join table for provider config -> keys relationship
-		// Setup the join table so GORM knows about the custom structure
-		if err := tx.SetupJoinTable(&tables.TableVirtualKeyProviderConfig{}, "Keys", &tables.TableVirtualKeyProviderConfigKey{}); err != nil {
-			return fmt.Errorf("failed to setup join table for provider config keys: %w", err)
-		}
+			// Step 1: Create the new join table for provider config -> keys relationship
+			// Setup the join table so GORM knows about the custom structure
+			if err := tx.SetupJoinTable(&tables.TableVirtualKeyProviderConfig{}, "Keys", &tables.TableVirtualKeyProviderConfigKey{}); err != nil {
+				return fmt.Errorf("failed to setup join table for provider config keys: %w", err)
+			}
 
-		// Create the join table if it doesn't exist
-		if !gormMigrator.HasTable(&tables.TableVirtualKeyProviderConfigKey{}) {
-			if err := gormMigrator.CreateTable(&tables.TableVirtualKeyProviderConfigKey{}); err != nil {
-				return fmt.Errorf("failed to create join table for provider config keys: %w", err)
+			// Create the join table if it doesn't exist
+			if !gormMigrator.HasTable(&tables.TableVirtualKeyProviderConfigKey{}) {
+				if err := gormMigrator.CreateTable(&tables.TableVirtualKeyProviderConfigKey{}); err != nil {
+					return fmt.Errorf("failed to create join table for provider config keys: %w", err)
+				}
 			}
-		}
 
 			// Step 2: Migrate existing key associations from virtual key to provider config level
 			// Check if old join table exists
@@ -1276,4 +1322,4 @@ func migrationAddPluginVersionColumn(ctx context.Context, db *gorm.DB) error {
 		return fmt.Errorf("error while running add plugin version column migration: %s", err.Error())
 	}
 	return nil
-}
+}

framework/configstore/tables/key.go

@@ -19,6 +19,7 @@ type TableKey struct {
 	Value      string    `gorm:"type:text;not null" json:"value"`
 	ModelsJSON string    `gorm:"type:text" json:"-"` // JSON serialized []string
 	Weight     float64   `gorm:"default:1.0" json:"weight"`
+	Enabled    *bool     `gorm:"default:true" json:"enabled,omitempty"`
 	CreatedAt  time.Time `gorm:"index;not null" json:"created_at"`
 	UpdatedAt  time.Time `gorm:"index;not null" json:"updated_at"`
 
@@ -64,6 +65,11 @@ func (k *TableKey) BeforeSave(tx *gorm.DB) error {
 		k.ModelsJSON = "[]"
 	}
 
+	if k.Enabled == nil {
+		enabled := true // DB default
+		k.Enabled = &enabled
+	}
+
 	if k.AzureKeyConfig != nil {
 		if k.AzureKeyConfig.Endpoint != "" {
 			k.AzureEndpoint = &k.AzureKeyConfig.Endpoint
@@ -168,6 +174,11 @@ func (k *TableKey) AfterFind(tx *gorm.DB) error {
 		}
 	}
 
+	if k.Enabled == nil {
+		enabled := true // DB default
+		k.Enabled = &enabled
+	}
+
 	// Reconstruct Azure config if fields are present
 	if k.AzureEndpoint != nil {
 		azureConfig := &schemas.AzureKeyConfig{

transports/bifrost-http/lib/config.go

@@ -1383,10 +1383,11 @@ func (c *Config) GetProviderConfigRedacted(provider schemas.ModelProvider) (*con
 	redactedConfig.Keys = make([]schemas.Key, len(config.Keys))
 	for i, key := range config.Keys {
 		redactedConfig.Keys[i] = schemas.Key{
-			ID:     key.ID,
-			Name:   key.Name,
-			Models: key.Models, // Copy slice reference - read-only so safe
-			Weight: key.Weight,
+			ID:      key.ID,
+			Name:    key.Name,
+			Models:  key.Models, // Copy slice reference - read-only so safe
+			Weight:  key.Weight,
+			Enabled: key.Enabled,
 		}
 
 		// Redact API key value

transports/changelog.md

@@ -0,0 +1,2 @@
+fix: vertex and bedrock usage aggregation improvements for streaming
+fix: choice index fixed to 0 for anthropic and bedrock streaming