mirror of
https://github.com/Wei-Shaw/claude-relay-service.git
synced 2026-01-23 09:38:02 +00:00
Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0f5321b0ef | ||
|
|
c7d7bf47d6 | ||
|
|
ebc30b6026 | ||
|
|
d5a7af2d7d | ||
|
|
81a3e26e27 | ||
|
|
64db4a270d | ||
|
|
ca027ecb90 |
@@ -274,7 +274,9 @@ const handleResponses = async (req, res) => {
|
|||||||
'text_formatting',
|
'text_formatting',
|
||||||
'truncation',
|
'truncation',
|
||||||
'text',
|
'text',
|
||||||
'service_tier'
|
'service_tier',
|
||||||
|
'prompt_cache_retention',
|
||||||
|
'safety_identifier'
|
||||||
]
|
]
|
||||||
fieldsToRemove.forEach((field) => {
|
fieldsToRemove.forEach((field) => {
|
||||||
delete req.body[field]
|
delete req.body[field]
|
||||||
|
|||||||
@@ -343,8 +343,8 @@ class BedrockRelayService {
|
|||||||
res.write(`event: ${claudeEvent.type}\n`)
|
res.write(`event: ${claudeEvent.type}\n`)
|
||||||
res.write(`data: ${JSON.stringify(claudeEvent.data)}\n\n`)
|
res.write(`data: ${JSON.stringify(claudeEvent.data)}\n\n`)
|
||||||
|
|
||||||
// 提取使用统计
|
// 提取使用统计 (usage is reported in message_delta per Claude API spec)
|
||||||
if (claudeEvent.type === 'message_stop' && claudeEvent.data.usage) {
|
if (claudeEvent.type === 'message_delta' && claudeEvent.data.usage) {
|
||||||
totalUsage = claudeEvent.data.usage
|
totalUsage = claudeEvent.data.usage
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -576,14 +576,28 @@ class BedrockRelayService {
|
|||||||
return {
|
return {
|
||||||
type: 'message_start',
|
type: 'message_start',
|
||||||
data: {
|
data: {
|
||||||
type: 'message',
|
type: 'message_start',
|
||||||
id: `msg_${Date.now()}_bedrock`,
|
message: {
|
||||||
role: 'assistant',
|
id: `msg_${Date.now()}_bedrock`,
|
||||||
content: [],
|
type: 'message',
|
||||||
model: this.defaultModel,
|
role: 'assistant',
|
||||||
stop_reason: null,
|
content: [],
|
||||||
stop_sequence: null,
|
model: this.defaultModel,
|
||||||
usage: bedrockChunk.message?.usage || { input_tokens: 0, output_tokens: 0 }
|
stop_reason: null,
|
||||||
|
stop_sequence: null,
|
||||||
|
usage: bedrockChunk.message?.usage || { input_tokens: 0, output_tokens: 0 }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (bedrockChunk.type === 'content_block_start') {
|
||||||
|
return {
|
||||||
|
type: 'content_block_start',
|
||||||
|
data: {
|
||||||
|
type: 'content_block_start',
|
||||||
|
index: bedrockChunk.index || 0,
|
||||||
|
content_block: bedrockChunk.content_block || { type: 'text', text: '' }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -592,16 +606,28 @@ class BedrockRelayService {
|
|||||||
return {
|
return {
|
||||||
type: 'content_block_delta',
|
type: 'content_block_delta',
|
||||||
data: {
|
data: {
|
||||||
|
type: 'content_block_delta',
|
||||||
index: bedrockChunk.index || 0,
|
index: bedrockChunk.index || 0,
|
||||||
delta: bedrockChunk.delta || {}
|
delta: bedrockChunk.delta || {}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (bedrockChunk.type === 'content_block_stop') {
|
||||||
|
return {
|
||||||
|
type: 'content_block_stop',
|
||||||
|
data: {
|
||||||
|
type: 'content_block_stop',
|
||||||
|
index: bedrockChunk.index || 0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (bedrockChunk.type === 'message_delta') {
|
if (bedrockChunk.type === 'message_delta') {
|
||||||
return {
|
return {
|
||||||
type: 'message_delta',
|
type: 'message_delta',
|
||||||
data: {
|
data: {
|
||||||
|
type: 'message_delta',
|
||||||
delta: bedrockChunk.delta || {},
|
delta: bedrockChunk.delta || {},
|
||||||
usage: bedrockChunk.usage || {}
|
usage: bedrockChunk.usage || {}
|
||||||
}
|
}
|
||||||
@@ -612,7 +638,7 @@ class BedrockRelayService {
|
|||||||
return {
|
return {
|
||||||
type: 'message_stop',
|
type: 'message_stop',
|
||||||
data: {
|
data: {
|
||||||
usage: bedrockChunk.usage || {}
|
type: 'message_stop'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,8 +13,8 @@ const OAUTH_CONFIG = {
|
|||||||
AUTHORIZE_URL: 'https://claude.ai/oauth/authorize',
|
AUTHORIZE_URL: 'https://claude.ai/oauth/authorize',
|
||||||
TOKEN_URL: 'https://console.anthropic.com/v1/oauth/token',
|
TOKEN_URL: 'https://console.anthropic.com/v1/oauth/token',
|
||||||
CLIENT_ID: '9d1c250a-e61b-44d9-88ed-5944d1962f5e',
|
CLIENT_ID: '9d1c250a-e61b-44d9-88ed-5944d1962f5e',
|
||||||
REDIRECT_URI: 'https://console.anthropic.com/oauth/code/callback',
|
REDIRECT_URI: 'https://platform.claude.com/oauth/code/callback',
|
||||||
SCOPES: 'org:create_api_key user:profile user:inference',
|
SCOPES: 'org:create_api_key user:profile user:inference user:sessions:claude_code',
|
||||||
SCOPES_SETUP: 'user:inference' // Setup Token 只需要推理权限
|
SCOPES_SETUP: 'user:inference' // Setup Token 只需要推理权限
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -35,6 +35,7 @@ function generateState() {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 生成随机的 code verifier(PKCE)
|
* 生成随机的 code verifier(PKCE)
|
||||||
|
* 符合 RFC 7636 标准:32字节随机数 → base64url编码 → 43字符
|
||||||
* @returns {string} base64url 编码的随机字符串
|
* @returns {string} base64url 编码的随机字符串
|
||||||
*/
|
*/
|
||||||
function generateCodeVerifier() {
|
function generateCodeVerifier() {
|
||||||
|
|||||||
Reference in New Issue
Block a user