Skip to content

Commit fcb3ebd

Browse files
authored
fix: resolve merge conflict markers in providers.go (#61)
* fix: resolve merge conflict in providers.go (APIProtocolID -> ProtocolID) * fix: upgrade Go to 1.26.5
1 parent 194b0e6 commit fcb3ebd

3 files changed

Lines changed: 3 additions & 11 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ concurrency:
1919
cancel-in-progress: true
2020

2121
env:
22-
GO_VERSION: "1.26.4"
22+
GO_VERSION: "1.26.5"
2323
GOPRIVATE: "github.com/GrayCodeAI/*"
2424
GONOSUMDB: "github.com/GrayCodeAI/*"
2525
GONOSUMCHECK: "1"

catalog/registry/providers.go

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -174,31 +174,23 @@ func providerSpecs() []ProviderSpec {
174174
BaseURLEnv: []string{"POOLSIDE_BASE_URL", "OPENAI_BASE_URL", "OPENAI_API_BASE"},
175175
ProbeKind: ProbeOpenAIModels, ProbeBaseURL: "https://inference.poolside.ai/v1",
176176
LiveFetcherKey: "poolside", LiveCatalogKey: "poolside",
177-
APIProtocolID: "openai-chat-completions", AdapterID: "poolside", RuntimeProfileKey: "poolside",
177+
ProtocolID: "openai-chat-completions", AdapterID: "poolside", RuntimeProfileKey: "poolside",
178178
},
179179
{
180180
ProviderID: "groq", DisplayName: "Groq", DeploymentID: "groq-direct", SortOrder: 19, ChatPreference: 21,
181181
RequiresKey: true, CredentialEnv: "GROQ_API_KEY",
182182
BaseURLEnv: []string{"GROQ_BASE_URL", "OPENAI_BASE_URL", "OPENAI_API_BASE"},
183183
ProbeKind: ProbeOpenAIModels, ProbeBaseURL: "https://api.groq.com/openai/v1",
184184
LiveFetcherKey: "groq", LiveCatalogKey: "groq",
185-
<<<<<<< HEAD
186-
APIProtocolID: "openai-chat-completions", AdapterID: "groq", RuntimeProfileKey: "groq",
187-
=======
188185
ProtocolID: "openai-chat-completions", AdapterID: "groq", RuntimeProfileKey: "groq",
189-
>>>>>>> origin/main
190186
},
191187
{
192188
ProviderID: "clinepass", DisplayName: "ClinePass", DeploymentID: "clinepass", SortOrder: 20, ChatPreference: 22,
193189
RequiresKey: true, CredentialEnv: "CLINE_API_KEY",
194190
BaseURLEnv: []string{"CLINE_API_BASE", "OPENAI_BASE_URL", "OPENAI_API_BASE"},
195191
ProbeKind: ProbeNone,
196192
LiveFetcherKey: "clinepass", LiveCatalogKey: "clinepass",
197-
<<<<<<< HEAD
198-
APIProtocolID: "openai-chat-completions", AdapterID: "clinepass", RuntimeProfileKey: "clinepass",
199-
=======
200193
ProtocolID: "openai-chat-completions", AdapterID: "clinepass", RuntimeProfileKey: "clinepass",
201-
>>>>>>> origin/main
202194
},
203195
{
204196
ProviderID: "opencodego", DisplayName: "OpenCode Go", DeploymentID: "opencodego", SortOrder: 21, ChatPreference: 13,

go.mod

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)