From 5b796ade2f35d1dd4096d48fb54f18366b336730 Mon Sep 17 00:00:00 2001 From: nang-dev Date: Thu, 10 Apr 2025 00:25:51 -0400 Subject: [PATCH 1/2] Working --- src/api/providers/pearai/pearai.ts | 2 ++ src/api/providers/pearai/pearaiGeneric.ts | 2 ++ src/services/mcp/McpHub.ts | 1 - webview-ui/src/components/chat/TaskHeader.tsx | 30 ++++++++++--------- 4 files changed, 20 insertions(+), 15 deletions(-) diff --git a/src/api/providers/pearai/pearai.ts b/src/api/providers/pearai/pearai.ts index 58e1e5e9126..7d1bbf2c2d9 100644 --- a/src/api/providers/pearai/pearai.ts +++ b/src/api/providers/pearai/pearai.ts @@ -64,6 +64,7 @@ export class PearAiHandler extends BaseProvider implements SingleCompletionHandl if (modelId.startsWith("pearai")) { try { + // TODO: For some reason, if we move this fetch to above this if statement, it breaks everything) const response = await fetch(`${PEARAI_URL}/getPearAIAgentModels`) if (!response.ok) { throw new Error(`Failed to fetch models: ${response.statusText}`) @@ -117,6 +118,7 @@ export class PearAiHandler extends BaseProvider implements SingleCompletionHandl } getModel(): { id: string; info: ModelInfo } { + // TODO: this.pearAiModelsResponse is always undefined so we curretly have to just use client side model info if (this.options.apiModelId) { let modelInfo = null if (this.options.apiModelId.startsWith("pearai")) { diff --git a/src/api/providers/pearai/pearaiGeneric.ts b/src/api/providers/pearai/pearaiGeneric.ts index 03cbd61a883..3419687739c 100644 --- a/src/api/providers/pearai/pearaiGeneric.ts +++ b/src/api/providers/pearai/pearaiGeneric.ts @@ -38,6 +38,8 @@ export class PearAIGenericHandler extends BaseProvider implements SingleCompleti constructor(options: OpenAiHandlerOptions) { super() this.options = options + console.dir("Model ID") + console.dir(this.options.openAiModelId) const baseURL = this.options.openAiBaseUrl ?? "https://api.openai.com/v1" const apiKey = this.options.openAiApiKey ?? "not-provided" diff --git a/src/services/mcp/McpHub.ts b/src/services/mcp/McpHub.ts index 874d1391a70..1689b36c77c 100644 --- a/src/services/mcp/McpHub.ts +++ b/src/services/mcp/McpHub.ts @@ -359,7 +359,6 @@ export class McpHub { // Validate the config using McpSettingsSchema const result = McpSettingsSchema.safeParse(config) - console.log("IM HERE 10101", result) if (result.success) { await this.updateServerConnections(result.data.mcpServers || {}) } else { diff --git a/webview-ui/src/components/chat/TaskHeader.tsx b/webview-ui/src/components/chat/TaskHeader.tsx index 6423794b640..a3e821b6ff5 100644 --- a/webview-ui/src/components/chat/TaskHeader.tsx +++ b/webview-ui/src/components/chat/TaskHeader.tsx @@ -251,22 +251,18 @@ const TaskHeader: React.FC = ({ display: "flex", alignItems: "center", }}> -
setIsTextExpanded(!isTextExpanded)}> {t("chat:task.seeMore")} @@ -278,11 +274,17 @@ const TaskHeader: React.FC = ({
setIsTextExpanded(!isTextExpanded)}> {t("chat:task.seeLess")} From 05d1772fa395efd7f953eab0e965e56817e2a549 Mon Sep 17 00:00:00 2001 From: nang-dev Date: Thu, 10 Apr 2025 00:28:06 -0400 Subject: [PATCH 2/2] Revert --- src/api/providers/pearai/pearai.ts | 2 -- src/api/providers/pearai/pearaiGeneric.ts | 2 -- 2 files changed, 4 deletions(-) diff --git a/src/api/providers/pearai/pearai.ts b/src/api/providers/pearai/pearai.ts index 7d1bbf2c2d9..58e1e5e9126 100644 --- a/src/api/providers/pearai/pearai.ts +++ b/src/api/providers/pearai/pearai.ts @@ -64,7 +64,6 @@ export class PearAiHandler extends BaseProvider implements SingleCompletionHandl if (modelId.startsWith("pearai")) { try { - // TODO: For some reason, if we move this fetch to above this if statement, it breaks everything) const response = await fetch(`${PEARAI_URL}/getPearAIAgentModels`) if (!response.ok) { throw new Error(`Failed to fetch models: ${response.statusText}`) @@ -118,7 +117,6 @@ export class PearAiHandler extends BaseProvider implements SingleCompletionHandl } getModel(): { id: string; info: ModelInfo } { - // TODO: this.pearAiModelsResponse is always undefined so we curretly have to just use client side model info if (this.options.apiModelId) { let modelInfo = null if (this.options.apiModelId.startsWith("pearai")) { diff --git a/src/api/providers/pearai/pearaiGeneric.ts b/src/api/providers/pearai/pearaiGeneric.ts index 3419687739c..03cbd61a883 100644 --- a/src/api/providers/pearai/pearaiGeneric.ts +++ b/src/api/providers/pearai/pearaiGeneric.ts @@ -38,8 +38,6 @@ export class PearAIGenericHandler extends BaseProvider implements SingleCompleti constructor(options: OpenAiHandlerOptions) { super() this.options = options - console.dir("Model ID") - console.dir(this.options.openAiModelId) const baseURL = this.options.openAiBaseUrl ?? "https://api.openai.com/v1" const apiKey = this.options.openAiApiKey ?? "not-provided"