Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
35 changes: 27 additions & 8 deletions bifrost.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,23 +32,32 @@ type Bifrost struct {
account interfaces.Account
providers []interfaces.Provider // list of processed providers
plugins []interfaces.Plugin
configs map[interfaces.SupportedModelProvider]interfaces.ProviderConfig
requestQueues map[interfaces.SupportedModelProvider]chan ChannelMessage // provider request queues
wg map[interfaces.SupportedModelProvider]*sync.WaitGroup
}

func createProviderFromProviderKey(providerKey interfaces.SupportedModelProvider) (interfaces.Provider, error) {
func createProviderFromProviderKey(providerKey interfaces.SupportedModelProvider, config *interfaces.ProviderConfig) (interfaces.Provider, error) {
switch providerKey {
case interfaces.OpenAI:
return providers.NewOpenAIProvider(), nil
return providers.NewOpenAIProvider(config), nil
case interfaces.Anthropic:
return providers.NewAnthropicProvider(), nil
return providers.NewAnthropicProvider(config), nil
default:
return nil, fmt.Errorf("unsupported provider: %s", providerKey)
}
}

func (bifrost *Bifrost) prepareProvider(providerKey interfaces.SupportedModelProvider) error {
provider, err := createProviderFromProviderKey(providerKey)
func getConfigForProvider(providerKey interfaces.SupportedModelProvider, configs map[interfaces.SupportedModelProvider]interfaces.ProviderConfig) (*interfaces.ProviderConfig, error) {
if config, ok := configs[providerKey]; ok {
return &config, nil
}

return nil, fmt.Errorf("no config found for provider: %s", providerKey)
}

func (bifrost *Bifrost) prepareProvider(providerKey interfaces.SupportedModelProvider, config *interfaces.ProviderConfig) error {
provider, err := createProviderFromProviderKey(providerKey, config)
if err != nil {
return fmt.Errorf("failed to get provider for the given key: %v", err)
}
Expand Down Expand Up @@ -80,7 +89,7 @@ func (bifrost *Bifrost) prepareProvider(providerKey interfaces.SupportedModelPro
}

// Initializes infinite listening channels for each provider
func Init(account interfaces.Account, plugins []interfaces.Plugin) (*Bifrost, error) {
func Init(account interfaces.Account, plugins []interfaces.Plugin, configs map[interfaces.SupportedModelProvider]interfaces.ProviderConfig) (*Bifrost, error) {
bifrost := &Bifrost{account: account, plugins: plugins}
bifrost.wg = make(map[interfaces.SupportedModelProvider]*sync.WaitGroup)

Expand All @@ -93,7 +102,12 @@ func Init(account interfaces.Account, plugins []interfaces.Plugin) (*Bifrost, er

// Create buffered channels for each provider and start workers
for _, providerKey := range providerKeys {
if err := bifrost.prepareProvider(providerKey); err != nil {
config, err := getConfigForProvider(providerKey, configs)
if err != nil {
return nil, fmt.Errorf("failed to get config for provider: %v", err)
}

if err := bifrost.prepareProvider(providerKey, config); err != nil {
fmt.Printf("failed to prepare provider: %v", err)
}
}
Expand Down Expand Up @@ -200,7 +214,12 @@ func (bifrost *Bifrost) GetProviderQueue(providerKey interfaces.SupportedModelPr
var exists bool

if queue, exists = bifrost.requestQueues[providerKey]; !exists {
if err := bifrost.prepareProvider(providerKey); err != nil {
config, err := getConfigForProvider(providerKey, bifrost.configs)
if err != nil {
return nil, fmt.Errorf("failed to get config for provider: %v", err)
}

if err := bifrost.prepareProvider(providerKey, config); err != nil {
return nil, err
}

Expand Down
21 changes: 21 additions & 0 deletions interfaces/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,27 @@ type ImageContent struct {
// return nil
// }

type NetworkConfig struct {
DefaultRequestTimeoutInSeconds int `json:"defaultRequestTimeoutInSeconds"`
}

type MetaConfig struct {
BedrockMetaConfig *BedrockMetaConfig `json:"bedrockMetaConfig"`
}

type ProviderConfig struct {
NetworkConfig NetworkConfig `json:"networkConfig"`
MetaConfig *MetaConfig `json:"metaConfig"`
}

type BedrockMetaConfig struct {
SecretAccessKey string `json:"secretAccessKey"`
Region *string `json:"region"`
SessionToken *string `json:"sessionToken"`
ARN *string `json:"arn"`
InferenceProfiles map[string]string `json:"inferenceProfiles"`
}

// Provider defines the interface for AI model providers
type Provider interface {
GetProviderKey() SupportedModelProvider
Expand Down
5 changes: 2 additions & 3 deletions providers/anthropic.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,9 @@ type AnthropicProvider struct {
}

// NewAnthropicProvider creates a new AnthropicProvider instance
func NewAnthropicProvider() *AnthropicProvider {
func NewAnthropicProvider(config *interfaces.ProviderConfig) *AnthropicProvider {
return &AnthropicProvider{
// @comment let us have this be controllable
client: &http.Client{Timeout: 30 * time.Second},
client: &http.Client{Timeout: time.Second * time.Duration(config.NetworkConfig.DefaultRequestTimeoutInSeconds)},
}
}

Expand Down
4 changes: 2 additions & 2 deletions providers/openai.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ type OpenAIProvider struct {
}

// NewOpenAIProvider creates a new OpenAI provider instance
func NewOpenAIProvider() *OpenAIProvider {
func NewOpenAIProvider(config *interfaces.ProviderConfig) *OpenAIProvider {
return &OpenAIProvider{
client: &http.Client{Timeout: time.Second * 30},
client: &http.Client{Timeout: time.Second * time.Duration(config.NetworkConfig.DefaultRequestTimeoutInSeconds)},
}
}

Expand Down
15 changes: 14 additions & 1 deletion tests/setup.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,20 @@ func getBifrost() (*bifrost.Bifrost, error) {
return nil, err
}

bifrost, err := bifrost.Init(&account, []interfaces.Plugin{plugin})
configs := map[interfaces.SupportedModelProvider]interfaces.ProviderConfig{
interfaces.OpenAI: {
NetworkConfig: interfaces.NetworkConfig{
DefaultRequestTimeoutInSeconds: 30,
},
},
interfaces.Anthropic: {
NetworkConfig: interfaces.NetworkConfig{
DefaultRequestTimeoutInSeconds: 30,
},
},
}

bifrost, err := bifrost.Init(&account, []interfaces.Plugin{plugin}, configs)
if err != nil {
return nil, err
}
Expand Down