-
-
Notifications
You must be signed in to change notification settings - Fork 181
feat: 统一请求特殊设置命中的展示方式 #574
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,126 @@ | ||
| import { CONTEXT_1M_BETA_HEADER } from "@/lib/special-attributes"; | ||
| import type { SpecialSetting } from "@/types/special-settings"; | ||
|
|
||
| type BuildUnifiedSpecialSettingsParams = { | ||
| /** | ||
| * 已有 specialSettings（通常来自 DB special_settings 或 Session Redis 缓存） | ||
| */ | ||
| existing?: SpecialSetting[] | null; | ||
| /** | ||
| * 拦截类型（如 warmup / sensitive_word） | ||
| */ | ||
| blockedBy?: string | null; | ||
| /** | ||
| * 拦截原因（通常为 JSON 字符串） | ||
| */ | ||
| blockedReason?: string | null; | ||
| /** | ||
| * HTTP 状态码（用于补齐守卫拦截信息） | ||
| */ | ||
| statusCode?: number | null; | ||
| /** | ||
| * Cache TTL 实际应用值（用于展示 TTL/标头覆写命中） | ||
| */ | ||
| cacheTtlApplied?: string | null; | ||
| /** | ||
| * 1M 上下文是否应用（用于展示 1M 标头覆写命中） | ||
| */ | ||
| context1mApplied?: boolean | null; | ||
| }; | ||
|
|
||
| function buildSettingKey(setting: SpecialSetting): string { | ||
| switch (setting.type) { | ||
| case "provider_parameter_override": | ||
| return JSON.stringify([ | ||
| setting.type, | ||
| setting.providerId ?? null, | ||
| setting.providerType ?? null, | ||
| setting.hit, | ||
| setting.changed, | ||
| [...setting.changes] | ||
| .map((change) => [change.path, change.before, change.after, change.changed] as const) | ||
| .sort((a, b) => a[0].localeCompare(b[0])), | ||
| ]); | ||
| case "response_fixer": | ||
| return JSON.stringify([ | ||
| setting.type, | ||
| setting.hit, | ||
| [...setting.fixersApplied] | ||
| .map((fixer) => [fixer.fixer, fixer.applied] as const) | ||
| .sort((a, b) => a[0].localeCompare(b[0])), | ||
| ]); | ||
| case "guard_intercept": | ||
| return JSON.stringify([setting.type, setting.guard, setting.action, setting.statusCode]); | ||
| case "anthropic_cache_ttl_header_override": | ||
| return JSON.stringify([setting.type, setting.ttl]); | ||
| case "anthropic_context_1m_header_override": | ||
| return JSON.stringify([setting.type, setting.header, setting.flag]); | ||
| default: { | ||
| // 兜底：保证即使未来扩展类型也不会导致运行时崩溃 | ||
| const _exhaustive: never = setting; | ||
| return JSON.stringify(_exhaustive); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * 构建“统一特殊设置”展示数据 | ||
| * | ||
| * 目标：把 DB 字段（blockedBy/cacheTtlApplied/context1mApplied）与既有 special_settings 合并， | ||
| * 统一在以下位置展示：日志列表/日志详情弹窗/Session 详情页。 | ||
| */ | ||
| export function buildUnifiedSpecialSettings( | ||
| params: BuildUnifiedSpecialSettingsParams | ||
| ): SpecialSetting[] | null { | ||
| const base = params.existing ?? []; | ||
| const derived: SpecialSetting[] = []; | ||
|
|
||
| if (params.blockedBy) { | ||
| const guard = params.blockedBy; | ||
| const action = guard === "warmup" ? "intercept_response" : "block_request"; | ||
|
|
||
| derived.push({ | ||
| type: "guard_intercept", | ||
| scope: "guard", | ||
| hit: true, | ||
| guard, | ||
| action, | ||
| statusCode: params.statusCode ?? null, | ||
| reason: params.blockedReason ?? null, | ||
| }); | ||
| } | ||
|
|
||
| if (params.cacheTtlApplied) { | ||
| derived.push({ | ||
| type: "anthropic_cache_ttl_header_override", | ||
| scope: "request_header", | ||
| hit: true, | ||
| ttl: params.cacheTtlApplied, | ||
| }); | ||
| } | ||
|
|
||
| if (params.context1mApplied === true) { | ||
| derived.push({ | ||
| type: "anthropic_context_1m_header_override", | ||
| scope: "request_header", | ||
| hit: true, | ||
| header: "anthropic-beta", | ||
| flag: CONTEXT_1M_BETA_HEADER, | ||
| }); | ||
| } | ||
|
|
||
| if (base.length === 0 && derived.length === 0) { | ||
| return null; | ||
| } | ||
|
|
||
| const seen = new Set<string>(); | ||
| const result: SpecialSetting[] = []; | ||
| for (const item of [...base, ...derived]) { | ||
| const key = buildSettingKey(item); | ||
| if (seen.has(key)) continue; | ||
| seen.add(key); | ||
| result.push(item); | ||
| } | ||
|
|
||
| return result.length > 0 ? result : null; | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The deduplication logic assumes that if two settings have the same
buildSettingKey()result, they are duplicates and should be deduplicated. However, there's a subtle issue with the guard_intercept type deduplication.Consider this scenario:
existingcontains:{ type: "guard_intercept", guard: "warmup", action: "intercept_response", statusCode: 200, reason: "original_reason" }params.blockedBy: "warmup",params.blockedReason: "different_reason",params.statusCode: 200The buildSettingKey for guard_intercept (line 51-57) uses the
reasonfield in the key, so:"guard_intercept:warmup:intercept_response:200:original_reason""guard_intercept:warmup:intercept_response:200:different_reason"These have different keys, so both would be included! This violates the intention to deduplicate.
The issue is that the
reasonfield (which contains JSON string like{"reason": "..."}) is being used in the deduplication key. If the same guard intercepts a request multiple times with different reasons, they would all be kept rather than deduplicated.A better approach would be to not include the reason in the deduplication key, or to normalize the reason data before comparison:
Or if you want to keep the reason, at least normalize it by parsing the JSON first to make the comparison more robust.
Prompt To Fix With AI