Skip to content

Commit d1a65f4

Browse files
samhvw8samhvw8
committed
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
1 parent ca5d3c0 commit d1a65f4

File tree

5 files changed

+35
-35
lines changed

5 files changed

+35
-35
lines changed

‎src/api/providers/openai.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ export class OpenAiHandler implements ApiHandler, SingleCompletionHandler {
108108
getModel(): { id: string; info: ModelInfo } {
109109
return {
110110
id: this.options.openAiModelId ?? "",
111-
info: this.options.openAiCusModelInfo ?? openAiModelInfoSaneDefaults,
111+
info: this.options.openAiCustomModelInfo ?? openAiModelInfoSaneDefaults,
112112
}
113113
}
114114

‎src/core/webview/ClineProvider.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ type GlobalStateKey =
6868
| "taskHistory"
6969
| "openAiBaseUrl"
7070
| "openAiModelId"
71-
| "openAiCusModelInfo"
71+
| "openAiCustomModelInfo"
7272
| "ollamaModelId"
7373
| "ollamaBaseUrl"
7474
| "lmStudioModelId"
@@ -1199,7 +1199,7 @@ export class ClineProvider implements vscode.WebviewViewProvider {
11991199
openAiBaseUrl,
12001200
openAiApiKey,
12011201
openAiModelId,
1202-
openAiCusModelInfo,
1202+
openAiCustomModelInfo,
12031203
ollamaModelId,
12041204
ollamaBaseUrl,
12051205
lmStudioModelId,
@@ -1233,7 +1233,7 @@ export class ClineProvider implements vscode.WebviewViewProvider {
12331233
await this.updateGlobalState("openAiBaseUrl", openAiBaseUrl)
12341234
await this.storeSecret("openAiApiKey", openAiApiKey)
12351235
await this.updateGlobalState("openAiModelId", openAiModelId)
1236-
await this.updateGlobalState("openAiCusModelInfo", openAiCusModelInfo)
1236+
await this.updateGlobalState("openAiCustomModelInfo", openAiCustomModelInfo)
12371237
await this.updateGlobalState("ollamaModelId", ollamaModelId)
12381238
await this.updateGlobalState("ollamaBaseUrl", ollamaBaseUrl)
12391239
await this.updateGlobalState("lmStudioModelId", lmStudioModelId)
@@ -1850,7 +1850,7 @@ export class ClineProvider implements vscode.WebviewViewProvider {
18501850
openAiBaseUrl,
18511851
openAiApiKey,
18521852
openAiModelId,
1853-
openAiCusModelInfo,
1853+
openAiCustomModelInfo,
18541854
ollamaModelId,
18551855
ollamaBaseUrl,
18561856
lmStudioModelId,
@@ -1914,7 +1914,7 @@ export class ClineProvider implements vscode.WebviewViewProvider {
19141914
this.getGlobalState("openAiBaseUrl") as Promise<string | undefined>,
19151915
this.getSecret("openAiApiKey") as Promise<string | undefined>,
19161916
this.getGlobalState("openAiModelId") as Promise<string | undefined>,
1917-
this.getGlobalState("openAiCusModelInfo") as Promise<ModelInfo | undefined>,
1917+
this.getGlobalState("openAiCustomModelInfo") as Promise<ModelInfo | undefined>,
19181918
this.getGlobalState("ollamaModelId") as Promise<string | undefined>,
19191919
this.getGlobalState("ollamaBaseUrl") as Promise<string | undefined>,
19201920
this.getGlobalState("lmStudioModelId") as Promise<string | undefined>,
@@ -1995,7 +1995,7 @@ export class ClineProvider implements vscode.WebviewViewProvider {
19951995
openAiBaseUrl,
19961996
openAiApiKey,
19971997
openAiModelId,
1998-
openAiCusModelInfo,
1998+
openAiCustomModelInfo,
19991999
ollamaModelId,
20002000
ollamaBaseUrl,
20012001
lmStudioModelId,

‎src/shared/WebviewMessage.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ export interface WebviewMessage {
7676
| "autoApprovalEnabled"
7777
| "updateCustomMode"
7878
| "deleteCustomMode"
79-
| "setOpenAiCusModelInfo"
79+
| "setopenAiCustomModelInfo"
8080
text?: string
8181
disabled?: boolean
8282
askResponse?: ClineAskResponse

‎src/shared/api.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export interface ApiHandlerOptions {
3838
openAiBaseUrl?: string
3939
openAiApiKey?: string
4040
openAiModelId?: string
41-
openAiCusModelInfo?: ModelInfo
41+
openAiCustomModelInfo?: ModelInfo
4242
ollamaModelId?: string
4343
ollamaBaseUrl?: string
4444
lmStudioModelId?: string

‎webview-ui/src/components/settings/ApiOptions.tsx‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ interface ApiOptionsProps {
4545
}
4646

4747
const ApiOptions = ({ apiErrorMessage, modelIdErrorMessage }: ApiOptionsProps) => {
48-
const { apiConfiguration, setApiConfiguration, uriScheme, handleInputChange } = useExtensionState()
48+
const { apiConfiguration, uriScheme, handleInputChange } = useExtensionState()
4949
const [ollamaModels, setOllamaModels] = useState<string[]>([])
5050
const [lmStudioModels, setLmStudioModels] = useState<string[]>([])
5151
const [vsCodeLmModels, setVsCodeLmModels] = useState<vscodemodels.LanguageModelChatSelector[]>([])
@@ -571,7 +571,7 @@ const ApiOptions = ({ apiErrorMessage, modelIdErrorMessage }: ApiOptionsProps) =
571571
{
572572
iconName: "refresh",
573573
onClick: () =>
574-
handleInputChange("openAiCusModelInfo")({
574+
handleInputChange("openAiCustomModelInfo")({
575575
target: { value: openAiModelInfoSaneDefaults },
576576
}),
577577
},
@@ -613,15 +613,15 @@ const ApiOptions = ({ apiErrorMessage, modelIdErrorMessage }: ApiOptionsProps) =
613613
<div className="token-config-field">
614614
<VSCodeTextField
615615
value={
616-
apiConfiguration?.openAiCusModelInfo?.maxTokens?.toString() ||
616+
apiConfiguration?.openAiCustomModelInfo?.maxTokens?.toString() ||
617617
openAiModelInfoSaneDefaults.maxTokens?.toString() ||
618618
""
619619
}
620620
type="text"
621621
style={{
622622
width: "100%",
623623
borderColor: (() => {
624-
const value = apiConfiguration?.openAiCusModelInfo?.maxTokens
624+
const value = apiConfiguration?.openAiCustomModelInfo?.maxTokens
625625
if (!value) return "var(--vscode-input-border)"
626626
return value > 0
627627
? "var(--vscode-charts-green)"
@@ -631,10 +631,10 @@ const ApiOptions = ({ apiErrorMessage, modelIdErrorMessage }: ApiOptionsProps) =
631631
title="Maximum number of tokens the model can generate in a single response"
632632
onChange={(e: any) => {
633633
const value = parseInt(e.target.value)
634-
handleInputChange("openAiCusModelInfo")({
634+
handleInputChange("openAiCustomModelInfo")({
635635
target: {
636636
value: {
637-
...(apiConfiguration?.openAiCusModelInfo ||
637+
...(apiConfiguration?.openAiCustomModelInfo ||
638638
openAiModelInfoSaneDefaults),
639639
maxTokens: isNaN(value) ? undefined : value,
640640
},
@@ -664,15 +664,15 @@ const ApiOptions = ({ apiErrorMessage, modelIdErrorMessage }: ApiOptionsProps) =
664664
<div className="token-config-field">
665665
<VSCodeTextField
666666
value={
667-
apiConfiguration?.openAiCusModelInfo?.contextWindow?.toString() ||
667+
apiConfiguration?.openAiCustomModelInfo?.contextWindow?.toString() ||
668668
openAiModelInfoSaneDefaults.contextWindow?.toString() ||
669669
""
670670
}
671671
type="text"
672672
style={{
673673
width: "100%",
674674
borderColor: (() => {
675-
const value = apiConfiguration?.openAiCusModelInfo?.contextWindow
675+
const value = apiConfiguration?.openAiCustomModelInfo?.contextWindow
676676
if (!value) return "var(--vscode-input-border)"
677677
return value > 0
678678
? "var(--vscode-charts-green)"
@@ -682,10 +682,10 @@ const ApiOptions = ({ apiErrorMessage, modelIdErrorMessage }: ApiOptionsProps) =
682682
title="Total number of tokens (input + output) the model can process in a single request"
683683
onChange={(e: any) => {
684684
const parsed = parseInt(e.target.value)
685-
handleInputChange("openAiCusModelInfo")({
685+
handleInputChange("openAiCustomModelInfo")({
686686
target: {
687687
value: {
688-
...(apiConfiguration?.openAiCusModelInfo ||
688+
...(apiConfiguration?.openAiCustomModelInfo ||
689689
openAiModelInfoSaneDefaults),
690690
contextWindow:
691691
e.target.value === ""
@@ -742,14 +742,14 @@ const ApiOptions = ({ apiErrorMessage, modelIdErrorMessage }: ApiOptionsProps) =
742742
<div style={{ display: "flex", alignItems: "center", gap: "8px" }}>
743743
<Checkbox
744744
checked={
745-
apiConfiguration?.openAiCusModelInfo?.supportsImages ??
745+
apiConfiguration?.openAiCustomModelInfo?.supportsImages ??
746746
openAiModelInfoSaneDefaults.supportsImages
747747
}
748748
onChange={(checked: boolean) => {
749-
handleInputChange("openAiCusModelInfo")({
749+
handleInputChange("openAiCustomModelInfo")({
750750
target: {
751751
value: {
752-
...(apiConfiguration?.openAiCusModelInfo ||
752+
...(apiConfiguration?.openAiCustomModelInfo ||
753753
openAiModelInfoSaneDefaults),
754754
supportsImages: checked,
755755
},
@@ -790,14 +790,14 @@ const ApiOptions = ({ apiErrorMessage, modelIdErrorMessage }: ApiOptionsProps) =
790790
<div style={{ display: "flex", alignItems: "center", gap: "8px" }}>
791791
<Checkbox
792792
checked={
793-
apiConfiguration?.openAiCusModelInfo?.supportsComputerUse ??
794-
false
793+
apiConfiguration?.openAiCustomModelInfo
794+
?.supportsComputerUse ?? false
795795
}
796796
onChange={(checked: boolean) => {
797-
handleInputChange("openAiCusModelInfo")({
797+
handleInputChange("openAiCustomModelInfo")({
798798
target: {
799799
value: {
800-
...(apiConfiguration?.openAiCusModelInfo ||
800+
...(apiConfiguration?.openAiCustomModelInfo ||
801801
openAiModelInfoSaneDefaults),
802802
supportsComputerUse: checked,
803803
},
@@ -874,15 +874,15 @@ const ApiOptions = ({ apiErrorMessage, modelIdErrorMessage }: ApiOptionsProps) =
874874
<div className="price-input">
875875
<VSCodeTextField
876876
value={
877-
apiConfiguration?.openAiCusModelInfo?.inputPrice?.toString() ??
877+
apiConfiguration?.openAiCustomModelInfo?.inputPrice?.toString() ??
878878
openAiModelInfoSaneDefaults.inputPrice?.toString() ??
879879
""
880880
}
881881
type="text"
882882
style={{
883883
width: "100%",
884884
borderColor: (() => {
885-
const value = apiConfiguration?.openAiCusModelInfo?.inputPrice
885+
const value = apiConfiguration?.openAiCustomModelInfo?.inputPrice
886886
if (!value && value !== 0) return "var(--vscode-input-border)"
887887
return value >= 0
888888
? "var(--vscode-charts-green)"
@@ -891,10 +891,10 @@ const ApiOptions = ({ apiErrorMessage, modelIdErrorMessage }: ApiOptionsProps) =
891891
}}
892892
onChange={(e: any) => {
893893
const parsed = parseFloat(e.target.value)
894-
handleInputChange("openAiCusModelInfo")({
894+
handleInputChange("openAiCustomModelInfo")({
895895
target: {
896896
value: {
897-
...(apiConfiguration?.openAiCusModelInfo ??
897+
...(apiConfiguration?.openAiCustomModelInfo ??
898898
openAiModelInfoSaneDefaults),
899899
inputPrice:
900900
e.target.value === ""
@@ -925,15 +925,15 @@ const ApiOptions = ({ apiErrorMessage, modelIdErrorMessage }: ApiOptionsProps) =
925925
<div className="price-input">
926926
<VSCodeTextField
927927
value={
928-
apiConfiguration?.openAiCusModelInfo?.outputPrice?.toString() ||
928+
apiConfiguration?.openAiCustomModelInfo?.outputPrice?.toString() ||
929929
openAiModelInfoSaneDefaults.outputPrice?.toString() ||
930930
""
931931
}
932932
type="text"
933933
style={{
934934
width: "100%",
935935
borderColor: (() => {
936-
const value = apiConfiguration?.openAiCusModelInfo?.outputPrice
936+
const value = apiConfiguration?.openAiCustomModelInfo?.outputPrice
937937
if (!value && value !== 0) return "var(--vscode-input-border)"
938938
return value >= 0
939939
? "var(--vscode-charts-green)"
@@ -942,10 +942,10 @@ const ApiOptions = ({ apiErrorMessage, modelIdErrorMessage }: ApiOptionsProps) =
942942
}}
943943
onChange={(e: any) => {
944944
const parsed = parseFloat(e.target.value)
945-
handleInputChange("openAiCusModelInfo")({
945+
handleInputChange("openAiCustomModelInfo")({
946946
target: {
947947
value: {
948-
...(apiConfiguration?.openAiCusModelInfo ||
948+
...(apiConfiguration?.openAiCustomModelInfo ||
949949
openAiModelInfoSaneDefaults),
950950
outputPrice:
951951
e.target.value === ""
@@ -1460,7 +1460,7 @@ export function normalizeApiConfiguration(apiConfiguration?: ApiConfiguration) {
14601460
return {
14611461
selectedProvider: provider,
14621462
selectedModelId: apiConfiguration?.openAiModelId || "",
1463-
selectedModelInfo: apiConfiguration?.openAiCusModelInfo || openAiModelInfoSaneDefaults,
1463+
selectedModelInfo: apiConfiguration?.openAiCustomModelInfo || openAiModelInfoSaneDefaults,
14641464
}
14651465
case "ollama":
14661466
return {

0 commit comments

Comments
 (0)