|
@@ -33,6 +33,7 @@ https://github.com/KumarVariable/vscode-extension-sidebar-html/blob/master/src/c
|
|
|
|
|
|
|
|
type SecretKey =
|
|
type SecretKey =
|
|
|
| "apiKey"
|
|
| "apiKey"
|
|
|
|
|
+ | "glamaApiKey"
|
|
|
| "openRouterApiKey"
|
|
| "openRouterApiKey"
|
|
|
| "awsAccessKey"
|
|
| "awsAccessKey"
|
|
|
| "awsSecretKey"
|
|
| "awsSecretKey"
|
|
@@ -44,6 +45,8 @@ type SecretKey =
|
|
|
type GlobalStateKey =
|
|
type GlobalStateKey =
|
|
|
| "apiProvider"
|
|
| "apiProvider"
|
|
|
| "apiModelId"
|
|
| "apiModelId"
|
|
|
|
|
+ | "glamaModelId"
|
|
|
|
|
+ | "glamaModelInfo"
|
|
|
| "awsRegion"
|
|
| "awsRegion"
|
|
|
| "awsUseCrossRegionInference"
|
|
| "awsUseCrossRegionInference"
|
|
|
| "vertexProjectId"
|
|
| "vertexProjectId"
|
|
@@ -82,6 +85,7 @@ type GlobalStateKey =
|
|
|
export const GlobalFileNames = {
|
|
export const GlobalFileNames = {
|
|
|
apiConversationHistory: "api_conversation_history.json",
|
|
apiConversationHistory: "api_conversation_history.json",
|
|
|
uiMessages: "ui_messages.json",
|
|
uiMessages: "ui_messages.json",
|
|
|
|
|
+ glamaModels: "glama_models.json",
|
|
|
openRouterModels: "openrouter_models.json",
|
|
openRouterModels: "openrouter_models.json",
|
|
|
mcpSettings: "cline_mcp_settings.json",
|
|
mcpSettings: "cline_mcp_settings.json",
|
|
|
}
|
|
}
|
|
@@ -385,6 +389,24 @@ export class ClineProvider implements vscode.WebviewViewProvider {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
})
|
|
})
|
|
|
|
|
+ this.readGlamaModels().then((glamaModels) => {
|
|
|
|
|
+ if (glamaModels) {
|
|
|
|
|
+ this.postMessageToWebview({ type: "glamaModels", glamaModels })
|
|
|
|
|
+ }
|
|
|
|
|
+ })
|
|
|
|
|
+ this.refreshGlamaModels().then(async (glamaModels) => {
|
|
|
|
|
+ if (glamaModels) {
|
|
|
|
|
+ // update model info in state (this needs to be done here since we don't want to update state while settings is open, and we may refresh models there)
|
|
|
|
|
+ const { apiConfiguration } = await this.getState()
|
|
|
|
|
+ if (apiConfiguration.glamaModelId) {
|
|
|
|
|
+ await this.updateGlobalState(
|
|
|
|
|
+ "glamaModelInfo",
|
|
|
|
|
+ glamaModels[apiConfiguration.glamaModelId],
|
|
|
|
|
+ )
|
|
|
|
|
+ await this.postStateToWebview()
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ })
|
|
|
break
|
|
break
|
|
|
case "newTask":
|
|
case "newTask":
|
|
|
// Code that should run in response to the hello message command
|
|
// Code that should run in response to the hello message command
|
|
@@ -403,6 +425,9 @@ export class ClineProvider implements vscode.WebviewViewProvider {
|
|
|
apiProvider,
|
|
apiProvider,
|
|
|
apiModelId,
|
|
apiModelId,
|
|
|
apiKey,
|
|
apiKey,
|
|
|
|
|
+ glamaModelId,
|
|
|
|
|
+ glamaModelInfo,
|
|
|
|
|
+ glamaApiKey,
|
|
|
openRouterApiKey,
|
|
openRouterApiKey,
|
|
|
awsAccessKey,
|
|
awsAccessKey,
|
|
|
awsSecretKey,
|
|
awsSecretKey,
|
|
@@ -430,6 +455,9 @@ export class ClineProvider implements vscode.WebviewViewProvider {
|
|
|
await this.updateGlobalState("apiProvider", apiProvider)
|
|
await this.updateGlobalState("apiProvider", apiProvider)
|
|
|
await this.updateGlobalState("apiModelId", apiModelId)
|
|
await this.updateGlobalState("apiModelId", apiModelId)
|
|
|
await this.storeSecret("apiKey", apiKey)
|
|
await this.storeSecret("apiKey", apiKey)
|
|
|
|
|
+ await this.updateGlobalState("glamaModelId", glamaModelId)
|
|
|
|
|
+ await this.updateGlobalState("glamaModelInfo", glamaModelInfo)
|
|
|
|
|
+ await this.storeSecret("glamaApiKey", glamaApiKey)
|
|
|
await this.storeSecret("openRouterApiKey", openRouterApiKey)
|
|
await this.storeSecret("openRouterApiKey", openRouterApiKey)
|
|
|
await this.storeSecret("awsAccessKey", awsAccessKey)
|
|
await this.storeSecret("awsAccessKey", awsAccessKey)
|
|
|
await this.storeSecret("awsSecretKey", awsSecretKey)
|
|
await this.storeSecret("awsSecretKey", awsSecretKey)
|
|
@@ -525,6 +553,9 @@ export class ClineProvider implements vscode.WebviewViewProvider {
|
|
|
const lmStudioModels = await this.getLmStudioModels(message.text)
|
|
const lmStudioModels = await this.getLmStudioModels(message.text)
|
|
|
this.postMessageToWebview({ type: "lmStudioModels", lmStudioModels })
|
|
this.postMessageToWebview({ type: "lmStudioModels", lmStudioModels })
|
|
|
break
|
|
break
|
|
|
|
|
+ case "refreshGlamaModels":
|
|
|
|
|
+ await this.refreshGlamaModels()
|
|
|
|
|
+ break
|
|
|
case "refreshOpenRouterModels":
|
|
case "refreshOpenRouterModels":
|
|
|
await this.refreshOpenRouterModels()
|
|
await this.refreshOpenRouterModels()
|
|
|
break
|
|
break
|
|
@@ -831,6 +862,93 @@ export class ClineProvider implements vscode.WebviewViewProvider {
|
|
|
return cacheDir
|
|
return cacheDir
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ async readGlamaModels(): Promise<Record<string, ModelInfo> | undefined> {
|
|
|
|
|
+ const glamaModelsFilePath = path.join(
|
|
|
|
|
+ await this.ensureCacheDirectoryExists(),
|
|
|
|
|
+ GlobalFileNames.glamaModels,
|
|
|
|
|
+ )
|
|
|
|
|
+ const fileExists = await fileExistsAtPath(glamaModelsFilePath)
|
|
|
|
|
+ if (fileExists) {
|
|
|
|
|
+ const fileContents = await fs.readFile(glamaModelsFilePath, "utf8")
|
|
|
|
|
+ return JSON.parse(fileContents)
|
|
|
|
|
+ }
|
|
|
|
|
+ return undefined
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ async refreshGlamaModels() {
|
|
|
|
|
+ const glamaModelsFilePath = path.join(
|
|
|
|
|
+ await this.ensureCacheDirectoryExists(),
|
|
|
|
|
+ GlobalFileNames.glamaModels,
|
|
|
|
|
+ )
|
|
|
|
|
+
|
|
|
|
|
+ let models: Record<string, ModelInfo> = {}
|
|
|
|
|
+ try {
|
|
|
|
|
+ const response = await axios.get("https://glama.ai/api/gateway/v1/models")
|
|
|
|
|
+ /*
|
|
|
|
|
+ {
|
|
|
|
|
+ "added": "2024-12-24T15:12:49.324Z",
|
|
|
|
|
+ "capabilities": [
|
|
|
|
|
+ "adjustable_safety_settings",
|
|
|
|
|
+ "caching",
|
|
|
|
|
+ "code_execution",
|
|
|
|
|
+ "function_calling",
|
|
|
|
|
+ "json_mode",
|
|
|
|
|
+ "json_schema",
|
|
|
|
|
+ "system_instructions",
|
|
|
|
|
+ "tuning",
|
|
|
|
|
+ "input:audio",
|
|
|
|
|
+ "input:image",
|
|
|
|
|
+ "input:text",
|
|
|
|
|
+ "input:video",
|
|
|
|
|
+ "output:text"
|
|
|
|
|
+ ],
|
|
|
|
|
+ "id": "google-vertex/gemini-1.5-flash-002",
|
|
|
|
|
+ "maxTokensInput": 1048576,
|
|
|
|
|
+ "maxTokensOutput": 8192,
|
|
|
|
|
+ "pricePerToken": {
|
|
|
|
|
+ "cacheRead": null,
|
|
|
|
|
+ "cacheWrite": null,
|
|
|
|
|
+ "input": "0.000000075",
|
|
|
|
|
+ "output": "0.0000003"
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ */
|
|
|
|
|
+ if (response.data) {
|
|
|
|
|
+ const rawModels = response.data;
|
|
|
|
|
+ const parsePrice = (price: any) => {
|
|
|
|
|
+ if (price) {
|
|
|
|
|
+ return parseFloat(price) * 1_000_000
|
|
|
|
|
+ }
|
|
|
|
|
+ return undefined
|
|
|
|
|
+ }
|
|
|
|
|
+ for (const rawModel of rawModels) {
|
|
|
|
|
+ const modelInfo: ModelInfo = {
|
|
|
|
|
+ maxTokens: rawModel.maxTokensOutput,
|
|
|
|
|
+ contextWindow: rawModel.maxTokensInput,
|
|
|
|
|
+ supportsImages: rawModel.capabilities?.includes("input:image"),
|
|
|
|
|
+ supportsPromptCache: rawModel.capabilities?.includes("caching"),
|
|
|
|
|
+ inputPrice: parsePrice(rawModel.pricePerToken?.input),
|
|
|
|
|
+ outputPrice: parsePrice(rawModel.pricePerToken?.output),
|
|
|
|
|
+ description: undefined,
|
|
|
|
|
+ cacheWritesPrice: parsePrice(rawModel.pricePerToken?.cacheWrite),
|
|
|
|
|
+ cacheReadsPrice: parsePrice(rawModel.pricePerToken?.cacheRead),
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ models[rawModel.id] = modelInfo
|
|
|
|
|
+ }
|
|
|
|
|
+ } else {
|
|
|
|
|
+ console.error("Invalid response from Glama API")
|
|
|
|
|
+ }
|
|
|
|
|
+ await fs.writeFile(glamaModelsFilePath, JSON.stringify(models))
|
|
|
|
|
+ console.log("Glama models fetched and saved", models)
|
|
|
|
|
+ } catch (error) {
|
|
|
|
|
+ console.error("Error fetching Glama models:", error)
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ await this.postMessageToWebview({ type: "glamaModels", glamaModels: models })
|
|
|
|
|
+ return models
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
async readOpenRouterModels(): Promise<Record<string, ModelInfo> | undefined> {
|
|
async readOpenRouterModels(): Promise<Record<string, ModelInfo> | undefined> {
|
|
|
const openRouterModelsFilePath = path.join(
|
|
const openRouterModelsFilePath = path.join(
|
|
|
await this.ensureCacheDirectoryExists(),
|
|
await this.ensureCacheDirectoryExists(),
|
|
@@ -1153,6 +1271,9 @@ export class ClineProvider implements vscode.WebviewViewProvider {
|
|
|
storedApiProvider,
|
|
storedApiProvider,
|
|
|
apiModelId,
|
|
apiModelId,
|
|
|
apiKey,
|
|
apiKey,
|
|
|
|
|
+ glamaApiKey,
|
|
|
|
|
+ glamaModelId,
|
|
|
|
|
+ glamaModelInfo,
|
|
|
openRouterApiKey,
|
|
openRouterApiKey,
|
|
|
awsAccessKey,
|
|
awsAccessKey,
|
|
|
awsSecretKey,
|
|
awsSecretKey,
|
|
@@ -1200,6 +1321,9 @@ export class ClineProvider implements vscode.WebviewViewProvider {
|
|
|
this.getGlobalState("apiProvider") as Promise<ApiProvider | undefined>,
|
|
this.getGlobalState("apiProvider") as Promise<ApiProvider | undefined>,
|
|
|
this.getGlobalState("apiModelId") as Promise<string | undefined>,
|
|
this.getGlobalState("apiModelId") as Promise<string | undefined>,
|
|
|
this.getSecret("apiKey") as Promise<string | undefined>,
|
|
this.getSecret("apiKey") as Promise<string | undefined>,
|
|
|
|
|
+ this.getSecret("glamaApiKey") as Promise<string | undefined>,
|
|
|
|
|
+ this.getGlobalState("glamaModelId") as Promise<string | undefined>,
|
|
|
|
|
+ this.getGlobalState("glamaModelInfo") as Promise<ModelInfo | undefined>,
|
|
|
this.getSecret("openRouterApiKey") as Promise<string | undefined>,
|
|
this.getSecret("openRouterApiKey") as Promise<string | undefined>,
|
|
|
this.getSecret("awsAccessKey") as Promise<string | undefined>,
|
|
this.getSecret("awsAccessKey") as Promise<string | undefined>,
|
|
|
this.getSecret("awsSecretKey") as Promise<string | undefined>,
|
|
this.getSecret("awsSecretKey") as Promise<string | undefined>,
|
|
@@ -1264,6 +1388,9 @@ export class ClineProvider implements vscode.WebviewViewProvider {
|
|
|
apiProvider,
|
|
apiProvider,
|
|
|
apiModelId,
|
|
apiModelId,
|
|
|
apiKey,
|
|
apiKey,
|
|
|
|
|
+ glamaApiKey,
|
|
|
|
|
+ glamaModelId,
|
|
|
|
|
+ glamaModelInfo,
|
|
|
openRouterApiKey,
|
|
openRouterApiKey,
|
|
|
awsAccessKey,
|
|
awsAccessKey,
|
|
|
awsSecretKey,
|
|
awsSecretKey,
|
|
@@ -1402,6 +1529,7 @@ export class ClineProvider implements vscode.WebviewViewProvider {
|
|
|
}
|
|
}
|
|
|
const secretKeys: SecretKey[] = [
|
|
const secretKeys: SecretKey[] = [
|
|
|
"apiKey",
|
|
"apiKey",
|
|
|
|
|
+ "glamaApiKey",
|
|
|
"openRouterApiKey",
|
|
"openRouterApiKey",
|
|
|
"awsAccessKey",
|
|
"awsAccessKey",
|
|
|
"awsSecretKey",
|
|
"awsSecretKey",
|