Spaces:
Paused
Paused
Dhudean commited on
Commit ·
13f17ad
1
Parent(s): e0b8007
v1.8.11
Browse files- common/constants.go +1 -1
- controller/chat.go +5 -4
- go.mod +12 -14
- go.sum +24 -27
- model/openai.go +36 -6
common/constants.go
CHANGED
|
@@ -3,7 +3,7 @@ package common
|
|
| 3 |
import "time"
|
| 4 |
|
| 5 |
var StartTime = time.Now().Unix() // unit: second
|
| 6 |
-
var Version = "v1.8.
|
| 7 |
|
| 8 |
var DefaultOpenaiModelList = []string{
|
| 9 |
"gpt-4o",
|
|
|
|
| 3 |
import "time"
|
| 4 |
|
| 5 |
var StartTime = time.Now().Unix() // unit: second
|
| 6 |
+
var Version = "v1.8.11" // this hard coding will be replaced automatically when building, no need to manually change
|
| 7 |
|
| 8 |
var DefaultOpenaiModelList = []string{
|
| 9 |
"gpt-4o",
|
controller/chat.go
CHANGED
|
@@ -323,7 +323,7 @@ func fetchImageBytes(url string) ([]byte, error) {
|
|
| 323 |
}
|
| 324 |
|
| 325 |
func createRequestBody(c *gin.Context, client cycletls.CycleTLS, cookie string, openAIReq *model.OpenAIChatCompletionRequest) (map[string]interface{}, error) {
|
| 326 |
-
openAIReq.SystemMessagesProcess()
|
| 327 |
|
| 328 |
// 处理消息中的图像 URL
|
| 329 |
err := processMessages(c, client, cookie, openAIReq.Messages)
|
|
@@ -333,12 +333,13 @@ func createRequestBody(c *gin.Context, client cycletls.CycleTLS, cookie string,
|
|
| 333 |
}
|
| 334 |
|
| 335 |
currentQueryString := fmt.Sprintf("type=%s", chatType)
|
| 336 |
-
//
|
| 337 |
-
// 查找 key 对应的 value
|
| 338 |
if chatId, ok := config.ModelChatMap[openAIReq.Model]; ok {
|
| 339 |
currentQueryString = fmt.Sprintf("id=%s&type=%s", chatId, chatType)
|
| 340 |
} else if chatId, ok := config.GlobalSessionManager.GetChatID(cookie, openAIReq.Model); ok {
|
| 341 |
currentQueryString = fmt.Sprintf("id=%s&type=%s", chatId, chatType)
|
|
|
|
|
|
|
| 342 |
}
|
| 343 |
|
| 344 |
models := []string{openAIReq.Model}
|
|
@@ -373,7 +374,7 @@ func createRequestBody(c *gin.Context, client cycletls.CycleTLS, cookie string,
|
|
| 373 |
//"current_query_string": fmt.Sprintf("&type=%s", chatType),
|
| 374 |
"current_query_string": currentQueryString,
|
| 375 |
"messages": openAIReq.Messages,
|
| 376 |
-
//"user_s_input":
|
| 377 |
"action_params": map[string]interface{}{},
|
| 378 |
"extra_data": map[string]interface{}{
|
| 379 |
"models": models,
|
|
|
|
| 323 |
}
|
| 324 |
|
| 325 |
func createRequestBody(c *gin.Context, client cycletls.CycleTLS, cookie string, openAIReq *model.OpenAIChatCompletionRequest) (map[string]interface{}, error) {
|
| 326 |
+
openAIReq.SystemMessagesProcess(openAIReq.Model)
|
| 327 |
|
| 328 |
// 处理消息中的图像 URL
|
| 329 |
err := processMessages(c, client, cookie, openAIReq.Messages)
|
|
|
|
| 333 |
}
|
| 334 |
|
| 335 |
currentQueryString := fmt.Sprintf("type=%s", chatType)
|
| 336 |
+
//查找 key 对应的 value
|
|
|
|
| 337 |
if chatId, ok := config.ModelChatMap[openAIReq.Model]; ok {
|
| 338 |
currentQueryString = fmt.Sprintf("id=%s&type=%s", chatId, chatType)
|
| 339 |
} else if chatId, ok := config.GlobalSessionManager.GetChatID(cookie, openAIReq.Model); ok {
|
| 340 |
currentQueryString = fmt.Sprintf("id=%s&type=%s", chatId, chatType)
|
| 341 |
+
} else if openAIReq.Model == "deep-seek-r1" {
|
| 342 |
+
openAIReq.FilterUserMessage()
|
| 343 |
}
|
| 344 |
|
| 345 |
models := []string{openAIReq.Model}
|
|
|
|
| 374 |
//"current_query_string": fmt.Sprintf("&type=%s", chatType),
|
| 375 |
"current_query_string": currentQueryString,
|
| 376 |
"messages": openAIReq.Messages,
|
| 377 |
+
//"user_s_input": "我刚刚问了什么问题?",
|
| 378 |
"action_params": map[string]interface{}{},
|
| 379 |
"extra_data": map[string]interface{}{
|
| 380 |
"models": models,
|
go.mod
CHANGED
|
@@ -3,35 +3,33 @@ module genspark2api
|
|
| 3 |
go 1.23
|
| 4 |
|
| 5 |
require (
|
| 6 |
-
github.com/
|
| 7 |
-
github.com/deanxv/CycleTLS/cycletls v0.0.0-20241224121421-e85d37b47388
|
| 8 |
github.com/gin-contrib/cors v1.7.3
|
| 9 |
github.com/gin-gonic/gin v1.10.0
|
| 10 |
github.com/google/uuid v1.6.0
|
| 11 |
github.com/json-iterator/go v1.1.12
|
| 12 |
github.com/pkoukk/tiktoken-go v0.1.7
|
| 13 |
-
github.com/samber/lo v1.
|
| 14 |
)
|
| 15 |
|
| 16 |
require (
|
| 17 |
github.com/Danny-Dasilva/fhttp v0.0.0-20240217042913-eeeb0b347ce1 // indirect
|
| 18 |
github.com/andybalholm/brotli v1.1.1 // indirect
|
| 19 |
-
github.com/bytedance/sonic v1.12.
|
| 20 |
-
github.com/bytedance/sonic/loader v0.2.
|
| 21 |
-
github.com/cloudflare/circl v1.
|
| 22 |
-
github.com/cloudwego/base64x v0.1.
|
| 23 |
github.com/dlclark/regexp2 v1.11.4 // indirect
|
| 24 |
github.com/gabriel-vasile/mimetype v1.4.8 // indirect
|
| 25 |
github.com/gin-contrib/sse v1.0.0 // indirect
|
| 26 |
github.com/go-playground/locales v0.14.1 // indirect
|
| 27 |
github.com/go-playground/universal-translator v0.18.1 // indirect
|
| 28 |
-
github.com/go-playground/validator/v10 v10.
|
| 29 |
-
github.com/goccy/go-json v0.10.
|
| 30 |
github.com/google/go-cmp v0.6.0 // indirect
|
| 31 |
github.com/gorilla/websocket v1.5.3 // indirect
|
| 32 |
github.com/klauspost/compress v1.17.11 // indirect
|
| 33 |
github.com/klauspost/cpuid/v2 v2.2.9 // indirect
|
| 34 |
-
github.com/kr/text v0.2.0 // indirect
|
| 35 |
github.com/leodido/go-urn v1.4.0 // indirect
|
| 36 |
github.com/mattn/go-isatty v0.0.20 // indirect
|
| 37 |
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
|
|
@@ -40,12 +38,12 @@ require (
|
|
| 40 |
github.com/refraction-networking/utls v1.6.7 // indirect
|
| 41 |
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
|
| 42 |
github.com/ugorji/go/codec v1.2.12 // indirect
|
| 43 |
-
golang.org/x/arch v0.
|
| 44 |
golang.org/x/crypto v0.32.0 // indirect
|
| 45 |
golang.org/x/net v0.34.0 // indirect
|
| 46 |
-
golang.org/x/sys v0.
|
| 47 |
-
golang.org/x/text v0.
|
| 48 |
-
google.golang.org/protobuf v1.36.
|
| 49 |
gopkg.in/yaml.v3 v3.0.1 // indirect
|
| 50 |
h12.io/socks v1.0.3 // indirect
|
| 51 |
)
|
|
|
|
| 3 |
go 1.23
|
| 4 |
|
| 5 |
require (
|
| 6 |
+
github.com/deanxv/CycleTLS/cycletls v0.0.0-20250206060125-b8e4d910abbf
|
|
|
|
| 7 |
github.com/gin-contrib/cors v1.7.3
|
| 8 |
github.com/gin-gonic/gin v1.10.0
|
| 9 |
github.com/google/uuid v1.6.0
|
| 10 |
github.com/json-iterator/go v1.1.12
|
| 11 |
github.com/pkoukk/tiktoken-go v0.1.7
|
| 12 |
+
github.com/samber/lo v1.49.1
|
| 13 |
)
|
| 14 |
|
| 15 |
require (
|
| 16 |
github.com/Danny-Dasilva/fhttp v0.0.0-20240217042913-eeeb0b347ce1 // indirect
|
| 17 |
github.com/andybalholm/brotli v1.1.1 // indirect
|
| 18 |
+
github.com/bytedance/sonic v1.12.8 // indirect
|
| 19 |
+
github.com/bytedance/sonic/loader v0.2.3 // indirect
|
| 20 |
+
github.com/cloudflare/circl v1.6.0 // indirect
|
| 21 |
+
github.com/cloudwego/base64x v0.1.5 // indirect
|
| 22 |
github.com/dlclark/regexp2 v1.11.4 // indirect
|
| 23 |
github.com/gabriel-vasile/mimetype v1.4.8 // indirect
|
| 24 |
github.com/gin-contrib/sse v1.0.0 // indirect
|
| 25 |
github.com/go-playground/locales v0.14.1 // indirect
|
| 26 |
github.com/go-playground/universal-translator v0.18.1 // indirect
|
| 27 |
+
github.com/go-playground/validator/v10 v10.24.0 // indirect
|
| 28 |
+
github.com/goccy/go-json v0.10.5 // indirect
|
| 29 |
github.com/google/go-cmp v0.6.0 // indirect
|
| 30 |
github.com/gorilla/websocket v1.5.3 // indirect
|
| 31 |
github.com/klauspost/compress v1.17.11 // indirect
|
| 32 |
github.com/klauspost/cpuid/v2 v2.2.9 // indirect
|
|
|
|
| 33 |
github.com/leodido/go-urn v1.4.0 // indirect
|
| 34 |
github.com/mattn/go-isatty v0.0.20 // indirect
|
| 35 |
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
|
|
|
|
| 38 |
github.com/refraction-networking/utls v1.6.7 // indirect
|
| 39 |
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
|
| 40 |
github.com/ugorji/go/codec v1.2.12 // indirect
|
| 41 |
+
golang.org/x/arch v0.14.0 // indirect
|
| 42 |
golang.org/x/crypto v0.32.0 // indirect
|
| 43 |
golang.org/x/net v0.34.0 // indirect
|
| 44 |
+
golang.org/x/sys v0.30.0 // indirect
|
| 45 |
+
golang.org/x/text v0.22.0 // indirect
|
| 46 |
+
google.golang.org/protobuf v1.36.4 // indirect
|
| 47 |
gopkg.in/yaml.v3 v3.0.1 // indirect
|
| 48 |
h12.io/socks v1.0.3 // indirect
|
| 49 |
)
|
go.sum
CHANGED
|
@@ -18,30 +18,27 @@ github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24
|
|
| 18 |
github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g=
|
| 19 |
github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s=
|
| 20 |
github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
|
| 21 |
-
github.com/bytedance/sonic v1.12.
|
| 22 |
-
github.com/bytedance/sonic v1.12.
|
| 23 |
github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
|
| 24 |
-
github.com/bytedance/sonic/loader v0.2.
|
| 25 |
-
github.com/bytedance/sonic/loader v0.2.
|
| 26 |
-
github.com/capsolver/capsolver-go v0.0.0-20241119090425-3bd68095f5c1 h1:FBFHj/uFbtDu1oXngYEA1wIBoJWQKN8wSfWNna7bzq0=
|
| 27 |
-
github.com/capsolver/capsolver-go v0.0.0-20241119090425-3bd68095f5c1/go.mod h1:auD5FFe3cKFAtiRmeD8I8Bf1Og/NAlnmJqtbjOb6qPM=
|
| 28 |
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
|
| 29 |
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
|
| 30 |
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
|
| 31 |
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
|
| 32 |
github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA=
|
| 33 |
-
github.com/cloudflare/circl v1.
|
| 34 |
-
github.com/cloudflare/circl v1.
|
| 35 |
-
github.com/cloudwego/base64x v0.1.
|
| 36 |
-
github.com/cloudwego/base64x v0.1.
|
| 37 |
github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY=
|
| 38 |
github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
|
| 39 |
-
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
|
| 40 |
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
| 41 |
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
| 42 |
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
| 43 |
-
github.com/deanxv/CycleTLS/cycletls v0.0.0-
|
| 44 |
-
github.com/deanxv/CycleTLS/cycletls v0.0.0-
|
| 45 |
github.com/dlclark/regexp2 v1.11.4 h1:rPYF9/LECdNymJufQKmri9gV604RvvABwgOA8un7yAo=
|
| 46 |
github.com/dlclark/regexp2 v1.11.4/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
|
| 47 |
github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
|
|
@@ -69,12 +66,12 @@ github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/o
|
|
| 69 |
github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
|
| 70 |
github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
|
| 71 |
github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
|
| 72 |
-
github.com/go-playground/validator/v10 v10.
|
| 73 |
-
github.com/go-playground/validator/v10 v10.
|
| 74 |
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
|
| 75 |
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
|
| 76 |
-
github.com/goccy/go-json v0.10.
|
| 77 |
-
github.com/goccy/go-json v0.10.
|
| 78 |
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
|
| 79 |
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
|
| 80 |
github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E=
|
|
@@ -213,8 +210,8 @@ github.com/refraction-networking/utls v1.6.7/go.mod h1:BC3O4vQzye5hqpmDTWUqi4P5D
|
|
| 213 |
github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8=
|
| 214 |
github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
|
| 215 |
github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
|
| 216 |
-
github.com/samber/lo v1.
|
| 217 |
-
github.com/samber/lo v1.
|
| 218 |
github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
|
| 219 |
github.com/shurcooL/component v0.0.0-20170202220835-f88ec8f54cc4/go.mod h1:XhFIlyj5a1fBNx5aJTbKoIq0mNaPvOagO+HjB3EtxrY=
|
| 220 |
github.com/shurcooL/events v0.0.0-20181021180414-410e4ca65f48/go.mod h1:5u70Mqkb5O5cxEA8nxTsgrgLehJeAw6Oc4Ab1c/P1HM=
|
|
@@ -270,8 +267,8 @@ github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1
|
|
| 270 |
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
|
| 271 |
go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA=
|
| 272 |
go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE=
|
| 273 |
-
golang.org/x/arch v0.
|
| 274 |
-
golang.org/x/arch v0.
|
| 275 |
golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod h1:OWs+y06UdEOHN4y+MfF/py+xQ/tYqIWW03b70/CG9Rw=
|
| 276 |
golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
|
| 277 |
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
|
@@ -376,8 +373,8 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|
| 376 |
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
| 377 |
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
| 378 |
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
| 379 |
-
golang.org/x/sys v0.
|
| 380 |
-
golang.org/x/sys v0.
|
| 381 |
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
| 382 |
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
|
| 383 |
golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
|
|
@@ -400,8 +397,8 @@ golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
|
|
| 400 |
golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
|
| 401 |
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
|
| 402 |
golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
|
| 403 |
-
golang.org/x/text v0.
|
| 404 |
-
golang.org/x/text v0.
|
| 405 |
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
| 406 |
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
| 407 |
golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
|
@@ -448,8 +445,8 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2
|
|
| 448 |
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
|
| 449 |
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
|
| 450 |
google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
|
| 451 |
-
google.golang.org/protobuf v1.36.
|
| 452 |
-
google.golang.org/protobuf v1.36.
|
| 453 |
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
| 454 |
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
| 455 |
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
|
|
|
|
| 18 |
github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g=
|
| 19 |
github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s=
|
| 20 |
github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
|
| 21 |
+
github.com/bytedance/sonic v1.12.8 h1:4xYRVRlXIgvSZ4e8iVTlMF5szgpXd4AfvuWgA8I8lgs=
|
| 22 |
+
github.com/bytedance/sonic v1.12.8/go.mod h1:uVvFidNmlt9+wa31S1urfwwthTWteBgG0hWuoKAXTx8=
|
| 23 |
github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
|
| 24 |
+
github.com/bytedance/sonic/loader v0.2.3 h1:yctD0Q3v2NOGfSWPLPvG2ggA2kV6TS6s4wioyEqssH0=
|
| 25 |
+
github.com/bytedance/sonic/loader v0.2.3/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFosQU6FxH2JmUe6VI=
|
|
|
|
|
|
|
| 26 |
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
|
| 27 |
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
|
| 28 |
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
|
| 29 |
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
|
| 30 |
github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA=
|
| 31 |
+
github.com/cloudflare/circl v1.6.0 h1:cr5JKic4HI+LkINy2lg3W2jF8sHCVTBncJr5gIIq7qk=
|
| 32 |
+
github.com/cloudflare/circl v1.6.0/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs=
|
| 33 |
+
github.com/cloudwego/base64x v0.1.5 h1:XPciSp1xaq2VCSt6lF0phncD4koWyULpl5bUxbfCyP4=
|
| 34 |
+
github.com/cloudwego/base64x v0.1.5/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w=
|
| 35 |
github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY=
|
| 36 |
github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
|
|
|
|
| 37 |
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
| 38 |
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
| 39 |
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
| 40 |
+
github.com/deanxv/CycleTLS/cycletls v0.0.0-20250206060125-b8e4d910abbf h1:nsskm99CacPwCDkwCoIFDAqIHahLJyjht1bICqu1uvc=
|
| 41 |
+
github.com/deanxv/CycleTLS/cycletls v0.0.0-20250206060125-b8e4d910abbf/go.mod h1:eAyIp7Lbyq6WnJDGicqf7nYr0bTj5FQ0HXQbIesuuJ8=
|
| 42 |
github.com/dlclark/regexp2 v1.11.4 h1:rPYF9/LECdNymJufQKmri9gV604RvvABwgOA8un7yAo=
|
| 43 |
github.com/dlclark/regexp2 v1.11.4/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
|
| 44 |
github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
|
|
|
|
| 66 |
github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
|
| 67 |
github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
|
| 68 |
github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
|
| 69 |
+
github.com/go-playground/validator/v10 v10.24.0 h1:KHQckvo8G6hlWnrPX4NJJ+aBfWNAE/HH+qdL2cBpCmg=
|
| 70 |
+
github.com/go-playground/validator/v10 v10.24.0/go.mod h1:GGzBIJMuE98Ic/kJsBXbz1x/7cByt++cQ+YOuDM5wus=
|
| 71 |
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
|
| 72 |
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
|
| 73 |
+
github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4=
|
| 74 |
+
github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
|
| 75 |
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
|
| 76 |
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
|
| 77 |
github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E=
|
|
|
|
| 210 |
github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8=
|
| 211 |
github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
|
| 212 |
github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
|
| 213 |
+
github.com/samber/lo v1.49.1 h1:4BIFyVfuQSEpluc7Fua+j1NolZHiEHEpaSEKdsH0tew=
|
| 214 |
+
github.com/samber/lo v1.49.1/go.mod h1:dO6KHFzUKXgP8LDhU0oI8d2hekjXnGOu0DB8Jecxd6o=
|
| 215 |
github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
|
| 216 |
github.com/shurcooL/component v0.0.0-20170202220835-f88ec8f54cc4/go.mod h1:XhFIlyj5a1fBNx5aJTbKoIq0mNaPvOagO+HjB3EtxrY=
|
| 217 |
github.com/shurcooL/events v0.0.0-20181021180414-410e4ca65f48/go.mod h1:5u70Mqkb5O5cxEA8nxTsgrgLehJeAw6Oc4Ab1c/P1HM=
|
|
|
|
| 267 |
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
|
| 268 |
go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA=
|
| 269 |
go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE=
|
| 270 |
+
golang.org/x/arch v0.14.0 h1:z9JUEZWr8x4rR0OU6c4/4t6E6jOZ8/QBS2bBYBm4tx4=
|
| 271 |
+
golang.org/x/arch v0.14.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
|
| 272 |
golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod h1:OWs+y06UdEOHN4y+MfF/py+xQ/tYqIWW03b70/CG9Rw=
|
| 273 |
golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
|
| 274 |
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
|
|
|
| 373 |
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
| 374 |
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
| 375 |
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
| 376 |
+
golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
|
| 377 |
+
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
| 378 |
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
| 379 |
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
|
| 380 |
golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
|
|
|
|
| 397 |
golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
|
| 398 |
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
|
| 399 |
golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
|
| 400 |
+
golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
|
| 401 |
+
golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
|
| 402 |
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
| 403 |
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
| 404 |
golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
|
|
|
| 445 |
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
|
| 446 |
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
|
| 447 |
google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
|
| 448 |
+
google.golang.org/protobuf v1.36.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM=
|
| 449 |
+
google.golang.org/protobuf v1.36.4/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
|
| 450 |
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
| 451 |
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
| 452 |
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
|
model/openai.go
CHANGED
|
@@ -11,19 +11,49 @@ type OpenAIChatCompletionExtraRequest struct {
|
|
| 11 |
ChannelId *string `json:"channelId"`
|
| 12 |
}
|
| 13 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 14 |
type OpenAIChatMessage struct {
|
| 15 |
-
Role
|
| 16 |
-
Content
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 17 |
}
|
| 18 |
|
| 19 |
-
func (r *OpenAIChatCompletionRequest)
|
| 20 |
if r.Messages == nil {
|
| 21 |
return
|
| 22 |
}
|
| 23 |
|
| 24 |
-
|
| 25 |
-
|
| 26 |
-
|
|
|
|
|
|
|
| 27 |
}
|
| 28 |
}
|
| 29 |
}
|
|
|
|
| 11 |
ChannelId *string `json:"channelId"`
|
| 12 |
}
|
| 13 |
|
| 14 |
+
type SessionState struct {
|
| 15 |
+
Models []string `json:"models"`
|
| 16 |
+
Layers int `json:"layers"`
|
| 17 |
+
Answer string `json:"answer"`
|
| 18 |
+
AnswerIsFinished bool `json:"answer_is_finished"`
|
| 19 |
+
}
|
| 20 |
type OpenAIChatMessage struct {
|
| 21 |
+
Role string `json:"role"`
|
| 22 |
+
Content interface{} `json:"content"`
|
| 23 |
+
IsPrompt bool `json:"is_prompt"`
|
| 24 |
+
SessionState *SessionState `json:"session_state"`
|
| 25 |
+
}
|
| 26 |
+
|
| 27 |
+
func (r *OpenAIChatCompletionRequest) SystemMessagesProcess(model string) {
|
| 28 |
+
if r.Messages == nil {
|
| 29 |
+
return
|
| 30 |
+
}
|
| 31 |
+
|
| 32 |
+
if model == "deep-seek-r1" {
|
| 33 |
+
for i := range r.Messages {
|
| 34 |
+
if r.Messages[i].Role == "system" {
|
| 35 |
+
r.Messages[i].Role = "user"
|
| 36 |
+
}
|
| 37 |
+
if r.Messages[i].Role == "assistant" {
|
| 38 |
+
r.Messages[i].IsPrompt = false
|
| 39 |
+
r.Messages[i].SessionState = &SessionState{
|
| 40 |
+
Models: []string{model},
|
| 41 |
+
}
|
| 42 |
+
}
|
| 43 |
+
}
|
| 44 |
+
}
|
| 45 |
}
|
| 46 |
|
| 47 |
+
func (r *OpenAIChatCompletionRequest) FilterUserMessage() {
|
| 48 |
if r.Messages == nil {
|
| 49 |
return
|
| 50 |
}
|
| 51 |
|
| 52 |
+
// 返回最后一个role为user的元素
|
| 53 |
+
for i := len(r.Messages) - 1; i >= 0; i-- {
|
| 54 |
+
if r.Messages[i].Role == "user" {
|
| 55 |
+
r.Messages = r.Messages[i:]
|
| 56 |
+
break
|
| 57 |
}
|
| 58 |
}
|
| 59 |
}
|