feat: add bing model

Author: bincooo

core/gin/response/message.go

@@ -28,10 +28,22 @@ var (
 	CLAUDE_ROLE_FMT = func(role string) string { return fmt.Sprintf("\n\r\n%s: ", role) }
 	GPT_ROLE_FMT    = func(role string) string { return fmt.Sprintf("<|start|>%s\n", role) }
 	ROLE_FMT        = func(role string) string { return fmt.Sprintf("<|%s|>\n", role) }
+	BING_ROLE_FMT   = func(role string) string { return bingFormater(role) }
 	END             = "<|end|>\n\n"
 	delimiter       = "\n\n"
 )
 
+func bingFormater(role string) string {
+	switch role {
+	case "user":
+		return "Hu: "
+	case "assistant":
+		return "Ai: "
+	default:
+		return "Sys: "
+	}
+}
+
 var (
 	regExp       = regexp.MustCompile(`^/(.+)/([a-z]*)$`, regexp.ECMAScript)
 	regExpClears = []*regexp.Regexp{
@@ -168,6 +180,11 @@ func ConvertRole(ctx *gin.Context, role string) (newRole, end string) {
 		return
 	}
 
+	if IsBing(completion.Model) {
+		newRole = BING_ROLE_FMT(role)
+		return
+	}
+
 	end = END
 	if IsGPT(completion.Model) {
 		switch role {
@@ -183,6 +200,10 @@ func ConvertRole(ctx *gin.Context, role string) (newRole, end string) {
 	return
 }
 
+func IsBing(mod string) bool {
+	return mod == "bing"
+}
+
 func splitToMessages(content string, merge bool) (messages []model.Keyv[interface{}]) {
 	chunkMap := map[string][]byte{
 		"assistant": []byte("\n\nassistant: "),

go.mod

@@ -5,6 +5,7 @@ go 1.23.3
 require (
 	github.com/antonfisher/nested-logrus-formatter v1.3.1
 	github.com/bincooo/coze-api v1.0.2-0.20241204052445-8100a9ce45d0
+	github.com/bincooo/edge-api v1.0.4-0.20241209110641-d6c9bba09984
 	github.com/bincooo/emit.io v1.0.1-0.20241206102606-d234e60afcc9
 	github.com/bincooo/you.com v0.0.0-20241111060258-85f9deb66109
 	github.com/bogdanfinn/tls-client v1.7.7

go.sum

@@ -52,6 +52,8 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bincooo/coze-api v1.0.2-0.20241204052445-8100a9ce45d0 h1:LHJy+OS1JyHNznFu3Rz1LtUsbOI0qxMVH2mtsvATllA=
 github.com/bincooo/coze-api v1.0.2-0.20241204052445-8100a9ce45d0/go.mod h1:qhaSqKdvR4T594sBMzp+TKZ+PcaeelAiBMvIE254b6g=
+github.com/bincooo/edge-api v1.0.4-0.20241209110641-d6c9bba09984 h1:NERX3sB1nrUUPgAvGCiIUFtC0T7OBRcnwSaIs24Jrys=
+github.com/bincooo/edge-api v1.0.4-0.20241209110641-d6c9bba09984/go.mod h1:JMD3hj34imIyW8GLD2cmhynEbG7jXuUQG2/WWtjgzTw=
 github.com/bincooo/emit.io v1.0.1-0.20241206102606-d234e60afcc9 h1:xAmw70FCu96WcJpL+m2bZHel+fBGyPFzUTn8tBex7oM=
 github.com/bincooo/emit.io v1.0.1-0.20241206102606-d234e60afcc9/go.mod h1:OJbKJoZ6x6vSpCC+JNtfcaXo3ilpvQscWrcGEmtmrZI=
 github.com/bincooo/go-annotation v0.0.0-20241129022159-ea84d341fcda h1:bhkDbl8cz++1rXqroCNLYxs2Eu5ac/D3yDkxlUfHL1Y=

relay/alloc/coze/coze.go

@@ -42,6 +42,11 @@ func init() {
 		if len(values) == 0 {
 			return
 		}
+
+		if !env.GetBool("browser-less.enabled") && env.GetString("browser-less.reversal") == "" {
+			panic("don't used browser-less, please setting `browser-less.enabled` or `browser-less.reversal`")
+		}
+
 		cookiesContainer = common.NewPollContainer("coze", make([]*account, 0), 60*time.Second) // 报错进入60秒冷却
 		cookiesContainer.Condition = condition(env.GetString("server.proxied"))
 		run(env, values...)
@@ -187,7 +192,6 @@ func draftBot(ctx *gin.Context, systemMessage string, chat coze.Chat, completion
 		PresencePenalty:  0,
 		ResponseFormat:   0,
 	}, systemMessage); err != nil {
-		// 全局配置修改失败，解锁
 		logger.Error(fmt.Errorf("全局配置修改失败[%s]：%v", botId, err))
 		return &emit.Error{Code: -1, Err: err}
 	}

relay/alloc/you/you.go

@@ -206,43 +206,49 @@ func resetMarked(cookies string) {
 }
 
 func hookCloudflare(env *env.Environment) error {
-	if clearance == "" {
-		logger.Info("trying cloudflare ...")
+	if clearance != "" {
+		return nil
+	}
 
-		mu.Lock()
-		defer mu.Unlock()
-		if clearance != "" {
-			return nil
-		}
+	baseUrl := env.GetString("browser-less.reversal")
+	if !env.GetBool("browser-less.enabled") && baseUrl == "" {
+		return errors.New("trying cloudflare failed, please setting `browser-less.enabled` or `browser-less.reversal`")
+	}
 
-		baseUrl := env.GetString("browser-less.reversal")
-		if baseUrl == "" {
-			baseUrl = "http://127.0.0.1:" + env.GetString("browser-less.port")
-		}
+	logger.Info("trying cloudflare ...")
 
-		r, err := emit.ClientBuilder(common.HTTPClient).
-			GET(baseUrl+"/clearance").
-			DoC(emit.Status(http.StatusOK), emit.IsJSON)
-		if err != nil {
-			logger.Error(err)
-			if emit.IsJSON(r) == nil {
-				logger.Error(emit.TextResponse(r))
-			}
-			return err
-		}
+	mu.Lock()
+	defer mu.Unlock()
+	if clearance != "" {
+		return nil
+	}
 
-		defer r.Body.Close()
-		obj, err := emit.ToMap(r)
-		if err != nil {
-			logger.Error(err)
-			return err
+	if baseUrl == "" {
+		baseUrl = "http://127.0.0.1:" + env.GetString("browser-less.port")
+	}
+
+	r, err := emit.ClientBuilder(common.HTTPClient).
+		GET(baseUrl+"/clearance").
+		DoC(emit.Status(http.StatusOK), emit.IsJSON)
+	if err != nil {
+		logger.Error(err)
+		if emit.IsJSON(r) == nil {
+			logger.Error(emit.TextResponse(r))
 		}
+		return err
+	}
 
-		data := obj["data"].(map[string]interface{})
-		clearance = data["cookie"].(string)
-		userAgent = data["userAgent"].(string)
-		lang = data["lang"].(string)
+	defer r.Body.Close()
+	obj, err := emit.ToMap(r)
+	if err != nil {
+		logger.Error(err)
+		return err
 	}
+
+	data := obj["data"].(map[string]interface{})
+	clearance = data["cookie"].(string)
+	userAgent = data["userAgent"].(string)
+	lang = data["lang"].(string)
 	return nil
 }
 

relay/llm/bing/adapter.go

@@ -0,0 +1,124 @@
+package bing
+
+import (
+	"chatgpt-adapter/core/common"
+	"chatgpt-adapter/core/common/toolcall"
+	"chatgpt-adapter/core/common/vars"
+	"chatgpt-adapter/core/gin/inter"
+	"chatgpt-adapter/core/gin/model"
+	"chatgpt-adapter/core/gin/response"
+	"context"
+	"github.com/bincooo/edge-api"
+	"github.com/gin-gonic/gin"
+	"github.com/iocgo/sdk/env"
+	"github.com/iocgo/sdk/stream"
+	"strings"
+	"time"
+)
+
+var (
+	Model = "bing"
+)
+
+type api struct {
+	inter.BaseAdapter
+
+	env    *env.Environment
+	holder *response.ContentHolder
+}
+
+func (api *api) Match(ctx *gin.Context, model string) (ok bool, err error) {
+	ok = Model == model
+	if ok {
+		var token = ctx.GetString("token")
+		password := api.env.GetString("server.password")
+		if password != "" && password != token {
+			err = response.UnauthorizedError
+			return
+		}
+	}
+	return
+}
+
+func (*api) Models() (slice []model.Model) {
+	slice = append(slice, model.Model{
+		Id:      Model,
+		Object:  "model",
+		Created: 1686935002,
+		By:      Model + "-adapter",
+	})
+	return
+}
+
+func (api *api) HandleMessages(ctx *gin.Context, completion model.Completion) (messages []model.Keyv[interface{}], err error) {
+	var (
+		toolMessages = toolcall.ExtractToolMessages(&completion)
+	)
+
+	if messages, err = api.holder.Handle(ctx, completion); err != nil {
+		return
+	}
+	messages = append(messages, toolMessages...)
+	return
+}
+
+func (api *api) ToolChoice(ctx *gin.Context) (ok bool, err error) {
+	var (
+		completion = common.GetGinCompletion(ctx)
+		echo       = ctx.GetBool(vars.GinEcho)
+	)
+
+	if echo {
+		echoMessages(ctx, completion)
+		return
+	}
+
+	if toolChoice(ctx, completion) {
+		ok = true
+	}
+	return
+}
+
+func (api *api) Completion(ctx *gin.Context) (err error) {
+	var (
+		completion = common.GetGinCompletion(ctx)
+		echo       = ctx.GetBool(vars.GinEcho)
+	)
+
+	if echo {
+		echoMessages(ctx, completion)
+		return
+	}
+
+	request := convertRequest(ctx, completion)
+
+	timeout, cancel := context.WithTimeout(ctx.Request.Context(), 10*time.Second)
+	defer cancel()
+	conversationId, err := edge.CreateConversation(common.HTTPClient, timeout)
+	if err != nil {
+		return
+	}
+
+	message, err := edge.Chat(common.HTTPClient, ctx.Request.Context(), conversationId, request)
+	if err != nil {
+		return
+	}
+
+	content := waitResponse(ctx, message, completion.Stream)
+	if content == "" && response.NotResponse(ctx) {
+		response.Error(ctx, -1, "EMPTY RESPONSE")
+	}
+	return
+}
+
+func convertRequest(ctx *gin.Context, completion model.Completion) (content string) {
+	content = strings.Join(stream.Map(stream.OfSlice(completion.Messages), func(message model.Keyv[interface{}]) string {
+		convertRole, trun := response.ConvertRole(ctx, message.GetString("role"))
+		return convertRole + message.GetString("content") + trun
+	}).ToSlice(), "\n\n")
+	if content != "" {
+		convertRole, _ := response.ConvertRole(ctx, "assistant")
+		content += "\n\n" + convertRole
+	}
+	return
+}

relay/llm/bing/ctor.go

@@ -0,0 +1,14 @@
+package bing
+
+import (
+	"chatgpt-adapter/core/gin/inter"
+	"chatgpt-adapter/core/gin/response"
+	"github.com/iocgo/sdk/env"
+
+	_ "github.com/iocgo/sdk"
+)
+
+// @Inject(name = "bing-adapter")
+func New(env *env.Environment, holder *response.ContentHolder) inter.Adapter {
+	return &api{env: env, holder: holder}
+}