dearwolf/LocalAI
1
0
Fork 0
mirror of https://github.com/mudler/LocalAI.git synced 2025-05-21 19:15:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Make functions more compatible with OpenAI specs

Browse source
This commit is contained in:
mudler 2023-07-09 10:02:09 +02:00
parent 4de7f55f2f
commit bbc4468908
1 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

25
api/openai.go
View file

@ -77,7 +77,7 @@ type Message struct {
// The message role // The message role
Role string `json:"role,omitempty" yaml:"role"` Role string `json:"role,omitempty" yaml:"role"`
// The message content // The message content
Content string `json:"content,omitempty" yaml:"content"` Content *string `json:"content" yaml:"content"`
// A result of a function call // A result of a function call
FunctionCall interface{} `json:"function_call,omitempty" yaml:"function_call,omitempty"` FunctionCall interface{} `json:"function_call,omitempty" yaml:"function_call,omitempty"`
} }
@ -392,7 +392,7 @@ func chatEndpoint(cm *ConfigMerger, o *Option) func(c *fiber.Ctx) error {
ComputeChoices(s, req, config, o, loader, func(s string, c *[]Choice) {}, func(s string) bool { ComputeChoices(s, req, config, o, loader, func(s string, c *[]Choice) {}, func(s string) bool {
resp := OpenAIResponse{ resp := OpenAIResponse{
Model: req.Model, // we have to return what the user sent here, due to OpenAI spec. Model: req.Model, // we have to return what the user sent here, due to OpenAI spec.
Choices: []Choice{{Delta: &Message{Content: s}, Index: 0}}, Choices: []Choice{{Delta: &Message{Content: &s}, Index: 0}},
Object: "chat.completion.chunk", Object: "chat.completion.chunk",
} }
log.Debug().Msgf("Sending goroutine: %s", s) log.Debug().Msgf("Sending goroutine: %s", s)
@ -460,12 +460,15 @@ func chatEndpoint(cm *ConfigMerger, o *Option) func(c *fiber.Ctx) error {
} }
} }
r := config.Roles[role] r := config.Roles[role]
contentExists := i.Content != nil && *i.Content != ""
if r != "" { if r != "" {
content = fmt.Sprint(r, " ", i.Content) if contentExists {
content = fmt.Sprint(r, " ", *i.Content)
}
if i.FunctionCall != nil { if i.FunctionCall != nil {
j, err := json.Marshal(i.FunctionCall) j, err := json.Marshal(i.FunctionCall)
if err == nil { if err == nil {
if i.Content != "" { if contentExists {
content += "\n" + fmt.Sprint(r, " ", string(j)) content += "\n" + fmt.Sprint(r, " ", string(j))
} else { } else {
content = fmt.Sprint(r, " ", string(j)) content = fmt.Sprint(r, " ", string(j))
@ -473,11 +476,13 @@ func chatEndpoint(cm *ConfigMerger, o *Option) func(c *fiber.Ctx) error {
} }
} }
} else { } else {
content = i.Content if contentExists {
content = fmt.Sprint(*i.Content)
}
if i.FunctionCall != nil { if i.FunctionCall != nil {
j, err := json.Marshal(i.FunctionCall) j, err := json.Marshal(i.FunctionCall)
if err == nil { if err == nil {
if i.Content != "" { if contentExists {
content += "\n" + string(j) content += "\n" + string(j)
} else { } else {
content = string(j) content = string(j)
@ -600,7 +605,7 @@ func chatEndpoint(cm *ConfigMerger, o *Option) func(c *fiber.Ctx) error {
message = Finetune(*config, predInput, message) message = Finetune(*config, predInput, message)
log.Debug().Msgf("Reply received from LLM(finetuned): %s", message) log.Debug().Msgf("Reply received from LLM(finetuned): %s", message)
*c = append(*c, Choice{Message: &Message{Role: "assistant", Content: message}}) *c = append(*c, Choice{Message: &Message{Role: "assistant", Content: &message}})
return return
} }
} }
@ -623,18 +628,18 @@ func chatEndpoint(cm *ConfigMerger, o *Option) func(c *fiber.Ctx) error {
} }
prediction = Finetune(*config, predInput, prediction) prediction = Finetune(*config, predInput, prediction)
*c = append(*c, Choice{Message: &Message{Role: "assistant", Content: prediction}}) *c = append(*c, Choice{Message: &Message{Role: "assistant", Content: &prediction}})
} else { } else {
// otherwise reply with the function call // otherwise reply with the function call
*c = append(*c, Choice{ *c = append(*c, Choice{
FinishReason: "function_call", FinishReason: "function_call",
Message: &Message{Role: "function", FunctionCall: ss}, Message: &Message{Role: "assistant", FunctionCall: ss},
}) })
} }
return return
} }
*c = append(*c, Choice{Message: &Message{Role: "assistant", Content: s}}) *c = append(*c, Choice{Message: &Message{Role: "assistant", Content: &s}})
}, nil) }, nil)
if err != nil { if err != nil {
return err return err