fix: google toolCall

Author: bincooo

internal/common/messages.go

@@ -18,6 +18,51 @@ func MessageCombiner[T any](
 	buffer := new(bytes.Buffer)
 	msgs := make([]map[string]string, 0)
 	for _, message := range messages {
+		if message.Is("role", "assistant") && message.Has("tool_calls") {
+			if buffer.Len() > 0 {
+				msgs = append(msgs, map[string]string{
+					"role":    previous,
+					"content": buffer.String(),
+				})
+				buffer.Reset()
+			}
+
+			previous = message.GetString("role")
+			toolCalls := message.GetSlice("tool_calls")
+			if len(toolCalls) == 0 {
+				continue
+			}
+
+			var toolCall pkg.Keyv[interface{}] = toolCalls[0].(map[string]interface{})
+			keyv := toolCall.GetKeyv("function")
+
+			msgs = append(msgs, map[string]string{
+				"tool_calls": "yes",
+				"role":       previous,
+				"name":       keyv.GetString("name"),
+				"content":    keyv.GetString("arguments"),
+			})
+			continue
+		}
+
+		if message.Is("role", "tool") || message.Is("role", "function") {
+			if buffer.Len() > 0 {
+				msgs = append(msgs, map[string]string{
+					"role":    previous,
+					"content": buffer.String(),
+				})
+				buffer.Reset()
+			}
+
+			previous = message.GetString("role")
+			msgs = append(msgs, map[string]string{
+				"role":    previous,
+				"name":    message.GetString("name"),
+				"content": message.GetString("content"),
+			})
+			continue
+		}
+
 		str := strings.TrimSpace(message.GetString("content"))
 		if str == "" {
 			continue
@@ -33,7 +78,7 @@ func MessageCombiner[T any](
 			continue
 		}
 
-		if previous == message["role"] {
+		if message.Is("role", previous) {
 			buffer.WriteString(str)
 			continue
 		}

internal/plugin/llm/gemini/adapter.go

@@ -12,6 +12,7 @@ import (
 	"github.com/bincooo/emit.io"
 	"github.com/gin-gonic/gin"
 	"net/http"
+	"net/url"
 	"reflect"
 	"strings"
 	"sync"
@@ -104,6 +105,10 @@ func complete(ctx *gin.Context) {
 	ctx.Set(ginTokens, tokens)
 	r, err := build(ctx.Request.Context(), proxies, cookie, newMessages, completion)
 	if err != nil {
+		var urlError *url.Error
+		if errors.As(err, &urlError) {
+			urlError.URL = strings.ReplaceAll(urlError.URL, cookie, "AIzaSy***")
+		}
 		response.Error(ctx, -1, err)
 		return
 	}

internal/plugin/llm/gemini/fetch.go

@@ -46,27 +46,65 @@ func build(ctx context.Context, proxies, token string, messages []map[string]int
 		completion.TopP = 0.95
 	}
 
+	toStrings := func(slice []interface{}) (values []string) {
+		for _, v := range slice {
+			values = append(values, v.(string))
+		}
+		return
+	}
+
+	condition := func(str string) string {
+		switch str {
+		case "string":
+			return "STRING"
+		case "boolean":
+			return "BOOLEAN"
+		case "number":
+			return "NUMBER"
+		default:
+			if strings.HasPrefix(str, "array") {
+				return "ARRAY"
+			}
+			return "OBJECT"
+		}
+	}
+
+	// fix: type 枚举必须符合google定义，否则报错400
+	// https://ai.google.dev/api/rest/v1beta/Schema?hl=zh-cn#type
+	var fix func(keyv pkg.Keyv[interface{}]) pkg.Keyv[interface{}]
+	{
+		fix = func(keyv pkg.Keyv[interface{}]) pkg.Keyv[interface{}] {
+			if keyv.Has("type") {
+				keyv.Set("type", condition(keyv.GetString("type")))
+			}
+			for k, _ := range keyv {
+				child := keyv.GetKeyv(k)
+				if child != nil {
+					keyv.Set(k, fix(child))
+				}
+			}
+			return keyv
+		}
+	}
+
 	// 参数基本与openai对齐
 	_funcDecls := make([]funcDecl, 0)
 	if toolsL := len(completion.Tools); toolsL > 0 {
 		for _, v := range completion.Tools {
 			kv := v.GetKeyv("function").GetKeyv("parameters")
-			required, ok := kv.Get("required")
-			if !ok {
-				required = []string{}
-			}
-
+			required := kv.GetSlice("required")
 			_funcDecls = append(_funcDecls, funcDecl{
+				// 必须为 a-z、A-Z、0-9，或包含下划线和短划线，长度上限为 63 个字符
 				Name:        strings.Replace(v.GetKeyv("function").GetString("name"), "-", "_", -1),
 				Description: v.GetKeyv("function").GetString("description"),
 				Params: struct {
 					Properties map[string]interface{} `json:"properties"`
 					Required   []string               `json:"required"`
 					Type       string                 `json:"type"`
 				}{
-					Properties: kv.GetKeyv("properties"),
-					Required:   required.([]string),
-					Type:       kv.GetString("function"),
+					Properties: fix(kv.GetKeyv("properties")),
+					Required:   toStrings(required),
+					Type:       condition(kv.GetString("type")),
 				},
 			})
 		}
@@ -120,7 +158,7 @@ func build(ctx context.Context, proxies, token string, messages []map[string]int
 		// 函数调用
 		payload["tools"] = []map[string]interface{}{
 			{
-				"function_declarations": _funcDecls,
+				"functionDeclarations": _funcDecls,
 			},
 		}
 	}
@@ -148,10 +186,10 @@ func build(ctx context.Context, proxies, token string, messages []map[string]int
 
 	if res.StatusCode != http.StatusOK {
 		h := res.Header
-		if c := h.Get("content-type"); strings.Contains(c, "application/json") {
+		if c := h.Get("content-type"); !strings.Contains(c, "text/html") {
 			bts, e := io.ReadAll(res.Body)
 			if e == nil {
-				return nil, fmt.Errorf("%s: %s", res.Status, bts)
+				logger.Errorf("%s", bts)
 			}
 		}
 		return nil, errors.New(res.Status)

internal/plugin/llm/gemini/message.go

@@ -171,7 +171,7 @@ func mergeMessages(messages []pkg.Keyv[interface{}]) (newMessages []map[string]i
 	// role类型转换
 	condition := func(expr string) string {
 		switch expr {
-		case "end":
+		case "function", "tool", "end":
 			return expr
 		case "assistant":
 			return "model"
@@ -185,18 +185,57 @@ func mergeMessages(messages []pkg.Keyv[interface{}]) (newMessages []map[string]i
 		tokens += com.CalcTokens(message["content"])
 		if condition(role) == condition(next) {
 			// cache buffer
-			if role == "function" {
-				buffer.WriteString(fmt.Sprintf("这是系统内置tools工具的返回结果: (%s)\n\n##\n%s\n##", message["name"], message["content"]))
-				return nil
-			}
 			buffer.WriteString(message["content"])
 			return nil
 		}
 
 		defer buffer.Reset()
 		buffer.WriteString(fmt.Sprintf(message["content"]))
+		var result []map[string]interface{}
+
+		if role == "tool" || role == "function" {
+			var args interface{}
+			if err := json.Unmarshal([]byte(message["content"]), &args); err != nil {
+				logger.Error(err)
+				return nil
+			}
+
+			result = append(result, map[string]interface{}{
+				"role": "user",
+				"parts": []interface{}{
+					map[string]interface{}{
+						"functionResponse": map[string]interface{}{
+							"name":     message["name"],
+							"response": args,
+						},
+					},
+				},
+			})
+			return result
+		}
+
+		if toolCalls, ok := message["tool_calls"]; ok && role == "assistant" && toolCalls == "yes" {
+			var args interface{}
+			if err := json.Unmarshal([]byte(message["content"]), &args); err != nil {
+				logger.Error(err)
+				return nil
+			}
+
+			result = append(result, map[string]interface{}{
+				"role": "assistant",
+				"parts": []interface{}{
+					map[string]interface{}{
+						"functionCall": map[string]interface{}{
+							"name": message["name"],
+							"args": args,
+						},
+					},
+				},
+			})
+			return result
+		}
+
 		if role == "system" {
-			var result []map[string]interface{}
 			result = append(result, map[string]interface{}{
 				"role": "user",
 				"parts": []interface{}{

internal/plugin/toolcall.go

@@ -205,7 +205,7 @@ func toolCacheHash(completion pkg.ChatCompletion) (hash string) {
 		return "-1"
 	}
 
-	return common.HashString(hash)
+	return common.HashString(completion.Model + hash)
 }
 
 func buildTemplate(ctx *gin.Context, completion pkg.ChatCompletion, template string) (message string, err error) {