Skip to content

Commit fee1cce

Browse files
authored
feat(zgsm): add support for ClineProvider token access (#481)
1 parent bdd2531 commit fee1cce

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

src/api/providers/fetchers/modelCache.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import { getDeepInfraModels } from "./deepinfra"
2727
import { ZgsmAuthConfig } from "../../../core/costrict/auth"
2828
import { IZgsmModelResponseData } from "@roo-code/types"
2929
import { getHuggingFaceModels } from "./huggingface"
30+
import { ClineProvider } from "../../../core/webview/ClineProvider"
3031

3132
const memoryCache = new NodeCache({ stdTTL: 5 * 60, checkperiod: 5 * 60 })
3233

@@ -57,6 +58,7 @@ export async function readModels(router: RouterName): Promise<ModelRecord | unde
5758
*/
5859
export const getModels = async (options: GetModelsOptions): Promise<ModelRecord> => {
5960
const { provider } = options
61+
const clineProvider = await ClineProvider.getInstance()
6062

6163
let models = getModelsFromCache(provider)
6264

@@ -73,7 +75,7 @@ export const getModels = async (options: GetModelsOptions): Promise<ModelRecord>
7375
case "zgsm": {
7476
const _models = await getZgsmModels(
7577
options.baseUrl || ZgsmAuthConfig.getInstance().getDefaultApiBaseUrl(),
76-
options.apiKey,
78+
options.apiKey || clineProvider?.getValue("zgsmAccessToken"),
7779
options.openAiHeaders,
7880
)
7981
models = _models.reduce((acc, model: IZgsmModelResponseData) => {

src/api/providers/zgsm.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,9 @@ export class ZgsmAiHandler extends BaseProvider implements SingleCompletionHandl
461461
async fetchModel() {
462462
const id = this.options.zgsmModelId ?? zgsmDefaultModelId
463463

464-
this.modelInfo = (await getModels({ provider: "zgsm" }))[id] || zgsmModels.default
464+
this.modelInfo =
465+
(await getModels({ provider: "zgsm", baseUrl: this.baseURL, apiKey: this.options.zgsmAccessToken }))[id] ||
466+
zgsmModels.default
465467
}
466468

467469
override getModel() {

src/core/webview/webviewMessageHandler.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ import { playTts, setTtsEnabled, setTtsSpeed, stopTts } from "../../utils/tts"
4848
import { searchCommits } from "../../utils/git"
4949
import { exportSettings, importSettingsWithFeedback } from "../config/importExport"
5050
import { getOpenAiModels } from "../../api/providers/openai"
51-
import { getZgsmModels } from "../../api/providers/fetchers/zgsm"
5251
import { getVsCodeLmModels } from "../../api/providers/vscode-lm"
5352
import { openMention } from "../mentions"
5453
import { getWorkspacePath } from "../../utils/path"

0 commit comments

Comments
 (0)