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
d2c268dd
authored
Nov 14, 2025
by
CaIon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(aws): Add support for anthropic-beta header in AwsClaudeRequest
parent
31384833
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
19 deletions
+19
-19
relay/channel/aws/dto.go
+14
-17
relay/channel/aws/relay-aws.go
+5
-2
No files found.
relay/channel/aws/dto.go
View file @
d2c268dd
package
aws
package
aws
import
(
import
(
"encoding/json"
"io"
"io"
"net/http"
"github.com/QuantumNous/new-api/common"
"github.com/QuantumNous/new-api/common"
"github.com/QuantumNous/new-api/dto"
"github.com/QuantumNous/new-api/dto"
...
@@ -10,6 +12,7 @@ import (
...
@@ -10,6 +12,7 @@ import (
type
AwsClaudeRequest
struct
{
type
AwsClaudeRequest
struct
{
// AnthropicVersion should be "bedrock-2023-05-31"
// AnthropicVersion should be "bedrock-2023-05-31"
AnthropicVersion
string
`json:"anthropic_version"`
AnthropicVersion
string
`json:"anthropic_version"`
AnthropicBeta
json
.
RawMessage
`json:"anthropic_beta"`
System
any
`json:"system,omitempty"`
System
any
`json:"system,omitempty"`
Messages
[]
dto
.
ClaudeMessage
`json:"messages"`
Messages
[]
dto
.
ClaudeMessage
`json:"messages"`
MaxTokens
uint
`json:"max_tokens,omitempty"`
MaxTokens
uint
`json:"max_tokens,omitempty"`
...
@@ -22,29 +25,23 @@ type AwsClaudeRequest struct {
...
@@ -22,29 +25,23 @@ type AwsClaudeRequest struct {
Thinking
*
dto
.
Thinking
`json:"thinking,omitempty"`
Thinking
*
dto
.
Thinking
`json:"thinking,omitempty"`
}
}
func
copyRequest
(
req
*
dto
.
ClaudeRequest
)
*
AwsClaudeRequest
{
func
formatRequest
(
requestBody
io
.
Reader
,
requestHeader
http
.
Header
)
(
*
AwsClaudeRequest
,
error
)
{
return
&
AwsClaudeRequest
{
AnthropicVersion
:
"bedrock-2023-05-31"
,
System
:
req
.
System
,
Messages
:
req
.
Messages
,
MaxTokens
:
req
.
MaxTokens
,
Temperature
:
req
.
Temperature
,
TopP
:
req
.
TopP
,
TopK
:
req
.
TopK
,
StopSequences
:
req
.
StopSequences
,
Tools
:
req
.
Tools
,
ToolChoice
:
req
.
ToolChoice
,
Thinking
:
req
.
Thinking
,
}
}
func
formatRequest
(
requestBody
io
.
Reader
)
(
*
AwsClaudeRequest
,
error
)
{
var
awsClaudeRequest
AwsClaudeRequest
var
awsClaudeRequest
AwsClaudeRequest
err
:=
common
.
DecodeJson
(
requestBody
,
&
awsClaudeRequest
)
err
:=
common
.
DecodeJson
(
requestBody
,
&
awsClaudeRequest
)
if
err
!=
nil
{
if
err
!=
nil
{
return
nil
,
err
return
nil
,
err
}
}
awsClaudeRequest
.
AnthropicVersion
=
"bedrock-2023-05-31"
awsClaudeRequest
.
AnthropicVersion
=
"bedrock-2023-05-31"
// check header anthropic-beta
anthropicBetaValues
:=
requestHeader
.
Values
(
"anthropic-beta"
)
if
len
(
anthropicBetaValues
)
>
0
{
betaJson
,
err
:=
json
.
Marshal
(
anthropicBetaValues
)
if
err
!=
nil
{
return
nil
,
err
}
awsClaudeRequest
.
AnthropicBeta
=
json
.
RawMessage
(
betaJson
)
}
return
&
awsClaudeRequest
,
nil
return
&
awsClaudeRequest
,
nil
}
}
...
...
relay/channel/aws/relay-aws.go
View file @
d2c268dd
...
@@ -73,7 +73,6 @@ func doAwsClientRequest(c *gin.Context, info *relaycommon.RelayInfo, a *Adaptor,
...
@@ -73,7 +73,6 @@ func doAwsClientRequest(c *gin.Context, info *relaycommon.RelayInfo, a *Adaptor,
}
}
a
.
AwsClient
=
awsCli
a
.
AwsClient
=
awsCli
println
(
info
.
UpstreamModelName
)
// 获取对应的AWS模型ID
// 获取对应的AWS模型ID
awsModelId
:=
getAwsModelID
(
info
.
UpstreamModelName
)
awsModelId
:=
getAwsModelID
(
info
.
UpstreamModelName
)
...
@@ -83,6 +82,10 @@ func doAwsClientRequest(c *gin.Context, info *relaycommon.RelayInfo, a *Adaptor,
...
@@ -83,6 +82,10 @@ func doAwsClientRequest(c *gin.Context, info *relaycommon.RelayInfo, a *Adaptor,
awsModelId
=
awsModelCrossRegion
(
awsModelId
,
awsRegionPrefix
)
awsModelId
=
awsModelCrossRegion
(
awsModelId
,
awsRegionPrefix
)
}
}
// init empty request.header
requestHeader
:=
http
.
Header
{}
a
.
SetupRequestHeader
(
c
,
&
requestHeader
,
info
)
if
isNovaModel
(
awsModelId
)
{
if
isNovaModel
(
awsModelId
)
{
var
novaReq
*
NovaRequest
var
novaReq
*
NovaRequest
err
=
common
.
DecodeJson
(
requestBody
,
&
novaReq
)
err
=
common
.
DecodeJson
(
requestBody
,
&
novaReq
)
...
@@ -104,7 +107,7 @@ func doAwsClientRequest(c *gin.Context, info *relaycommon.RelayInfo, a *Adaptor,
...
@@ -104,7 +107,7 @@ func doAwsClientRequest(c *gin.Context, info *relaycommon.RelayInfo, a *Adaptor,
awsReq
.
Body
=
reqBody
awsReq
.
Body
=
reqBody
return
nil
,
nil
return
nil
,
nil
}
else
{
}
else
{
awsClaudeReq
,
err
:=
formatRequest
(
requestBody
)
awsClaudeReq
,
err
:=
formatRequest
(
requestBody
,
requestHeader
)
if
err
!=
nil
{
if
err
!=
nil
{
return
nil
,
types
.
NewError
(
errors
.
Wrap
(
err
,
"format aws request fail"
),
types
.
ErrorCodeBadRequestBody
)
return
nil
,
types
.
NewError
(
errors
.
Wrap
(
err
,
"format aws request fail"
),
types
.
ErrorCodeBadRequestBody
)
}
}
...
...
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