scriptoriumadmin/Roo-Code
1
0
Fork 0
mirror of https://github.com/RooVetGit/Roo-Code.git synced 2026-09-10 22:41:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor by pr comment

Browse source
This commit is contained in:
sam hoang 2025-03-04 20:26:22 +07:00
parent 167229fa73
commit b4094a6281
2 changed files with 52 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/core/webview/ClineProvider.ts
View file

@ -8,7 +8,7 @@ import * as path from "path"
import * as vscode from "vscode"
import simpleGit from "simple-git"
import { ApiConfiguration, ApiProvider, ModelInfo } from "../../shared/api"
import { ApiConfiguration, ApiProvider, ModelInfo, API_CONFIG_KEYS } from "../../shared/api"
import { findLast } from "../../shared/array"
import { CustomSupportPrompts, supportPrompt } from "../../shared/support-prompt"
import { GlobalFileNames } from "../../shared/globalFileNames"
@ -2114,47 +2114,19 @@ export class ClineProvider implements vscode.WebviewViewProvider {
}
// Build the apiConfiguration object combining state values and secrets
// Using the dynamic approach with API_CONFIG_KEYS
const apiConfiguration: ApiConfiguration = {
apiProvider,
apiModelId: stateValues.apiModelId,
glamaModelId: stateValues.glamaModelId,
glamaModelInfo: stateValues.glamaModelInfo,
awsRegion: stateValues.awsRegion,
awsUseCrossRegionInference: stateValues.awsUseCrossRegionInference,
awsProfile: stateValues.awsProfile,
awsUseProfile: stateValues.awsUseProfile,
vertexProjectId: stateValues.vertexProjectId,
vertexRegion: stateValues.vertexRegion,
openAiBaseUrl: stateValues.openAiBaseUrl,
openAiModelId: stateValues.openAiModelId,
openAiCustomModelInfo: stateValues.openAiCustomModelInfo,
openAiUseAzure: stateValues.openAiUseAzure,
ollamaModelId: stateValues.ollamaModelId,
ollamaBaseUrl: stateValues.ollamaBaseUrl,
lmStudioModelId: stateValues.lmStudioModelId,
lmStudioBaseUrl: stateValues.lmStudioBaseUrl,
anthropicBaseUrl: stateValues.anthropicBaseUrl,
modelMaxThinkingTokens: stateValues.modelMaxThinkingTokens,
mistralCodestralUrl: stateValues.mistralCodestralUrl,
azureApiVersion: stateValues.azureApiVersion,
openAiStreamingEnabled: stateValues.openAiStreamingEnabled,
openRouterModelId: stateValues.openRouterModelId,
openRouterModelInfo: stateValues.openRouterModelInfo,
openRouterBaseUrl: stateValues.openRouterBaseUrl,
openRouterUseMiddleOutTransform: stateValues.openRouterUseMiddleOutTransform,
vsCodeLmModelSelector: stateValues.vsCodeLmModelSelector,
unboundModelId: stateValues.unboundModelId,
unboundModelInfo: stateValues.unboundModelInfo,
requestyModelId: stateValues.requestyModelId,
requestyModelInfo: stateValues.requestyModelInfo,
modelTemperature: stateValues.modelTemperature,
modelMaxTokens: stateValues.modelMaxTokens,
lmStudioSpeculativeDecodingEnabled: stateValues.lmStudioSpeculativeDecodingEnabled,
lmStudioDraftModelId: stateValues.lmStudioDraftModelId,
// Dynamically add all API-related keys from stateValues
...Object.fromEntries(API_CONFIG_KEYS.map((key) => [key, stateValues[key]])),
// Add all secrets
...secretValues,
}
// Ensure apiProvider is set properly if not already in state
if (!apiConfiguration.apiProvider) {
apiConfiguration.apiProvider = apiProvider
}
// Return the same structure as before
return {
apiConfiguration,

43
src/shared/api.ts
View file

@ -78,6 +78,49 @@ export type ApiConfiguration = ApiHandlerOptions & {
id?: string // stable unique identifier
}
// Import GlobalStateKey type from globalState.ts
import { GlobalStateKey } from "./globalState"
// Define API configuration keys for dynamic object building
export const API_CONFIG_KEYS: GlobalStateKey[] = [
"apiProvider",
"apiModelId",
"glamaModelId",
"glamaModelInfo",
"awsRegion",
"awsUseCrossRegionInference",
"awsProfile",
"awsUseProfile",
"vertexProjectId",
"vertexRegion",
"openAiBaseUrl",
"openAiModelId",
"openAiCustomModelInfo",
"openAiUseAzure",
"ollamaModelId",
"ollamaBaseUrl",
"lmStudioModelId",
"lmStudioBaseUrl",
"anthropicBaseUrl",
"modelMaxThinkingTokens",
"mistralCodestralUrl",
"azureApiVersion",
"openAiStreamingEnabled",
"openRouterModelId",
"openRouterModelInfo",
"openRouterBaseUrl",
"openRouterUseMiddleOutTransform",
"vsCodeLmModelSelector",
"unboundModelId",
"unboundModelInfo",
"requestyModelId",
"requestyModelInfo",
"modelTemperature",
"modelMaxTokens",
"lmStudioSpeculativeDecodingEnabled",
"lmStudioDraftModelId"
]
// Models
export interface ModelInfo {