github/claude-relay-service
1
0
Fork 0
mirror of https://github.com/Wei-Shaw/claude-relay-service.git synced 2026-03-29 23:14:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: 移除1m模型限制和配套的apikey功能

Browse Source
This commit is contained in:
shaw
2026-03-14 12:04:22 +08:00
parent 5c0a1fc276
commit 48c14f4e1b
8 changed files with 3 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/middleware/auth.js
View File

@@ -1313,7 +1313,6 @@ const authenticateApiKey = async (req, res, next) => {
restrictedModels: validation.keyData.restrictedModels,
enableClientRestriction: validation.keyData.enableClientRestriction,
allowedClients: validation.keyData.allowedClients,
allow1mContext: validation.keyData.allow1mContext,
dailyCostLimit: validation.keyData.dailyCostLimit,
dailyCost: validation.keyData.dailyCost,
totalCostLimit: validation.keyData.totalCostLimit,

2
src/models/redis.js
View File

@@ -773,7 +773,7 @@ class RedisClient {
const parsed = { ...data }
// 布尔字段
const boolFields = ['isActive', 'enableModelRestriction', 'isDeleted', 'allow1mContext']
const boolFields = ['isActive', 'enableModelRestriction', 'isDeleted']
for (const field of boolFields) {
if (parsed[field] !== undefined) {
parsed[field] = parsed[field] === 'true'

19
src/routes/admin/apiKeys.js
View File

@@ -1483,7 +1483,6 @@ router.post('/api-keys', authenticateAdmin, async (req, res) => {
restrictedModels,
enableClientRestriction,
allowedClients,
allow1mContext,
dailyCostLimit,
totalCostLimit,
weeklyOpusCostLimit,
@@ -1563,10 +1562,6 @@ router.post('/api-keys', authenticateAdmin, async (req, res) => {
return res.status(400).json({ error: 'Allowed clients must be an array' })
}
if (allow1mContext !== undefined && typeof allow1mContext !== 'boolean') {
return res.status(400).json({ error: 'allow1mContext must be a boolean' })
}
// 验证标签字段
if (tags !== undefined && !Array.isArray(tags)) {
return res.status(400).json({ error: 'Tags must be an array' })
@@ -1667,7 +1662,6 @@ router.post('/api-keys', authenticateAdmin, async (req, res) => {
restrictedModels,
enableClientRestriction,
allowedClients,
allow1mContext,
dailyCostLimit,
totalCostLimit,
weeklyOpusCostLimit,
@@ -1719,7 +1713,6 @@ router.post('/api-keys/batch', authenticateAdmin, async (req, res) => {
restrictedModels,
enableClientRestriction,
allowedClients,
allow1mContext,
dailyCostLimit,
totalCostLimit,
weeklyOpusCostLimit,
@@ -1785,7 +1778,6 @@ router.post('/api-keys/batch', authenticateAdmin, async (req, res) => {
restrictedModels,
enableClientRestriction,
allowedClients,
allow1mContext,
dailyCostLimit,
totalCostLimit,
weeklyOpusCostLimit,
@@ -1947,9 +1939,6 @@ router.put('/api-keys/batch', authenticateAdmin, async (req, res) => {
if (updates.serviceRates !== undefined) {
finalUpdates.serviceRates = updates.serviceRates
}
if (updates.allow1mContext !== undefined) {
finalUpdates.allow1mContext = updates.allow1mContext
}
if (updates.weeklyResetDay !== undefined) {
const day = Number(updates.weeklyResetDay)
if (Number.isInteger(day) && day >= 1 && day <= 7) {
@@ -2090,7 +2079,6 @@ router.put('/api-keys/:keyId', authenticateAdmin, async (req, res) => {
restrictedModels,
enableClientRestriction,
allowedClients,
allow1mContext,
expiresAt,
dailyCostLimit,
totalCostLimit,
@@ -2224,13 +2212,6 @@ router.put('/api-keys/:keyId', authenticateAdmin, async (req, res) => {
updates.allowedClients = allowedClients
}
if (allow1mContext !== undefined) {
if (typeof allow1mContext !== 'boolean') {
return res.status(400).json({ error: 'allow1mContext must be a boolean' })
}
updates.allow1mContext = allow1mContext
}
// 处理过期时间字段
if (expiresAt !== undefined) {
if (expiresAt === null) {

19
src/routes/api.js
View File

@@ -197,18 +197,6 @@ async function handleMessagesRequest(req, res) {
}
}
// 检测 1M 上下文窗口请求（anthropic-beta 包含 context-1m）
const betaHeader = (req.headers['anthropic-beta'] || '').toLowerCase()
const is1mContextRequest = betaHeader.includes('context-1m')
if (is1mContextRequest && !req.apiKey.allow1mContext) {
return res.status(403).json({
error: {
type: 'forbidden',
message: '该 API Key 未启用 1M 上下文窗口，请联系管理员开启或切换为非 [1m] 模型'
}
})
}
logger.api('📥 /v1/messages request received', {
model: req.body.model || null,
forcedVendor,
@@ -389,13 +377,6 @@ async function handleMessagesRequest(req, res) {
throw error
}
// 1M 上下文窗口：记录日志（admin 已通过 allow1mContext 授权，信任其决定）
if (is1mContextRequest) {
logger.api(
`📐 1M context request allowed for key: ${req.apiKey.name}, accountType: ${accountType}`
)
}
// 🔗 在成功调度后建立会话绑定（仅 claude-official 类型）
// claude-official 只接受：1) 新会话 2) 已绑定的会话
if (

4
src/services/apiKeyService.js
View File

@@ -153,7 +153,6 @@ class ApiKeyService {
restrictedModels = [],
enableClientRestriction = false,
allowedClients = [],
allow1mContext = false,
dailyCostLimit = 0,
totalCostLimit = 0,
weeklyOpusCostLimit = 0,
@@ -198,7 +197,6 @@ class ApiKeyService {
restrictedModels: JSON.stringify(restrictedModels || []),
enableClientRestriction: String(enableClientRestriction || false),
allowedClients: JSON.stringify(allowedClients || []),
allow1mContext: String(allow1mContext || false),
dailyCostLimit: String(dailyCostLimit || 0),
totalCostLimit: String(totalCostLimit || 0),
weeklyOpusCostLimit: String(weeklyOpusCostLimit || 0),
@@ -453,7 +451,6 @@ class ApiKeyService {
restrictedModels,
enableClientRestriction: keyData.enableClientRestriction === 'true',
allowedClients,
allow1mContext: keyData.allow1mContext === 'true',
dailyCostLimit,
totalCostLimit,
weeklyOpusCostLimit,
@@ -1231,7 +1228,6 @@ class ApiKeyService {
'restrictedModels',
'enableClientRestriction',
'allowedClients',
'allow1mContext',
'dailyCostLimit',
'totalCostLimit',
'weeklyOpusCostLimit',

34
web/admin-spa/src/components/apikeys/BatchEditApiKeyModal.vue
View File

@@ -322,32 +322,6 @@
</div>
</div>
<!-- 允许 1M 上下文 -->
<div>
<div class="mb-3 flex items-center gap-4">
<label class="text-sm font-semibold text-gray-700 dark:text-gray-300"
>允许 1M 上下文</label
>
<div class="flex gap-4">
<label class="flex cursor-pointer items-center">
<input v-model="form.allow1mContext" class="mr-2" type="radio" :value="true" />
<span class="text-sm text-gray-700 dark:text-gray-300">启用</span>
</label>
<label class="flex cursor-pointer items-center">
<input v-model="form.allow1mContext" class="mr-2" type="radio" :value="false" />
<span class="text-sm text-gray-700 dark:text-gray-300">禁用</span>
</label>
<label class="flex cursor-pointer items-center">
<input v-model="form.allow1mContext" class="mr-2" type="radio" :value="null" />
<span class="text-sm text-gray-700 dark:text-gray-300">不修改</span>
</label>
</div>
</div>
<p class="ml-0 text-xs text-gray-500 dark:text-gray-400">
启用后允许使用 [1m] 模型（需要 Bedrock 账户支持）
</p>
</div>
<!-- 服务权限 -->
<div>
<label class="mb-3 block text-sm font-semibold text-gray-700 dark:text-gray-300"
@@ -583,8 +557,7 @@ const form = reactive({
bedrockAccountId: '',
droidAccountId: '',
tags: [],
isActive: null, // null表示不修改
allow1mContext: null // null表示不修改
isActive: null // null表示不修改
})
const UNCHANGED_OPTION_VALUE = '__KEEP_ORIGINAL__'
@@ -869,11 +842,6 @@ const batchUpdateApiKeys = async () => {
updates.isActive = form.isActive
}
// 1M 上下文
if (form.allow1mContext !== null) {
updates.allow1mContext = form.allow1mContext
}
// 标签处理
if (tagOperation.value !== 'none') {
updates.tags = form.tags

25
web/admin-spa/src/components/apikeys/CreateApiKeyModal.vue
View File

@@ -938,27 +938,6 @@
</div>
</div>
<!-- 允许 1M 上下文 -->
<div>
<div class="mb-2 flex items-center">
<input
id="allow1mContext"
v-model="form.allow1mContext"
class="h-4 w-4 rounded border-gray-300 bg-gray-100 text-blue-600 focus:ring-blue-500"
type="checkbox"
/>
<label
class="ml-2 cursor-pointer text-sm font-semibold text-gray-700 dark:text-gray-300"
for="allow1mContext"
>
允许 1M 上下文
</label>
</div>
<p class="ml-6 text-xs text-gray-500 dark:text-gray-400">
启用后允许使用 [1m] 模型（需要 Bedrock 账户支持）
</p>
</div>
<div class="flex gap-3 pt-2">
<button
class="flex-1 rounded-lg bg-gray-100 px-4 py-2.5 text-sm font-semibold text-gray-700 transition-colors hover:bg-gray-200 dark:bg-gray-700 dark:text-gray-300 dark:hover:bg-gray-600"
@@ -1135,7 +1114,6 @@ const form = reactive({
modelInput: '',
enableClientRestriction: false,
allowedClients: [],
allow1mContext: false,
tags: []
})
@@ -1564,8 +1542,7 @@ const createApiKey = async () => {
enableModelRestriction: form.enableModelRestriction,
restrictedModels: form.restrictedModels,
enableClientRestriction: form.enableClientRestriction,
allowedClients: form.allowedClients,
allow1mContext: form.allow1mContext
allowedClients: form.allowedClients
}
// 处理Claude账户绑定（区分OAuth和Console）

27
web/admin-spa/src/components/apikeys/EditApiKeyModal.vue
View File

@@ -776,27 +776,6 @@
</div>
</div>
<!-- 允许 1M 上下文 -->
<div>
<div class="mb-2 flex items-center">
<input
id="editAllow1mContext"
v-model="form.allow1mContext"
class="h-4 w-4 rounded border-gray-300 bg-gray-100 text-blue-600 focus:ring-blue-500 dark:border-gray-600 dark:bg-gray-700"
type="checkbox"
/>
<label
class="ml-2 cursor-pointer text-sm font-semibold text-gray-700 dark:text-gray-300"
for="editAllow1mContext"
>
允许 1M 上下文
</label>
</div>
<p class="ml-6 text-xs text-gray-500 dark:text-gray-400">
启用后允许使用 [1m] 模型（需要 Bedrock 账户支持）
</p>
</div>
<div class="flex gap-3 pt-4">
<button
class="flex-1 rounded-xl bg-gray-100 px-6 py-3 font-semibold text-gray-700 transition-colors hover:bg-gray-200 dark:bg-gray-700 dark:text-gray-300 dark:hover:bg-gray-600"
@@ -969,7 +948,6 @@ const form = reactive({
modelInput: '',
enableClientRestriction: false,
allowedClients: [],
allow1mContext: false,
tags: [],
isActive: true,
ownerId: '' // 新增：所有者ID
@@ -1153,9 +1131,6 @@ const updateApiKey = async () => {
data.enableClientRestriction = form.enableClientRestriction
data.allowedClients = form.allowedClients
// 1M 上下文
data.allow1mContext = form.allow1mContext
// 活跃状态
data.isActive = form.isActive
@@ -1473,8 +1448,6 @@ onMounted(async () => {
props.apiKey.enableModelRestriction === true || props.apiKey.enableModelRestriction === 'true'
form.enableClientRestriction =
props.apiKey.enableClientRestriction === true || props.apiKey.enableClientRestriction === 'true'
form.allow1mContext =
props.apiKey.allow1mContext === true || props.apiKey.allow1mContext === 'true'
// 初始化活跃状态，默认为 true（强制转换为布尔值，因为Redis返回字符串）
form.isActive =
props.apiKey.isActive === undefined ||