Skip to content

Remove Glama provider integration and related references #4269

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

Closed
wants to merge 1 commit into from
Closed

Remove Glama provider integration and related references #4269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 0 additions & 4 deletions evals/apps/web/src/app/runs/new/new-run.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,6 @@ export function NewRun() {
apiProvider,
apiModelId,
openRouterModelId,
glamaModelId,
requestyModelId,
unboundModelId,
ollamaModelId,
Expand All @@ -192,9 +191,6 @@ export function NewRun() {
case "openrouter":
setValue("model", openRouterModelId ?? "")
break
case "glama":
setValue("model", glamaModelId ?? "")
break
case "requesty":
setValue("model", requestyModelId ?? "")
break
Expand Down
17 changes: 0 additions & 17 deletions evals/packages/types/src/roo-code.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import { Equals, Keys, AssertEqual } from "./utils.js"

export const providerNames = [
"anthropic",
"glama",
"openrouter",
"bedrock",
"vertex",
Expand Down Expand Up @@ -353,11 +352,6 @@ const anthropicSchema = z.object({
anthropicUseAuthToken: z.boolean().optional(),
})

const glamaSchema = z.object({
glamaModelId: z.string().optional(),
glamaApiKey: z.string().optional(),
})

const openRouterSchema = z.object({
openRouterApiKey: z.string().optional(),
openRouterModelId: z.string().optional(),
Expand Down Expand Up @@ -488,11 +482,6 @@ export const providerSettingsSchemaDiscriminated = z
apiProvider: z.literal("anthropic"),
}),
),
glamaSchema.merge(
z.object({
apiProvider: z.literal("glama"),
}),
),
openRouterSchema.merge(
z.object({
apiProvider: z.literal("openrouter"),
Expand Down Expand Up @@ -595,7 +584,6 @@ export const providerSettingsSchemaDiscriminated = z
export const providerSettingsSchema = z.object({
apiProvider: providerNamesSchema.optional(),
...anthropicSchema.shape,
...glamaSchema.shape,
...openRouterSchema.shape,
...bedrockSchema.shape,
...vertexSchema.shape,
Expand Down Expand Up @@ -629,9 +617,6 @@ const providerSettingsRecord: ProviderSettingsRecord = {
apiKey: undefined,
anthropicBaseUrl: undefined,
anthropicUseAuthToken: undefined,
// Glama
glamaModelId: undefined,
glamaApiKey: undefined,
// OpenRouter
openRouterApiKey: undefined,
openRouterModelId: undefined,
Expand Down Expand Up @@ -896,7 +881,6 @@ export const ROO_CODE_SETTINGS_KEYS = [...GLOBAL_SETTINGS_KEYS, ...PROVIDER_SETT
export type SecretState = Pick<
ProviderSettings,
| "apiKey"
| "glamaApiKey"
| "openRouterApiKey"
| "awsAccessKey"
| "awsSecretKey"
Expand All @@ -915,7 +899,6 @@ type SecretStateRecord = Record<Keys<SecretState>, undefined>

const secretStateRecord: SecretStateRecord = {
apiKey: undefined,
glamaApiKey: undefined,
openRouterApiKey: undefined,
awsAccessKey: undefined,
awsSecretKey: undefined,
Expand Down
4 changes: 1 addition & 3 deletions packages/types/src/global-settings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export const globalSettingsSchema = z.object({
allowedMaxRequests: z.number().nullish(),
autoCondenseContext: z.boolean().optional(),
autoCondenseContextPercent: z.number().optional(),
maxConcurrentFileReads: z.number().optional(),
maxConcurrentFileReads: z.number().optional(),

browserToolEnabled: z.boolean().optional(),
browserViewportSize: z.string().optional(),
Expand Down Expand Up @@ -205,7 +205,6 @@ export type RooCodeSettings = GlobalSettings & ProviderSettings
export type SecretState = Pick<
ProviderSettings,
| "apiKey"
| "glamaApiKey"
| "openRouterApiKey"
| "awsAccessKey"
| "awsSecretKey"
Expand All @@ -227,7 +226,6 @@ export type SecretState = Pick<

export const SECRET_STATE_KEYS = keysOf<SecretState>()([
"apiKey",
"glamaApiKey",
"openRouterApiKey",
"awsAccessKey",
"awsSecretKey",
Expand Down
11 changes: 0 additions & 11 deletions packages/types/src/provider-settings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import { codebaseIndexProviderSchema } from "./codebase-index.js"

export const providerNames = [
"anthropic",
"glama",
"openrouter",
"bedrock",
"vertex",
Expand Down Expand Up @@ -77,11 +76,6 @@ const anthropicSchema = apiModelIdProviderModelSchema.extend({
anthropicUseAuthToken: z.boolean().optional(),
})

const glamaSchema = baseProviderSettingsSchema.extend({
glamaModelId: z.string().optional(),
glamaApiKey: z.string().optional(),
})

const openRouterSchema = baseProviderSettingsSchema.extend({
openRouterApiKey: z.string().optional(),
openRouterModelId: z.string().optional(),
Expand Down Expand Up @@ -208,7 +202,6 @@ const defaultSchema = z.object({

export const providerSettingsSchemaDiscriminated = z.discriminatedUnion("apiProvider", [
anthropicSchema.merge(z.object({ apiProvider: z.literal("anthropic") })),
glamaSchema.merge(z.object({ apiProvider: z.literal("glama") })),
openRouterSchema.merge(z.object({ apiProvider: z.literal("openrouter") })),
bedrockSchema.merge(z.object({ apiProvider: z.literal("bedrock") })),
vertexSchema.merge(z.object({ apiProvider: z.literal("vertex") })),
Expand All @@ -234,7 +227,6 @@ export const providerSettingsSchemaDiscriminated = z.discriminatedUnion("apiProv
export const providerSettingsSchema = z.object({
apiProvider: providerNamesSchema.optional(),
...anthropicSchema.shape,
...glamaSchema.shape,
...openRouterSchema.shape,
...bedrockSchema.shape,
...vertexSchema.shape,
Expand Down Expand Up @@ -266,9 +258,6 @@ export const PROVIDER_SETTINGS_KEYS = keysOf<ProviderSettings>()([
"apiKey",
"anthropicBaseUrl",
"anthropicUseAuthToken",
// Glama
"glamaModelId",
"glamaApiKey",
// OpenRouter
"openRouterApiKey",
"openRouterModelId",
Expand Down
20 changes: 0 additions & 20 deletions packages/types/src/providers/glama.ts
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion packages/types/src/providers/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ export * from "./bedrock.js"
export * from "./chutes.js"
export * from "./deepseek.js"
export * from "./gemini.js"
export * from "./glama.js"
export * from "./groq.js"
export * from "./lite-llm.js"
export * from "./lm-studio.js"
Expand Down
7 changes: 0 additions & 7 deletions src/activate/handleUri.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,6 @@ export const handleUri = async (uri: vscode.Uri) => {
}

switch (path) {
case "/glama": {
const code = query.get("code")
if (code) {
await visibleProvider.handleGlamaCallback(code)
}
break
}
case "/openrouter": {
const code = query.get("code")
if (code) {
Expand Down
3 changes: 0 additions & 3 deletions src/api/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import type { ProviderSettings, ModelInfo } from "@roo-code/types"
import { ApiStream } from "./transform/stream"

import {
GlamaHandler,
AnthropicHandler,
AwsBedrockHandler,
OpenRouterHandler,
Expand Down Expand Up @@ -64,8 +63,6 @@ export function buildApiHandler(configuration: ProviderSettings): ApiHandler {
switch (apiProvider) {
case "anthropic":
return new AnthropicHandler(options)
case "glama":
return new GlamaHandler(options)
case "openrouter":
return new OpenRouterHandler(options)
case "bedrock":
Expand Down
Loading