Skip to content

Fork pr 353 1776490057 #356

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.

Sign up for GitHub

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
phantom5099 merged 11 commits into from
Apr 18, 2026
Merged

Fork pr 353 1776490057 #356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a7866d0
Merge remote-tracking branch 'refs/remotes/upstream/main'
phantom5099 Apr 17, 2026
d9220ec
Merge remote-tracking branch 'refs/remotes/origin/main'
phantom5099 Apr 17, 2026
3059946
refactor(provider):Provider 协议分层重构与 Discovery 通用化
phantom5099 Apr 18, 2026
db60f83
test(app): fix unsupported driver startup assertion
xgopilot Apr 18, 2026
04ef83c
Merge pull request #35 from phantom5099/fork-pr-353-1776490057
phantom5099 Apr 18, 2026
6c54c7a
fix(provider): resolve unresolved discovery review issues
xgopilot Apr 18, 2026
81dd113
Merge pull request #36 from phantom5099/fork-pr-353-1776490057
phantom5099 Apr 18, 2026
abd48ac
test(provider): increase coverage for discovery and driver protocol b…
xgopilot Apr 18, 2026
b950f46
Merge pull request #37 from phantom5099/fork-pr-353-1776490057
phantom5099 Apr 18, 2026
3b83b44
fix(provider): address security and discovery error handling regressions
xgopilot Apr 18, 2026
ae2ebd9
fix(provider): redact sensitive discovery error body summary
xgopilot Apr 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions internal/app/bootstrap_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,11 +112,9 @@ func TestBuildRuntimeRejectsUnsupportedSelectedProviderDriverOnStartup(t *testin

rawProvider := []byte(
"name: company-gateway\n" +
"driver: anthropic\n" +
"driver: unsupported-driver\n" +
"api_key_env: COMPANY_GATEWAY_API_KEY\n" +
"anthropic:\n" +
" base_url: https://api.anthropic.example/v1\n" +
" api_version: 2023-06-01\n",
"base_url: https://api.example.com/v1\n",
)
if err := os.WriteFile(filepath.Join(providerDir, "provider.yaml"), rawProvider, 0o644); err != nil {
t.Fatalf("write provider config: %v", err)
Expand Down
162 changes: 129 additions & 33 deletions internal/config/loader_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,8 @@ models:
openai_compatible:
base_url: https://llm.example.com/v1
api_style: chat_completions
discovery_endpoint_path: /gateway/models
discovery_response_profile: generic
`
customDir := filepath.Join(loader.BaseDir(), providersDirName, "company-gateway")
if err := os.WriteFile(filepath.Join(customDir, customProviderConfigName), []byte(strings.TrimSpace(providerYAML)+"\n"), 0o644); err != nil {
Expand Down Expand Up @@ -295,6 +297,16 @@ openai_compatible:
if customProvider.BaseURL != "https://llm.example.com/v1" {
t.Fatalf("expected base url https://llm.example.com/v1, got %q", customProvider.BaseURL)
}
if customProvider.DiscoveryEndpointPath != "/gateway/models" {
t.Fatalf("expected discovery endpoint /gateway/models, got %q", customProvider.DiscoveryEndpointPath)
}
if customProvider.DiscoveryResponseProfile != provider.DiscoveryResponseProfileGeneric {
t.Fatalf(
"expected discovery response profile %q, got %q",
provider.DiscoveryResponseProfileGeneric,
customProvider.DiscoveryResponseProfile,
)
}
if customProvider.Model != "" {
t.Fatalf("expected custom provider default model to be empty, got %q", customProvider.Model)
}
Expand Down Expand Up @@ -362,6 +374,32 @@ func TestLoaderRejectsMalformedCustomProviderYAML(t *testing.T) {
}
}

func TestLoaderRejectsTopLevelDiscoverySettingsForKnownDriver(t *testing.T) {
t.Parallel()

loader := NewLoader(t.TempDir(), testDefaultConfig())
customDir := filepath.Join(loader.BaseDir(), providersDirName, "company-gateway")
if err := os.MkdirAll(customDir, 0o755); err != nil {
t.Fatalf("mkdir custom provider dir: %v", err)
}

providerYAML := `
name: company-gateway
driver: openaicompat
api_key_env: COMPANY_GATEWAY_API_KEY
discovery_endpoint_path: /models
openai_compatible:
base_url: https://llm.example.com/v1
`
if err := os.WriteFile(filepath.Join(customDir, customProviderConfigName), []byte(strings.TrimSpace(providerYAML)+"\n"), 0o644); err != nil {
t.Fatalf("write provider.yaml: %v", err)
}

if _, err := loader.Load(context.Background()); err == nil || !strings.Contains(err.Error(), "openai_compatible") {
t.Fatalf("expected known driver top-level discovery placement error, got %v", err)
}
}

func TestLoaderRejectsCustomProviderDefaultModel(t *testing.T) {
t.Parallel()

Expand Down Expand Up @@ -861,77 +899,127 @@ func TestSaveCustomProviderPersistsDriverSpecificSettings(t *testing.T) {

baseDir := t.TempDir()
tests := []struct {
name string
driver string
baseURL string
apiStyle string
deploymentMode string
apiVersion string
assert func(t *testing.T, cfg ProviderConfig)
name string
driver string
baseURL string
apiStyle string
deploymentMode string
apiVersion string
discoveryEndpointPath string
discoveryResponseProfile string
assert func(t *testing.T, cfg ProviderConfig)
}{
{
name: "openaicompat settings",
driver: provider.DriverOpenAICompat,
baseURL: "https://llm.example.com/v1",
apiStyle: provider.OpenAICompatibleAPIStyleResponses,
deploymentMode: "ignored",
apiVersion: "ignored",
name: "openaicompat settings",
driver: provider.DriverOpenAICompat,
baseURL: "https://llm.example.com/v1",
apiStyle: provider.OpenAICompatibleAPIStyleResponses,
deploymentMode: "ignored",
apiVersion: "ignored",
discoveryEndpointPath: "/gateway/models",
discoveryResponseProfile: provider.DiscoveryResponseProfileGeneric,
assert: func(t *testing.T, cfg ProviderConfig) {
t.Helper()
if cfg.APIStyle != provider.OpenAICompatibleAPIStyleResponses {
t.Fatalf("expected APIStyle=%q, got %q", provider.OpenAICompatibleAPIStyleResponses, cfg.APIStyle)
}
if cfg.DiscoveryEndpointPath != "/gateway/models" {
t.Fatalf("expected DiscoveryEndpointPath=/gateway/models, got %q", cfg.DiscoveryEndpointPath)
}
if cfg.DiscoveryResponseProfile != provider.DiscoveryResponseProfileGeneric {
t.Fatalf(
"expected DiscoveryResponseProfile=%q, got %q",
provider.DiscoveryResponseProfileGeneric,
cfg.DiscoveryResponseProfile,
)
}
if cfg.DeploymentMode != "" || cfg.APIVersion != "" {
t.Fatalf("expected non-openai specific settings to be empty, got %+v", cfg)
}
},
},
{
name: "gemini settings",
driver: provider.DriverGemini,
baseURL: "https://generativelanguage.googleapis.com/v1beta/openai",
apiStyle: "ignored",
deploymentMode: "vertex",
apiVersion: "ignored",
name: "gemini settings",
driver: provider.DriverGemini,
baseURL: "https://generativelanguage.googleapis.com/v1beta/openai",
apiStyle: "ignored",
deploymentMode: "vertex",
apiVersion: "ignored",
discoveryEndpointPath: "/models",
discoveryResponseProfile: provider.DiscoveryResponseProfileGemini,
assert: func(t *testing.T, cfg ProviderConfig) {
t.Helper()
if cfg.DeploymentMode != "vertex" {
t.Fatalf("expected DeploymentMode=vertex, got %q", cfg.DeploymentMode)
}
if cfg.APIStyle != "" || cfg.APIVersion != "" {
t.Fatalf("expected non-gemini specific settings to be empty, got %+v", cfg)
if cfg.DiscoveryEndpointPath != "/models" {
t.Fatalf("expected DiscoveryEndpointPath=/models, got %q", cfg.DiscoveryEndpointPath)
}
if cfg.DiscoveryResponseProfile != provider.DiscoveryResponseProfileGemini {
t.Fatalf(
"expected DiscoveryResponseProfile=%q, got %q",
provider.DiscoveryResponseProfileGemini,
cfg.DiscoveryResponseProfile,
)
}
if cfg.APIStyle != provider.OpenAICompatibleAPIStyleChatCompletions || cfg.APIVersion != "" {
t.Fatalf("expected gemini legacy api_style and empty api_version, got %+v", cfg)
}
},
},
{
name: "anthropic settings",
driver: provider.DriverAnthropic,
baseURL: "https://api.anthropic.com/v1",
apiStyle: "ignored",
deploymentMode: "ignored",
apiVersion: "2023-06-01",
name: "anthropic settings",
driver: provider.DriverAnthropic,
baseURL: "https://api.anthropic.com/v1",
apiStyle: "ignored",
deploymentMode: "ignored",
apiVersion: "2023-06-01",
discoveryEndpointPath: "/models",
discoveryResponseProfile: provider.DiscoveryResponseProfileGeneric,
assert: func(t *testing.T, cfg ProviderConfig) {
t.Helper()
if cfg.APIVersion != "2023-06-01" {
t.Fatalf("expected APIVersion=2023-06-01, got %q", cfg.APIVersion)
}
if cfg.DiscoveryEndpointPath != "/models" {
t.Fatalf("expected DiscoveryEndpointPath=/models, got %q", cfg.DiscoveryEndpointPath)
}
if cfg.DiscoveryResponseProfile != provider.DiscoveryResponseProfileGeneric {
t.Fatalf(
"expected DiscoveryResponseProfile=%q, got %q",
provider.DiscoveryResponseProfileGeneric,
cfg.DiscoveryResponseProfile,
)
}
if cfg.APIStyle != "" || cfg.DeploymentMode != "" {
t.Fatalf("expected non-anthropic specific settings to be empty, got %+v", cfg)
}
},
},
{
name: "unknown driver keeps top-level base url",
driver: "custom-driver",
baseURL: "https://custom.example.com/v1",
apiStyle: "responses",
deploymentMode: "vertex",
apiVersion: "2023-06-01",
name: "unknown driver keeps top-level base url",
driver: "custom-driver",
baseURL: "https://custom.example.com/v1",
apiStyle: "responses",
deploymentMode: "vertex",
apiVersion: "2023-06-01",
discoveryEndpointPath: "/catalog/models",
discoveryResponseProfile: provider.DiscoveryResponseProfileGeneric,
assert: func(t *testing.T, cfg ProviderConfig) {
t.Helper()
if cfg.BaseURL != "https://custom.example.com/v1" {
t.Fatalf("expected BaseURL=https://custom.example.com/v1, got %q", cfg.BaseURL)
}
if cfg.DiscoveryEndpointPath != "/catalog/models" {
t.Fatalf("expected DiscoveryEndpointPath=/catalog/models, got %q", cfg.DiscoveryEndpointPath)
}
if cfg.DiscoveryResponseProfile != provider.DiscoveryResponseProfileGeneric {
t.Fatalf(
"expected DiscoveryResponseProfile=%q, got %q",
provider.DiscoveryResponseProfileGeneric,
cfg.DiscoveryResponseProfile,
)
}
if cfg.APIStyle != "" || cfg.DeploymentMode != "" || cfg.APIVersion != "" {
t.Fatalf("expected unknown driver protocol settings to be empty, got %+v", cfg)
}
Expand All @@ -955,6 +1043,8 @@ func TestSaveCustomProviderPersistsDriverSpecificSettings(t *testing.T) {
tt.apiStyle,
tt.deploymentMode,
tt.apiVersion,
tt.discoveryEndpointPath,
tt.discoveryResponseProfile,
); err != nil {
t.Fatalf("SaveCustomProvider() error = %v", err)
}
Expand Down Expand Up @@ -1001,6 +1091,8 @@ func TestSaveCustomProviderRejectsUnsafeProviderName(t *testing.T) {
provider.OpenAICompatibleAPIStyleChatCompletions,
"",
"",
"",
"",
)
if err == nil {
t.Fatalf("expected SaveCustomProvider to reject %q", name)
Expand Down Expand Up @@ -1150,6 +1242,8 @@ func TestSaveCustomProviderFileSystemErrors(t *testing.T) {
provider.OpenAICompatibleAPIStyleChatCompletions,
"",
"",
"",
"",
)
if err == nil {
t.Fatal("expected create provider dir error")
Expand All @@ -1172,6 +1266,8 @@ func TestSaveCustomProviderFileSystemErrors(t *testing.T) {
provider.OpenAICompatibleAPIStyleChatCompletions,
"",
"",
"",
"",
)
if err == nil {
t.Fatal("expected write provider error")
Expand Down
Loading
Loading