Merge pull request #71 from trypear/1.8.8-hotfix

Added v1.8.8 hotfix

Author: nang-dev

src/api/providers/pearai/pearai.ts

@@ -82,6 +82,7 @@ export class PearAiHandler extends BaseProvider implements SingleCompletionHandl
 						apiModelId: underlyingModel,
 					})
 				} else {
+					// Use OpenAI fields here as we are using the same handler structure as OpenAI Hander lin PearAIGenericHandler
 					this.handler = new PearAIGenericHandler({
 						...options,
 						openAiBaseUrl: PEARAI_URL,

src/api/providers/pearai/pearaiGeneric.ts

@@ -221,28 +221,30 @@ export class PearAIGenericHandler extends BaseProvider implements SingleCompleti
 	}
 
 	override getModel(): { id: string; info: ModelInfo } {
-		const modelId = this.options.openAiModelId ?? "none"
+		const modelId = this.options.openAiModelId
 		// Prioritize serverside model info
-		if (this.options.apiModelId && this.options.pearaiAgentModels) {
+		if (modelId && this.options.pearaiAgentModels) {
 			let modelInfo = null
-			if (this.options.apiModelId.startsWith("pearai")) {
-				modelInfo = this.options.pearaiAgentModels.models[this.options.apiModelId].underlyingModelUpdated
+			if (modelId.startsWith("pearai")) {
+				modelInfo = this.options.pearaiAgentModels.models[modelId].underlyingModelUpdated
 			} else {
-				modelInfo = this.options.pearaiAgentModels.models[this.options.apiModelId || "pearai-model"]
+				modelInfo = this.options.pearaiAgentModels.models[modelId || "pearai-model"]
 			}
 			if (modelInfo) {
-				return {
-					id: this.options.apiModelId,
+				const result = {
+					id: modelId,
 					info: modelInfo,
 				}
+				return result
 			}
 		}
-		return {
-			id: modelId,
-			info: allModels[modelId],
+
+		const result = {
+			id: modelId ?? pearAiDefaultModelId,
+			info: allModels[modelId ?? pearAiDefaultModelId],
 		}
+		return result
 	}
-
 	async completePrompt(prompt: string): Promise<string> {
 		try {
 			const requestOptions: OpenAI.Chat.Completions.ChatCompletionCreateParamsNonStreaming = {