style: 删减多余代码

Author: bincooo

examples/claude-2/claude2_test.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"github.com/bincooo/claude-api"
 	"github.com/bincooo/claude-api/types"
-	"github.com/bincooo/claude-api/vars"
 	"testing"
 	"time"
 )
@@ -37,7 +36,7 @@ func Test_messages(t *testing.T) {
 	//}
 	//token = tk
 	//fmt.Println(email)
-	options := claude.NewDefaultOptions(token, vars.Model4WebClaude2)
+	options := claude.NewDefaultOptions(token, "claude-3-opt")
 	options.Proxies = "socks5://127.0.0.1:7890"
 	//options.BaseURL = "https://bincooo-single-proxy.hf.space/claude/api"
 	chat, err := claude.New(options)

internal/web-claude2.go

@@ -26,31 +26,21 @@ const (
 	WebClaude2BU = "https://claude.ai/api"
 	UA           = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36 Edg/114.0.1823.79"
 	Mod          = "claude-2.0"
-	Mod_V1       = "claude-2.1"
+	ModV1        = "claude-2.1"
 	//Mod_Magenta  = "claude-2.0-magenta"
 
 	gRetry = 2
 )
 
 var (
-	JA3       = "771,4865-4866-4867-49195-49199-49196-49200-52393-52392-49171-49172-156-157-47-53,0-23-65281-10-11-35-16-5-13-18-51-45-43-27-17513-21,29-23-24,0"
-	cacheMods = make(map[string]_mod)
+	JA3 = "771,4865-4866-4867-49195-49199-49196-49200-52393-52392-49171-49172-156-157-47-53,0-23-65281-10-11-35-16-5-13-18-51-45-43-27-17513-21,29-23-24,0"
 )
 
 type _mod struct {
 	time.Time
 	model string
 }
 
-func _delMods() {
-	for k, v := range cacheMods {
-		// 10分钟内没有使用，则清理
-		if v.Add(10 * time.Minute).Before(time.Now()) {
-			delete(cacheMods, k)
-		}
-	}
-}
-
 func init() {
 	JA3 = util.LoadEnvVar("JA3", JA3)
 }
@@ -78,7 +68,11 @@ type WebClaude2 struct {
 }
 
 func NewWebClaude2(opt types.Options) types.Chat {
-	return &WebClaude2{mod: "", Options: opt}
+	mod := ""
+	if strings.HasPrefix(opt.Model, "claude-") {
+		mod = opt.Model
+	}
+	return &WebClaude2{mod: mod, Options: opt}
 }
 
 func (wc *WebClaude2) NewChannel(string) error {
@@ -92,39 +86,29 @@ func (wc *WebClaude2) Reply(ctx context.Context, prompt string, attrs []types.At
 	}
 
 	if wc.mod == "" {
+		// 加载 model
 		model, err := wc.loadModel()
 		if err != nil {
 			return nil, err
 		}
 		wc.mod = model
 	}
 
-	// 避免每次都检查新模型
-	if mod, ok := cacheMods[wc.oid]; ok {
-		wc.mod = mod.model
-	}
-	cacheMods[wc.oid] = _mod{time.Now(), wc.mod}
-
+	logrus.Info("model: ", wc.mod)
 	var response *models.Response
 	for index := 1; index <= wc.Retry; index++ {
 		r, err := wc.PostMessage(5*time.Minute, prompt, attrs)
 		if err != nil {
 			if index >= wc.Retry {
-				delete(cacheMods, wc.oid)
 				wc.mu.Unlock()
 				return nil, err
 			}
 
 			var wap *types.ErrorWrapper
 			ok := errors.As(err, &wap)
 
-			// 尝试新模型
 			if ok && wap.ErrorType.Message == "Invalid model" {
-				if wc.mod == Mod {
-					logrus.Info("尝试新模型: ", Mod_V1)
-					wc.mod = Mod_V1
-				}
-				cacheMods[wc.oid] = _mod{time.Now(), wc.mod}
+				wc.mod = ""
 			} else {
 				logrus.Error("[retry] ", err)
 			}
@@ -309,7 +293,6 @@ func (wc *WebClaude2) Delete() {
 	if wc.cid == "" {
 		return
 	}
-	_delMods()
 	headers := make(Kv)
 	headers["user-agent"] = UA
 	_, _ = wc.newRequest(10*time.Second, http.MethodDelete, "organizations/"+wc.oid+"/chat_conversations/"+wc.cid, headers, nil)