ExternalVendorCode/LocalAI
1
0
Fork 0
mirror of https://github.com/mudler/LocalAI.git synced 2024-12-18 20:27:57 +00:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

fix(functions): respect when selected from string (#1940)

Browse Source 
* fix(functions): respect when selected from string

* fix(toolschoice): decode both string and objects
This commit is contained in:
Ettore Di Giacinto 2024-04-01 19:39:54 +02:00 committed by GitHub
parent ebb1fcedea
commit e8f02c083f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/config/backend_config.go
View File

@ -185,7 +185,12 @@ func (c *BackendConfig) ShouldCallSpecificFunction() bool {
} }
func (c *BackendConfig) FunctionToCall() string { func (c *BackendConfig) FunctionToCall() string {
return c.functionCallNameString if c.functionCallNameString != "" &&
c.functionCallNameString != "none" && c.functionCallNameString != "auto" {
return c.functionCallNameString
}
return c.functionCallString
} }
func (cfg *BackendConfig) SetDefaults(opts ...ConfigLoaderOption) { func (cfg *BackendConfig) SetDefaults(opts ...ConfigLoaderOption) {

9
core/http/endpoints/openai/request.go
View File

@ -146,7 +146,14 @@ func updateRequestConfig(config *config.BackendConfig, input *schema.OpenAIReque
if input.ToolsChoice != nil { if input.ToolsChoice != nil {
var toolChoice grammar.Tool var toolChoice grammar.Tool
json.Unmarshal([]byte(input.ToolsChoice.(string)), &toolChoice)
switch content := input.ToolsChoice.(type) {
case string:
_ = json.Unmarshal([]byte(content), &toolChoice)
case map[string]interface{}:
dat, _ := json.Marshal(content)
_ = json.Unmarshal(dat, &toolChoice)
}
input.FunctionCall = map[string]interface{}{ input.FunctionCall = map[string]interface{}{
"name": toolChoice.Function.Name, "name": toolChoice.Function.Name,
} }