refactor: move websearch provider code to providers folder

src/renderer/src/pages/settings/ProviderSettings/ProviderSetting.tsx

@@ -6,7 +6,7 @@ import { PROVIDER_CONFIG } from '@renderer/config/providers'
 import { useTheme } from '@renderer/context/ThemeProvider'
 import { useProvider } from '@renderer/hooks/useProvider'
 import i18n from '@renderer/i18n'
-import { isOpenAIProvider } from '@renderer/providers/ProviderFactory'
+import { isOpenAIProvider } from '@renderer/providers/AiProvider/ProviderFactory'
 import { checkApi, formatApiKeys } from '@renderer/services/ApiService'
 import { checkModelsHealth, ModelCheckStatus } from '@renderer/services/HealthCheckService'
 import { isProviderSupportAuth, isProviderSupportCharge } from '@renderer/services/ProviderService'

src/renderer/src/providers/AiProvider/AnthropicProvider.ts

@@ -221,7 +221,7 @@ export default class AnthropicProvider extends BaseProvider {
       return onChunk({
         text,
         reasoning_content,
-        usage: message.usage,
+        usage: message.usage as any,
         metrics: {
           completion_tokens: message.usage.output_tokens,
           time_completion_millsec,

src/renderer/src/providers/AiProvider/index.ts

@@ -1,9 +1,47 @@
-import BaseProvider from '@renderer/providers/BaseProvider'
+import type { GroundingMetadata } from '@google/generative-ai'
-import ProviderFactory from '@renderer/providers/ProviderFactory'
+import BaseProvider from '@renderer/providers/AiProvider/BaseProvider'
-import { Assistant, GenerateImageParams, Message, Model, Provider, Suggestion } from '@renderer/types'
+import ProviderFactory from '@renderer/providers/AiProvider/ProviderFactory'
+import type {
+  Assistant,
+  GenerateImageParams,
+  GenerateImageResponse,
+  MCPTool,
+  MCPToolResponse,
+  Message,
+  Metrics,
+  Model,
+  Provider,
+  Suggestion
+} from '@renderer/types'
 import OpenAI from 'openai'
 
-import { CompletionsParams } from '.'
+export interface ChunkCallbackData {
+  text?: string
+  reasoning_content?: string
+  usage?: OpenAI.Completions.CompletionUsage
+  metrics?: Metrics
+  search?: GroundingMetadata
+  citations?: string[]
+  mcpToolResponse?: MCPToolResponse[]
+  generateImage?: GenerateImageResponse
+}
+
+export interface CompletionsParams {
+  messages: Message[]
+  assistant: Assistant
+  onChunk: ({
+    text,
+    reasoning_content,
+    usage,
+    metrics,
+    search,
+    citations,
+    mcpToolResponse,
+    generateImage
+  }: ChunkCallbackData) => void
+  onFilterMessages: (messages: Message[]) => void
+  mcpTools?: MCPTool[]
+}
 
 export default class AiProvider {
   private sdk: BaseProvider

src/renderer/src/providers/index.d.ts

@@ -1,30 +0,0 @@
-import type { GroundingMetadata } from '@google/generative-ai'
-import type { Assistant, MCPToolResponse, Message, Metrics } from '@renderer/types'
-
-interface ChunkCallbackData {
-  text?: string
-  reasoning_content?: string
-  usage?: OpenAI.Completions.CompletionUsage
-  metrics?: Metrics
-  search?: GroundingMetadata
-  citations?: string[]
-  mcpToolResponse?: MCPToolResponse[]
-  generateImage?: GenerateImageResponse
-}
-
-interface CompletionsParams {
-  messages: Message[]
-  assistant: Assistant
-  onChunk: ({
-    text,
-    reasoning_content,
-    usage,
-    metrics,
-    search,
-    citations,
-    mcpToolResponse,
-    generateImage
-  }: ChunkCallbackData) => void
-  onFilterMessages: (messages: Message[]) => void
-  mcpTools?: MCPTool[]
-}

src/renderer/src/services/WebSearchService.ts

@@ -1,8 +1,8 @@
+import WebSearchEngineProvider from '@renderer/providers/WebSearchProvider'
 import store from '@renderer/store'
 import { setDefaultProvider, WebSearchState } from '@renderer/store/websearch'
 import { WebSearchProvider, WebSearchResponse } from '@renderer/types'
 import { hasObjectKey } from '@renderer/utils'
-import WebSearchEngineProvider from '@renderer/webSearchProvider/WebSearchEngineProvider'
 import dayjs from 'dayjs'
 
 /**

src/renderer/src/utils/mcp-tools.ts

@@ -18,7 +18,7 @@ import { addMCPServer } from '@renderer/store/mcp'
 import { MCPServer, MCPTool, MCPToolResponse } from '@renderer/types'
 import { ChatCompletionMessageToolCall, ChatCompletionTool } from 'openai/resources'
 
-import { ChunkCallbackData } from '../providers'
+import { ChunkCallbackData } from '../providers/AiProvider'
 
 const ensureValidSchema = (obj: Record<string, any>): FunctionDeclarationSchemaProperty => {
   // Filter out unsupported keys for Gemini