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
103 changes: 68 additions & 35 deletions bifrost.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,26 +19,19 @@ const (
ChatCompletionRequest RequestType = "chat_completion"
)

// Request represents a generic request for text or chat completion
type Request struct {
Model string
Input RequestInput
Params *interfaces.ModelParameters
type ChannelMessage struct {
interfaces.BifrostRequest
Response chan *interfaces.CompletionResult
Err chan error
Type RequestType
}

type RequestInput struct {
StringInput *string
MessageInput *[]interfaces.Message
}

// Bifrost manages providers and maintains infinite open channels
type Bifrost struct {
account interfaces.Account
providers []interfaces.Provider // list of processed providers
requestQueues map[interfaces.SupportedModelProvider]chan Request // provider request queues
providers []interfaces.Provider // list of processed providers
plugins []interfaces.Plugin
requestQueues map[interfaces.SupportedModelProvider]chan ChannelMessage // provider request queues
wg map[interfaces.SupportedModelProvider]*sync.WaitGroup
}

Expand Down Expand Up @@ -70,7 +63,7 @@ func (bifrost *Bifrost) prepareProvider(providerKey interfaces.SupportedModelPro
return fmt.Errorf("failed to get keys for provider: %v", err)
}

queue := make(chan Request, concurrencyAndBuffer.BufferSize) // Buffered channel per provider
queue := make(chan ChannelMessage, concurrencyAndBuffer.BufferSize) // Buffered channel per provider

bifrost.requestQueues[provider.GetProviderKey()] = queue

Expand All @@ -86,16 +79,16 @@ func (bifrost *Bifrost) prepareProvider(providerKey interfaces.SupportedModelPro
}

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

providerKeys, err := bifrost.account.GetInitiallyConfiguredProviderKeys()
if err != nil {
return nil, err
}

bifrost.requestQueues = make(map[interfaces.SupportedModelProvider]chan Request)
bifrost.requestQueues = make(map[interfaces.SupportedModelProvider]chan ChannelMessage)

// Create buffered channels for each provider and start workers
for _, providerKey := range providerKeys {
Expand Down Expand Up @@ -162,7 +155,7 @@ func (bifrost *Bifrost) SelectKeyFromProviderForModel(provider interfaces.Provid
return supportedKeys[len(supportedKeys)-1].Value, nil
}

func (bifrost *Bifrost) processRequests(provider interfaces.Provider, queue chan Request) {
func (bifrost *Bifrost) processRequests(provider interfaces.Provider, queue chan ChannelMessage) {
defer bifrost.wg[provider.GetProviderKey()].Done()

for req := range queue {
Expand Down Expand Up @@ -201,8 +194,8 @@ func (bifrost *Bifrost) GetConfiguredProviderFromProviderKey(key interfaces.Supp
return nil, fmt.Errorf("no provider found for key: %s", key)
}

func (bifrost *Bifrost) GetProviderQueue(providerKey interfaces.SupportedModelProvider) (chan Request, error) {
var queue chan Request
func (bifrost *Bifrost) GetProviderQueue(providerKey interfaces.SupportedModelProvider) (chan ChannelMessage, error) {
var queue chan ChannelMessage
var exists bool

if queue, exists = bifrost.requestQueues[providerKey]; !exists {
Expand All @@ -216,7 +209,7 @@ func (bifrost *Bifrost) GetProviderQueue(providerKey interfaces.SupportedModelPr
return queue, nil
}

func (bifrost *Bifrost) TextCompletionRequest(providerKey interfaces.SupportedModelProvider, model, text string, params *interfaces.ModelParameters) (*interfaces.CompletionResult, error) {
func (bifrost *Bifrost) TextCompletionRequest(providerKey interfaces.SupportedModelProvider, req *interfaces.BifrostRequest) (*interfaces.CompletionResult, error) {
queue, err := bifrost.GetProviderQueue(providerKey)
if err != nil {
return nil, err
Expand All @@ -225,24 +218,44 @@ func (bifrost *Bifrost) TextCompletionRequest(providerKey interfaces.SupportedMo
responseChan := make(chan *interfaces.CompletionResult)
errorChan := make(chan error)

queue <- Request{
Model: model,
Input: RequestInput{StringInput: &text},
Params: params,
Response: responseChan,
Err: errorChan,
Type: TextCompletionRequest,
for _, plugin := range bifrost.plugins {
if req.PluginParams == nil {
req.PluginParams = make(map[string]interface{})
}

req, err = plugin.PreHook(req)

if err != nil {
return nil, err
}
}

queue <- ChannelMessage{
BifrostRequest: *req,
Response: responseChan,
Err: errorChan,
Type: TextCompletionRequest,
}

select {
case result := <-responseChan:
result.PluginParams = req.PluginParams

for _, plugin := range bifrost.plugins {
result, err = plugin.PostHook(result)

if err != nil {
return nil, err
}
}

return result, nil
case err := <-errorChan:
return nil, err
}
}

func (bifrost *Bifrost) ChatCompletionRequest(providerKey interfaces.SupportedModelProvider, model string, messages []interfaces.Message, params *interfaces.ModelParameters) (*interfaces.CompletionResult, error) {
func (bifrost *Bifrost) ChatCompletionRequest(providerKey interfaces.SupportedModelProvider, req *interfaces.BifrostRequest) (*interfaces.CompletionResult, error) {
queue, err := bifrost.GetProviderQueue(providerKey)
if err != nil {
return nil, err
Expand All @@ -251,18 +264,38 @@ func (bifrost *Bifrost) ChatCompletionRequest(providerKey interfaces.SupportedMo
responseChan := make(chan *interfaces.CompletionResult)
errorChan := make(chan error)

queue <- Request{
Model: model,
Input: RequestInput{MessageInput: &messages},
Params: params,
Response: responseChan,
Err: errorChan,
Type: ChatCompletionRequest,
for _, plugin := range bifrost.plugins {
if req.PluginParams == nil {
req.PluginParams = make(map[string]interface{})
}

req, err = plugin.PreHook(req)

if err != nil {
return nil, err
}
}

queue <- ChannelMessage{
BifrostRequest: *req,
Response: responseChan,
Err: errorChan,
Type: ChatCompletionRequest,
}

// Wait for response
select {
case result := <-responseChan:
result.PluginParams = req.PluginParams

for _, plugin := range bifrost.plugins {
result, err = plugin.PostHook(result)

if err != nil {
return nil, err
}
}

return result, nil
case err := <-errorChan:
return nil, err
Expand Down
2 changes: 2 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ module bifrost
go 1.21.1

require github.com/joho/godotenv v1.5.1

require github.com/maximhq/maxim-go v0.1.1 // indirect
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
github.com/maximhq/maxim-go v0.1.1 h1:69uUQjjDPmUGcKg/M4/3AO0fbD+70Agt66pH/UCsI5M=
github.com/maximhq/maxim-go v0.1.1/go.mod h1:0+UTWM7UZwNNE5VnljLtr/vpRGtYP8r/2q9WDwlLWFw=
18 changes: 18 additions & 0 deletions interfaces/plugin.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package interfaces

type RequestInput struct {
StringInput *string
MessageInput *[]Message
}

type BifrostRequest struct {
Model string
Input RequestInput
Params *ModelParameters
PluginParams map[string]interface{}
}

type Plugin interface {
PreHook(req *BifrostRequest) (*BifrostRequest, error)
PostHook(result *CompletionResult) (*CompletionResult, error)
}
3 changes: 2 additions & 1 deletion interfaces/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,8 @@ type CompletionResult struct {
Cost *LLMInteractionCost `json:"cost"`
Model string `json:"model"`
Created string `json:"created"`
ModelParams *interface{} `json:"modelParams"`
Params *interface{} `json:"modelParams"`
PluginParams map[string]interface{} `json:"-"`
Trace *struct {
Input interface{} `json:"input"`
Output interface{} `json:"output"`
Expand Down
6 changes: 3 additions & 3 deletions tests/account.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ import (
type BaseAccount struct{}

// GetInitiallyConfiguredProviderKeys returns all provider keys
func (ba *BaseAccount) GetInitiallyConfiguredProviderKeys() ([]interfaces.SupportedModelProvider, error) {
func (baseAccount *BaseAccount) GetInitiallyConfiguredProviderKeys() ([]interfaces.SupportedModelProvider, error) {
return []interfaces.SupportedModelProvider{interfaces.OpenAI, interfaces.Anthropic}, nil
}

// GetKeysForProvider returns all keys associated with a provider
func (ba *BaseAccount) GetKeysForProvider(provider interfaces.Provider) ([]interfaces.Key, error) {
func (baseAccount *BaseAccount) GetKeysForProvider(provider interfaces.Provider) ([]interfaces.Key, error) {
switch provider.GetProviderKey() {
case interfaces.OpenAI:
return []interfaces.Key{
Expand All @@ -39,7 +39,7 @@ func (ba *BaseAccount) GetKeysForProvider(provider interfaces.Provider) ([]inter
}

// GetConcurrencyAndBufferSizeForProvider returns the concurrency and buffer size settings for a provider
func (ba *BaseAccount) GetConcurrencyAndBufferSizeForProvider(provider interfaces.Provider) (*interfaces.ConcurrencyAndBufferSize, error) {
func (baseAccount *BaseAccount) GetConcurrencyAndBufferSizeForProvider(provider interfaces.Provider) (*interfaces.ConcurrencyAndBufferSize, error) {
switch provider.GetProviderKey() {
case interfaces.OpenAI:
return &interfaces.ConcurrencyAndBufferSize{
Expand Down
22 changes: 18 additions & 4 deletions tests/anthropic_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,28 @@ func setupAnthropicRequests(bifrost *bifrost.Bifrost) {
}

go func() {
config := interfaces.ModelParameters{
params := interfaces.ModelParameters{
ExtraParams: map[string]interface{}{
"max_tokens_to_sample": 4096,
},
}
text := "Hello world!"

result, err := bifrost.TextCompletionRequest(interfaces.Anthropic, "claude-2.1", "Hello world!", &config)
result, err := bifrost.TextCompletionRequest(interfaces.Anthropic, &interfaces.BifrostRequest{
Model: "claude-2.1",
Input: interfaces.RequestInput{
StringInput: &text,
},
Params: &params,
})
if err != nil {
fmt.Println("Error:", err)
} else {
fmt.Println("🤖 Text Completion Result:", result.Choices[0].Message.Content)
}
}()

config := interfaces.ModelParameters{
params := interfaces.ModelParameters{
ExtraParams: map[string]interface{}{
"max_tokens": 4096,
},
Expand All @@ -48,7 +55,14 @@ func setupAnthropicRequests(bifrost *bifrost.Bifrost) {
Content: &msg,
},
}
result, err := bifrost.ChatCompletionRequest(interfaces.Anthropic, "claude-3-7-sonnet-20250219", messages, &config)
result, err := bifrost.ChatCompletionRequest(interfaces.Anthropic, &interfaces.BifrostRequest{
Model: "claude-3-7-sonnet-20250219",
Input: interfaces.RequestInput{
MessageInput: &messages,
},
Params: &params,
})

if err != nil {
fmt.Printf("Error in Anthropic request %d: %v\n", index+1, err)
} else {
Expand Down
18 changes: 16 additions & 2 deletions tests/openai_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,17 @@ import (

// setupOpenAIRequests sends multiple test requests to OpenAI
func setupOpenAIRequests(bifrost *bifrost.Bifrost) {
text := "Hello world!"

// Text completion request
go func() {
result, err := bifrost.TextCompletionRequest(interfaces.OpenAI, "gpt-4o-mini", "Hello world!", nil)
result, err := bifrost.TextCompletionRequest(interfaces.OpenAI, &interfaces.BifrostRequest{
Model: "gpt-4o-mini",
Input: interfaces.RequestInput{
StringInput: &text,
},
Params: nil,
})
if err != nil {
fmt.Println("Error:", err)
} else {
Expand All @@ -38,7 +46,13 @@ func setupOpenAIRequests(bifrost *bifrost.Bifrost) {
Content: &msg,
},
}
result, err := bifrost.ChatCompletionRequest(interfaces.OpenAI, "gpt-4o-mini", messages, nil)
result, err := bifrost.ChatCompletionRequest(interfaces.OpenAI, &interfaces.BifrostRequest{
Model: "gpt-4o-mini",
Input: interfaces.RequestInput{
MessageInput: &messages,
},
Params: nil,
})
if err != nil {
fmt.Printf("Error in OpenAI request %d: %v\n", index+1, err)
} else {
Expand Down
38 changes: 38 additions & 0 deletions tests/plugin.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
package tests

import (
"bifrost/interfaces"
"fmt"
"time"

"github.com/maximhq/maxim-go"
"github.com/maximhq/maxim-go/logging"
)

type Plugin struct {
logger *logging.Logger
}

func (plugin *Plugin) PreHook(req *interfaces.BifrostRequest) (*interfaces.BifrostRequest, error) {
traceID := time.Now().Format("20060102_150405000")

trace := plugin.logger.Trace(&logging.TraceConfig{
Id: traceID,
Name: maxim.StrPtr("bifrost"),
})

trace.SetInput(fmt.Sprintf("New Request Incoming: %v", req))

req.PluginParams["traceID"] = traceID

return req, nil
}

func (plugin *Plugin) PostHook(res *interfaces.CompletionResult) (*interfaces.CompletionResult, error) {
fmt.Println(res.PluginParams)

traceID := res.PluginParams["traceID"].(string)

plugin.logger.SetTraceOutput(traceID, fmt.Sprintf("Response: %v", res))
return res, nil
}
Loading