Skip to content

Commit d5c9280

Browse files
committed
Remove Glama provider integration and related references
- Deleted GlamaHandler export from providers index. - Removed Glama callback handling from ClineProvider. - Updated tests to exclude Glama API key and model checks. - Removed Glama-related configurations from ProfileValidator and validation functions. - Eliminated Glama components and settings from the UI. - Cleaned up localization files by removing Glama-specific entries. - Updated API utility functions to exclude Glama authentication.
1 parent af2e9ed commit d5c9280

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+17
-745
lines changed

evals/apps/web/src/app/runs/new/new-run.tsx

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,6 @@ export function NewRun() {
170170
apiProvider,
171171
apiModelId,
172172
openRouterModelId,
173-
glamaModelId,
174173
requestyModelId,
175174
unboundModelId,
176175
ollamaModelId,
@@ -192,9 +191,6 @@ export function NewRun() {
192191
case "openrouter":
193192
setValue("model", openRouterModelId ?? "")
194193
break
195-
case "glama":
196-
setValue("model", glamaModelId ?? "")
197-
break
198194
case "requesty":
199195
setValue("model", requestyModelId ?? "")
200196
break

evals/packages/types/src/roo-code.ts

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import { Equals, Keys, AssertEqual } from "./utils.js"
88

99
export const providerNames = [
1010
"anthropic",
11-
"glama",
1211
"openrouter",
1312
"bedrock",
1413
"vertex",
@@ -353,11 +352,6 @@ const anthropicSchema = z.object({
353352
anthropicUseAuthToken: z.boolean().optional(),
354353
})
355354

356-
const glamaSchema = z.object({
357-
glamaModelId: z.string().optional(),
358-
glamaApiKey: z.string().optional(),
359-
})
360-
361355
const openRouterSchema = z.object({
362356
openRouterApiKey: z.string().optional(),
363357
openRouterModelId: z.string().optional(),
@@ -488,11 +482,6 @@ export const providerSettingsSchemaDiscriminated = z
488482
apiProvider: z.literal("anthropic"),
489483
}),
490484
),
491-
glamaSchema.merge(
492-
z.object({
493-
apiProvider: z.literal("glama"),
494-
}),
495-
),
496485
openRouterSchema.merge(
497486
z.object({
498487
apiProvider: z.literal("openrouter"),
@@ -595,7 +584,6 @@ export const providerSettingsSchemaDiscriminated = z
595584
export const providerSettingsSchema = z.object({
596585
apiProvider: providerNamesSchema.optional(),
597586
...anthropicSchema.shape,
598-
...glamaSchema.shape,
599587
...openRouterSchema.shape,
600588
...bedrockSchema.shape,
601589
...vertexSchema.shape,
@@ -629,9 +617,6 @@ const providerSettingsRecord: ProviderSettingsRecord = {
629617
apiKey: undefined,
630618
anthropicBaseUrl: undefined,
631619
anthropicUseAuthToken: undefined,
632-
// Glama
633-
glamaModelId: undefined,
634-
glamaApiKey: undefined,
635620
// OpenRouter
636621
openRouterApiKey: undefined,
637622
openRouterModelId: undefined,
@@ -896,7 +881,6 @@ export const ROO_CODE_SETTINGS_KEYS = [...GLOBAL_SETTINGS_KEYS, ...PROVIDER_SETT
896881
export type SecretState = Pick<
897882
ProviderSettings,
898883
| "apiKey"
899-
| "glamaApiKey"
900884
| "openRouterApiKey"
901885
| "awsAccessKey"
902886
| "awsSecretKey"
@@ -915,7 +899,6 @@ type SecretStateRecord = Record<Keys<SecretState>, undefined>
915899

916900
const secretStateRecord: SecretStateRecord = {
917901
apiKey: undefined,
918-
glamaApiKey: undefined,
919902
openRouterApiKey: undefined,
920903
awsAccessKey: undefined,
921904
awsSecretKey: undefined,

packages/types/src/global-settings.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export const globalSettingsSchema = z.object({
4848
allowedMaxRequests: z.number().nullish(),
4949
autoCondenseContext: z.boolean().optional(),
5050
autoCondenseContextPercent: z.number().optional(),
51-
maxConcurrentFileReads: z.number().optional(),
51+
maxConcurrentFileReads: z.number().optional(),
5252

5353
browserToolEnabled: z.boolean().optional(),
5454
browserViewportSize: z.string().optional(),
@@ -205,7 +205,6 @@ export type RooCodeSettings = GlobalSettings & ProviderSettings
205205
export type SecretState = Pick<
206206
ProviderSettings,
207207
| "apiKey"
208-
| "glamaApiKey"
209208
| "openRouterApiKey"
210209
| "awsAccessKey"
211210
| "awsSecretKey"
@@ -227,7 +226,6 @@ export type SecretState = Pick<
227226

228227
export const SECRET_STATE_KEYS = keysOf<SecretState>()([
229228
"apiKey",
230-
"glamaApiKey",
231229
"openRouterApiKey",
232230
"awsAccessKey",
233231
"awsSecretKey",

packages/types/src/provider-settings.ts

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import { codebaseIndexProviderSchema } from "./codebase-index.js"
1010

1111
export const providerNames = [
1212
"anthropic",
13-
"glama",
1413
"openrouter",
1514
"bedrock",
1615
"vertex",
@@ -77,11 +76,6 @@ const anthropicSchema = apiModelIdProviderModelSchema.extend({
7776
anthropicUseAuthToken: z.boolean().optional(),
7877
})
7978

80-
const glamaSchema = baseProviderSettingsSchema.extend({
81-
glamaModelId: z.string().optional(),
82-
glamaApiKey: z.string().optional(),
83-
})
84-
8579
const openRouterSchema = baseProviderSettingsSchema.extend({
8680
openRouterApiKey: z.string().optional(),
8781
openRouterModelId: z.string().optional(),
@@ -208,7 +202,6 @@ const defaultSchema = z.object({
208202

209203
export const providerSettingsSchemaDiscriminated = z.discriminatedUnion("apiProvider", [
210204
anthropicSchema.merge(z.object({ apiProvider: z.literal("anthropic") })),
211-
glamaSchema.merge(z.object({ apiProvider: z.literal("glama") })),
212205
openRouterSchema.merge(z.object({ apiProvider: z.literal("openrouter") })),
213206
bedrockSchema.merge(z.object({ apiProvider: z.literal("bedrock") })),
214207
vertexSchema.merge(z.object({ apiProvider: z.literal("vertex") })),
@@ -234,7 +227,6 @@ export const providerSettingsSchemaDiscriminated = z.discriminatedUnion("apiProv
234227
export const providerSettingsSchema = z.object({
235228
apiProvider: providerNamesSchema.optional(),
236229
...anthropicSchema.shape,
237-
...glamaSchema.shape,
238230
...openRouterSchema.shape,
239231
...bedrockSchema.shape,
240232
...vertexSchema.shape,
@@ -266,9 +258,6 @@ export const PROVIDER_SETTINGS_KEYS = keysOf<ProviderSettings>()([
266258
"apiKey",
267259
"anthropicBaseUrl",
268260
"anthropicUseAuthToken",
269-
// Glama
270-
"glamaModelId",
271-
"glamaApiKey",
272261
// OpenRouter
273262
"openRouterApiKey",
274263
"openRouterModelId",

packages/types/src/providers/glama.ts

Lines changed: 0 additions & 20 deletions
This file was deleted.

packages/types/src/providers/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ export * from "./bedrock.js"
33
export * from "./chutes.js"
44
export * from "./deepseek.js"
55
export * from "./gemini.js"
6-
export * from "./glama.js"
76
export * from "./groq.js"
87
export * from "./lite-llm.js"
98
export * from "./lm-studio.js"

src/activate/handleUri.ts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,6 @@ export const handleUri = async (uri: vscode.Uri) => {
1414
}
1515

1616
switch (path) {
17-
case "/glama": {
18-
const code = query.get("code")
19-
if (code) {
20-
await visibleProvider.handleGlamaCallback(code)
21-
}
22-
break
23-
}
2417
case "/openrouter": {
2518
const code = query.get("code")
2619
if (code) {

src/api/index.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import type { ProviderSettings, ModelInfo } from "@roo-code/types"
55
import { ApiStream } from "./transform/stream"
66

77
import {
8-
GlamaHandler,
98
AnthropicHandler,
109
AwsBedrockHandler,
1110
OpenRouterHandler,
@@ -64,8 +63,6 @@ export function buildApiHandler(configuration: ProviderSettings): ApiHandler {
6463
switch (apiProvider) {
6564
case "anthropic":
6665
return new AnthropicHandler(options)
67-
case "glama":
68-
return new GlamaHandler(options)
6966
case "openrouter":
7067
return new OpenRouterHandler(options)
7168
case "bedrock":

0 commit comments

Comments
 (0)