Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
phsl
/
new-api
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
ffe9deb1
authored
Feb 02, 2024
by
CaIon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修正 Unicode 转义序列解析问题,close #63
parent
28da2408
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
21 additions
and
13 deletions
+21
-13
controller/relay-ali.go
+3
-3
controller/relay-baidu.go
+2
-2
controller/relay-gemini.go
+1
-1
controller/relay-palm.go
+1
-1
controller/relay-tencent.go
+2
-2
controller/relay-xunfei.go
+2
-2
controller/relay-zhipu.go
+2
-2
controller/relay.go
+8
-0
No files found.
controller/relay-ali.go
View file @
ffe9deb1
...
@@ -88,17 +88,17 @@ func requestOpenAI2Ali(request GeneralOpenAIRequest) *AliChatRequest {
...
@@ -88,17 +88,17 @@ func requestOpenAI2Ali(request GeneralOpenAIRequest) *AliChatRequest {
message
:=
request
.
Messages
[
i
]
message
:=
request
.
Messages
[
i
]
if
message
.
Role
==
"system"
{
if
message
.
Role
==
"system"
{
messages
=
append
(
messages
,
AliMessage
{
messages
=
append
(
messages
,
AliMessage
{
User
:
string
(
message
.
Content
),
User
:
message
.
StringContent
(
),
Bot
:
"Okay"
,
Bot
:
"Okay"
,
})
})
continue
continue
}
else
{
}
else
{
if
i
==
len
(
request
.
Messages
)
-
1
{
if
i
==
len
(
request
.
Messages
)
-
1
{
prompt
=
string
(
message
.
Content
)
prompt
=
message
.
StringContent
(
)
break
break
}
}
messages
=
append
(
messages
,
AliMessage
{
messages
=
append
(
messages
,
AliMessage
{
User
:
string
(
message
.
Content
),
User
:
message
.
StringContent
(
),
Bot
:
string
(
request
.
Messages
[
i
+
1
]
.
Content
),
Bot
:
string
(
request
.
Messages
[
i
+
1
]
.
Content
),
})
})
i
++
i
++
...
...
controller/relay-baidu.go
View file @
ffe9deb1
...
@@ -89,7 +89,7 @@ func requestOpenAI2Baidu(request GeneralOpenAIRequest) *BaiduChatRequest {
...
@@ -89,7 +89,7 @@ func requestOpenAI2Baidu(request GeneralOpenAIRequest) *BaiduChatRequest {
if
message
.
Role
==
"system"
{
if
message
.
Role
==
"system"
{
messages
=
append
(
messages
,
BaiduMessage
{
messages
=
append
(
messages
,
BaiduMessage
{
Role
:
"user"
,
Role
:
"user"
,
Content
:
string
(
message
.
Content
),
Content
:
message
.
StringContent
(
),
})
})
messages
=
append
(
messages
,
BaiduMessage
{
messages
=
append
(
messages
,
BaiduMessage
{
Role
:
"assistant"
,
Role
:
"assistant"
,
...
@@ -98,7 +98,7 @@ func requestOpenAI2Baidu(request GeneralOpenAIRequest) *BaiduChatRequest {
...
@@ -98,7 +98,7 @@ func requestOpenAI2Baidu(request GeneralOpenAIRequest) *BaiduChatRequest {
}
else
{
}
else
{
messages
=
append
(
messages
,
BaiduMessage
{
messages
=
append
(
messages
,
BaiduMessage
{
Role
:
message
.
Role
,
Role
:
message
.
Role
,
Content
:
string
(
message
.
Content
),
Content
:
message
.
StringContent
(
),
})
})
}
}
}
}
...
...
controller/relay-gemini.go
View file @
ffe9deb1
...
@@ -97,7 +97,7 @@ func requestOpenAI2Gemini(textRequest GeneralOpenAIRequest) *GeminiChatRequest {
...
@@ -97,7 +97,7 @@ func requestOpenAI2Gemini(textRequest GeneralOpenAIRequest) *GeminiChatRequest {
Role
:
message
.
Role
,
Role
:
message
.
Role
,
Parts
:
[]
GeminiPart
{
Parts
:
[]
GeminiPart
{
{
{
Text
:
string
(
message
.
Content
),
Text
:
message
.
StringContent
(
),
},
},
},
},
}
}
...
...
controller/relay-palm.go
View file @
ffe9deb1
...
@@ -59,7 +59,7 @@ func requestOpenAI2PaLM(textRequest GeneralOpenAIRequest) *PaLMChatRequest {
...
@@ -59,7 +59,7 @@ func requestOpenAI2PaLM(textRequest GeneralOpenAIRequest) *PaLMChatRequest {
}
}
for
_
,
message
:=
range
textRequest
.
Messages
{
for
_
,
message
:=
range
textRequest
.
Messages
{
palmMessage
:=
PaLMChatMessage
{
palmMessage
:=
PaLMChatMessage
{
Content
:
string
(
message
.
Content
),
Content
:
message
.
StringContent
(
),
}
}
if
message
.
Role
==
"user"
{
if
message
.
Role
==
"user"
{
palmMessage
.
Author
=
"0"
palmMessage
.
Author
=
"0"
...
...
controller/relay-tencent.go
View file @
ffe9deb1
...
@@ -84,7 +84,7 @@ func requestOpenAI2Tencent(request GeneralOpenAIRequest) *TencentChatRequest {
...
@@ -84,7 +84,7 @@ func requestOpenAI2Tencent(request GeneralOpenAIRequest) *TencentChatRequest {
if
message
.
Role
==
"system"
{
if
message
.
Role
==
"system"
{
messages
=
append
(
messages
,
TencentMessage
{
messages
=
append
(
messages
,
TencentMessage
{
Role
:
"user"
,
Role
:
"user"
,
Content
:
string
(
message
.
Content
),
Content
:
message
.
StringContent
(
),
})
})
messages
=
append
(
messages
,
TencentMessage
{
messages
=
append
(
messages
,
TencentMessage
{
Role
:
"assistant"
,
Role
:
"assistant"
,
...
@@ -93,7 +93,7 @@ func requestOpenAI2Tencent(request GeneralOpenAIRequest) *TencentChatRequest {
...
@@ -93,7 +93,7 @@ func requestOpenAI2Tencent(request GeneralOpenAIRequest) *TencentChatRequest {
continue
continue
}
}
messages
=
append
(
messages
,
TencentMessage
{
messages
=
append
(
messages
,
TencentMessage
{
Content
:
string
(
message
.
Content
),
Content
:
message
.
StringContent
(
),
Role
:
message
.
Role
,
Role
:
message
.
Role
,
})
})
}
}
...
...
controller/relay-xunfei.go
View file @
ffe9deb1
...
@@ -81,7 +81,7 @@ func requestOpenAI2Xunfei(request GeneralOpenAIRequest, xunfeiAppId string, doma
...
@@ -81,7 +81,7 @@ func requestOpenAI2Xunfei(request GeneralOpenAIRequest, xunfeiAppId string, doma
if
message
.
Role
==
"system"
{
if
message
.
Role
==
"system"
{
messages
=
append
(
messages
,
XunfeiMessage
{
messages
=
append
(
messages
,
XunfeiMessage
{
Role
:
"user"
,
Role
:
"user"
,
Content
:
string
(
message
.
Content
),
Content
:
message
.
StringContent
(
),
})
})
messages
=
append
(
messages
,
XunfeiMessage
{
messages
=
append
(
messages
,
XunfeiMessage
{
Role
:
"assistant"
,
Role
:
"assistant"
,
...
@@ -90,7 +90,7 @@ func requestOpenAI2Xunfei(request GeneralOpenAIRequest, xunfeiAppId string, doma
...
@@ -90,7 +90,7 @@ func requestOpenAI2Xunfei(request GeneralOpenAIRequest, xunfeiAppId string, doma
}
else
{
}
else
{
messages
=
append
(
messages
,
XunfeiMessage
{
messages
=
append
(
messages
,
XunfeiMessage
{
Role
:
message
.
Role
,
Role
:
message
.
Role
,
Content
:
string
(
message
.
Content
),
Content
:
message
.
StringContent
(
),
})
})
}
}
}
}
...
...
controller/relay-zhipu.go
View file @
ffe9deb1
...
@@ -114,7 +114,7 @@ func requestOpenAI2Zhipu(request GeneralOpenAIRequest) *ZhipuRequest {
...
@@ -114,7 +114,7 @@ func requestOpenAI2Zhipu(request GeneralOpenAIRequest) *ZhipuRequest {
if
message
.
Role
==
"system"
{
if
message
.
Role
==
"system"
{
messages
=
append
(
messages
,
ZhipuMessage
{
messages
=
append
(
messages
,
ZhipuMessage
{
Role
:
"system"
,
Role
:
"system"
,
Content
:
string
(
message
.
Content
),
Content
:
message
.
StringContent
(
),
})
})
messages
=
append
(
messages
,
ZhipuMessage
{
messages
=
append
(
messages
,
ZhipuMessage
{
Role
:
"user"
,
Role
:
"user"
,
...
@@ -123,7 +123,7 @@ func requestOpenAI2Zhipu(request GeneralOpenAIRequest) *ZhipuRequest {
...
@@ -123,7 +123,7 @@ func requestOpenAI2Zhipu(request GeneralOpenAIRequest) *ZhipuRequest {
}
else
{
}
else
{
messages
=
append
(
messages
,
ZhipuMessage
{
messages
=
append
(
messages
,
ZhipuMessage
{
Role
:
message
.
Role
,
Role
:
message
.
Role
,
Content
:
string
(
message
.
Content
),
Content
:
message
.
StringContent
(
),
})
})
}
}
}
}
...
...
controller/relay.go
View file @
ffe9deb1
...
@@ -36,6 +36,14 @@ const (
...
@@ -36,6 +36,14 @@ const (
ContentTypeImageURL
=
"image_url"
ContentTypeImageURL
=
"image_url"
)
)
func
(
m
Message
)
StringContent
()
string
{
var
stringContent
string
if
err
:=
json
.
Unmarshal
(
m
.
Content
,
&
stringContent
);
err
==
nil
{
return
stringContent
}
return
string
(
m
.
Content
)
}
func
(
m
Message
)
ParseContent
()
[]
MediaMessage
{
func
(
m
Message
)
ParseContent
()
[]
MediaMessage
{
var
contentList
[]
MediaMessage
var
contentList
[]
MediaMessage
var
stringContent
string
var
stringContent
string
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment