9a48b2e942
- 修改 applyCodexOAuthTransform 函数签名，增加 isCodexCLI 参数 - 移除 && !isCodexCLI 条件，对所有 OAuth 请求统一处理 - 新增 applyInstructions/applyCodexCLIInstructions/applyOpenCodeInstructions 辅助函数 - 新增 isInstructionsEmpty 函数检查 instructions 字段是否为空 - 添加 Codex CLI 和非 Codex CLI 场景的测试用例 逻辑说明： - Codex CLI + 有 instructions: 保持不变 - Codex CLI + 无 instructions: 补充 opencode 指令 - 非 Codex CLI: 使用 opencode 指令覆盖
273 lines
7.2 KiB
Go
273 lines
7.2 KiB
Go
package service
|
||
|
||
import (
|
||
"encoding/json"
|
||
"os"
|
||
"path/filepath"
|
||
"testing"
|
||
"time"
|
||
|
||
"github.com/stretchr/testify/require"
|
||
)
|
||
|
||
func TestApplyCodexOAuthTransform_ToolContinuationPreservesInput(t *testing.T) {
|
||
// 续链场景：保留 item_reference 与 id，但不再强制 store=true。
|
||
setupCodexCache(t)
|
||
|
||
reqBody := map[string]any{
|
||
"model": "gpt-5.2",
|
||
"input": []any{
|
||
map[string]any{"type": "item_reference", "id": "ref1", "text": "x"},
|
||
map[string]any{"type": "function_call_output", "call_id": "call_1", "output": "ok", "id": "o1"},
|
||
},
|
||
"tool_choice": "auto",
|
||
}
|
||
|
||
applyCodexOAuthTransform(reqBody, false)
|
||
|
||
// 未显式设置 store=true，默认为 false。
|
||
store, ok := reqBody["store"].(bool)
|
||
require.True(t, ok)
|
||
require.False(t, store)
|
||
|
||
input, ok := reqBody["input"].([]any)
|
||
require.True(t, ok)
|
||
require.Len(t, input, 2)
|
||
|
||
// 校验 input[0] 为 map，避免断言失败导致测试中断。
|
||
first, ok := input[0].(map[string]any)
|
||
require.True(t, ok)
|
||
require.Equal(t, "item_reference", first["type"])
|
||
require.Equal(t, "ref1", first["id"])
|
||
|
||
// 校验 input[1] 为 map，确保后续字段断言安全。
|
||
second, ok := input[1].(map[string]any)
|
||
require.True(t, ok)
|
||
require.Equal(t, "o1", second["id"])
|
||
}
|
||
|
||
func TestApplyCodexOAuthTransform_ExplicitStoreFalsePreserved(t *testing.T) {
|
||
// 续链场景：显式 store=false 不再强制为 true，保持 false。
|
||
setupCodexCache(t)
|
||
|
||
reqBody := map[string]any{
|
||
"model": "gpt-5.1",
|
||
"store": false,
|
||
"input": []any{
|
||
map[string]any{"type": "function_call_output", "call_id": "call_1"},
|
||
},
|
||
"tool_choice": "auto",
|
||
}
|
||
|
||
applyCodexOAuthTransform(reqBody, false)
|
||
|
||
store, ok := reqBody["store"].(bool)
|
||
require.True(t, ok)
|
||
require.False(t, store)
|
||
}
|
||
|
||
func TestApplyCodexOAuthTransform_ExplicitStoreTrueForcedFalse(t *testing.T) {
|
||
// 显式 store=true 也会强制为 false。
|
||
setupCodexCache(t)
|
||
|
||
reqBody := map[string]any{
|
||
"model": "gpt-5.1",
|
||
"store": true,
|
||
"input": []any{
|
||
map[string]any{"type": "function_call_output", "call_id": "call_1"},
|
||
},
|
||
"tool_choice": "auto",
|
||
}
|
||
|
||
applyCodexOAuthTransform(reqBody, false)
|
||
|
||
store, ok := reqBody["store"].(bool)
|
||
require.True(t, ok)
|
||
require.False(t, store)
|
||
}
|
||
|
||
func TestApplyCodexOAuthTransform_NonContinuationDefaultsStoreFalseAndStripsIDs(t *testing.T) {
|
||
// 非续链场景：未设置 store 时默认 false，并移除 input 中的 id。
|
||
setupCodexCache(t)
|
||
|
||
reqBody := map[string]any{
|
||
"model": "gpt-5.1",
|
||
"input": []any{
|
||
map[string]any{"type": "text", "id": "t1", "text": "hi"},
|
||
},
|
||
}
|
||
|
||
applyCodexOAuthTransform(reqBody, false)
|
||
|
||
store, ok := reqBody["store"].(bool)
|
||
require.True(t, ok)
|
||
require.False(t, store)
|
||
|
||
input, ok := reqBody["input"].([]any)
|
||
require.True(t, ok)
|
||
require.Len(t, input, 1)
|
||
// 校验 input[0] 为 map，避免类型不匹配触发 errcheck。
|
||
item, ok := input[0].(map[string]any)
|
||
require.True(t, ok)
|
||
_, hasID := item["id"]
|
||
require.False(t, hasID)
|
||
}
|
||
|
||
func TestFilterCodexInput_RemovesItemReferenceWhenNotPreserved(t *testing.T) {
|
||
input := []any{
|
||
map[string]any{"type": "item_reference", "id": "ref1"},
|
||
map[string]any{"type": "text", "id": "t1", "text": "hi"},
|
||
}
|
||
|
||
filtered := filterCodexInput(input, false)
|
||
require.Len(t, filtered, 1)
|
||
// 校验 filtered[0] 为 map，确保字段检查可靠。
|
||
item, ok := filtered[0].(map[string]any)
|
||
require.True(t, ok)
|
||
require.Equal(t, "text", item["type"])
|
||
_, hasID := item["id"]
|
||
require.False(t, hasID)
|
||
}
|
||
|
||
func TestApplyCodexOAuthTransform_NormalizeCodexTools_PreservesResponsesFunctionTools(t *testing.T) {
|
||
setupCodexCache(t)
|
||
|
||
reqBody := map[string]any{
|
||
"model": "gpt-5.1",
|
||
"tools": []any{
|
||
map[string]any{
|
||
"type": "function",
|
||
"name": "bash",
|
||
"description": "desc",
|
||
"parameters": map[string]any{"type": "object"},
|
||
},
|
||
map[string]any{
|
||
"type": "function",
|
||
"function": nil,
|
||
},
|
||
},
|
||
}
|
||
|
||
applyCodexOAuthTransform(reqBody, false)
|
||
|
||
tools, ok := reqBody["tools"].([]any)
|
||
require.True(t, ok)
|
||
require.Len(t, tools, 1)
|
||
|
||
first, ok := tools[0].(map[string]any)
|
||
require.True(t, ok)
|
||
require.Equal(t, "function", first["type"])
|
||
require.Equal(t, "bash", first["name"])
|
||
}
|
||
|
||
func TestApplyCodexOAuthTransform_EmptyInput(t *testing.T) {
|
||
// 空 input 应保持为空且不触发异常。
|
||
setupCodexCache(t)
|
||
|
||
reqBody := map[string]any{
|
||
"model": "gpt-5.1",
|
||
"input": []any{},
|
||
}
|
||
|
||
applyCodexOAuthTransform(reqBody, false)
|
||
|
||
input, ok := reqBody["input"].([]any)
|
||
require.True(t, ok)
|
||
require.Len(t, input, 0)
|
||
}
|
||
|
||
func setupCodexCache(t *testing.T) {
|
||
t.Helper()
|
||
|
||
// 使用临时 HOME 避免触发网络拉取 header。
|
||
tempDir := t.TempDir()
|
||
t.Setenv("HOME", tempDir)
|
||
|
||
cacheDir := filepath.Join(tempDir, ".opencode", "cache")
|
||
require.NoError(t, os.MkdirAll(cacheDir, 0o755))
|
||
require.NoError(t, os.WriteFile(filepath.Join(cacheDir, "opencode-codex-header.txt"), []byte("header"), 0o644))
|
||
|
||
meta := map[string]any{
|
||
"etag": "",
|
||
"lastFetch": time.Now().UTC().Format(time.RFC3339),
|
||
"lastChecked": time.Now().UnixMilli(),
|
||
}
|
||
data, err := json.Marshal(meta)
|
||
require.NoError(t, err)
|
||
require.NoError(t, os.WriteFile(filepath.Join(cacheDir, "opencode-codex-header-meta.json"), data, 0o644))
|
||
}
|
||
|
||
func TestApplyCodexOAuthTransform_CodexCLI_PreservesExistingInstructions(t *testing.T) {
|
||
// Codex CLI 场景：已有 instructions 时不修改
|
||
setupCodexCache(t)
|
||
|
||
reqBody := map[string]any{
|
||
"model": "gpt-5.1",
|
||
"instructions": "existing instructions",
|
||
}
|
||
|
||
result := applyCodexOAuthTransform(reqBody, true) // isCodexCLI=true
|
||
|
||
instructions, ok := reqBody["instructions"].(string)
|
||
require.True(t, ok)
|
||
require.Equal(t, "existing instructions", instructions)
|
||
// Modified 仍可能为 true（因为其他字段被修改），但 instructions 应保持不变
|
||
_ = result
|
||
}
|
||
|
||
func TestApplyCodexOAuthTransform_CodexCLI_SuppliesDefaultWhenEmpty(t *testing.T) {
|
||
// Codex CLI 场景：无 instructions 时补充默认值
|
||
setupCodexCache(t)
|
||
|
||
reqBody := map[string]any{
|
||
"model": "gpt-5.1",
|
||
// 没有 instructions 字段
|
||
}
|
||
|
||
result := applyCodexOAuthTransform(reqBody, true) // isCodexCLI=true
|
||
|
||
instructions, ok := reqBody["instructions"].(string)
|
||
require.True(t, ok)
|
||
require.NotEmpty(t, instructions)
|
||
require.True(t, result.Modified)
|
||
}
|
||
|
||
func TestApplyCodexOAuthTransform_NonCodexCLI_OverridesInstructions(t *testing.T) {
|
||
// 非 Codex CLI 场景：使用 opencode 指令覆盖
|
||
setupCodexCache(t)
|
||
|
||
reqBody := map[string]any{
|
||
"model": "gpt-5.1",
|
||
"instructions": "old instructions",
|
||
}
|
||
|
||
result := applyCodexOAuthTransform(reqBody, false) // isCodexCLI=false
|
||
|
||
instructions, ok := reqBody["instructions"].(string)
|
||
require.True(t, ok)
|
||
require.NotEqual(t, "old instructions", instructions)
|
||
require.True(t, result.Modified)
|
||
}
|
||
|
||
func TestIsInstructionsEmpty(t *testing.T) {
|
||
tests := []struct {
|
||
name string
|
||
reqBody map[string]any
|
||
expected bool
|
||
}{
|
||
{"missing field", map[string]any{}, true},
|
||
{"nil value", map[string]any{"instructions": nil}, true},
|
||
{"empty string", map[string]any{"instructions": ""}, true},
|
||
{"whitespace only", map[string]any{"instructions": " "}, true},
|
||
{"non-string", map[string]any{"instructions": 123}, true},
|
||
{"valid string", map[string]any{"instructions": "hello"}, false},
|
||
}
|
||
|
||
for _, tt := range tests {
|
||
t.Run(tt.name, func(t *testing.T) {
|
||
result := isInstructionsEmpty(tt.reqBody)
|
||
require.Equal(t, tt.expected, result)
|
||
})
|
||
}
|
||
}
|