lbyxiaolizi
612436a5a7
修复 #5520：Codex 经 force_chat_completions 桥接到 DeepSeek thinking 上游时， 历史中的 encrypted-only reasoning item（summary 为空 + 不透明 encrypted_content， 远程 compaction / 跨会话恢复后常见）取不出明文，后续 assistant 消息缺 reasoning_content，DeepSeek 400 "The reasoning_content in the thinking mode must be passed back to the API"，客户端仅看到通用 502。 reasoning item 的 id 一定会被客户端回传，以其为 key 做服务端缓存： - GatewayCache 新增 Set/GetReasoningContent（Redis，默认 TTL 7 天） - 响应侧：流式扫 response.output_item.done、非流式扫 output，把 reasoning 全文按 item id 写缓存；客户端断连后 drain 期间用 detached ctx 仍会写完 - 请求侧：apicompat 新增 ResponsesToChatCompletionsRequestWithOptions 与 ReasoningContentByID 钩子，encrypted-only item 查缓存补回 pendingReasoning； 缓存 miss/出错一律 fail-open 维持原行为 - 自愈：历史里带明文 summary 的 reasoning item 顺手刷新缓存，覆盖 Redis flush / 跨实例漂移 测试：apicompat（命中恢复/miss 保持原样/明文优先）、service 端到端（流式 写缓存、请求侧回注+自愈）、repository miniredis 存取。
160 lines
5.9 KiB
Go
160 lines
5.9 KiB
Go
//go:build unit
|
|
|
|
// Package testutil 提供单元测试共享的 Stub、Fixture 和辅助函数。
|
|
// 所有文件使用 //go:build unit 标签，确保不会被生产构建包含。
|
|
package testutil
|
|
|
|
import (
|
|
"context"
|
|
"time"
|
|
|
|
"github.com/Wei-Shaw/sub2api/internal/service"
|
|
)
|
|
|
|
// ============================================================
|
|
// StubConcurrencyCache — service.ConcurrencyCache 的空实现
|
|
// ============================================================
|
|
|
|
// 编译期接口断言
|
|
var _ service.ConcurrencyCache = StubConcurrencyCache{}
|
|
|
|
// StubConcurrencyCache 是 ConcurrencyCache 的默认空实现，所有方法返回零值。
|
|
type StubConcurrencyCache struct{}
|
|
|
|
func (c StubConcurrencyCache) AcquireAccountSlot(_ context.Context, _ int64, _ int, _ string) (bool, error) {
|
|
return true, nil
|
|
}
|
|
func (c StubConcurrencyCache) ReleaseAccountSlot(_ context.Context, _ int64, _ string) error {
|
|
return nil
|
|
}
|
|
func (c StubConcurrencyCache) GetAccountConcurrency(_ context.Context, _ int64) (int, error) {
|
|
return 0, nil
|
|
}
|
|
func (c StubConcurrencyCache) IncrementAccountWaitCount(_ context.Context, _ int64, _ int) (bool, error) {
|
|
return true, nil
|
|
}
|
|
func (c StubConcurrencyCache) DecrementAccountWaitCount(_ context.Context, _ int64) error {
|
|
return nil
|
|
}
|
|
func (c StubConcurrencyCache) GetAccountWaitingCount(_ context.Context, _ int64) (int, error) {
|
|
return 0, nil
|
|
}
|
|
func (c StubConcurrencyCache) AcquireUserSlot(_ context.Context, _ int64, _ int, _ string) (bool, error) {
|
|
return true, nil
|
|
}
|
|
func (c StubConcurrencyCache) ReleaseUserSlot(_ context.Context, _ int64, _ string) error {
|
|
return nil
|
|
}
|
|
func (c StubConcurrencyCache) GetUserConcurrency(_ context.Context, _ int64) (int, error) {
|
|
return 0, nil
|
|
}
|
|
func (c StubConcurrencyCache) IncrementWaitCount(_ context.Context, _ int64, _ int) (bool, error) {
|
|
return true, nil
|
|
}
|
|
func (c StubConcurrencyCache) DecrementWaitCount(_ context.Context, _ int64) error { return nil }
|
|
func (c StubConcurrencyCache) GetAccountsLoadBatch(_ context.Context, accounts []service.AccountWithConcurrency) (map[int64]*service.AccountLoadInfo, error) {
|
|
result := make(map[int64]*service.AccountLoadInfo, len(accounts))
|
|
for _, acc := range accounts {
|
|
result[acc.ID] = &service.AccountLoadInfo{AccountID: acc.ID, LoadRate: 0}
|
|
}
|
|
return result, nil
|
|
}
|
|
func (c StubConcurrencyCache) GetUsersLoadBatch(_ context.Context, users []service.UserWithConcurrency) (map[int64]*service.UserLoadInfo, error) {
|
|
result := make(map[int64]*service.UserLoadInfo, len(users))
|
|
for _, u := range users {
|
|
result[u.ID] = &service.UserLoadInfo{UserID: u.ID, LoadRate: 0}
|
|
}
|
|
return result, nil
|
|
}
|
|
func (c StubConcurrencyCache) GetAccountConcurrencyBatch(_ context.Context, accountIDs []int64) (map[int64]int, error) {
|
|
result := make(map[int64]int, len(accountIDs))
|
|
for _, id := range accountIDs {
|
|
result[id] = 0
|
|
}
|
|
return result, nil
|
|
}
|
|
func (c StubConcurrencyCache) CleanupExpiredAccountSlots(_ context.Context, _ int64) error {
|
|
return nil
|
|
}
|
|
func (c StubConcurrencyCache) CleanupExpiredAccountSlotKeys(_ context.Context) error {
|
|
return nil
|
|
}
|
|
func (c StubConcurrencyCache) CleanupStaleProcessSlots(_ context.Context, _ string) error {
|
|
return nil
|
|
}
|
|
|
|
// ============================================================
|
|
// StubGatewayCache — service.GatewayCache 的空实现
|
|
// ============================================================
|
|
|
|
var _ service.GatewayCache = StubGatewayCache{}
|
|
|
|
type StubGatewayCache struct{}
|
|
|
|
func (c StubGatewayCache) GetSessionAccountID(_ context.Context, _ int64, _ string) (int64, error) {
|
|
return 0, nil
|
|
}
|
|
func (c StubGatewayCache) SetSessionAccountID(_ context.Context, _ int64, _ string, _ int64, _ time.Duration) error {
|
|
return nil
|
|
}
|
|
func (c StubGatewayCache) RefreshSessionTTL(_ context.Context, _ int64, _ string, _ time.Duration) error {
|
|
return nil
|
|
}
|
|
func (c StubGatewayCache) DeleteSessionAccountID(_ context.Context, _ int64, _ string) error {
|
|
return nil
|
|
}
|
|
|
|
func (c StubGatewayCache) SetGrokVideoPendingBilling(_ context.Context, _ string, _ []byte, _ time.Duration) error {
|
|
return nil
|
|
}
|
|
func (c StubGatewayCache) GetGrokVideoPendingBilling(_ context.Context, _ string) ([]byte, error) {
|
|
return nil, nil
|
|
}
|
|
func (c StubGatewayCache) ClaimGrokVideoBilled(_ context.Context, _ string, _ time.Duration) (bool, error) {
|
|
return true, nil
|
|
}
|
|
|
|
func (c StubGatewayCache) ReleaseGrokVideoBilled(_ context.Context, _ string) error {
|
|
return nil
|
|
}
|
|
|
|
func (c StubGatewayCache) SetReasoningContent(_ context.Context, _ string, _ string, _ time.Duration) error {
|
|
return nil
|
|
}
|
|
func (c StubGatewayCache) GetReasoningContent(_ context.Context, _ string) (string, error) {
|
|
return "", service.ErrReasoningContentNotFound
|
|
}
|
|
|
|
// ============================================================
|
|
// StubSessionLimitCache — service.SessionLimitCache 的空实现
|
|
// ============================================================
|
|
|
|
var _ service.SessionLimitCache = StubSessionLimitCache{}
|
|
|
|
type StubSessionLimitCache struct{}
|
|
|
|
func (c StubSessionLimitCache) RegisterSession(_ context.Context, _ int64, _ string, _ int, _ time.Duration) (bool, error) {
|
|
return true, nil
|
|
}
|
|
func (c StubSessionLimitCache) RefreshSession(_ context.Context, _ int64, _ string, _ time.Duration) error {
|
|
return nil
|
|
}
|
|
func (c StubSessionLimitCache) GetActiveSessionCount(_ context.Context, _ int64) (int, error) {
|
|
return 0, nil
|
|
}
|
|
func (c StubSessionLimitCache) GetActiveSessionCountBatch(_ context.Context, _ []int64, _ map[int64]time.Duration) (map[int64]int, error) {
|
|
return nil, nil
|
|
}
|
|
func (c StubSessionLimitCache) IsSessionActive(_ context.Context, _ int64, _ string) (bool, error) {
|
|
return false, nil
|
|
}
|
|
func (c StubSessionLimitCache) GetWindowCost(_ context.Context, _ int64) (float64, bool, error) {
|
|
return 0, false, nil
|
|
}
|
|
func (c StubSessionLimitCache) SetWindowCost(_ context.Context, _ int64, _ float64) error {
|
|
return nil
|
|
}
|
|
func (c StubSessionLimitCache) GetWindowCostBatch(_ context.Context, _ []int64) (map[int64]float64, error) {
|
|
return nil, nil
|
|
}
|