Progress

Author: nang-dev

src/api/providers/pearai/pearai.ts

@@ -67,7 +67,7 @@ export class PearAiHandler extends BaseProvider implements SingleCompletionHandl
 				}
 				const data = (await response.json()) as PearAiModelsResponse
 				const underlyingModel = data.models[modelId]?.underlyingModelUpdated || "claude-3-5-sonnet-20241022"
-				if (underlyingModel.startsWith("claude")) {
+				if (underlyingModel.startsWith("claude") || modelId.startsWith("anthropic/")) {
 					// Default to Claude
 					this.handler = new AnthropicHandler({
 						...options,
@@ -93,7 +93,7 @@ export class PearAiHandler extends BaseProvider implements SingleCompletionHandl
 					apiModelId: "claude-3-5-sonnet-20241022",
 				})
 			}
-		} else if (modelId.startsWith("claude")) {
+		} else if (modelId.startsWith("claude") || modelId.startsWith("anthropic/")) {
 			this.handler = new AnthropicHandler({
 				...options,
 				apiKey: options.pearaiApiKey,
@@ -111,20 +111,7 @@ export class PearAiHandler extends BaseProvider implements SingleCompletionHandl
 
 	getModel(): { id: string; info: ModelInfo } {
 		const baseModel = this.handler.getModel()
-		return {
-			id: baseModel.id,
-			info: {
-				...baseModel.info,
-				// Inherit all capabilities from the underlying model
-				supportsImages: baseModel.info.supportsImages,
-				supportsComputerUse: baseModel.info.supportsComputerUse,
-				supportsPromptCache: baseModel.info.supportsPromptCache,
-				inputPrice: baseModel.info.inputPrice || 0,
-				outputPrice: baseModel.info.outputPrice || 0,
-				cacheWritesPrice: baseModel.info.cacheWritesPrice ? baseModel.info.cacheWritesPrice : undefined,
-				cacheReadsPrice: baseModel.info.cacheReadsPrice ? baseModel.info.cacheReadsPrice : undefined,
-			},
-		}
+		return baseModel
 	}
 
 	async *createMessage(systemPrompt: string, messages: any[]): AsyncGenerator<any> {

src/api/providers/pearai/pearaiGeneric.ts

@@ -16,6 +16,7 @@ import { ApiStream, ApiStreamUsageChunk } from "../../transform/stream"
 import { BaseProvider } from "../base-provider"
 import { XmlMatcher } from "../../../utils/xml-matcher"
 import { allModels, pearAiDefaultModelId, pearAiDefaultModelInfo } from "../../../shared/pearaiApi"
+import { calculateApiCostOpenAI } from "../../../utils/cost"
 
 const DEEP_SEEK_DEFAULT_TEMPERATURE = 0.6
 
@@ -65,6 +66,9 @@ export class PearAIGenericHandler extends BaseProvider implements SingleCompleti
 		const modelUrl = this.options.openAiBaseUrl ?? ""
 		const modelId = this.options.openAiModelId ?? ""
 
+		console.dir("MODEL INFO")
+		console.dir(modelInfo)
+		console.dir(modelId)
 		const deepseekReasoner = modelId.includes("deepseek-reasoner")
 		const ark = modelUrl.includes(".volces.com")
 
@@ -198,21 +202,36 @@ export class PearAIGenericHandler extends BaseProvider implements SingleCompleti
 	}
 
 	protected processUsageMetrics(usage: any, modelInfo?: ModelInfo): ApiStreamUsageChunk {
-		console.dir(usage?.prompt_tokens_details)
+		const inputTokens = usage?.prompt_tokens || 0
+		const outputTokens = usage?.completion_tokens || 0
+		const cacheWriteTokens = usage?.prompt_tokens_details?.caching_tokens || 0
+		const cacheReadTokens = usage?.prompt_tokens_details?.cached_tokens || 0
+		const totalCost = modelInfo
+			? calculateApiCostOpenAI(modelInfo, inputTokens, outputTokens, cacheWriteTokens, cacheReadTokens)
+			: 0
+
+		console.dir("COST")
+		console.log(totalCost)
+		console.dir("MODEL")
+		console.dir(modelInfo)
 		return {
 			type: "usage",
-			inputTokens: usage?.prompt_tokens || 0,
-			outputTokens: usage?.completion_tokens || 0,
-			cacheWriteTokens: usage?.prompt_tokens_details?.cache_miss_tokens,
-			cacheReadTokens: usage?.prompt_tokens_details?.cached_tokens,
+			inputTokens: inputTokens,
+			outputTokens: outputTokens,
+			cacheWriteTokens: cacheWriteTokens,
+			cacheReadTokens: cacheReadTokens,
+			totalCost: totalCost,
 		}
 	}
 
 	override getModel(): { id: string; info: ModelInfo } {
-		const modelId = this.options.openAiModelId ?? pearAiDefaultModelId
+		const modelId = this.options.openAiModelId ?? "none"
+		console.log("MODEL INFO IN GETMODEL", allModels[modelId])
+		console.log("Available models:", Object.keys(allModels))
+		console.log("Keys: ", Object.keys(allModels[modelId]))
 		return {
 			id: modelId,
-			info: allModels[modelId] ?? pearAiDefaultModelInfo,
+			info: allModels[modelId],
 		}
 	}
 

src/shared/api.ts

@@ -772,8 +772,8 @@ export const geminiModels = {
 		contextWindow: 1_048_576,
 		supportsImages: true,
 		supportsPromptCache: false,
-		inputPrice: 0,
-		outputPrice: 0,
+		inputPrice: 0.15,
+		outputPrice: 0.6,
 	},
 	"gemini-2.0-flash-lite-preview-02-05": {
 		maxTokens: 8192,

src/shared/pearaiApi.ts

@@ -135,7 +135,7 @@ export const allModels: { [key: string]: ModelInfo } = {
 	...Object.entries(pearAiModels).reduce(
 		(acc, [key, value]) => ({
 			...acc,
-			[`{key}`]: value,
+			[key]: value,
 		}),
 		{},
 	),

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

@@ -56,7 +56,7 @@ import { validateApiConfiguration, validateModelId, validateBedrockArn } from "@
 import { ApiErrorMessage } from "./ApiErrorMessage"
 import { ThinkingBudget } from "./ThinkingBudget"
 import { usePearAiModels } from "../../hooks/usePearAiModels"
-import { pearAiDefaultModelId, pearAiDefaultModelInfo } from "../../../../src/shared/pearaiApi"
+import { allModels, pearAiDefaultModelId, pearAiDefaultModelInfo } from "../../../../src/shared/pearaiApi"
 
 interface ApiOptionsProps {
 	uriScheme: string | undefined
@@ -1690,10 +1690,9 @@ export function normalizeApiConfiguration(
 			}
 		case "pearai": {
 			// Always use the models from the hook which are fetched when provider is selected
-			return getProviderData(
-				pearAiModelsQuery || { [pearAiDefaultModelId]: pearAiDefaultModelInfo },
-				pearAiDefaultModelId,
-			)
+			let query = pearAiModelsQuery
+			console.log("query", query)
+			return getProviderData(pearAiModelsQuery || allModels, pearAiDefaultModelId)
 		}
 		default:
 			return getProviderData(anthropicModels, anthropicDefaultModelId)

webview-ui/src/components/settings/constants.ts

@@ -7,7 +7,6 @@ import {
 	geminiModels,
 	mistralModels,
 	openAiNativeModels,
-	pearAiModels,
 	vertexModels,
 } from "../../../../src/shared/api"