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

* fix(functions): respect when selected from string * fix(toolschoice): decode both string and objects
mudler · Apr 1, 2024 · e8f02c0 · e8f02c0
1 parent ebb1fce
commit e8f02c0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/core/config/backend_config.go b/core/config/backend_config.go
@@ -185,7 +185,12 @@ func (c *BackendConfig) ShouldCallSpecificFunction() bool {
 }
 
 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) {

diff --git a/core/http/endpoints/openai/request.go b/core/http/endpoints/openai/request.go
@@ -146,7 +146,14 @@ func updateRequestConfig(config *config.BackendConfig, input *schema.OpenAIReque
 
 	if input.ToolsChoice != nil {
 		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{}{
 			"name": toolChoice.Function.Name,
 		}