Implement my own review feedback

Author: chrarnoldus

.changeset/pretty-hornets-brake.md

@@ -1,6 +1,5 @@
 ---
-"@roo-code/types": minor
 "kilo-code": minor
 ---
 
-feat: add DeepInfra provider with dynamic model fetching and prompt caching
+Added DeepInfra provider with dynamic model fetching and prompt caching

packages/types/src/global-settings.ts

@@ -203,11 +203,11 @@ export const SECRET_STATE_KEYS = [
 	"groqApiKey",
 	"chutesApiKey",
 	"litellmApiKey",
-	"deepInfraApiKey",
 	"codeIndexOpenAiKey",
 	"codeIndexQdrantApiKey",
 	// kilocode_change start
 	"kilocodeToken",
+	"deepInfraApiKey",
 	// kilocode_change end
 	"codebaseIndexOpenAiCompatibleApiKey",
 	"codebaseIndexGeminiApiKey",

packages/types/src/provider-settings.ts

@@ -53,11 +53,11 @@ export const providerNames = [
 	"fake-ai",
 	"xai",
 	"groq",
-	"deepinfra",
 	"chutes",
 	"litellm",
 	// kilocode_change start
 	"kilocode",
+	"deepinfra",
 	"gemini-cli",
 	"virtual-quota-fallback",
 	"qwen-code",
@@ -249,12 +249,6 @@ const deepSeekSchema = apiModelIdProviderModelSchema.extend({
 	deepSeekApiKey: z.string().optional(),
 })
 
-const deepInfraSchema = apiModelIdProviderModelSchema.extend({
-	deepInfraBaseUrl: z.string().optional(),
-	deepInfraApiKey: z.string().optional(),
-	deepInfraModelId: z.string().optional(),
-})
-
 const doubaoSchema = apiModelIdProviderModelSchema.extend({
 	doubaoBaseUrl: z.string().optional(),
 	doubaoApiKey: z.string().optional(),
@@ -327,6 +321,12 @@ const kilocodeSchema = baseProviderSettingsSchema.extend({
 	openRouterProviderSort: openRouterProviderSortSchema.optional(),
 })
 
+const deepInfraSchema = apiModelIdProviderModelSchema.extend({
+	deepInfraBaseUrl: z.string().optional(),
+	deepInfraApiKey: z.string().optional(),
+	deepInfraModelId: z.string().optional(),
+})
+
 export const virtualQuotaFallbackProfileDataSchema = z.object({
 	profileName: z.string().optional(),
 	profileId: z.string().optional(),
@@ -392,7 +392,6 @@ export const providerSettingsSchemaDiscriminated = z.discriminatedUnion("apiProv
 	openAiNativeSchema.merge(z.object({ apiProvider: z.literal("openai-native") })),
 	mistralSchema.merge(z.object({ apiProvider: z.literal("mistral") })),
 	deepSeekSchema.merge(z.object({ apiProvider: z.literal("deepseek") })),
-	deepInfraSchema.merge(z.object({ apiProvider: z.literal("deepinfra") })),
 	doubaoSchema.merge(z.object({ apiProvider: z.literal("doubao") })),
 	moonshotSchema.merge(z.object({ apiProvider: z.literal("moonshot") })),
 	unboundSchema.merge(z.object({ apiProvider: z.literal("unbound") })),
@@ -401,6 +400,7 @@ export const providerSettingsSchemaDiscriminated = z.discriminatedUnion("apiProv
 	fakeAiSchema.merge(z.object({ apiProvider: z.literal("fake-ai") })),
 	xaiSchema.merge(z.object({ apiProvider: z.literal("xai") })),
 	// kilocode_change start
+	deepInfraSchema.merge(z.object({ apiProvider: z.literal("deepinfra") })),
 	geminiCliSchema.merge(z.object({ apiProvider: z.literal("gemini-cli") })),
 	kilocodeSchema.merge(z.object({ apiProvider: z.literal("kilocode") })),
 	virtualQuotaFallbackSchema.merge(z.object({ apiProvider: z.literal("virtual-quota-fallback") })),
@@ -438,11 +438,11 @@ export const providerSettingsSchema = z.object({
 	...kilocodeSchema.shape,
 	...virtualQuotaFallbackSchema.shape,
 	...qwenCodeSchema.shape,
+	...deepInfraSchema.shape,
 	// kilocode_change end
 	...openAiNativeSchema.shape,
 	...mistralSchema.shape,
 	...deepSeekSchema.shape,
-	...deepInfraSchema.shape,
 	...doubaoSchema.shape,
 	...moonshotSchema.shape,
 	...unboundSchema.shape,
@@ -487,7 +487,7 @@ export const MODEL_ID_KEYS: Partial<keyof ProviderSettings>[] = [
 	"litellmModelId",
 	"huggingFaceModelId",
 	"ioIntelligenceModelId",
-	"deepInfraModelId",
+	"deepInfraModelId", // kilocode_change
 ]
 
 export const getModelId = (settings: ProviderSettings): string | undefined => {
@@ -603,12 +603,12 @@ export const MODELS_BY_PROVIDER: Record<
 	openrouter: { id: "openrouter", label: "OpenRouter", models: [] },
 	requesty: { id: "requesty", label: "Requesty", models: [] },
 	unbound: { id: "unbound", label: "Unbound", models: [] },
-	deepinfra: { id: "deepinfra", label: "DeepInfra", models: [] },
 
 	// kilocode_change start
 	kilocode: { id: "kilocode", label: "Kilocode", models: [] },
 	"virtual-quota-fallback": { id: "virtual-quota-fallback", label: "Virtual Quota Fallback", models: [] },
 	"qwen-code": { id: "qwen-code", label: "Qwen Code", models: [] },
+	deepinfra: { id: "deepinfra", label: "DeepInfra", models: [] },
 	// kilocode_change end
 }
 
@@ -619,10 +619,10 @@ export const dynamicProviders = [
 	"openrouter",
 	"requesty",
 	"unbound",
-	"deepinfra",
 	// kilocode_change start
 	"kilocode",
 	"virtual-quota-fallback",
+	"deepinfra",
 	// kilocode_change end
 ] as const satisfies readonly ProviderName[]
 

packages/types/src/providers/deepinfra.ts

@@ -1,3 +1,5 @@
+// kilocode_change: provider added
+
 import type { ModelInfo } from "../model.js"
 
 // Default fallback values for DeepInfra when model metadata is not yet loaded.

packages/types/src/providers/index.ts

@@ -8,7 +8,11 @@ export * from "./doubao.js"
 export * from "./featherless.js"
 export * from "./fireworks.js"
 export * from "./gemini.js"
-export * from "./gemini-cli.js" // kilocode_change
+// kilocode_change start
+export * from "./gemini-cli.js"
+export * from "./qwen-code.js"
+export * from "./deepinfra.js"
+// kilocode_change end
 export * from "./glama.js"
 export * from "./groq.js"
 export * from "./huggingface.js"
@@ -21,12 +25,10 @@ export * from "./ollama.js"
 export * from "./openai.js"
 export * from "./openrouter.js"
 export * from "./requesty.js"
-export * from "./qwen-code.js" // kilocode_change
 export * from "./roo.js"
 export * from "./sambanova.js"
 export * from "./unbound.js"
 export * from "./vertex.js"
 export * from "./vscode-llm.js"
 export * from "./xai.js"
 export * from "./zai.js"
-export * from "./deepinfra.js"

src/api/index.ts

@@ -34,6 +34,7 @@ import {
 	VirtualQuotaFallbackHandler,
 	GeminiCliHandler,
 	QwenCodeHandler,
+	DeepInfraHandler,
 	// kilocode_change end
 	ClaudeCodeHandler,
 	SambaNovaHandler,
@@ -43,7 +44,6 @@ import {
 	FireworksHandler,
 	RooHandler,
 	FeatherlessHandler,
-	DeepInfraHandler,
 } from "./providers"
 // kilocode_change start
 import { KilocodeOpenrouterHandler } from "./providers/kilocode-openrouter"
@@ -99,6 +99,8 @@ export function buildApiHandler(configuration: ProviderSettings): ApiHandler {
 			return new VirtualQuotaFallbackHandler(options)
 		case "qwen-code":
 			return new QwenCodeHandler(options)
+		case "deepinfra":
+			return new DeepInfraHandler(options)
 		// kilocode_change end
 		case "anthropic":
 			return new AnthropicHandler(options)
@@ -146,8 +148,6 @@ export function buildApiHandler(configuration: ProviderSettings): ApiHandler {
 			return new XAIHandler(options)
 		case "groq":
 			return new GroqHandler(options)
-		case "deepinfra":
-			return new DeepInfraHandler(options)
 		case "huggingface":
 			return new HuggingFaceHandler(options)
 		case "chutes":

src/api/providers/deepinfra.ts

@@ -1,3 +1,5 @@
+// kilocode_change - provider added
+
 import { Anthropic } from "@anthropic-ai/sdk" // for message param types
 import OpenAI from "openai"
 
@@ -61,19 +63,19 @@ export class DeepInfraHandler extends RouterProvider implements SingleCompletion
 		_metadata?: ApiHandlerCreateMessageMetadata,
 	): ApiStream {
 		const { id: modelId, info, reasoningEffort: reasoning_effort } = await this.fetchModel()
-		let prompt_cache_key = undefined;
+		let prompt_cache_key = undefined
 		if (info.supportsPromptCache && _metadata?.taskId) {
-			prompt_cache_key = _metadata.taskId;
+			prompt_cache_key = _metadata.taskId
 		}
 
-		const requestOptions: OpenAI.Chat.Completions.ChatCompletionCreateParamsStreaming = {
+		const requestOptions = {
 			model: modelId,
 			messages: [{ role: "system", content: systemPrompt }, ...convertToOpenAiMessages(messages)],
 			stream: true,
 			stream_options: { include_usage: true },
 			reasoning_effort,
 			prompt_cache_key,
-		}
+		} as OpenAI.Chat.Completions.ChatCompletionCreateParamsStreaming
 
 		if (this.supportsTemperature(modelId)) {
 			requestOptions.temperature = this.options.modelTemperature ?? 0

src/api/providers/fetchers/modelCache.ts

@@ -19,7 +19,7 @@ import { getKiloBaseUriFromToken } from "../../../shared/kilocode/token"
 import { getOllamaModels } from "./ollama"
 import { getLMStudioModels } from "./lmstudio"
 import { getIOIntelligenceModels } from "./io-intelligence"
-import { getDeepInfraModels } from "./deepinfra"
+import { getDeepInfraModels } from "./deepinfra" // kilocode_change
 const memoryCache = new NodeCache({ stdTTL: 5 * 60, checkperiod: 5 * 60 })
 
 export /*kilocode_change*/ async function writeModels(router: RouterName, data: ModelRecord) {
@@ -79,9 +79,6 @@ export const getModels = async (options: GetModelsOptions): Promise<ModelRecord>
 				// Type safety ensures apiKey and baseUrl are always provided for litellm
 				models = await getLiteLLMModels(options.apiKey, options.baseUrl)
 				break
-			case "deepinfra":
-				models = await getDeepInfraModels(options.apiKey, options.baseUrl)
-				break
 			// kilocode_change start
 			case "kilocode-openrouter":
 				models = await getOpenRouterModels({
@@ -93,6 +90,9 @@ export const getModels = async (options: GetModelsOptions): Promise<ModelRecord>
 					headers: options.kilocodeToken ? { Authorization: `Bearer ${options.kilocodeToken}` } : undefined,
 				})
 				break
+			case "deepinfra":
+				models = await getDeepInfraModels(options.apiKey, options.baseUrl)
+				break
 			case "cerebras":
 				models = cerebrasModels
 				break

src/api/providers/index.ts

@@ -26,6 +26,7 @@ export { SambaNovaHandler } from "./sambanova"
 export { UnboundHandler } from "./unbound"
 export { VertexHandler } from "./vertex"
 // kilocode_change start
+export { DeepInfraHandler } from "./deepinfra"
 export { GeminiCliHandler } from "./gemini-cli"
 export { QwenCodeHandler } from "./qwen-code"
 export { VirtualQuotaFallbackHandler } from "./virtual-quota-fallback"
@@ -36,4 +37,3 @@ export { ZAiHandler } from "./zai"
 export { FireworksHandler } from "./fireworks"
 export { RooHandler } from "./roo"
 export { FeatherlessHandler } from "./featherless"
-export { DeepInfraHandler } from "./deepinfra"

src/core/webview/__tests__/ClineProvider.spec.ts

@@ -2728,6 +2728,7 @@ describe("ClineProvider - Router Models", () => {
 				"kilocode-openrouter": mockModels,
 				ollama: mockModels, // kilocode_change
 				lmstudio: {},
+				deepinfra: mockModels, // kilocode_change
 			},
 		})
 	})
@@ -2760,6 +2761,7 @@ describe("ClineProvider - Router Models", () => {
 			.mockRejectedValueOnce(new Error("Unbound API error")) // unbound fail
 			.mockRejectedValueOnce(new Error("Kilocode-OpenRouter API error")) // kilocode-openrouter fail
 			.mockRejectedValueOnce(new Error("Ollama API error")) // kilocode_change
+			.mockRejectedValueOnce(new Error("DeepInfra API error")) // kilocode_change
 			.mockRejectedValueOnce(new Error("LiteLLM connection failed")) // litellm fail
 
 		await messageHandler({ type: "requestRouterModels" })
@@ -2776,6 +2778,7 @@ describe("ClineProvider - Router Models", () => {
 				lmstudio: {},
 				litellm: {},
 				"kilocode-openrouter": {},
+				deepinfra: {}, // kilocode_change
 			},
 		})
 
@@ -2892,6 +2895,7 @@ describe("ClineProvider - Router Models", () => {
 				unbound: mockModels,
 				litellm: {},
 				"kilocode-openrouter": mockModels,
+				deepinfra: mockModels, // kilocode_change
 				ollama: mockModels, // kilocode_change
 				lmstudio: {},
 			},