opencode/picoclaw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: restore factory.go from main branch

Browse source
This commit is contained in:
liugangjian 2026-03-09 11:46:20 +08:00
parent 810e74a11d
commit 65043336d7
1 changed files with 4 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
pkg/providers/factory.go
View file

@ -21,8 +21,7 @@ const (
providerTypeCodexCLIToken providerTypeCodexCLIToken
providerTypeClaudeCLI providerTypeClaudeCLI
providerTypeCodexCLI providerTypeCodexCLI
providerTypeGitHubCopilot providerTypeGitHubCopilot
providerTypePicoLM
) )
type providerSelection struct { type providerSelection struct {
@ -200,15 +199,7 @@ func resolveProviderSelection(cfg *config.Config) (providerSelection, error) {
} }
sel.connectMode = cfg.Providers.GitHubCopilot.ConnectMode sel.connectMode = cfg.Providers.GitHubCopilot.ConnectMode
return sel, nil return sel, nil
case "picolm":
// Local picolm provider - no API key required
workspace := cfg.WorkspacePath()
if workspace == "" {
workspace = "."
} }
sel.providerType = providerTypePicoLM
sel.workspace = workspace
return sel, nil
} }
// Fallback: infer provider from model and configured keys. // Fallback: infer provider from model and configured keys.
@ -308,34 +299,8 @@ func resolveProviderSelection(cfg *config.Config) (providerSelection, error) {
sel.proxy = cfg.Providers.Mistral.Proxy sel.proxy = cfg.Providers.Mistral.Proxy
if sel.apiBase == "" { if sel.apiBase == "" {
sel.apiBase = "https://api.mistral.ai/v1" sel.apiBase = "https://api.mistral.ai/v1"
case (strings.Contains(lowerModel, "deepseek") || strings.HasPrefix(model, "deepseek/") || strings.HasPrefix(model, "deepseek-ai/")) && cfg.Providers.DeepSeek.APIKey != "":
sel.apiKey = cfg.Providers.DeepSeek.APIKey
sel.apiBase = cfg.Providers.DeepSeek.APIBase
sel.proxy = cfg.Providers.DeepSeek.Proxy
if sel.apiBase == "" {
sel.apiBase = "https://api.deepseek.com/v1"
} }
case cfg.Providers.VLLM.APIBase != "":
// Keep original model name logic for backward compatibility
if !strings.HasPrefix(model, "deepseek/") && !strings.HasPrefix(model, "deepseek-ai/") {
if model != "deepseek-chat" && model != "deepseek-reasoner" {
sel.model = "deepseek-chat"
}
}
case cfg.Providers.VLLM.APIBase != ":
sel.apiKey = cfg.Providers.VLLM.APIKey sel.apiKey = cfg.Providers.VLLM.APIKey
sel.apiBase = cfg.Providers.VLLM.APIBase sel.apiBase = cfg.Providers.VLLM.APIBase
sel.proxy = cfg.Providers.VLLM.Proxy sel.proxy = cfg.Providers.VLLM.Proxy
@ -358,31 +323,9 @@ func resolveProviderSelection(cfg *config.Config) (providerSelection, error) {
if sel.apiKey == "" && !strings.HasPrefix(model, "bedrock/") { if sel.apiKey == "" && !strings.HasPrefix(model, "bedrock/") {
return providerSelection{}, fmt.Errorf("no API key configured for provider (model: %s)", model) return providerSelection{}, fmt.Errorf("no API key configured for provider (model: %s)", model)
} }
if sel.apiBase == "" {
// Rather than defaulting to a specific provider (including GLM), we'll prioritize
// the first configured provider base in a consistent order
// This prevents default always choosing GLM provider when it shouldn't
orderedBases := []string{
cfg.Providers.OpenAI.APIBase,
cfg.Providers.Anthropic.APIBase,
cfg.Providers.Gemini.APIBase,
cfg.Providers.Groq.APIBase,
cfg.Providers.Zhipu.APIBase, // The GLM provider is lower in the order to prevent automatic defaulting
cfg.Providers.OpenRouter.APIBase,
cfg.Providers.LiteLLM.APIBase,
cfg.Providers.VLLM.APIBase,
}
for _, base := range orderedBases {
if base != "" {
sel.apiBase = base
break
}
}
if sel.apiBase == "" { if sel.apiBase == "" {
return providerSelection{}, fmt.Errorf("no API base configured for provider (model: %s)", model) return providerSelection{}, fmt.Errorf("no API base configured for provider (model: %s)", model)
} }
}
} }
return sel, nil return sel, nil