merge upstream

Signed-off-by: wozulong <>

common/email-outlook-auth.go

@@ -0,0 +1,32 @@
+package common
+
+import (
+	"errors"
+	"net/smtp"
+)
+
+type outlookAuth struct {
+	username, password string
+}
+
+func LoginAuth(username, password string) smtp.Auth {
+	return &outlookAuth{username, password}
+}
+
+func (a *outlookAuth) Start(_ *smtp.ServerInfo) (string, []byte, error) {
+	return "LOGIN", []byte{}, nil
+}
+
+func (a *outlookAuth) Next(fromServer []byte, more bool) ([]byte, error) {
+	if more {
+		switch string(fromServer) {
+		case "Username:":
+			return []byte(a.username), nil
+		case "Password:":
+			return []byte(a.password), nil
+		default:
+			return nil, errors.New("unknown fromServer")
+		}
+	}
+	return nil, nil
+}

common/email.go

@@ -62,6 +62,9 @@ func SendEmail(subject string, receiver string, content string) error {
 		if err != nil {
 			return err
 		}
+	} else if strings.HasSuffix(SMTPAccount, "outlook.com") {
+		auth = LoginAuth(SMTPAccount, SMTPToken)
+		err = smtp.SendMail(addr, auth, SMTPAccount, to, mail)
 	} else {
 		err = smtp.SendMail(addr, auth, SMTPAccount, to, mail)
 	}

common/model-ratio.go

@@ -3,6 +3,7 @@ package common
 import (
 	"encoding/json"
 	"strings"
+	"sync"
 )
 
 // from songquanpeng/one-api
@@ -183,8 +184,14 @@ var defaultModelPrice = map[string]float64{
 	"swap_face":         0.05,
 }
 
-var modelPrice map[string]float64 = nil
-var modelRatio map[string]float64 = nil
+var (
+	modelPriceMap      = make(map[string]float64)
+	modelPriceMapMutex = sync.RWMutex{}
+)
+var (
+	modelRatioMap      map[string]float64 = nil
+	modelRatioMapMutex                    = sync.RWMutex{}
+)
 
 var CompletionRatio map[string]float64 = nil
 var defaultCompletionRatio = map[string]float64{
@@ -194,11 +201,18 @@ var defaultCompletionRatio = map[string]float64{
 	"gpt-4o-all":    2,
 }
 
-func ModelPrice2JSONString() string {
-	if modelPrice == nil {
-		modelPrice = defaultModelPrice
+func GetModelPriceMap() map[string]float64 {
+	modelPriceMapMutex.Lock()
+	defer modelPriceMapMutex.Unlock()
+	if modelPriceMap == nil {
+		modelPriceMap = defaultModelPrice
 	}
-	jsonBytes, err := json.Marshal(modelPrice)
+	return modelPriceMap
+}
+
+func ModelPrice2JSONString() string {
+	GetModelPriceMap()
+	jsonBytes, err := json.Marshal(modelPriceMap)
 	if err != nil {
 		SysError("error marshalling model price: " + err.Error())
 	}
@@ -206,21 +220,21 @@ func ModelPrice2JSONString() string {
 }
 
 func UpdateModelPriceByJSONString(jsonStr string) error {
-	modelPrice = make(map[string]float64)
-	return json.Unmarshal([]byte(jsonStr), &modelPrice)
+	modelPriceMapMutex.Lock()
+	defer modelPriceMapMutex.Unlock()
+	modelPriceMap = make(map[string]float64)
+	return json.Unmarshal([]byte(jsonStr), &modelPriceMap)
 }
 
 // GetModelPrice 返回模型的价格，如果模型不存在则返回-1，false
 func GetModelPrice(name string, printErr bool) (float64, bool) {
-	if modelPrice == nil {
-		modelPrice = defaultModelPrice
-	}
+	GetModelPriceMap()
 	if strings.HasPrefix(name, "gpt-4-gizmo") {
 		name = "gpt-4-gizmo-*"
 	} else if strings.HasPrefix(name, "g-") {
 		name = "g-*"
 	}
-	price, ok := modelPrice[name]
+	price, ok := modelPriceMap[name]
 	if !ok {
 		if printErr {
 			SysError("model price not found: " + name)
@@ -230,18 +244,18 @@ func GetModelPrice(name string, printErr bool) (float64, bool) {
 	return price, true
 }
 
-func GetModelPriceMap() map[string]float64 {
-	if modelPrice == nil {
-		modelPrice = defaultModelPrice
+func GetModelRatioMap() map[string]float64 {
+	modelRatioMapMutex.Lock()
+	defer modelRatioMapMutex.Unlock()
+	if modelRatioMap == nil {
+		modelRatioMap = defaultModelRatio
 	}
-	return modelPrice
+	return modelRatioMap
 }
 
 func ModelRatio2JSONString() string {
-	if modelRatio == nil {
-		modelRatio = defaultModelRatio
-	}
-	jsonBytes, err := json.Marshal(modelRatio)
+	GetModelRatioMap()
+	jsonBytes, err := json.Marshal(modelRatioMap)
 	if err != nil {
 		SysError("error marshalling model ratio: " + err.Error())
 	}
@@ -249,20 +263,20 @@ func ModelRatio2JSONString() string {
 }
 
 func UpdateModelRatioByJSONString(jsonStr string) error {
-	modelRatio = make(map[string]float64)
-	return json.Unmarshal([]byte(jsonStr), &modelRatio)
+	modelRatioMapMutex.Lock()
+	defer modelRatioMapMutex.Unlock()
+	modelRatioMap = make(map[string]float64)
+	return json.Unmarshal([]byte(jsonStr), &modelRatioMap)
 }
 
 func GetModelRatio(name string) float64 {
-	if modelRatio == nil {
-		modelRatio = defaultModelRatio
-	}
+	GetModelRatioMap()
 	if strings.HasPrefix(name, "gpt-4-gizmo") {
 		name = "gpt-4-gizmo-*"
 	} else if strings.HasPrefix(name, "g-") {
 		name = "g-*"
 	}
-	ratio, ok := modelRatio[name]
+	ratio, ok := modelRatioMap[name]
 	if !ok {
 		SysError("model ratio not found: " + name)
 		return 30