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
75130657
authored
Mar 14, 2025
by
Sh1n3zZ
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: wrong thinking labels appear in non-thinking models (#861)
parent
25aaefc6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
3 deletions
+15
-3
relay/channel/openai/adaptor.go
+11
-1
relay/channel/openai/relay-openai.go
+4
-2
No files found.
relay/channel/openai/adaptor.go
View file @
75130657
...
...
@@ -5,7 +5,6 @@ import (
"encoding/json"
"errors"
"fmt"
"github.com/gin-gonic/gin"
"io"
"mime/multipart"
"net/http"
...
...
@@ -23,6 +22,8 @@ import (
"one-api/relay/constant"
"one-api/service"
"strings"
"github.com/gin-gonic/gin"
)
type
Adaptor
struct
{
...
...
@@ -48,6 +49,15 @@ func (a *Adaptor) ConvertClaudeRequest(c *gin.Context, info *relaycommon.RelayIn
func
(
a
*
Adaptor
)
Init
(
info
*
relaycommon
.
RelayInfo
)
{
a
.
ChannelType
=
info
.
ChannelType
// initialize ThinkingContentInfo when thinking_to_content is enabled
if
think2Content
,
ok
:=
info
.
ChannelSetting
[
constant2
.
ChannelSettingThinkingToContent
]
.
(
bool
);
ok
&&
think2Content
{
info
.
ThinkingContentInfo
=
relaycommon
.
ThinkingContentInfo
{
IsFirstThinkingContent
:
true
,
SendLastThinkingContent
:
false
,
HasSentThinkingContent
:
false
,
}
}
}
func
(
a
*
Adaptor
)
GetRequestURL
(
info
*
relaycommon
.
RelayInfo
)
(
string
,
error
)
{
...
...
relay/channel/openai/relay-openai.go
View file @
75130657
...
...
@@ -65,6 +65,7 @@ func sendStreamData(c *gin.Context, info *relaycommon.RelayInfo, data string, fo
response
.
Choices
[
i
]
.
Delta
.
Reasoning
=
nil
}
info
.
ThinkingContentInfo
.
IsFirstThinkingContent
=
false
info
.
ThinkingContentInfo
.
HasSentThinkingContent
=
true
return
helper
.
ObjectData
(
c
,
response
)
}
}
...
...
@@ -76,7 +77,8 @@ func sendStreamData(c *gin.Context, info *relaycommon.RelayInfo, data string, fo
// Process each choice
for
i
,
choice
:=
range
lastStreamResponse
.
Choices
{
// Handle transition from thinking to content
if
hasContent
&&
!
info
.
ThinkingContentInfo
.
SendLastThinkingContent
{
// only send `</think>` tag when previous thinking content has been sent
if
hasContent
&&
!
info
.
ThinkingContentInfo
.
SendLastThinkingContent
&&
info
.
ThinkingContentInfo
.
HasSentThinkingContent
{
response
:=
lastStreamResponse
.
Copy
()
for
j
:=
range
response
.
Choices
{
response
.
Choices
[
j
]
.
Delta
.
SetContentString
(
"
\n
</think>
\n
"
)
...
...
@@ -87,7 +89,7 @@ func sendStreamData(c *gin.Context, info *relaycommon.RelayInfo, data string, fo
helper
.
ObjectData
(
c
,
response
)
}
// Convert reasoning content to regular content
// Convert reasoning content to regular content
if any
if
len
(
choice
.
Delta
.
GetReasoningContent
())
>
0
{
lastStreamResponse
.
Choices
[
i
]
.
Delta
.
SetContentString
(
choice
.
Delta
.
GetReasoningContent
())
lastStreamResponse
.
Choices
[
i
]
.
Delta
.
ReasoningContent
=
nil
...
...
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