Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/types/src/provider-settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ export const dynamicProviders = [
"requesty",
"roo",
"unbound",
"deepseek",
] as const

export type DynamicProvider = (typeof dynamicProviders)[number]
Expand Down
91 changes: 91 additions & 0 deletions src/api/providers/fetchers/deepseek.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
import type { ModelRecord } from "@roo-code/types"
import { deepSeekModels, DEEP_SEEK_DEFAULT_TEMPERATURE } from "@roo-code/types"

import { DEFAULT_HEADERS } from "../constants"

/**
* Fetches available models from the DeepSeek API and merges them with known specs.
*
* The DeepSeek /models endpoint only returns basic model IDs without pricing
* or context window info, so we merge the API response with the static
* `deepSeekModels` map for known models. Unknown models get sensible defaults.
*/
export async function getDeepSeekModels(baseUrl?: string, apiKey?: string): Promise<ModelRecord> {
const normalizedBase = (baseUrl || "https://api.deepseek.com").replace(/\/?v1\/?$/, "")
const url = `${normalizedBase}/models`

const headers: Record<string, string> = {
"Content-Type": "application/json",
...DEFAULT_HEADERS,
}

if (apiKey) {
headers["Authorization"] = `Bearer ${apiKey}`
}

const controller = new AbortController()
const timeoutId = setTimeout(() => controller.abort(), 10000)

try {
const response = await fetch(url, {
headers,
signal: controller.signal,
})

if (!response.ok) {
let errorBody = ""
try {
errorBody = await response.text()
} catch {
errorBody = "(unable to read response body)"
}

console.error(`[getDeepSeekModels] HTTP error:`, {
status: response.status,
statusText: response.statusText,
url,
body: errorBody,
})

throw new Error(`HTTP ${response.status}: ${response.statusText}`)
}

const data = await response.json()

if (!data?.data || !Array.isArray(data.data)) {
console.error("[getDeepSeekModels] Unexpected response format:", data)
throw new Error("Failed to fetch DeepSeek models: Unexpected response format.")
}

// Use null-prototype object to prevent prototype pollution
const models: ModelRecord = Object.create(null)

for (const model of data.data) {
const modelId = typeof model.id === "string" && model.id ? model.id : null
if (!modelId) continue

const knownSpecs = deepSeekModels[modelId as keyof typeof deepSeekModels]

if (knownSpecs) {
models[modelId] = { ...knownSpecs }
} else {
models[modelId] = {
maxTokens: 8192,
contextWindow: 128_000,
supportsImages: false,
supportsPromptCache: true,
inputPrice: 0.28,
outputPrice: 0.42,
cacheWritesPrice: 0.28,
cacheReadsPrice: 0.028,
defaultTemperature: DEEP_SEEK_DEFAULT_TEMPERATURE,
description: `DeepSeek model: ${modelId}`,
}
}
}

return models
} finally {
clearTimeout(timeoutId)
}
}
4 changes: 4 additions & 0 deletions src/api/providers/fetchers/modelCache.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import { GetModelsOptions } from "../../../shared/api"
import { getOllamaModels } from "./ollama"
import { getLMStudioModels } from "./lmstudio"
import { getRooModels } from "./roo"
import { getDeepSeekModels } from "./deepseek"

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

Expand Down Expand Up @@ -89,6 +90,9 @@ async function fetchModelsFromProvider(options: GetModelsOptions): Promise<Model
case "poe":
models = await getPoeModels(options.apiKey, options.baseUrl)
break
case "deepseek":
models = await getDeepSeekModels(options.baseUrl, options.apiKey)
break
case "roo": {
// Roo Code Cloud provider requires baseUrl and optional apiKey
const rooBaseUrl = options.baseUrl ?? process.env.ROO_CODE_PROVIDER_URL ?? "https://api.roocode.com/proxy"
Expand Down
3 changes: 3 additions & 0 deletions src/core/webview/__tests__/ClineProvider.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2495,6 +2495,7 @@ describe("ClineProvider - Router Models", () => {
ollama: {},
lmstudio: {},
"vercel-ai-gateway": mockModels,
deepseek: {},
},
values: undefined,
})
Expand Down Expand Up @@ -2542,6 +2543,7 @@ describe("ClineProvider - Router Models", () => {
litellm: {},
poe: {},
"vercel-ai-gateway": mockModels,
deepseek: {},
},
values: undefined,
})
Expand Down Expand Up @@ -2637,6 +2639,7 @@ describe("ClineProvider - Router Models", () => {
ollama: {},
lmstudio: {},
"vercel-ai-gateway": mockModels,
deepseek: {},
},
values: undefined,
})
Expand Down
3 changes: 3 additions & 0 deletions src/core/webview/__tests__/webviewMessageHandler.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,7 @@ describe("webviewMessageHandler - requestRouterModels", () => {
ollama: {},
lmstudio: {},
"vercel-ai-gateway": mockModels,
deepseek: {},
},
values: undefined,
})
Expand Down Expand Up @@ -433,6 +434,7 @@ describe("webviewMessageHandler - requestRouterModels", () => {
ollama: {},
lmstudio: {},
"vercel-ai-gateway": mockModels,
deepseek: {},
},
values: undefined,
})
Expand Down Expand Up @@ -489,6 +491,7 @@ describe("webviewMessageHandler - requestRouterModels", () => {
ollama: {},
lmstudio: {},
"vercel-ai-gateway": mockModels,
deepseek: {},
},
values: undefined,
})
Expand Down
16 changes: 16 additions & 0 deletions src/core/webview/webviewMessageHandler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -956,6 +956,7 @@ export const webviewMessageHandler = async (
ollama: {},
lmstudio: {},
roo: {},
deepseek: {},
}

const safeGetModels = async (options: GetModelsOptions): Promise<ModelRecord> => {
Expand Down Expand Up @@ -1034,6 +1035,21 @@ export const webviewMessageHandler = async (
})
}

// DeepSeek is conditional on apiKey
const deepSeekApiKey = apiConfiguration.deepSeekApiKey || message?.values?.deepSeekApiKey
const deepSeekBaseUrl = apiConfiguration.deepSeekBaseUrl || message?.values?.deepSeekBaseUrl

if (deepSeekApiKey) {
if (message?.values?.deepSeekApiKey || message?.values?.deepSeekBaseUrl) {
await flushModels({ provider: "deepseek", apiKey: deepSeekApiKey, baseUrl: deepSeekBaseUrl }, true)
}

candidates.push({
key: "deepseek",
options: { provider: "deepseek", apiKey: deepSeekApiKey, baseUrl: deepSeekBaseUrl },
})
}

// Apply single provider filter if specified
const modelFetchPromises = providerFilter
? candidates.filter(({ key }) => key === providerFilter)
Expand Down
1 change: 1 addition & 0 deletions src/shared/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@ const dynamicProviderExtras = {
ollama: {} as {}, // eslint-disable-line @typescript-eslint/no-empty-object-type
lmstudio: {} as {}, // eslint-disable-line @typescript-eslint/no-empty-object-type
roo: {} as { apiKey?: string; baseUrl?: string },
deepseek: {} as { apiKey?: string; baseUrl?: string },
} as const satisfies Record<RouterName, object>

// Build the dynamic options union from the map, intersected with CommonFetchParams
Expand Down
10 changes: 7 additions & 3 deletions webview-ui/src/components/ui/hooks/useSelectedModel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -237,9 +237,13 @@ function getSelectedModel({
return { id, info }
}
case "deepseek": {
const id = apiConfiguration.apiModelId ?? defaultModelId
const info = deepSeekModels[id as keyof typeof deepSeekModels]
return { id, info }
const availableModels = routerModels.deepseek
? { ...deepSeekModels, ...routerModels.deepseek }
: deepSeekModels
const id = getValidatedModelId(apiConfiguration.apiModelId, availableModels, defaultModelId)
const routerInfo = routerModels.deepseek?.[id]
const staticInfo = deepSeekModels[id as keyof typeof deepSeekModels]
return { id, info: routerInfo ?? staticInfo }
}
case "moonshot": {
const id = apiConfiguration.apiModelId ?? defaultModelId
Expand Down
1 change: 1 addition & 0 deletions webview-ui/src/utils/__tests__/validate.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ describe("Model Validation Functions", () => {
lmstudio: {},
"vercel-ai-gateway": {},
roo: {},
deepseek: {},
}

const allowAllOrganization: OrganizationAllowList = {
Expand Down