wizardchen
386df92582
PR #1238 引入的 context.WithTimeout 会把上层 ctx 的 deadline 强制截断到 默认 120s/300s，导致调用方无法设置更长的合理超时（例如长推理模型场景）。 同时 ChatStream 在走 chatStreamWithRawHTTP 早返回路径时丢弃了 cancel 函数，timeoutCtx 要等 deadline 到期才释放，go vet/lostcancel 也会告警。 本次修复： - 新增 withLLMTimeout 辅助函数：仅在上层 ctx 没有 deadline 时附加默认 超时；上层若已显式设置 deadline（无论比默认更短还是更长），都原样 尊重，把超时的最终决定权交还给调用方。 - 默认值通过环境变量可覆盖： - WEKNORA_LLM_CHAT_TIMEOUT_SECONDS （默认 120s） - WEKNORA_LLM_STREAM_TIMEOUT_SECONDS （默认 300s） - 修复 ChatStream raw HTTP 早返回路径未调用 cancel 的泄漏：新增 wrapStreamCancel，在底层 channel 关闭后统一执行 cancel。 - 补充单测覆盖三种 deadline 场景与环境变量解析。
87 lines
2.3 KiB
Go
87 lines
2.3 KiB
Go
package chat
|
|
|
|
import (
|
|
"context"
|
|
"os"
|
|
"testing"
|
|
"time"
|
|
)
|
|
|
|
func TestWithLLMTimeout_NoParentDeadline_AppliesDefault(t *testing.T) {
|
|
ctx, cancel := withLLMTimeout(context.Background(), 50*time.Millisecond)
|
|
defer cancel()
|
|
|
|
dl, ok := ctx.Deadline()
|
|
if !ok {
|
|
t.Fatalf("expected deadline to be set when parent has none")
|
|
}
|
|
if remaining := time.Until(dl); remaining <= 0 || remaining > 50*time.Millisecond {
|
|
t.Fatalf("unexpected remaining duration: %v", remaining)
|
|
}
|
|
}
|
|
|
|
func TestWithLLMTimeout_ShorterParentDeadline_Respected(t *testing.T) {
|
|
parent, parentCancel := context.WithTimeout(context.Background(), 20*time.Millisecond)
|
|
defer parentCancel()
|
|
|
|
ctx, cancel := withLLMTimeout(parent, 10*time.Second)
|
|
defer cancel()
|
|
|
|
dl, _ := ctx.Deadline()
|
|
if remaining := time.Until(dl); remaining > 30*time.Millisecond {
|
|
t.Fatalf("parent shorter deadline should be respected, got remaining=%v", remaining)
|
|
}
|
|
}
|
|
|
|
func TestWithLLMTimeout_LongerParentDeadline_NotTruncated(t *testing.T) {
|
|
parent, parentCancel := context.WithTimeout(context.Background(), 10*time.Second)
|
|
defer parentCancel()
|
|
|
|
ctx, cancel := withLLMTimeout(parent, 50*time.Millisecond)
|
|
defer cancel()
|
|
|
|
dl, ok := ctx.Deadline()
|
|
if !ok {
|
|
t.Fatalf("deadline must be set")
|
|
}
|
|
if remaining := time.Until(dl); remaining < 5*time.Second {
|
|
t.Fatalf("parent longer deadline should NOT be truncated by default, got remaining=%v", remaining)
|
|
}
|
|
}
|
|
|
|
func TestEnvDurationSeconds(t *testing.T) {
|
|
const key = "WEKNORA_TEST_TIMEOUT_SECONDS"
|
|
|
|
t.Run("unset returns fallback", func(t *testing.T) {
|
|
os.Unsetenv(key)
|
|
if got := envDurationSeconds(key, 7*time.Second); got != 7*time.Second {
|
|
t.Fatalf("got %v", got)
|
|
}
|
|
})
|
|
|
|
t.Run("valid value parsed", func(t *testing.T) {
|
|
t.Setenv(key, "42")
|
|
if got := envDurationSeconds(key, 1*time.Second); got != 42*time.Second {
|
|
t.Fatalf("got %v", got)
|
|
}
|
|
})
|
|
|
|
t.Run("invalid falls back", func(t *testing.T) {
|
|
t.Setenv(key, "not-a-number")
|
|
if got := envDurationSeconds(key, 9*time.Second); got != 9*time.Second {
|
|
t.Fatalf("got %v", got)
|
|
}
|
|
})
|
|
|
|
t.Run("non-positive falls back", func(t *testing.T) {
|
|
t.Setenv(key, "0")
|
|
if got := envDurationSeconds(key, 9*time.Second); got != 9*time.Second {
|
|
t.Fatalf("got %v", got)
|
|
}
|
|
t.Setenv(key, "-5")
|
|
if got := envDurationSeconds(key, 9*time.Second); got != 9*time.Second {
|
|
t.Fatalf("got %v", got)
|
|
}
|
|
})
|
|
}
|