From d1a65f4de041703f9fedfe76ba9008f362a1f2a1 Mon Sep 17 00:00:00 2001
From: sam hoang <samhv.ict@gmail.com>
Date: Tue, 21 Jan 2025 23:06:07 +0700
Subject: [PATCH] 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
---
 src/api/providers/openai.ts                   |  2 +-
 src/core/webview/ClineProvider.ts             | 12 ++---
 src/shared/WebviewMessage.ts                  |  2 +-
 src/shared/api.ts                             |  2 +-
 .../src/components/settings/ApiOptions.tsx    | 52 +++++++++----------
 5 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/src/api/providers/openai.ts b/src/api/providers/openai.ts
index c2c3a89..d71a51f 100644
--- a/src/api/providers/openai.ts
+++ b/src/api/providers/openai.ts
@@ -108,7 +108,7 @@ export class OpenAiHandler implements ApiHandler, SingleCompletionHandler {
 	getModel(): { id: string; info: ModelInfo } {
 		return {
 			id: this.options.openAiModelId ?? "",
-			info: this.options.openAiCusModelInfo ?? openAiModelInfoSaneDefaults,
+			info: this.options.openAiCustomModelInfo ?? openAiModelInfoSaneDefaults,
 		}
 	}
 
diff --git a/src/core/webview/ClineProvider.ts b/src/core/webview/ClineProvider.ts
index 771aae3..23fe36e 100644
--- a/src/core/webview/ClineProvider.ts
+++ b/src/core/webview/ClineProvider.ts
@@ -68,7 +68,7 @@ type GlobalStateKey =
 	| "taskHistory"
 	| "openAiBaseUrl"
 	| "openAiModelId"
-	| "openAiCusModelInfo"
+	| "openAiCustomModelInfo"
 	| "ollamaModelId"
 	| "ollamaBaseUrl"
 	| "lmStudioModelId"
@@ -1199,7 +1199,7 @@ export class ClineProvider implements vscode.WebviewViewProvider {
 			openAiBaseUrl,
 			openAiApiKey,
 			openAiModelId,
-			openAiCusModelInfo,
+			openAiCustomModelInfo,
 			ollamaModelId,
 			ollamaBaseUrl,
 			lmStudioModelId,
@@ -1233,7 +1233,7 @@ export class ClineProvider implements vscode.WebviewViewProvider {
 		await this.updateGlobalState("openAiBaseUrl", openAiBaseUrl)
 		await this.storeSecret("openAiApiKey", openAiApiKey)
 		await this.updateGlobalState("openAiModelId", openAiModelId)
-		await this.updateGlobalState("openAiCusModelInfo", openAiCusModelInfo)
+		await this.updateGlobalState("openAiCustomModelInfo", openAiCustomModelInfo)
 		await this.updateGlobalState("ollamaModelId", ollamaModelId)
 		await this.updateGlobalState("ollamaBaseUrl", ollamaBaseUrl)
 		await this.updateGlobalState("lmStudioModelId", lmStudioModelId)
@@ -1850,7 +1850,7 @@ export class ClineProvider implements vscode.WebviewViewProvider {
 			openAiBaseUrl,
 			openAiApiKey,
 			openAiModelId,
-			openAiCusModelInfo,
+			openAiCustomModelInfo,
 			ollamaModelId,
 			ollamaBaseUrl,
 			lmStudioModelId,
@@ -1914,7 +1914,7 @@ export class ClineProvider implements vscode.WebviewViewProvider {
 			this.getGlobalState("openAiBaseUrl") as Promise<string | undefined>,
 			this.getSecret("openAiApiKey") 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("ollamaBaseUrl") as Promise<string | undefined>,
 			this.getGlobalState("lmStudioModelId") as Promise<string | undefined>,
@@ -1995,7 +1995,7 @@ export class ClineProvider implements vscode.WebviewViewProvider {
 				openAiBaseUrl,
 				openAiApiKey,
 				openAiModelId,
-				openAiCusModelInfo,
+				openAiCustomModelInfo,
 				ollamaModelId,
 				ollamaBaseUrl,
 				lmStudioModelId,
diff --git a/src/shared/WebviewMessage.ts b/src/shared/WebviewMessage.ts
index 5aaaa82..5705378 100644
--- a/src/shared/WebviewMessage.ts
+++ b/src/shared/WebviewMessage.ts
@@ -76,7 +76,7 @@ export interface WebviewMessage {
 		| "autoApprovalEnabled"
 		| "updateCustomMode"
 		| "deleteCustomMode"
-		| "setOpenAiCusModelInfo"
+		| "setopenAiCustomModelInfo"
 	text?: string
 	disabled?: boolean
 	askResponse?: ClineAskResponse
diff --git a/src/shared/api.ts b/src/shared/api.ts
index 5524a1e..8d7b919 100644
--- a/src/shared/api.ts
+++ b/src/shared/api.ts
@@ -38,7 +38,7 @@ export interface ApiHandlerOptions {
 	openAiBaseUrl?: string
 	openAiApiKey?: string
 	openAiModelId?: string
-	openAiCusModelInfo?: ModelInfo
+	openAiCustomModelInfo?: ModelInfo
 	ollamaModelId?: string
 	ollamaBaseUrl?: string
 	lmStudioModelId?: string
diff --git a/webview-ui/src/components/settings/ApiOptions.tsx b/webview-ui/src/components/settings/ApiOptions.tsx
index 083c35b..cda5191 100644
--- a/webview-ui/src/components/settings/ApiOptions.tsx
+++ b/webview-ui/src/components/settings/ApiOptions.tsx
@@ -45,7 +45,7 @@ interface ApiOptionsProps {
 }
 
 const ApiOptions = ({ apiErrorMessage, modelIdErrorMessage }: ApiOptionsProps) => {
-	const { apiConfiguration, setApiConfiguration, uriScheme, handleInputChange } = useExtensionState()
+	const { apiConfiguration, uriScheme, handleInputChange } = useExtensionState()
 	const [ollamaModels, setOllamaModels] = useState<string[]>([])
 	const [lmStudioModels, setLmStudioModels] = useState<string[]>([])
 	const [vsCodeLmModels, setVsCodeLmModels] = useState<vscodemodels.LanguageModelChatSelector[]>([])
@@ -571,7 +571,7 @@ const ApiOptions = ({ apiErrorMessage, modelIdErrorMessage }: ApiOptionsProps) =
 							{
 								iconName: "refresh",
 								onClick: () =>
-									handleInputChange("openAiCusModelInfo")({
+									handleInputChange("openAiCustomModelInfo")({
 										target: { value: openAiModelInfoSaneDefaults },
 									}),
 							},
@@ -613,7 +613,7 @@ const ApiOptions = ({ apiErrorMessage, modelIdErrorMessage }: ApiOptionsProps) =
 									<div className="token-config-field">
 										<VSCodeTextField
 											value={
-												apiConfiguration?.openAiCusModelInfo?.maxTokens?.toString() ||
+												apiConfiguration?.openAiCustomModelInfo?.maxTokens?.toString() ||
 												openAiModelInfoSaneDefaults.maxTokens?.toString() ||
 												""
 											}
@@ -621,7 +621,7 @@ const ApiOptions = ({ apiErrorMessage, modelIdErrorMessage }: ApiOptionsProps) =
 											style={{
 												width: "100%",
 												borderColor: (() => {
-													const value = apiConfiguration?.openAiCusModelInfo?.maxTokens
+													const value = apiConfiguration?.openAiCustomModelInfo?.maxTokens
 													if (!value) return "var(--vscode-input-border)"
 													return value > 0
 														? "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"
 											onChange={(e: any) => {
 												const value = parseInt(e.target.value)
-												handleInputChange("openAiCusModelInfo")({
+												handleInputChange("openAiCustomModelInfo")({
 													target: {
 														value: {
-															...(apiConfiguration?.openAiCusModelInfo ||
+															...(apiConfiguration?.openAiCustomModelInfo ||
 																openAiModelInfoSaneDefaults),
 															maxTokens: isNaN(value) ? undefined : value,
 														},
@@ -664,7 +664,7 @@ const ApiOptions = ({ apiErrorMessage, modelIdErrorMessage }: ApiOptionsProps) =
 									<div className="token-config-field">
 										<VSCodeTextField
 											value={
-												apiConfiguration?.openAiCusModelInfo?.contextWindow?.toString() ||
+												apiConfiguration?.openAiCustomModelInfo?.contextWindow?.toString() ||
 												openAiModelInfoSaneDefaults.contextWindow?.toString() ||
 												""
 											}
@@ -672,7 +672,7 @@ const ApiOptions = ({ apiErrorMessage, modelIdErrorMessage }: ApiOptionsProps) =
 											style={{
 												width: "100%",
 												borderColor: (() => {
-													const value = apiConfiguration?.openAiCusModelInfo?.contextWindow
+													const value = apiConfiguration?.openAiCustomModelInfo?.contextWindow
 													if (!value) return "var(--vscode-input-border)"
 													return value > 0
 														? "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"
 											onChange={(e: any) => {
 												const parsed = parseInt(e.target.value)
-												handleInputChange("openAiCusModelInfo")({
+												handleInputChange("openAiCustomModelInfo")({
 													target: {
 														value: {
-															...(apiConfiguration?.openAiCusModelInfo ||
+															...(apiConfiguration?.openAiCustomModelInfo ||
 																openAiModelInfoSaneDefaults),
 															contextWindow:
 																e.target.value === ""
@@ -742,14 +742,14 @@ const ApiOptions = ({ apiErrorMessage, modelIdErrorMessage }: ApiOptionsProps) =
 												<div style={{ display: "flex", alignItems: "center", gap: "8px" }}>
 													<Checkbox
 														checked={
-															apiConfiguration?.openAiCusModelInfo?.supportsImages ??
+															apiConfiguration?.openAiCustomModelInfo?.supportsImages ??
 															openAiModelInfoSaneDefaults.supportsImages
 														}
 														onChange={(checked: boolean) => {
-															handleInputChange("openAiCusModelInfo")({
+															handleInputChange("openAiCustomModelInfo")({
 																target: {
 																	value: {
-																		...(apiConfiguration?.openAiCusModelInfo ||
+																		...(apiConfiguration?.openAiCustomModelInfo ||
 																			openAiModelInfoSaneDefaults),
 																		supportsImages: checked,
 																	},
@@ -790,14 +790,14 @@ const ApiOptions = ({ apiErrorMessage, modelIdErrorMessage }: ApiOptionsProps) =
 												<div style={{ display: "flex", alignItems: "center", gap: "8px" }}>
 													<Checkbox
 														checked={
-															apiConfiguration?.openAiCusModelInfo?.supportsComputerUse ??
-															false
+															apiConfiguration?.openAiCustomModelInfo
+																?.supportsComputerUse ?? false
 														}
 														onChange={(checked: boolean) => {
-															handleInputChange("openAiCusModelInfo")({
+															handleInputChange("openAiCustomModelInfo")({
 																target: {
 																	value: {
-																		...(apiConfiguration?.openAiCusModelInfo ||
+																		...(apiConfiguration?.openAiCustomModelInfo ||
 																			openAiModelInfoSaneDefaults),
 																		supportsComputerUse: checked,
 																	},
@@ -874,7 +874,7 @@ const ApiOptions = ({ apiErrorMessage, modelIdErrorMessage }: ApiOptionsProps) =
 									<div className="price-input">
 										<VSCodeTextField
 											value={
-												apiConfiguration?.openAiCusModelInfo?.inputPrice?.toString() ??
+												apiConfiguration?.openAiCustomModelInfo?.inputPrice?.toString() ??
 												openAiModelInfoSaneDefaults.inputPrice?.toString() ??
 												""
 											}
@@ -882,7 +882,7 @@ const ApiOptions = ({ apiErrorMessage, modelIdErrorMessage }: ApiOptionsProps) =
 											style={{
 												width: "100%",
 												borderColor: (() => {
-													const value = apiConfiguration?.openAiCusModelInfo?.inputPrice
+													const value = apiConfiguration?.openAiCustomModelInfo?.inputPrice
 													if (!value && value !== 0) return "var(--vscode-input-border)"
 													return value >= 0
 														? "var(--vscode-charts-green)"
@@ -891,10 +891,10 @@ const ApiOptions = ({ apiErrorMessage, modelIdErrorMessage }: ApiOptionsProps) =
 											}}
 											onChange={(e: any) => {
 												const parsed = parseFloat(e.target.value)
-												handleInputChange("openAiCusModelInfo")({
+												handleInputChange("openAiCustomModelInfo")({
 													target: {
 														value: {
-															...(apiConfiguration?.openAiCusModelInfo ??
+															...(apiConfiguration?.openAiCustomModelInfo ??
 																openAiModelInfoSaneDefaults),
 															inputPrice:
 																e.target.value === ""
@@ -925,7 +925,7 @@ const ApiOptions = ({ apiErrorMessage, modelIdErrorMessage }: ApiOptionsProps) =
 									<div className="price-input">
 										<VSCodeTextField
 											value={
-												apiConfiguration?.openAiCusModelInfo?.outputPrice?.toString() ||
+												apiConfiguration?.openAiCustomModelInfo?.outputPrice?.toString() ||
 												openAiModelInfoSaneDefaults.outputPrice?.toString() ||
 												""
 											}
@@ -933,7 +933,7 @@ const ApiOptions = ({ apiErrorMessage, modelIdErrorMessage }: ApiOptionsProps) =
 											style={{
 												width: "100%",
 												borderColor: (() => {
-													const value = apiConfiguration?.openAiCusModelInfo?.outputPrice
+													const value = apiConfiguration?.openAiCustomModelInfo?.outputPrice
 													if (!value && value !== 0) return "var(--vscode-input-border)"
 													return value >= 0
 														? "var(--vscode-charts-green)"
@@ -942,10 +942,10 @@ const ApiOptions = ({ apiErrorMessage, modelIdErrorMessage }: ApiOptionsProps) =
 											}}
 											onChange={(e: any) => {
 												const parsed = parseFloat(e.target.value)
-												handleInputChange("openAiCusModelInfo")({
+												handleInputChange("openAiCustomModelInfo")({
 													target: {
 														value: {
-															...(apiConfiguration?.openAiCusModelInfo ||
+															...(apiConfiguration?.openAiCustomModelInfo ||
 																openAiModelInfoSaneDefaults),
 															outputPrice:
 																e.target.value === ""
@@ -1460,7 +1460,7 @@ export function normalizeApiConfiguration(apiConfiguration?: ApiConfiguration) {
 			return {
 				selectedProvider: provider,
 				selectedModelId: apiConfiguration?.openAiModelId || "",
-				selectedModelInfo: apiConfiguration?.openAiCusModelInfo || openAiModelInfoSaneDefaults,
+				selectedModelInfo: apiConfiguration?.openAiCustomModelInfo || openAiModelInfoSaneDefaults,
 			}
 		case "ollama":
 			return {