Progress

Author: nang-dev

src/api/providers/pearai/pearai.ts

@@ -23,6 +23,8 @@ interface PearAiModelsResponse {
 
 export class PearAiHandler extends BaseProvider implements SingleCompletionHandler {
 	private handler!: AnthropicHandler | PearAIGenericHandler
+	private pearAiModelsResponse: PearAiModelsResponse | null = null
+	private options: ApiHandlerOptions
 
 	constructor(options: ApiHandlerOptions) {
 		super()
@@ -42,6 +44,7 @@ export class PearAiHandler extends BaseProvider implements SingleCompletionHandl
 		} else {
 			vscode.commands.executeCommand("pearai.checkPearAITokens", undefined)
 		}
+		this.options = options
 
 		this.handler = new PearAIGenericHandler({
 			...options,
@@ -66,6 +69,7 @@ export class PearAiHandler extends BaseProvider implements SingleCompletionHandl
 					throw new Error(`Failed to fetch models: ${response.statusText}`)
 				}
 				const data = (await response.json()) as PearAiModelsResponse
+				this.pearAiModelsResponse = data
 				const underlyingModel = data.models[modelId]?.underlyingModelUpdated || "claude-3-5-sonnet-20241022"
 				if (underlyingModel.startsWith("claude") || modelId.startsWith("anthropic/")) {
 					// Default to Claude
@@ -110,6 +114,23 @@ export class PearAiHandler extends BaseProvider implements SingleCompletionHandl
 	}
 
 	getModel(): { id: string; info: ModelInfo } {
+		if (
+			this.pearAiModelsResponse &&
+			this.options.apiModelId === "pearai-model" &&
+			this.pearAiModelsResponse.models
+		) {
+			const modelInfo = this.pearAiModelsResponse.models[this.options.apiModelId]
+			if (modelInfo) {
+				return {
+					id: this.options.apiModelId,
+					info: {
+						contextWindow: modelInfo.contextWindow || 4096, // provide default or actual value
+						supportsPromptCache: modelInfo.supportsPromptCaching || false, // provide default or actual value
+						...modelInfo,
+					},
+				}
+			}
+		}
 		const baseModel = this.handler.getModel()
 		return baseModel
 	}

src/shared/pearaiApi.ts

@@ -130,13 +130,4 @@ export const allModels: { [key: string]: ModelInfo } = {
 
 	// Unbound models (single default model)
 	[`unbound/${unboundDefaultModelId}`]: unboundDefaultModelInfo,
-
-	// PearAI models
-	...Object.entries(pearAiModels).reduce(
-		(acc, [key, value]) => ({
-			...acc,
-			[key]: value,
-		}),
-		{},
-	),
 } as const satisfies Record<string, ModelInfo>

webview-ui/src/components/chat/TaskHeader.tsx

@@ -18,6 +18,7 @@ import Thumbnails from "../common/Thumbnails"
 import { normalizeApiConfiguration } from "../settings/ApiOptions"
 import { DeleteTaskDialog } from "../history/DeleteTaskDialog"
 import { vscBadgeBackground, vscEditorBackground, vscInputBackground } from "../ui"
+import { usePearAiModels } from "@/hooks/usePearAiModels"
 
 interface TaskHeaderProps {
 	task: ClineMessage
@@ -44,7 +45,11 @@ const TaskHeader: React.FC<TaskHeaderProps> = ({
 }) => {
 	const { t } = useTranslation()
 	const { apiConfiguration, currentTaskItem } = useExtensionState()
-	const { selectedModelInfo } = useMemo(() => normalizeApiConfiguration(apiConfiguration), [apiConfiguration])
+	const pearAiModels = usePearAiModels(apiConfiguration)
+	const { selectedModelInfo } = useMemo(() => {
+		return normalizeApiConfiguration(apiConfiguration, pearAiModels)
+	}, [apiConfiguration, pearAiModels])
+
 	const [isTaskExpanded, setIsTaskExpanded] = useState(true)
 	const [isTextExpanded, setIsTextExpanded] = useState(false)
 	const [showSeeMore, setShowSeeMore] = useState(false)

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

@@ -1692,7 +1692,7 @@ export function normalizeApiConfiguration(
 			// Always use the models from the hook which are fetched when provider is selected
 			let query = pearAiModelsQuery
 			console.log("query", query)
-			return getProviderData(pearAiModelsQuery || allModels, pearAiDefaultModelId)
+			return getProviderData(pearAiModelsQuery || {}, pearAiDefaultModelId)
 		}
 		default:
 			return getProviderData(anthropicModels, anthropicDefaultModelId)