refactor: implement provider based on BaseOpenAiCompatibleProvider

Author: AnotiaWang

src/api/providers/siliconcloud.ts

@@ -2,59 +2,59 @@ import { Anthropic } from "@anthropic-ai/sdk"
 import OpenAI from "openai"
 
 import {
-	siliconCloudModels,
 	siliconCloudApiLineConfigs,
 	siliconCloudDefaultModelId,
 	siliconCloudDefaultApiLine,
+	siliconCloudModelsByApiLine,
 } from "@roo-code/types"
 
 import { type ApiHandlerOptions } from "../../shared/api"
 import { type ApiStream } from "../transform/stream"
 import { convertToOpenAiMessages } from "../transform/openai-format"
-import { getModelParams } from "../transform/model-params"
 import { handleOpenAIError } from "./utils/openai-error-handler"
-import { OpenAiHandler } from "./openai"
 import { ApiHandlerCreateMessageMetadata } from ".."
+import { BaseOpenAiCompatibleProvider } from "./base-openai-compatible-provider"
 
-const SILICON_CLOUD_PROVIDER_NAME = "siliconcloud" as const
-
-export class SiliconCloudHandler extends OpenAiHandler {
+export class SiliconCloudHandler extends BaseOpenAiCompatibleProvider<string> {
 	constructor(options: ApiHandlerOptions) {
 		const apiLine = options.siliconCloudApiLine || siliconCloudDefaultApiLine
+		const baseURL = siliconCloudApiLineConfigs[apiLine].baseUrl
+		const providerModels = siliconCloudModelsByApiLine[apiLine]
 
 		super({
 			...options,
-			openAiApiKey: options.siliconCloudApiKey,
-			openAiBaseUrl: siliconCloudApiLineConfigs[apiLine].baseUrl,
-			openAiModelId: options.apiModelId || siliconCloudDefaultModelId,
+			providerName: "SiliconCloud",
+			baseURL,
+			apiKey: options.siliconCloudApiKey,
+			defaultProviderModelId: siliconCloudDefaultModelId,
+			providerModels,
+			defaultTemperature: 0,
 		})
 	}
 
-	override getModel() {
-		const id = this.options.apiModelId || siliconCloudDefaultModelId
-		const info =
-			siliconCloudModels[id as keyof typeof siliconCloudModels] ?? siliconCloudModels[siliconCloudDefaultModelId]
-		const params = getModelParams({ format: "openai", modelId: id, model: info, settings: this.options })
-		return { id, info, ...params }
-	}
-
-	override async *createMessage(
+	protected override createStream(
 		systemPrompt: string,
 		messages: Anthropic.Messages.MessageParam[],
 		metadata?: ApiHandlerCreateMessageMetadata,
-	): ApiStream {
-		const { id: model, info } = this.getModel()
+		requestOptions?: OpenAI.RequestOptions,
+	) {
+		const {
+			id: model,
+			info: { maxTokens: max_tokens, supportsReasoningBudget },
+		} = this.getModel()
+
+		const temperature = this.options.modelTemperature ?? this.defaultTemperature
 
 		const params: OpenAI.Chat.Completions.ChatCompletionCreateParamsStreaming = {
 			model,
-			max_tokens: info.maxTokens,
-			temperature: this.options.modelTemperature ?? 0,
+			max_tokens,
+			temperature,
 			messages: [{ role: "system", content: systemPrompt }, ...convertToOpenAiMessages(messages)],
 			stream: true,
 			stream_options: { include_usage: true },
 		}
 
-		if (info.supportsReasoningBudget) {
+		if (supportsReasoningBudget) {
 			if (this.options.enableReasoningEffort) {
 				// @ts-ignore
 				params.enable_thinking = true
@@ -66,13 +66,19 @@ export class SiliconCloudHandler extends OpenAiHandler {
 			}
 		}
 
-		let stream
 		try {
-			stream = await this.client.chat.completions.create(params)
+			return this.client.chat.completions.create(params, requestOptions)
 		} catch (error) {
-			throw handleOpenAIError(error, SILICON_CLOUD_PROVIDER_NAME)
+			throw handleOpenAIError(error, this.providerName)
 		}
+	}
 
+	override async *createMessage(
+		systemPrompt: string,
+		messages: Anthropic.Messages.MessageParam[],
+		metadata?: ApiHandlerCreateMessageMetadata,
+	): ApiStream {
+		const stream = await this.createStream(systemPrompt, messages, metadata)
 		let lastUsage: OpenAI.CompletionUsage | undefined
 
 		for await (const chunk of stream) {
@@ -98,7 +104,11 @@ export class SiliconCloudHandler extends OpenAiHandler {
 		}
 
 		if (lastUsage) {
-			yield super.processUsageMetrics(lastUsage)
+			yield {
+				type: "usage",
+				inputTokens: lastUsage.prompt_tokens || 0,
+				outputTokens: lastUsage.completion_tokens || 0,
+			}
 		}
 	}
 }