refactor: rename openAiCusModelInfo to openAiCustomModelInfo for better clarity

- Rename openAiCusModelInfo to openAiCustomModelInfo across all files for better readability
- Update related variable names and references to maintain consistency
- Affects OpenAI provider, ClineProvider, WebviewMessage, API interfaces, and UI components
This commit is contained in:
sam hoang
2025-01-21 23:06:07 +07:00
parent ca5d3c0ab0
commit d1a65f4de0
5 changed files with 35 additions and 35 deletions

View File

@@ -108,7 +108,7 @@ export class OpenAiHandler implements ApiHandler, SingleCompletionHandler {
getModel(): { id: string; info: ModelInfo } { getModel(): { id: string; info: ModelInfo } {
return { return {
id: this.options.openAiModelId ?? "", id: this.options.openAiModelId ?? "",
info: this.options.openAiCusModelInfo ?? openAiModelInfoSaneDefaults, info: this.options.openAiCustomModelInfo ?? openAiModelInfoSaneDefaults,
} }
} }

View File

@@ -68,7 +68,7 @@ type GlobalStateKey =
| "taskHistory" | "taskHistory"
| "openAiBaseUrl" | "openAiBaseUrl"
| "openAiModelId" | "openAiModelId"
| "openAiCusModelInfo" | "openAiCustomModelInfo"
| "ollamaModelId" | "ollamaModelId"
| "ollamaBaseUrl" | "ollamaBaseUrl"
| "lmStudioModelId" | "lmStudioModelId"
@@ -1199,7 +1199,7 @@ export class ClineProvider implements vscode.WebviewViewProvider {
openAiBaseUrl, openAiBaseUrl,
openAiApiKey, openAiApiKey,
openAiModelId, openAiModelId,
openAiCusModelInfo, openAiCustomModelInfo,
ollamaModelId, ollamaModelId,
ollamaBaseUrl, ollamaBaseUrl,
lmStudioModelId, lmStudioModelId,
@@ -1233,7 +1233,7 @@ export class ClineProvider implements vscode.WebviewViewProvider {
await this.updateGlobalState("openAiBaseUrl", openAiBaseUrl) await this.updateGlobalState("openAiBaseUrl", openAiBaseUrl)
await this.storeSecret("openAiApiKey", openAiApiKey) await this.storeSecret("openAiApiKey", openAiApiKey)
await this.updateGlobalState("openAiModelId", openAiModelId) await this.updateGlobalState("openAiModelId", openAiModelId)
await this.updateGlobalState("openAiCusModelInfo", openAiCusModelInfo) await this.updateGlobalState("openAiCustomModelInfo", openAiCustomModelInfo)
await this.updateGlobalState("ollamaModelId", ollamaModelId) await this.updateGlobalState("ollamaModelId", ollamaModelId)
await this.updateGlobalState("ollamaBaseUrl", ollamaBaseUrl) await this.updateGlobalState("ollamaBaseUrl", ollamaBaseUrl)
await this.updateGlobalState("lmStudioModelId", lmStudioModelId) await this.updateGlobalState("lmStudioModelId", lmStudioModelId)
@@ -1850,7 +1850,7 @@ export class ClineProvider implements vscode.WebviewViewProvider {
openAiBaseUrl, openAiBaseUrl,
openAiApiKey, openAiApiKey,
openAiModelId, openAiModelId,
openAiCusModelInfo, openAiCustomModelInfo,
ollamaModelId, ollamaModelId,
ollamaBaseUrl, ollamaBaseUrl,
lmStudioModelId, lmStudioModelId,
@@ -1914,7 +1914,7 @@ export class ClineProvider implements vscode.WebviewViewProvider {
this.getGlobalState("openAiBaseUrl") as Promise<string | undefined>, this.getGlobalState("openAiBaseUrl") as Promise<string | undefined>,
this.getSecret("openAiApiKey") as Promise<string | undefined>, this.getSecret("openAiApiKey") as Promise<string | undefined>,
this.getGlobalState("openAiModelId") as Promise<string | undefined>, this.getGlobalState("openAiModelId") as Promise<string | undefined>,
this.getGlobalState("openAiCusModelInfo") as Promise<ModelInfo | undefined>, this.getGlobalState("openAiCustomModelInfo") as Promise<ModelInfo | undefined>,
this.getGlobalState("ollamaModelId") as Promise<string | undefined>, this.getGlobalState("ollamaModelId") as Promise<string | undefined>,
this.getGlobalState("ollamaBaseUrl") as Promise<string | undefined>, this.getGlobalState("ollamaBaseUrl") as Promise<string | undefined>,
this.getGlobalState("lmStudioModelId") as Promise<string | undefined>, this.getGlobalState("lmStudioModelId") as Promise<string | undefined>,
@@ -1995,7 +1995,7 @@ export class ClineProvider implements vscode.WebviewViewProvider {
openAiBaseUrl, openAiBaseUrl,
openAiApiKey, openAiApiKey,
openAiModelId, openAiModelId,
openAiCusModelInfo, openAiCustomModelInfo,
ollamaModelId, ollamaModelId,
ollamaBaseUrl, ollamaBaseUrl,
lmStudioModelId, lmStudioModelId,

View File

@@ -76,7 +76,7 @@ export interface WebviewMessage {
| "autoApprovalEnabled" | "autoApprovalEnabled"
| "updateCustomMode" | "updateCustomMode"
| "deleteCustomMode" | "deleteCustomMode"
| "setOpenAiCusModelInfo" | "setopenAiCustomModelInfo"
text?: string text?: string
disabled?: boolean disabled?: boolean
askResponse?: ClineAskResponse askResponse?: ClineAskResponse

View File

@@ -38,7 +38,7 @@ export interface ApiHandlerOptions {
openAiBaseUrl?: string openAiBaseUrl?: string
openAiApiKey?: string openAiApiKey?: string
openAiModelId?: string openAiModelId?: string
openAiCusModelInfo?: ModelInfo openAiCustomModelInfo?: ModelInfo
ollamaModelId?: string ollamaModelId?: string
ollamaBaseUrl?: string ollamaBaseUrl?: string
lmStudioModelId?: string lmStudioModelId?: string

View File

@@ -45,7 +45,7 @@ interface ApiOptionsProps {
} }
const ApiOptions = ({ apiErrorMessage, modelIdErrorMessage }: ApiOptionsProps) => { const ApiOptions = ({ apiErrorMessage, modelIdErrorMessage }: ApiOptionsProps) => {
const { apiConfiguration, setApiConfiguration, uriScheme, handleInputChange } = useExtensionState() const { apiConfiguration, uriScheme, handleInputChange } = useExtensionState()
const [ollamaModels, setOllamaModels] = useState<string[]>([]) const [ollamaModels, setOllamaModels] = useState<string[]>([])
const [lmStudioModels, setLmStudioModels] = useState<string[]>([]) const [lmStudioModels, setLmStudioModels] = useState<string[]>([])
const [vsCodeLmModels, setVsCodeLmModels] = useState<vscodemodels.LanguageModelChatSelector[]>([]) const [vsCodeLmModels, setVsCodeLmModels] = useState<vscodemodels.LanguageModelChatSelector[]>([])
@@ -571,7 +571,7 @@ const ApiOptions = ({ apiErrorMessage, modelIdErrorMessage }: ApiOptionsProps) =
{ {
iconName: "refresh", iconName: "refresh",
onClick: () => onClick: () =>
handleInputChange("openAiCusModelInfo")({ handleInputChange("openAiCustomModelInfo")({
target: { value: openAiModelInfoSaneDefaults }, target: { value: openAiModelInfoSaneDefaults },
}), }),
}, },
@@ -613,7 +613,7 @@ const ApiOptions = ({ apiErrorMessage, modelIdErrorMessage }: ApiOptionsProps) =
<div className="token-config-field"> <div className="token-config-field">
<VSCodeTextField <VSCodeTextField
value={ value={
apiConfiguration?.openAiCusModelInfo?.maxTokens?.toString() || apiConfiguration?.openAiCustomModelInfo?.maxTokens?.toString() ||
openAiModelInfoSaneDefaults.maxTokens?.toString() || openAiModelInfoSaneDefaults.maxTokens?.toString() ||
"" ""
} }
@@ -621,7 +621,7 @@ const ApiOptions = ({ apiErrorMessage, modelIdErrorMessage }: ApiOptionsProps) =
style={{ style={{
width: "100%", width: "100%",
borderColor: (() => { borderColor: (() => {
const value = apiConfiguration?.openAiCusModelInfo?.maxTokens const value = apiConfiguration?.openAiCustomModelInfo?.maxTokens
if (!value) return "var(--vscode-input-border)" if (!value) return "var(--vscode-input-border)"
return value > 0 return value > 0
? "var(--vscode-charts-green)" ? "var(--vscode-charts-green)"
@@ -631,10 +631,10 @@ const ApiOptions = ({ apiErrorMessage, modelIdErrorMessage }: ApiOptionsProps) =
title="Maximum number of tokens the model can generate in a single response" title="Maximum number of tokens the model can generate in a single response"
onChange={(e: any) => { onChange={(e: any) => {
const value = parseInt(e.target.value) const value = parseInt(e.target.value)
handleInputChange("openAiCusModelInfo")({ handleInputChange("openAiCustomModelInfo")({
target: { target: {
value: { value: {
...(apiConfiguration?.openAiCusModelInfo || ...(apiConfiguration?.openAiCustomModelInfo ||
openAiModelInfoSaneDefaults), openAiModelInfoSaneDefaults),
maxTokens: isNaN(value) ? undefined : value, maxTokens: isNaN(value) ? undefined : value,
}, },
@@ -664,7 +664,7 @@ const ApiOptions = ({ apiErrorMessage, modelIdErrorMessage }: ApiOptionsProps) =
<div className="token-config-field"> <div className="token-config-field">
<VSCodeTextField <VSCodeTextField
value={ value={
apiConfiguration?.openAiCusModelInfo?.contextWindow?.toString() || apiConfiguration?.openAiCustomModelInfo?.contextWindow?.toString() ||
openAiModelInfoSaneDefaults.contextWindow?.toString() || openAiModelInfoSaneDefaults.contextWindow?.toString() ||
"" ""
} }
@@ -672,7 +672,7 @@ const ApiOptions = ({ apiErrorMessage, modelIdErrorMessage }: ApiOptionsProps) =
style={{ style={{
width: "100%", width: "100%",
borderColor: (() => { borderColor: (() => {
const value = apiConfiguration?.openAiCusModelInfo?.contextWindow const value = apiConfiguration?.openAiCustomModelInfo?.contextWindow
if (!value) return "var(--vscode-input-border)" if (!value) return "var(--vscode-input-border)"
return value > 0 return value > 0
? "var(--vscode-charts-green)" ? "var(--vscode-charts-green)"
@@ -682,10 +682,10 @@ const ApiOptions = ({ apiErrorMessage, modelIdErrorMessage }: ApiOptionsProps) =
title="Total number of tokens (input + output) the model can process in a single request" title="Total number of tokens (input + output) the model can process in a single request"
onChange={(e: any) => { onChange={(e: any) => {
const parsed = parseInt(e.target.value) const parsed = parseInt(e.target.value)
handleInputChange("openAiCusModelInfo")({ handleInputChange("openAiCustomModelInfo")({
target: { target: {
value: { value: {
...(apiConfiguration?.openAiCusModelInfo || ...(apiConfiguration?.openAiCustomModelInfo ||
openAiModelInfoSaneDefaults), openAiModelInfoSaneDefaults),
contextWindow: contextWindow:
e.target.value === "" e.target.value === ""
@@ -742,14 +742,14 @@ const ApiOptions = ({ apiErrorMessage, modelIdErrorMessage }: ApiOptionsProps) =
<div style={{ display: "flex", alignItems: "center", gap: "8px" }}> <div style={{ display: "flex", alignItems: "center", gap: "8px" }}>
<Checkbox <Checkbox
checked={ checked={
apiConfiguration?.openAiCusModelInfo?.supportsImages ?? apiConfiguration?.openAiCustomModelInfo?.supportsImages ??
openAiModelInfoSaneDefaults.supportsImages openAiModelInfoSaneDefaults.supportsImages
} }
onChange={(checked: boolean) => { onChange={(checked: boolean) => {
handleInputChange("openAiCusModelInfo")({ handleInputChange("openAiCustomModelInfo")({
target: { target: {
value: { value: {
...(apiConfiguration?.openAiCusModelInfo || ...(apiConfiguration?.openAiCustomModelInfo ||
openAiModelInfoSaneDefaults), openAiModelInfoSaneDefaults),
supportsImages: checked, supportsImages: checked,
}, },
@@ -790,14 +790,14 @@ const ApiOptions = ({ apiErrorMessage, modelIdErrorMessage }: ApiOptionsProps) =
<div style={{ display: "flex", alignItems: "center", gap: "8px" }}> <div style={{ display: "flex", alignItems: "center", gap: "8px" }}>
<Checkbox <Checkbox
checked={ checked={
apiConfiguration?.openAiCusModelInfo?.supportsComputerUse ?? apiConfiguration?.openAiCustomModelInfo
false ?.supportsComputerUse ?? false
} }
onChange={(checked: boolean) => { onChange={(checked: boolean) => {
handleInputChange("openAiCusModelInfo")({ handleInputChange("openAiCustomModelInfo")({
target: { target: {
value: { value: {
...(apiConfiguration?.openAiCusModelInfo || ...(apiConfiguration?.openAiCustomModelInfo ||
openAiModelInfoSaneDefaults), openAiModelInfoSaneDefaults),
supportsComputerUse: checked, supportsComputerUse: checked,
}, },
@@ -874,7 +874,7 @@ const ApiOptions = ({ apiErrorMessage, modelIdErrorMessage }: ApiOptionsProps) =
<div className="price-input"> <div className="price-input">
<VSCodeTextField <VSCodeTextField
value={ value={
apiConfiguration?.openAiCusModelInfo?.inputPrice?.toString() ?? apiConfiguration?.openAiCustomModelInfo?.inputPrice?.toString() ??
openAiModelInfoSaneDefaults.inputPrice?.toString() ?? openAiModelInfoSaneDefaults.inputPrice?.toString() ??
"" ""
} }
@@ -882,7 +882,7 @@ const ApiOptions = ({ apiErrorMessage, modelIdErrorMessage }: ApiOptionsProps) =
style={{ style={{
width: "100%", width: "100%",
borderColor: (() => { borderColor: (() => {
const value = apiConfiguration?.openAiCusModelInfo?.inputPrice const value = apiConfiguration?.openAiCustomModelInfo?.inputPrice
if (!value && value !== 0) return "var(--vscode-input-border)" if (!value && value !== 0) return "var(--vscode-input-border)"
return value >= 0 return value >= 0
? "var(--vscode-charts-green)" ? "var(--vscode-charts-green)"
@@ -891,10 +891,10 @@ const ApiOptions = ({ apiErrorMessage, modelIdErrorMessage }: ApiOptionsProps) =
}} }}
onChange={(e: any) => { onChange={(e: any) => {
const parsed = parseFloat(e.target.value) const parsed = parseFloat(e.target.value)
handleInputChange("openAiCusModelInfo")({ handleInputChange("openAiCustomModelInfo")({
target: { target: {
value: { value: {
...(apiConfiguration?.openAiCusModelInfo ?? ...(apiConfiguration?.openAiCustomModelInfo ??
openAiModelInfoSaneDefaults), openAiModelInfoSaneDefaults),
inputPrice: inputPrice:
e.target.value === "" e.target.value === ""
@@ -925,7 +925,7 @@ const ApiOptions = ({ apiErrorMessage, modelIdErrorMessage }: ApiOptionsProps) =
<div className="price-input"> <div className="price-input">
<VSCodeTextField <VSCodeTextField
value={ value={
apiConfiguration?.openAiCusModelInfo?.outputPrice?.toString() || apiConfiguration?.openAiCustomModelInfo?.outputPrice?.toString() ||
openAiModelInfoSaneDefaults.outputPrice?.toString() || openAiModelInfoSaneDefaults.outputPrice?.toString() ||
"" ""
} }
@@ -933,7 +933,7 @@ const ApiOptions = ({ apiErrorMessage, modelIdErrorMessage }: ApiOptionsProps) =
style={{ style={{
width: "100%", width: "100%",
borderColor: (() => { borderColor: (() => {
const value = apiConfiguration?.openAiCusModelInfo?.outputPrice const value = apiConfiguration?.openAiCustomModelInfo?.outputPrice
if (!value && value !== 0) return "var(--vscode-input-border)" if (!value && value !== 0) return "var(--vscode-input-border)"
return value >= 0 return value >= 0
? "var(--vscode-charts-green)" ? "var(--vscode-charts-green)"
@@ -942,10 +942,10 @@ const ApiOptions = ({ apiErrorMessage, modelIdErrorMessage }: ApiOptionsProps) =
}} }}
onChange={(e: any) => { onChange={(e: any) => {
const parsed = parseFloat(e.target.value) const parsed = parseFloat(e.target.value)
handleInputChange("openAiCusModelInfo")({ handleInputChange("openAiCustomModelInfo")({
target: { target: {
value: { value: {
...(apiConfiguration?.openAiCusModelInfo || ...(apiConfiguration?.openAiCustomModelInfo ||
openAiModelInfoSaneDefaults), openAiModelInfoSaneDefaults),
outputPrice: outputPrice:
e.target.value === "" e.target.value === ""
@@ -1460,7 +1460,7 @@ export function normalizeApiConfiguration(apiConfiguration?: ApiConfiguration) {
return { return {
selectedProvider: provider, selectedProvider: provider,
selectedModelId: apiConfiguration?.openAiModelId || "", selectedModelId: apiConfiguration?.openAiModelId || "",
selectedModelInfo: apiConfiguration?.openAiCusModelInfo || openAiModelInfoSaneDefaults, selectedModelInfo: apiConfiguration?.openAiCustomModelInfo || openAiModelInfoSaneDefaults,
} }
case "ollama": case "ollama":
return { return {