feat: fix some bug for provider

Author: 2214962083

src/extension/ai/model-providers/aide.ts

@@ -1,11 +1,108 @@
 import { logger } from '@extension/logger'
-import { AIProviderType, type AideProvider } from '@shared/entities'
+import { ChatAnthropic } from '@langchain/anthropic'
+import {
+  ChatOpenAI,
+  type ChatOpenAICallOptions,
+  type ClientOptions as OpenAIClientOptions
+} from '@langchain/openai'
+import {
+  AIProviderType,
+  type AideProvider,
+  type OpenAIProvider
+} from '@shared/entities'
+import { t } from 'i18next'
+import OpenAI from 'openai'
 
 import { aideKeyUsageInfo } from '../aide-key-request'
-import { type BaseModelUsageInfo } from './helpers/base'
-import { OpenAIModelProvider } from './openai'
+import { BaseModelProvider, type BaseModelUsageInfo } from './helpers/base'
+
+export class AideModelProvider extends BaseModelProvider<
+  ChatOpenAI<ChatOpenAICallOptions> | ChatAnthropic
+> {
+  createOpenaiClient(options?: OpenAIClientOptions) {
+    const { extraFields } = this.aiProvider as OpenAIProvider
+    const openai = new OpenAI({
+      baseURL: extraFields.apiBaseUrl,
+      apiKey: extraFields.apiKey,
+      fetch,
+      ...options
+    })
+
+    return openai
+  }
+
+  private async createLangChainAnthropicModel() {
+    if (!this.aiModel?.name) {
+      throw new Error(t('extension.modelProviders.errors.modelNameRequired'))
+    }
+
+    const { extraFields } = this.aiProvider as AideProvider
+    // remove baseURL /v1
+    const anthropicApiUrl = extraFields.apiBaseUrl.replace(/\/v1$/, '')
+
+    const model = new ChatAnthropic({
+      apiKey: extraFields.apiKey,
+      anthropicApiUrl,
+      clientOptions: {
+        fetch,
+        defaultHeaders: {
+          Authorization: `Bearer ${extraFields.apiKey}`
+        }
+      },
+      modelName: this.aiModel.name,
+      temperature: 0.95,
+      maxRetries: 6,
+      verbose: this.isDev
+    })
+
+    return model
+  }
+
+  private async createLangChainOpenAIModel() {
+    if (!this.aiModel?.name) {
+      throw new Error(t('extension.modelProviders.errors.modelNameRequired'))
+    }
+
+    const { extraFields } = this.aiProvider as AideProvider
+
+    const model = new ChatOpenAI({
+      apiKey: extraFields.apiKey,
+      configuration: {
+        baseURL: extraFields.apiBaseUrl,
+        fetch
+      },
+      modelName: this.aiModel.name,
+      temperature: 0.95,
+      maxRetries: 3,
+      verbose: this.isDev
+    })
+
+    // Clear incompatible parameters for third-party models
+    model.frequencyPenalty = undefined as any
+    model.n = undefined as any
+    model.presencePenalty = undefined as any
+    model.topP = undefined as any
+
+    return model
+  }
+
+  createLangChainModel() {
+    const isAnthropicModels = /claude|anthropic/.test(this.aiModel?.name || '')
+
+    if (isAnthropicModels) {
+      return this.createLangChainAnthropicModel()
+    }
+
+    return this.createLangChainOpenAIModel()
+  }
+
+  async getSupportModelNames() {
+    const openai = this.createOpenaiClient()
+    const list = await openai.models.list()
+
+    return list.data.map(model => model.id)
+  }
 
-export class AideModelProvider extends OpenAIModelProvider {
   async getUsageInfo(): Promise<BaseModelUsageInfo | null> {
     try {
       // Ensure this is an Aide provider and has an API key

src/extension/ai/model-providers/anthropic.ts

@@ -5,17 +5,13 @@ import { t } from 'i18next'
 
 import { BaseModelProvider } from './helpers/base'
 
-interface AnthropicModel {
-  id: string
-}
-
 export class AnthropicModelProvider extends BaseModelProvider<ChatAnthropic> {
   createAnthropicClient(options?: ClientOptions) {
     const { extraFields } = this.aiProvider as AnthropicProvider
 
     return new Anthropic({
-      apiKey: extraFields.anthropicApiKey,
-      baseURL: extraFields.anthropicApiUrl,
+      apiKey: extraFields.apiKey,
+      baseURL: extraFields.apiBaseUrl,
       fetch,
       ...options
     })
@@ -29,8 +25,8 @@ export class AnthropicModelProvider extends BaseModelProvider<ChatAnthropic> {
     const { extraFields } = this.aiProvider as AnthropicProvider
 
     const model = new ChatAnthropic({
-      apiKey: extraFields.anthropicApiKey,
-      anthropicApiUrl: extraFields.anthropicApiUrl,
+      apiKey: extraFields.apiKey,
+      anthropicApiUrl: extraFields.apiBaseUrl,
       clientOptions: {
         fetch
       },
@@ -45,8 +41,8 @@ export class AnthropicModelProvider extends BaseModelProvider<ChatAnthropic> {
 
   async getSupportModelNames() {
     const anthropic = this.createAnthropicClient()
-    const list = await anthropic.get<any, AnthropicModel[]>('/v1/models')
+    const list = await anthropic.models.list()
 
-    return list.map(model => model.id)
+    return list.data.map(model => model.id)
   }
 }

src/shared/entities/ai-provider-entity/anthropic.ts

@@ -10,8 +10,8 @@ import {
 export interface AnthropicProvider extends AIProvider {
   type: AIProviderType.Anthropic
   extraFields: {
-    anthropicApiUrl: string
-    anthropicApiKey: string
+    apiBaseUrl: string
+    apiKey: string
   }
 }
 
@@ -23,14 +23,14 @@ export class AnthropicProviderEntity extends AIProviderEntity<AnthropicProvider>
       name: t('shared.aiProvider.name.anthropic'),
       fields: [
         {
-          key: 'anthropicApiUrl',
+          key: 'apiBaseUrl',
           label: t('shared.aiProvider.fields.label.anthropicApiUrl'),
           required: true,
-          disabled: true,
+          disabled: false,
           defaultValue: 'https://api.anthropic.com'
         },
         {
-          key: 'anthropicApiKey',
+          key: 'apiKey',
           label: t('shared.aiProvider.fields.label.anthropicApiKey'),
           required: true,
           isSecret: true

src/shared/entities/ai-provider-entity/openai.ts

@@ -28,7 +28,7 @@ export class OpenAIProviderEntity extends AIProviderEntity<OpenAIProvider> {
           key: 'apiBaseUrl',
           label: t('shared.aiProvider.fields.label.openaiApiBaseUrl'),
           required: true,
-          disabled: true,
+          disabled: false,
           defaultValue: 'https://api.openai.com/v1'
         },
         {

src/webview/components/chat/selectors/file-selector/file-list-view.tsx

@@ -70,6 +70,10 @@ export const FileListView: React.FC<FileListViewProps> = ({
         className={cn(
           'cursor-pointer text-sm mx-2 px-1 py-1 flex items-center data-[selected=true]:bg-secondary data-[selected=true]:text-foreground'
         )}
+        style={{
+          height: '28px',
+          containIntrinsicSize: '28px'
+        }}
       >
         <div className="flex shrink-0 items-center mr-2">
           <input
@@ -90,9 +94,19 @@ export const FileListView: React.FC<FileListViewProps> = ({
   return (
     <div className="flex flex-col h-full pt-1">
       <Command loop ref={commandRef} shouldFilter={false}>
-        <CommandList className="py-2">
+        <CommandList
+          className="py-2"
+          style={{
+            contentVisibility: 'auto'
+          }}
+        >
           {!filteredFiles.length ? (
-            <CommandEmpty>
+            <CommandEmpty
+              style={{
+                containIntrinsicSize: '28px',
+                height: '28px'
+              }}
+            >
               {t('webview.fileSelector.noFilesFound')}
             </CommandEmpty>
           ) : (

src/webview/components/chat/selectors/model-selector.tsx

@@ -250,11 +250,11 @@ export const ModelSelector: React.FC<ModelSelectorProps> = ({
       actionParams: { ...data, order } as Omit<AIProvider, 'id'>
     })
     setIsAddingProvider(false)
-    invalidateQueries({
+    await invalidateQueries({
       type: 'all-webview',
       queryKeys: [providersQueryKey]
     })
-    invalidateQueries({
+    await invalidateQueries({
       type: 'all-webview',
       queryKeys: [modelsQueryKey]
     })
@@ -373,7 +373,10 @@ export const ModelSelector: React.FC<ModelSelectorProps> = ({
         initialProvider={editingProvider}
         onSubmit={async data => {
           await api.actions().server.aiProvider.updateProvider({
-            actionParams: data as AIProvider
+            actionParams: {
+              ...data,
+              id: editingProvider?.id
+            } as AIProvider
           })
           setEditingProvider(undefined)
           invalidateQueries({

src/webview/components/settings/custom-renders/ai-provider-management/provider-form/edit-provider-form.tsx

@@ -83,7 +83,7 @@ export const EditProviderForm = ({
             />
           </ScrollArea>
 
-          <Button className="w-full" disabled={isSubmitting}>
+          <Button className="w-full" type="submit" disabled={isSubmitting}>
             {isSubmitting
               ? t('webview.aiProvider.saving')
               : t('webview.aiProvider.saveChanges')}