Skip to content

feat: bifrost error added #11

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

Closed
Pratham-Mishra04 wants to merge 1 commit into from
Closed

feat: bifrost error added #11

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
119 changes: 94 additions & 25 deletions bifrost.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const (
type ChannelMessage struct {
interfaces.BifrostRequest
Response chan *interfaces.BifrostResponse
Err chan error
Err chan interfaces.BifrostError
Type RequestType
}

Expand Down Expand Up @@ -107,7 +107,8 @@ func Init(account interfaces.Account, plugins []interfaces.Plugin, logger interf
for _, providerKey := range providerKeys {
config, err := bifrost.account.GetConfigForProvider(providerKey)
if err != nil {
return nil, fmt.Errorf("failed to get config for provider: %v", err)
bifrost.logger.Warn(fmt.Sprintf("failed to get config for provider, skipping init: %v", err))
continue
}

if err := bifrost.prepareProvider(providerKey, config); err != nil {
Expand Down Expand Up @@ -176,29 +177,47 @@ func (bifrost *Bifrost) processRequests(provider interfaces.Provider, queue chan
for req := range queue {
var result *interfaces.BifrostResponse
var err error
var bifrostError *interfaces.BifrostError

key, err := bifrost.SelectKeyFromProviderForModel(provider.GetProviderKey(), req.Model)
if err != nil {
req.Err <- err
req.Err <- interfaces.BifrostError{
IsBifrostError: false,
Error: interfaces.ErrorField{
Message: err.Error(),
Error: err,
},
}

continue
}

if req.Type == TextCompletionRequest {
if req.Input.TextCompletionInput == nil {
err = fmt.Errorf("text not provided for text completion request")
bifrostError = &interfaces.BifrostError{
IsBifrostError: false,
Error: interfaces.ErrorField{
Message: "text not provided for text completion request",
},
}
} else {
result, err = provider.TextCompletion(req.Model, key, *req.Input.TextCompletionInput, req.Params)
result, bifrostError = provider.TextCompletion(req.Model, key, *req.Input.TextCompletionInput, req.Params)
}
} else if req.Type == ChatCompletionRequest {
if req.Input.ChatCompletionInput == nil {
err = fmt.Errorf("chats not provided for chat completion request")
bifrostError = &interfaces.BifrostError{
IsBifrostError: false,
Error: interfaces.ErrorField{
Message: "chats not provided for chat completion request",
},
}
} else {
result, err = provider.ChatCompletion(req.Model, key, *req.Input.ChatCompletionInput, req.Params)
result, bifrostError = provider.ChatCompletion(req.Model, key, *req.Input.ChatCompletionInput, req.Params)
}
}

if err != nil {
req.Err <- err
if bifrostError != nil {
req.Err <- *bifrostError
} else {
req.Response <- result
}
Expand Down Expand Up @@ -237,28 +256,48 @@ func (bifrost *Bifrost) GetProviderQueue(providerKey interfaces.SupportedModelPr
return queue, nil
}

func (bifrost *Bifrost) TextCompletionRequest(providerKey interfaces.SupportedModelProvider, req *interfaces.BifrostRequest, ctx context.Context) (*interfaces.BifrostResponse, error) {
func (bifrost *Bifrost) TextCompletionRequest(providerKey interfaces.SupportedModelProvider, req *interfaces.BifrostRequest, ctx context.Context) (*interfaces.BifrostResponse, *interfaces.BifrostError) {
if req == nil {
return nil, fmt.Errorf("bifrost request cannot be nil")
return nil, &interfaces.BifrostError{
IsBifrostError: false,
Error: interfaces.ErrorField{
Message: "bifrost request cannot be nil",
},
}
}

queue, err := bifrost.GetProviderQueue(providerKey)
if err != nil {
return nil, err
return nil, &interfaces.BifrostError{
IsBifrostError: false,
Error: interfaces.ErrorField{
Message: err.Error(),
},
}
}

responseChan := make(chan *interfaces.BifrostResponse)
errorChan := make(chan error)
errorChan := make(chan interfaces.BifrostError)

for _, plugin := range bifrost.plugins {
req, err = plugin.PreHook(&ctx, req)
if err != nil {
return nil, err
return nil, &interfaces.BifrostError{
IsBifrostError: false,
Error: interfaces.ErrorField{
Message: err.Error(),
},
}
}
}

if req == nil {
return nil, fmt.Errorf("bifrost request after plugin hooks cannot be nil")
return nil, &interfaces.BifrostError{
IsBifrostError: false,
Error: interfaces.ErrorField{
Message: "bifrost request after plugin hooks cannot be nil",
},
}
}

queue <- ChannelMessage{
Expand All @@ -275,38 +314,63 @@ func (bifrost *Bifrost) TextCompletionRequest(providerKey interfaces.SupportedMo
result, err = bifrost.plugins[i].PostHook(&ctx, result)

if err != nil {
return nil, err
return nil, &interfaces.BifrostError{
IsBifrostError: false,
Error: interfaces.ErrorField{
Message: err.Error(),
},
}
}
}

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

func (bifrost *Bifrost) ChatCompletionRequest(providerKey interfaces.SupportedModelProvider, req *interfaces.BifrostRequest, ctx context.Context) (*interfaces.BifrostResponse, error) {
func (bifrost *Bifrost) ChatCompletionRequest(providerKey interfaces.SupportedModelProvider, req *interfaces.BifrostRequest, ctx context.Context) (*interfaces.BifrostResponse, *interfaces.BifrostError) {
if req == nil {
return nil, fmt.Errorf("bifrost request cannot be nil")
return nil, &interfaces.BifrostError{
IsBifrostError: false,
Error: interfaces.ErrorField{
Message: "bifrost request cannot be nil",
},
}
}

queue, err := bifrost.GetProviderQueue(providerKey)
if err != nil {
return nil, err
return nil, &interfaces.BifrostError{
IsBifrostError: false,
Error: interfaces.ErrorField{
Message: err.Error(),
},
}
}

responseChan := make(chan *interfaces.BifrostResponse)
errorChan := make(chan error)
errorChan := make(chan interfaces.BifrostError)

for _, plugin := range bifrost.plugins {
req, err = plugin.PreHook(&ctx, req)
if err != nil {
return nil, err
return nil, &interfaces.BifrostError{
IsBifrostError: false,
Error: interfaces.ErrorField{
Message: err.Error(),
},
}
}
}

if req == nil {
return nil, fmt.Errorf("bifrost request after pre plugin hooks cannot be nil")
return nil, &interfaces.BifrostError{
IsBifrostError: false,
Error: interfaces.ErrorField{
Message: "bifrost request after plugin hooks cannot be nil",
},
}
}

queue <- ChannelMessage{
Expand All @@ -323,13 +387,18 @@ func (bifrost *Bifrost) ChatCompletionRequest(providerKey interfaces.SupportedMo
result, err = bifrost.plugins[i].PostHook(&ctx, result)

if err != nil {
return nil, err
return nil, &interfaces.BifrostError{
IsBifrostError: false,
Error: interfaces.ErrorField{
Message: err.Error(),
},
}
}
}

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

Expand Down
17 changes: 17 additions & 0 deletions interfaces/bifrost.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,3 +228,20 @@ type BifrostResponse struct {
Usage LLMUsage `json:"usage"`
ExtraFields BifrostResponseExtraFields `json:"extra_fields"`
}

type BifrostError struct {
EventID *string `json:"event_id"`
Type *string `json:"type"`
IsBifrostError bool `json:"is_bifrost_error"`
StatusCode *int `json:"status_code"`
Error ErrorField `json:"error"`
}

type ErrorField struct {
Type *string `json:"type"`
Code *string `json:"code"`
Message string `json:"message"`
Error error `json:"error"`
Param interface{} `json:"param"`
EventID *string `json:"event_id"`
}
5 changes: 3 additions & 2 deletions interfaces/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,12 @@ type ProviderConfig struct {
NetworkConfig NetworkConfig `json:"network_config"`
MetaConfig *MetaConfig `json:"meta_config,omitempty"`
ConcurrencyAndBufferSize ConcurrencyAndBufferSize `json:"concurrency_and_buffer_size"`
Logger Logger `json:"logger"`
}

// Provider defines the interface for AI model providers
type Provider interface {
GetProviderKey() SupportedModelProvider
TextCompletion(model, key, text string, params *ModelParameters) (*BifrostResponse, error)
ChatCompletion(model, key string, messages []Message, params *ModelParameters) (*BifrostResponse, error)
TextCompletion(model, key, text string, params *ModelParameters) (*BifrostResponse, *BifrostError)
ChatCompletion(model, key string, messages []Message, params *ModelParameters) (*BifrostResponse, *BifrostError)
}
Loading