feat(knowledge): support doc2x, mistral, MacOS, MinerU... OCR (#3734)

Co-authored-by: suyao <sy20010504@gmail.com>
Co-authored-by: 亢奋猫 <kangfenmao@qq.com>
This commit is contained in:
Chen Tao 2025-07-03 16:23:02 +08:00 committed by GitHub
parent 1afbb30bfc
commit e35b4d9cd1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
115 changed files with 5223 additions and 1233 deletions

View File

@ -79,6 +79,7 @@ jobs:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
RENDERER_VITE_AIHUBMIX_SECRET: ${{ vars.RENDERER_VITE_AIHUBMIX_SECRET }} RENDERER_VITE_AIHUBMIX_SECRET: ${{ vars.RENDERER_VITE_AIHUBMIX_SECRET }}
NODE_OPTIONS: --max-old-space-size=8192 NODE_OPTIONS: --max-old-space-size=8192
MAIN_VITE_MINERU_API_KEY: ${{ vars.MAIN_VITE_MINERU_API_KEY }}
- name: Build Mac - name: Build Mac
if: matrix.os == 'macos-latest' if: matrix.os == 'macos-latest'
@ -95,6 +96,7 @@ jobs:
RENDERER_VITE_AIHUBMIX_SECRET: ${{ vars.RENDERER_VITE_AIHUBMIX_SECRET }} RENDERER_VITE_AIHUBMIX_SECRET: ${{ vars.RENDERER_VITE_AIHUBMIX_SECRET }}
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NODE_OPTIONS: --max-old-space-size=8192 NODE_OPTIONS: --max-old-space-size=8192
MAIN_VITE_MINERU_API_KEY: ${{ vars.MAIN_VITE_MINERU_API_KEY }}
- name: Build Windows - name: Build Windows
if: matrix.os == 'windows-latest' if: matrix.os == 'windows-latest'
@ -105,6 +107,7 @@ jobs:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
RENDERER_VITE_AIHUBMIX_SECRET: ${{ vars.RENDERER_VITE_AIHUBMIX_SECRET }} RENDERER_VITE_AIHUBMIX_SECRET: ${{ vars.RENDERER_VITE_AIHUBMIX_SECRET }}
NODE_OPTIONS: --max-old-space-size=8192 NODE_OPTIONS: --max-old-space-size=8192
MAIN_VITE_MINERU_API_KEY: ${{ vars.MAIN_VITE_MINERU_API_KEY }}
- name: Release - name: Release
uses: ncipollo/release-action@v1 uses: ncipollo/release-action@v1

View File

@ -53,6 +53,8 @@ files:
- '!node_modules/pdf-parse/lib/pdf.js/{v1.9.426,v1.10.88,v2.0.550}' - '!node_modules/pdf-parse/lib/pdf.js/{v1.9.426,v1.10.88,v2.0.550}'
- '!node_modules/mammoth/{mammoth.browser.js,mammoth.browser.min.js}' - '!node_modules/mammoth/{mammoth.browser.js,mammoth.browser.min.js}'
- '!node_modules/selection-hook/prebuilds/**/*' # we rebuild .node, don't use prebuilds - '!node_modules/selection-hook/prebuilds/**/*' # we rebuild .node, don't use prebuilds
- '!node_modules/pdfjs-dist/web/**/*'
- '!node_modules/pdfjs-dist/legacy/web/*'
- '!node_modules/selection-hook/node_modules' # we don't need what in the node_modules dir - '!node_modules/selection-hook/node_modules' # we don't need what in the node_modules dir
- '!node_modules/selection-hook/src' # we don't need source files - '!node_modules/selection-hook/src' # we don't need source files
- '!**/*.{h,iobj,ipdb,tlog,recipe,vcxproj,vcxproj.filters,Makefile,*.Makefile}' # filter .node build files - '!**/*.{h,iobj,ipdb,tlog,recipe,vcxproj,vcxproj.filters,Makefile,*.Makefile}' # filter .node build files

View File

@ -20,7 +20,7 @@ export default defineConfig({
}, },
build: { build: {
rollupOptions: { rollupOptions: {
external: ['@libsql/client', 'bufferutil', 'utf-8-validate'], external: ['@libsql/client', 'bufferutil', 'utf-8-validate', '@cherrystudio/mac-system-ocr'],
output: { output: {
// 彻底禁用代码分割 - 返回 null 强制单文件打包 // 彻底禁用代码分割 - 返回 null 强制单文件打包
manualChunks: undefined, manualChunks: undefined,

View File

@ -58,6 +58,7 @@
"prepare": "husky" "prepare": "husky"
}, },
"dependencies": { "dependencies": {
"@cherrystudio/pdf-to-img-napi": "^0.0.1",
"@libsql/client": "0.14.0", "@libsql/client": "0.14.0",
"@libsql/win32-x64-msvc": "^0.4.7", "@libsql/win32-x64-msvc": "^0.4.7",
"@strongtz/win32-arm64-msvc": "^0.4.7", "@strongtz/win32-arm64-msvc": "^0.4.7",
@ -66,6 +67,7 @@
"node-stream-zip": "^1.15.0", "node-stream-zip": "^1.15.0",
"notion-helper": "^1.3.22", "notion-helper": "^1.3.22",
"os-proxy-config": "^1.1.2", "os-proxy-config": "^1.1.2",
"pdfjs-dist": "4.10.38",
"selection-hook": "^1.0.3", "selection-hook": "^1.0.3",
"turndown": "7.2.0" "turndown": "7.2.0"
}, },
@ -101,6 +103,7 @@
"@kangfenmao/keyv-storage": "^0.1.0", "@kangfenmao/keyv-storage": "^0.1.0",
"@langchain/community": "^0.3.36", "@langchain/community": "^0.3.36",
"@langchain/ollama": "^0.2.1", "@langchain/ollama": "^0.2.1",
"@mistralai/mistralai": "^1.6.0",
"@modelcontextprotocol/sdk": "^1.11.4", "@modelcontextprotocol/sdk": "^1.11.4",
"@mozilla/readability": "^0.6.0", "@mozilla/readability": "^0.6.0",
"@notionhq/client": "^2.2.15", "@notionhq/client": "^2.2.15",
@ -225,6 +228,9 @@
"word-extractor": "^1.0.4", "word-extractor": "^1.0.4",
"zipread": "^1.3.3" "zipread": "^1.3.3"
}, },
"optionalDependencies": {
"@cherrystudio/mac-system-ocr": "^0.2.2"
},
"resolutions": { "resolutions": {
"pdf-parse@npm:1.1.1": "patch:pdf-parse@npm%3A1.1.1#~/.yarn/patches/pdf-parse-npm-1.1.1-04a6109b2a.patch", "pdf-parse@npm:1.1.1": "patch:pdf-parse@npm%3A1.1.1#~/.yarn/patches/pdf-parse-npm-1.1.1-04a6109b2a.patch",
"@langchain/openai@npm:^0.3.16": "patch:@langchain/openai@npm%3A0.3.16#~/.yarn/patches/@langchain-openai-npm-0.3.16-e525b59526.patch", "@langchain/openai@npm:^0.3.16": "patch:@langchain/openai@npm%3A0.3.16#~/.yarn/patches/@langchain-openai-npm-0.3.16-e525b59526.patch",

View File

@ -118,6 +118,7 @@ export enum IpcChannel {
KnowledgeBase_Remove = 'knowledge-base:remove', KnowledgeBase_Remove = 'knowledge-base:remove',
KnowledgeBase_Search = 'knowledge-base:search', KnowledgeBase_Search = 'knowledge-base:search',
KnowledgeBase_Rerank = 'knowledge-base:rerank', KnowledgeBase_Rerank = 'knowledge-base:rerank',
KnowledgeBase_Check_Quota = 'knowledge-base:check-quota',
//file //file
File_Open = 'file:open', File_Open = 'file:open',
@ -128,9 +129,10 @@ export enum IpcChannel {
File_Clear = 'file:clear', File_Clear = 'file:clear',
File_Read = 'file:read', File_Read = 'file:read',
File_Delete = 'file:delete', File_Delete = 'file:delete',
File_DeleteDir = 'file:deleteDir',
File_Get = 'file:get', File_Get = 'file:get',
File_SelectFolder = 'file:selectFolder', File_SelectFolder = 'file:selectFolder',
File_Create = 'file:create', File_CreateTempFile = 'file:createTempFile',
File_Write = 'file:write', File_Write = 'file:write',
File_WriteWithId = 'file:writeWithId', File_WriteWithId = 'file:writeWithId',
File_SaveImage = 'file:saveImage', File_SaveImage = 'file:saveImage',
@ -143,6 +145,12 @@ export enum IpcChannel {
File_GetPdfInfo = 'file:getPdfInfo', File_GetPdfInfo = 'file:getPdfInfo',
Fs_Read = 'fs:read', Fs_Read = 'fs:read',
// file service
FileService_Upload = 'file-service:upload',
FileService_List = 'file-service:list',
FileService_Delete = 'file-service:delete',
FileService_Retrieve = 'file-service:retrieve',
Export_Word = 'export:word', Export_Word = 'export:word',
Shortcuts_Update = 'shortcuts:update', Shortcuts_Update = 'shortcuts:update',

View File

@ -1,6 +1,11 @@
import { ProcessingStatus } from '@types'
export type LoaderReturn = { export type LoaderReturn = {
entriesAdded: number entriesAdded: number
uniqueId: string uniqueId: string
uniqueIds: string[] uniqueIds: string[]
loaderType: string loaderType: string
status?: ProcessingStatus
message?: string
messageSource?: 'preprocess' | 'embedding'
} }

View File

@ -23,6 +23,9 @@ exports.default = async function (context) {
const node_modules_path = path.join(context.appOutDir, 'resources', 'app.asar.unpacked', 'node_modules') const node_modules_path = path.join(context.appOutDir, 'resources', 'app.asar.unpacked', 'node_modules')
const _arch = arch === Arch.arm64 ? ['linux-arm64-gnu', 'linux-arm64-musl'] : ['linux-x64-gnu', 'linux-x64-musl'] const _arch = arch === Arch.arm64 ? ['linux-arm64-gnu', 'linux-arm64-musl'] : ['linux-x64-gnu', 'linux-x64-musl']
keepPackageNodeFiles(node_modules_path, '@libsql', _arch) keepPackageNodeFiles(node_modules_path, '@libsql', _arch)
// 删除 macOS 专用的 OCR 包
removeMacOnlyPackages(node_modules_path)
} }
if (platform === 'windows') { if (platform === 'windows') {
@ -35,6 +38,8 @@ exports.default = async function (context) {
keepPackageNodeFiles(node_modules_path, '@strongtz', ['win32-x64-msvc']) keepPackageNodeFiles(node_modules_path, '@strongtz', ['win32-x64-msvc'])
keepPackageNodeFiles(node_modules_path, '@libsql', ['win32-x64-msvc']) keepPackageNodeFiles(node_modules_path, '@libsql', ['win32-x64-msvc'])
} }
removeMacOnlyPackages(node_modules_path)
} }
if (platform === 'windows') { if (platform === 'windows') {
@ -43,6 +48,22 @@ exports.default = async function (context) {
} }
} }
/**
* 删除 macOS 专用的包
* @param {string} nodeModulesPath
*/
function removeMacOnlyPackages(nodeModulesPath) {
const macOnlyPackages = ['@cherrystudio/mac-system-ocr']
macOnlyPackages.forEach((packageName) => {
const packagePath = path.join(nodeModulesPath, packageName)
if (fs.existsSync(packagePath)) {
fs.rmSync(packagePath, { recursive: true, force: true })
console.log(`[After Pack] Removed macOS-only package: ${packageName}`)
}
})
}
/** /**
* 使用指定架构的 node_modules 文件 * 使用指定架构的 node_modules 文件
* @param {*} nodeModulesPath * @param {*} nodeModulesPath

View File

@ -7,7 +7,7 @@ import { getBinaryPath, isBinaryExists, runInstallScript } from '@main/utils/pro
import { handleZoomFactor } from '@main/utils/zoom' import { handleZoomFactor } from '@main/utils/zoom'
import { UpgradeChannel } from '@shared/config/constant' import { UpgradeChannel } from '@shared/config/constant'
import { IpcChannel } from '@shared/IpcChannel' import { IpcChannel } from '@shared/IpcChannel'
import { Shortcut, ThemeMode } from '@types' import { FileMetadata, Provider, Shortcut, ThemeMode } from '@types'
import { BrowserWindow, dialog, ipcMain, session, shell, systemPreferences, webContents } from 'electron' import { BrowserWindow, dialog, ipcMain, session, shell, systemPreferences, webContents } from 'electron'
import log from 'electron-log' import log from 'electron-log'
import { Notification } from 'src/renderer/src/types/notification' import { Notification } from 'src/renderer/src/types/notification'
@ -17,8 +17,8 @@ import BackupManager from './services/BackupManager'
import { configManager } from './services/ConfigManager' import { configManager } from './services/ConfigManager'
import CopilotService from './services/CopilotService' import CopilotService from './services/CopilotService'
import { ExportService } from './services/ExportService' import { ExportService } from './services/ExportService'
import FileService from './services/FileService'
import FileStorage from './services/FileStorage' import FileStorage from './services/FileStorage'
import FileService from './services/FileSystemService'
import KnowledgeService from './services/KnowledgeService' import KnowledgeService from './services/KnowledgeService'
import mcpService from './services/MCPService' import mcpService from './services/MCPService'
import NotificationService from './services/NotificationService' import NotificationService from './services/NotificationService'
@ -26,6 +26,7 @@ import * as NutstoreService from './services/NutstoreService'
import ObsidianVaultService from './services/ObsidianVaultService' import ObsidianVaultService from './services/ObsidianVaultService'
import { ProxyConfig, proxyManager } from './services/ProxyManager' import { ProxyConfig, proxyManager } from './services/ProxyManager'
import { pythonService } from './services/PythonService' import { pythonService } from './services/PythonService'
import { FileServiceManager } from './services/remotefile/FileServiceManager'
import { searchService } from './services/SearchService' import { searchService } from './services/SearchService'
import { SelectionService } from './services/SelectionService' import { SelectionService } from './services/SelectionService'
import { registerShortcuts, unregisterAllShortcuts } from './services/ShortcutService' import { registerShortcuts, unregisterAllShortcuts } from './services/ShortcutService'
@ -377,9 +378,10 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
ipcMain.handle(IpcChannel.File_Clear, fileManager.clear) ipcMain.handle(IpcChannel.File_Clear, fileManager.clear)
ipcMain.handle(IpcChannel.File_Read, fileManager.readFile) ipcMain.handle(IpcChannel.File_Read, fileManager.readFile)
ipcMain.handle(IpcChannel.File_Delete, fileManager.deleteFile) ipcMain.handle(IpcChannel.File_Delete, fileManager.deleteFile)
ipcMain.handle('file:deleteDir', fileManager.deleteDir)
ipcMain.handle(IpcChannel.File_Get, fileManager.getFile) ipcMain.handle(IpcChannel.File_Get, fileManager.getFile)
ipcMain.handle(IpcChannel.File_SelectFolder, fileManager.selectFolder) ipcMain.handle(IpcChannel.File_SelectFolder, fileManager.selectFolder)
ipcMain.handle(IpcChannel.File_Create, fileManager.createTempFile) ipcMain.handle(IpcChannel.File_CreateTempFile, fileManager.createTempFile)
ipcMain.handle(IpcChannel.File_Write, fileManager.writeFile) ipcMain.handle(IpcChannel.File_Write, fileManager.writeFile)
ipcMain.handle(IpcChannel.File_WriteWithId, fileManager.writeFileWithId) ipcMain.handle(IpcChannel.File_WriteWithId, fileManager.writeFileWithId)
ipcMain.handle(IpcChannel.File_SaveImage, fileManager.saveImage) ipcMain.handle(IpcChannel.File_SaveImage, fileManager.saveImage)
@ -391,6 +393,27 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
ipcMain.handle(IpcChannel.File_Copy, fileManager.copyFile) ipcMain.handle(IpcChannel.File_Copy, fileManager.copyFile)
ipcMain.handle(IpcChannel.File_BinaryImage, fileManager.binaryImage) ipcMain.handle(IpcChannel.File_BinaryImage, fileManager.binaryImage)
// file service
ipcMain.handle(IpcChannel.FileService_Upload, async (_, provider: Provider, file: FileMetadata) => {
const service = FileServiceManager.getInstance().getService(provider)
return await service.uploadFile(file)
})
ipcMain.handle(IpcChannel.FileService_List, async (_, provider: Provider) => {
const service = FileServiceManager.getInstance().getService(provider)
return await service.listFiles()
})
ipcMain.handle(IpcChannel.FileService_Delete, async (_, provider: Provider, fileId: string) => {
const service = FileServiceManager.getInstance().getService(provider)
return await service.deleteFile(fileId)
})
ipcMain.handle(IpcChannel.FileService_Retrieve, async (_, provider: Provider, fileId: string) => {
const service = FileServiceManager.getInstance().getService(provider)
return await service.retrieveFile(fileId)
})
// fs // fs
ipcMain.handle(IpcChannel.Fs_Read, FileService.readFile) ipcMain.handle(IpcChannel.Fs_Read, FileService.readFile)
@ -420,6 +443,7 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
ipcMain.handle(IpcChannel.KnowledgeBase_Remove, KnowledgeService.remove) ipcMain.handle(IpcChannel.KnowledgeBase_Remove, KnowledgeService.remove)
ipcMain.handle(IpcChannel.KnowledgeBase_Search, KnowledgeService.search) ipcMain.handle(IpcChannel.KnowledgeBase_Search, KnowledgeService.search)
ipcMain.handle(IpcChannel.KnowledgeBase_Rerank, KnowledgeService.rerank) ipcMain.handle(IpcChannel.KnowledgeBase_Rerank, KnowledgeService.rerank)
ipcMain.handle(IpcChannel.KnowledgeBase_Check_Quota, KnowledgeService.checkQuota)
// window // window
ipcMain.handle(IpcChannel.Windows_SetMinimumSize, (_, width: number, height: number) => { ipcMain.handle(IpcChannel.Windows_SetMinimumSize, (_, width: number, height: number) => {

View File

@ -4,7 +4,7 @@ import { JsonLoader, LocalPathLoader, RAGApplication, TextLoader } from '@cherry
import type { AddLoaderReturn } from '@cherrystudio/embedjs-interfaces' import type { AddLoaderReturn } from '@cherrystudio/embedjs-interfaces'
import { WebLoader } from '@cherrystudio/embedjs-loader-web' import { WebLoader } from '@cherrystudio/embedjs-loader-web'
import { LoaderReturn } from '@shared/config/types' import { LoaderReturn } from '@shared/config/types'
import { FileType, KnowledgeBaseParams } from '@types' import { FileMetadata, KnowledgeBaseParams } from '@types'
import Logger from 'electron-log' import Logger from 'electron-log'
import { DraftsExportLoader } from './draftsExportLoader' import { DraftsExportLoader } from './draftsExportLoader'
@ -39,7 +39,7 @@ const FILE_LOADER_MAP: Record<string, string> = {
export async function addOdLoader( export async function addOdLoader(
ragApplication: RAGApplication, ragApplication: RAGApplication,
file: FileType, file: FileMetadata,
base: KnowledgeBaseParams, base: KnowledgeBaseParams,
forceReload: boolean forceReload: boolean
): Promise<AddLoaderReturn> { ): Promise<AddLoaderReturn> {
@ -65,7 +65,7 @@ export async function addOdLoader(
export async function addFileLoader( export async function addFileLoader(
ragApplication: RAGApplication, ragApplication: RAGApplication,
file: FileType, file: FileMetadata,
base: KnowledgeBaseParams, base: KnowledgeBaseParams,
forceReload: boolean forceReload: boolean
): Promise<LoaderReturn> { ): Promise<LoaderReturn> {

View File

@ -0,0 +1,122 @@
import fs from 'node:fs'
import path from 'node:path'
import { windowService } from '@main/services/WindowService'
import { getFileExt } from '@main/utils/file'
import { FileMetadata, OcrProvider } from '@types'
import { app } from 'electron'
import { TypedArray } from 'pdfjs-dist/types/src/display/api'
export default abstract class BaseOcrProvider {
protected provider: OcrProvider
public storageDir = path.join(app.getPath('userData'), 'Data', 'Files')
constructor(provider: OcrProvider) {
if (!provider) {
throw new Error('OCR provider is not set')
}
this.provider = provider
}
abstract parseFile(sourceId: string, file: FileMetadata): Promise<{ processedFile: FileMetadata; quota?: number }>
/**
*
* Data/Files/{file.id}
* @param file
* @returns null
*/
public async checkIfAlreadyProcessed(file: FileMetadata): Promise<FileMetadata | null> {
try {
// 检查 Data/Files/{file.id} 是否是目录
const preprocessDirPath = path.join(this.storageDir, file.id)
if (fs.existsSync(preprocessDirPath)) {
const stats = await fs.promises.stat(preprocessDirPath)
// 如果是目录,说明已经被预处理过
if (stats.isDirectory()) {
// 查找目录中的处理结果文件
const files = await fs.promises.readdir(preprocessDirPath)
// 查找主要的处理结果文件(.md 或 .txt
const processedFile = files.find((fileName) => fileName.endsWith('.md') || fileName.endsWith('.txt'))
if (processedFile) {
const processedFilePath = path.join(preprocessDirPath, processedFile)
const processedStats = await fs.promises.stat(processedFilePath)
const ext = getFileExt(processedFile)
return {
...file,
name: file.name.replace(file.ext, ext),
path: processedFilePath,
ext: ext,
size: processedStats.size,
created_at: processedStats.birthtime.toISOString()
}
}
}
}
return null
} catch (error) {
// 如果检查过程中出现错误返回null表示未处理
return null
}
}
/**
*
*/
public delay = (ms: number): Promise<void> => {
return new Promise((resolve) => setTimeout(resolve, ms))
}
public async readPdf(
source: string | URL | TypedArray,
passwordCallback?: (fn: (password: string) => void, reason: string) => string
) {
const { getDocument } = await import('pdfjs-dist/legacy/build/pdf.mjs')
const documentLoadingTask = getDocument(source)
if (passwordCallback) {
documentLoadingTask.onPassword = passwordCallback
}
const document = await documentLoadingTask.promise
return document
}
public async sendOcrProgress(sourceId: string, progress: number): Promise<void> {
const mainWindow = windowService.getMainWindow()
mainWindow?.webContents.send('file-ocr-progress', {
itemId: sourceId,
progress: progress
})
}
/**
*
* @param fileId id
* @param filePaths
* @returns
*/
public moveToAttachmentsDir(fileId: string, filePaths: string[]): string[] {
const attachmentsPath = path.join(this.storageDir, fileId)
if (!fs.existsSync(attachmentsPath)) {
fs.mkdirSync(attachmentsPath, { recursive: true })
}
const movedPaths: string[] = []
for (const filePath of filePaths) {
if (fs.existsSync(filePath)) {
const fileName = path.basename(filePath)
const destPath = path.join(attachmentsPath, fileName)
fs.copyFileSync(filePath, destPath)
fs.unlinkSync(filePath) // 删除原文件,实现"移动"
movedPaths.push(destPath)
}
}
return movedPaths
}
}

View File

@ -0,0 +1,12 @@
import { FileMetadata, OcrProvider } from '@types'
import BaseOcrProvider from './BaseOcrProvider'
export default class DefaultOcrProvider extends BaseOcrProvider {
constructor(provider: OcrProvider) {
super(provider)
}
public parseFile(): Promise<{ processedFile: FileMetadata }> {
throw new Error('Method not implemented.')
}
}

View File

@ -0,0 +1,128 @@
import { isMac } from '@main/constant'
import { FileMetadata, OcrProvider } from '@types'
import Logger from 'electron-log'
import * as fs from 'fs'
import * as path from 'path'
import { TextItem } from 'pdfjs-dist/types/src/display/api'
import BaseOcrProvider from './BaseOcrProvider'
export default class MacSysOcrProvider extends BaseOcrProvider {
private readonly MIN_TEXT_LENGTH = 1000
private MacOCR: any
private async initMacOCR() {
if (!isMac) {
throw new Error('MacSysOcrProvider is only available on macOS')
}
if (!this.MacOCR) {
try {
// @ts-ignore This module is optional and only installed/available on macOS. Runtime checks prevent execution on other platforms.
const module = await import('@cherrystudio/mac-system-ocr')
this.MacOCR = module.default
} catch (error) {
Logger.error('[OCR] Failed to load mac-system-ocr:', error)
throw error
}
}
return this.MacOCR
}
private getRecognitionLevel(level?: number) {
return level === 0 ? this.MacOCR.RECOGNITION_LEVEL_FAST : this.MacOCR.RECOGNITION_LEVEL_ACCURATE
}
constructor(provider: OcrProvider) {
super(provider)
}
private async processPages(
results: any,
totalPages: number,
sourceId: string,
writeStream: fs.WriteStream
): Promise<void> {
await this.initMacOCR()
// TODO: 下个版本后面使用批处理以及p-queue来优化
for (let i = 0; i < totalPages; i++) {
// Convert pages to buffers
const pageNum = i + 1
const pageBuffer = await results.getPage(pageNum)
// Process batch
const ocrResult = await this.MacOCR.recognizeFromBuffer(pageBuffer, {
ocrOptions: {
recognitionLevel: this.getRecognitionLevel(this.provider.options?.recognitionLevel),
minConfidence: this.provider.options?.minConfidence || 0.5
}
})
// Write results in order
writeStream.write(ocrResult.text + '\n')
// Update progress
await this.sendOcrProgress(sourceId, (pageNum / totalPages) * 100)
}
}
public async isScanPdf(buffer: Buffer): Promise<boolean> {
const doc = await this.readPdf(new Uint8Array(buffer))
const pageLength = doc.numPages
let counts = 0
const pagesToCheck = Math.min(pageLength, 10)
for (let i = 0; i < pagesToCheck; i++) {
const page = await doc.getPage(i + 1)
const pageData = await page.getTextContent()
const pageText = pageData.items.map((item) => (item as TextItem).str).join('')
counts += pageText.length
if (counts >= this.MIN_TEXT_LENGTH) {
return false
}
}
return true
}
public async parseFile(sourceId: string, file: FileMetadata): Promise<{ processedFile: FileMetadata }> {
Logger.info(`[OCR] Starting OCR process for file: ${file.name}`)
if (file.ext === '.pdf') {
try {
const { pdf } = await import('@cherrystudio/pdf-to-img-napi')
const pdfBuffer = await fs.promises.readFile(file.path)
const results = await pdf(pdfBuffer, {
scale: 2
})
const totalPages = results.length
const baseDir = path.dirname(file.path)
const baseName = path.basename(file.path, path.extname(file.path))
const txtFileName = `${baseName}.txt`
const txtFilePath = path.join(baseDir, txtFileName)
const writeStream = fs.createWriteStream(txtFilePath)
await this.processPages(results, totalPages, sourceId, writeStream)
await new Promise<void>((resolve, reject) => {
writeStream.end(() => {
Logger.info(`[OCR] OCR process completed successfully for ${file.origin_name}`)
resolve()
})
writeStream.on('error', reject)
})
const movedPaths = this.moveToAttachmentsDir(file.id, [txtFilePath])
return {
processedFile: {
...file,
name: txtFileName,
path: movedPaths[0],
ext: '.txt',
size: fs.statSync(movedPaths[0]).size
}
}
} catch (error) {
Logger.error('[OCR] Error during OCR process:', error)
throw error
}
}
return { processedFile: file }
}
}

View File

@ -0,0 +1,26 @@
import { FileMetadata, OcrProvider as Provider } from '@types'
import BaseOcrProvider from './BaseOcrProvider'
import OcrProviderFactory from './OcrProviderFactory'
export default class OcrProvider {
private sdk: BaseOcrProvider
constructor(provider: Provider) {
this.sdk = OcrProviderFactory.create(provider)
}
public async parseFile(
sourceId: string,
file: FileMetadata
): Promise<{ processedFile: FileMetadata; quota?: number }> {
return this.sdk.parseFile(sourceId, file)
}
/**
*
* @param file
* @returns null
*/
public async checkIfAlreadyProcessed(file: FileMetadata): Promise<FileMetadata | null> {
return this.sdk.checkIfAlreadyProcessed(file)
}
}

View File

@ -0,0 +1,20 @@
import { isMac } from '@main/constant'
import { OcrProvider } from '@types'
import Logger from 'electron-log'
import BaseOcrProvider from './BaseOcrProvider'
import DefaultOcrProvider from './DefaultOcrProvider'
import MacSysOcrProvider from './MacSysOcrProvider'
export default class OcrProviderFactory {
static create(provider: OcrProvider): BaseOcrProvider {
switch (provider.id) {
case 'system':
if (!isMac) {
Logger.warn('[OCR] System OCR provider is only available on macOS')
}
return new MacSysOcrProvider(provider)
default:
return new DefaultOcrProvider(provider)
}
}
}

View File

@ -0,0 +1,126 @@
import fs from 'node:fs'
import path from 'node:path'
import { windowService } from '@main/services/WindowService'
import { getFileExt } from '@main/utils/file'
import { FileMetadata, PreprocessProvider } from '@types'
import { app } from 'electron'
import { TypedArray } from 'pdfjs-dist/types/src/display/api'
export default abstract class BasePreprocessProvider {
protected provider: PreprocessProvider
protected userId?: string
public storageDir = path.join(app.getPath('userData'), 'Data', 'Files')
constructor(provider: PreprocessProvider, userId?: string) {
if (!provider) {
throw new Error('Preprocess provider is not set')
}
this.provider = provider
this.userId = userId
}
abstract parseFile(sourceId: string, file: FileMetadata): Promise<{ processedFile: FileMetadata; quota?: number }>
abstract checkQuota(): Promise<number>
/**
*
* Data/Files/{file.id}
* @param file
* @returns null
*/
public async checkIfAlreadyProcessed(file: FileMetadata): Promise<FileMetadata | null> {
try {
// 检查 Data/Files/{file.id} 是否是目录
const preprocessDirPath = path.join(this.storageDir, file.id)
if (fs.existsSync(preprocessDirPath)) {
const stats = await fs.promises.stat(preprocessDirPath)
// 如果是目录,说明已经被预处理过
if (stats.isDirectory()) {
// 查找目录中的处理结果文件
const files = await fs.promises.readdir(preprocessDirPath)
// 查找主要的处理结果文件(.md 或 .txt
const processedFile = files.find((fileName) => fileName.endsWith('.md') || fileName.endsWith('.txt'))
if (processedFile) {
const processedFilePath = path.join(preprocessDirPath, processedFile)
const processedStats = await fs.promises.stat(processedFilePath)
const ext = getFileExt(processedFile)
return {
...file,
name: file.name.replace(file.ext, ext),
path: processedFilePath,
ext: ext,
size: processedStats.size,
created_at: processedStats.birthtime.toISOString()
}
}
}
}
return null
} catch (error) {
// 如果检查过程中出现错误返回null表示未处理
return null
}
}
/**
*
*/
public delay = (ms: number): Promise<void> => {
return new Promise((resolve) => setTimeout(resolve, ms))
}
public async readPdf(
source: string | URL | TypedArray,
passwordCallback?: (fn: (password: string) => void, reason: string) => string
) {
const { getDocument } = await import('pdfjs-dist/legacy/build/pdf.mjs')
const documentLoadingTask = getDocument(source)
if (passwordCallback) {
documentLoadingTask.onPassword = passwordCallback
}
const document = await documentLoadingTask.promise
return document
}
public async sendPreprocessProgress(sourceId: string, progress: number): Promise<void> {
const mainWindow = windowService.getMainWindow()
mainWindow?.webContents.send('file-preprocess-progress', {
itemId: sourceId,
progress: progress
})
}
/**
*
* @param fileId id
* @param filePaths
* @returns
*/
public moveToAttachmentsDir(fileId: string, filePaths: string[]): string[] {
const attachmentsPath = path.join(this.storageDir, fileId)
if (!fs.existsSync(attachmentsPath)) {
fs.mkdirSync(attachmentsPath, { recursive: true })
}
const movedPaths: string[] = []
for (const filePath of filePaths) {
if (fs.existsSync(filePath)) {
const fileName = path.basename(filePath)
const destPath = path.join(attachmentsPath, fileName)
fs.copyFileSync(filePath, destPath)
fs.unlinkSync(filePath) // 删除原文件,实现"移动"
movedPaths.push(destPath)
}
}
return movedPaths
}
}

View File

@ -0,0 +1,16 @@
import { FileMetadata, PreprocessProvider } from '@types'
import BasePreprocessProvider from './BasePreprocessProvider'
export default class DefaultPreprocessProvider extends BasePreprocessProvider {
constructor(provider: PreprocessProvider) {
super(provider)
}
public parseFile(): Promise<{ processedFile: FileMetadata }> {
throw new Error('Method not implemented.')
}
public checkQuota(): Promise<number> {
throw new Error('Method not implemented.')
}
}

View File

@ -0,0 +1,329 @@
import fs from 'node:fs'
import path from 'node:path'
import { FileMetadata, PreprocessProvider } from '@types'
import AdmZip from 'adm-zip'
import axios, { AxiosRequestConfig } from 'axios'
import Logger from 'electron-log'
import BasePreprocessProvider from './BasePreprocessProvider'
type ApiResponse<T> = {
code: string
data: T
message?: string
}
type PreuploadResponse = {
uid: string
url: string
}
type StatusResponse = {
status: string
progress: number
}
type ParsedFileResponse = {
status: string
url: string
}
export default class Doc2xPreprocessProvider extends BasePreprocessProvider {
constructor(provider: PreprocessProvider) {
super(provider)
}
private async validateFile(filePath: string): Promise<void> {
const pdfBuffer = await fs.promises.readFile(filePath)
const doc = await this.readPdf(new Uint8Array(pdfBuffer))
// 文件页数小于1000页
if (doc.numPages >= 1000) {
throw new Error(`PDF page count (${doc.numPages}) exceeds the limit of 1000 pages`)
}
// 文件大小小于300MB
if (pdfBuffer.length >= 300 * 1024 * 1024) {
const fileSizeMB = Math.round(pdfBuffer.length / (1024 * 1024))
throw new Error(`PDF file size (${fileSizeMB}MB) exceeds the limit of 300MB`)
}
}
public async parseFile(sourceId: string, file: FileMetadata): Promise<{ processedFile: FileMetadata }> {
try {
Logger.info(`Preprocess processing started: ${file.path}`)
// 步骤1: 准备上传
const { uid, url } = await this.preupload()
Logger.info(`Preprocess preupload completed: uid=${uid}`)
await this.validateFile(file.path)
// 步骤2: 上传文件
await this.putFile(file.path, url)
// 步骤3: 等待处理完成
await this.waitForProcessing(sourceId, uid)
Logger.info(`Preprocess parsing completed successfully for: ${file.path}`)
// 步骤4: 导出文件
const { path: outputPath } = await this.exportFile(file, uid)
// 步骤5: 创建处理后的文件信息
return {
processedFile: this.createProcessedFileInfo(file, outputPath)
}
} catch (error) {
Logger.error(
`Preprocess processing failed for ${file.path}: ${error instanceof Error ? error.message : String(error)}`
)
throw error
}
}
private createProcessedFileInfo(file: FileMetadata, outputPath: string): FileMetadata {
const outputFilePath = `${outputPath}/${file.name.split('.').slice(0, -1).join('.')}.md`
return {
...file,
name: file.name.replace('.pdf', '.md'),
path: outputFilePath,
ext: '.md',
size: fs.statSync(outputFilePath).size
}
}
/**
*
* @param file
* @param uid uid
* @returns
*/
public async exportFile(file: FileMetadata, uid: string): Promise<{ path: string }> {
Logger.info(`Exporting file: ${file.path}`)
// 步骤1: 转换文件
await this.convertFile(uid, file.path)
Logger.info(`File conversion completed for: ${file.path}`)
// 步骤2: 等待导出并获取URL
const exportUrl = await this.waitForExport(uid)
// 步骤3: 下载并解压文件
return this.downloadFile(exportUrl, file)
}
/**
*
* @param sourceId ID
* @param uid uid
*/
private async waitForProcessing(sourceId: string, uid: string): Promise<void> {
while (true) {
await this.delay(1000)
const { status, progress } = await this.getStatus(uid)
await this.sendPreprocessProgress(sourceId, progress)
Logger.info(`Preprocess processing status: ${status}, progress: ${progress}%`)
if (status === 'success') {
return
} else if (status === 'failed') {
throw new Error('Preprocess processing failed')
}
}
}
/**
*
* @param uid uid
* @returns url
*/
private async waitForExport(uid: string): Promise<string> {
while (true) {
await this.delay(1000)
const { status, url } = await this.getParsedFile(uid)
Logger.info(`Export status: ${status}`)
if (status === 'success' && url) {
return url
} else if (status === 'failed') {
throw new Error('Export failed')
}
}
}
/**
*
* @returns url和uid
*/
private async preupload(): Promise<PreuploadResponse> {
const config = this.createAuthConfig()
const endpoint = `${this.provider.apiHost}/api/v2/parse/preupload`
try {
const { data } = await axios.post<ApiResponse<PreuploadResponse>>(endpoint, null, config)
if (data.code === 'success' && data.data) {
return data.data
} else {
throw new Error(`API returned error: ${data.message || JSON.stringify(data)}`)
}
} catch (error) {
Logger.error(`Failed to get preupload URL: ${error instanceof Error ? error.message : String(error)}`)
throw new Error('Failed to get preupload URL')
}
}
/**
*
* @param filePath
* @param url url
*/
private async putFile(filePath: string, url: string): Promise<void> {
try {
const fileStream = fs.createReadStream(filePath)
const response = await axios.put(url, fileStream)
if (response.status !== 200) {
throw new Error(`HTTP status ${response.status}: ${response.statusText}`)
}
} catch (error) {
Logger.error(`Failed to upload file ${filePath}: ${error instanceof Error ? error.message : String(error)}`)
throw new Error('Failed to upload file')
}
}
private async getStatus(uid: string): Promise<StatusResponse> {
const config = this.createAuthConfig()
const endpoint = `${this.provider.apiHost}/api/v2/parse/status?uid=${uid}`
try {
const response = await axios.get<ApiResponse<StatusResponse>>(endpoint, config)
if (response.data.code === 'success' && response.data.data) {
return response.data.data
} else {
throw new Error(`API returned error: ${response.data.message || JSON.stringify(response.data)}`)
}
} catch (error) {
Logger.error(`Failed to get status for uid ${uid}: ${error instanceof Error ? error.message : String(error)}`)
throw new Error('Failed to get processing status')
}
}
/**
* Preprocess文件
* @param uid uid
* @param filePath
*/
private async convertFile(uid: string, filePath: string): Promise<void> {
const fileName = path.basename(filePath).split('.')[0]
const config = {
...this.createAuthConfig(),
headers: {
...this.createAuthConfig().headers,
'Content-Type': 'application/json'
}
}
const payload = {
uid,
to: 'md',
formula_mode: 'normal',
filename: fileName
}
const endpoint = `${this.provider.apiHost}/api/v2/convert/parse`
try {
const response = await axios.post<ApiResponse<any>>(endpoint, payload, config)
if (response.data.code !== 'success') {
throw new Error(`API returned error: ${response.data.message || JSON.stringify(response.data)}`)
}
} catch (error) {
Logger.error(`Failed to convert file ${filePath}: ${error instanceof Error ? error.message : String(error)}`)
throw new Error('Failed to convert file')
}
}
/**
*
* @param uid uid
* @returns
*/
private async getParsedFile(uid: string): Promise<ParsedFileResponse> {
const config = this.createAuthConfig()
const endpoint = `${this.provider.apiHost}/api/v2/convert/parse/result?uid=${uid}`
try {
const response = await axios.get<ApiResponse<ParsedFileResponse>>(endpoint, config)
if (response.status === 200 && response.data.data) {
return response.data.data
} else {
throw new Error(`HTTP status ${response.status}: ${response.statusText}`)
}
} catch (error) {
Logger.error(
`Failed to get parsed file for uid ${uid}: ${error instanceof Error ? error.message : String(error)}`
)
throw new Error('Failed to get parsed file information')
}
}
/**
*
* @param url url
* @param file
* @returns
*/
private async downloadFile(url: string, file: FileMetadata): Promise<{ path: string }> {
const dirPath = this.storageDir
// 使用统一的存储路径Data/Files/{file.id}/
const extractPath = path.join(dirPath, file.id)
const zipPath = path.join(dirPath, `${file.id}.zip`)
// 确保目录存在
fs.mkdirSync(dirPath, { recursive: true })
fs.mkdirSync(extractPath, { recursive: true })
Logger.info(`Downloading to export path: ${zipPath}`)
try {
// 下载文件
const response = await axios.get(url, { responseType: 'arraybuffer' })
fs.writeFileSync(zipPath, response.data)
// 确保提取目录存在
if (!fs.existsSync(extractPath)) {
fs.mkdirSync(extractPath, { recursive: true })
}
// 解压文件
const zip = new AdmZip(zipPath)
zip.extractAllTo(extractPath, true)
Logger.info(`Extracted files to: ${extractPath}`)
// 删除临时ZIP文件
fs.unlinkSync(zipPath)
return { path: extractPath }
} catch (error) {
Logger.error(`Failed to download and extract file: ${error instanceof Error ? error.message : String(error)}`)
throw new Error('Failed to download and extract file')
}
}
private createAuthConfig(): AxiosRequestConfig {
return {
headers: {
Authorization: `Bearer ${this.provider.apiKey}`
}
}
}
public checkQuota(): Promise<number> {
throw new Error('Method not implemented.')
}
}

View File

@ -0,0 +1,399 @@
import fs from 'node:fs'
import path from 'node:path'
import { FileMetadata, PreprocessProvider } from '@types'
import AdmZip from 'adm-zip'
import axios from 'axios'
import Logger from 'electron-log'
import BasePreprocessProvider from './BasePreprocessProvider'
type ApiResponse<T> = {
code: number
data: T
msg?: string
trace_id?: string
}
type BatchUploadResponse = {
batch_id: string
file_urls: string[]
}
type ExtractProgress = {
extracted_pages: number
total_pages: number
start_time: string
}
type ExtractFileResult = {
file_name: string
state: 'done' | 'waiting-file' | 'pending' | 'running' | 'converting' | 'failed'
err_msg: string
full_zip_url?: string
extract_progress?: ExtractProgress
}
type ExtractResultResponse = {
batch_id: string
extract_result: ExtractFileResult[]
}
type QuotaResponse = {
code: number
data: {
user_left_quota: number
total_left_quota: number
}
msg?: string
trace_id?: string
}
export default class MineruPreprocessProvider extends BasePreprocessProvider {
constructor(provider: PreprocessProvider, userId?: string) {
super(provider, userId)
// todo免费期结束后删除
this.provider.apiKey = this.provider.apiKey || import.meta.env.MAIN_VITE_MINERU_API_KEY
}
public async parseFile(
sourceId: string,
file: FileMetadata
): Promise<{ processedFile: FileMetadata; quota: number }> {
try {
Logger.info(`MinerU preprocess processing started: ${file.path}`)
await this.validateFile(file.path)
// 1. 获取上传URL并上传文件
const batchId = await this.uploadFile(file)
Logger.info(`MinerU file upload completed: batch_id=${batchId}`)
// 2. 等待处理完成并获取结果
const extractResult = await this.waitForCompletion(sourceId, batchId, file.origin_name)
Logger.info(`MinerU processing completed for batch: ${batchId}`)
// 3. 下载并解压文件
const { path: outputPath } = await this.downloadAndExtractFile(extractResult.full_zip_url!, file)
// 4. check quota
const quota = await this.checkQuota()
// 5. 创建处理后的文件信息
return {
processedFile: this.createProcessedFileInfo(file, outputPath),
quota
}
} catch (error: any) {
Logger.error(`MinerU preprocess processing failed for ${file.path}: ${error.message}`)
throw new Error(error.message)
}
}
public async checkQuota() {
try {
const quota = await fetch(`${this.provider.apiHost}/api/v4/quota`, {
method: 'GET',
headers: {
'Content-Type': 'application/json',
Authorization: `Bearer ${this.provider.apiKey}`,
token: this.userId ?? ''
}
})
if (!quota.ok) {
throw new Error(`HTTP ${quota.status}: ${quota.statusText}`)
}
const response: QuotaResponse = await quota.json()
return response.data.user_left_quota
} catch (error) {
console.error('Error checking quota:', error)
throw error
}
}
private async validateFile(filePath: string): Promise<void> {
const quota = await this.checkQuota()
const pdfBuffer = await fs.promises.readFile(filePath)
const doc = await this.readPdf(new Uint8Array(pdfBuffer))
// 文件页数小于600页
if (doc.numPages >= 600) {
throw new Error(`PDF page count (${doc.numPages}) exceeds the limit of 600 pages`)
}
// 文件大小小于200MB
if (pdfBuffer.length >= 200 * 1024 * 1024) {
const fileSizeMB = Math.round(pdfBuffer.length / (1024 * 1024))
throw new Error(`PDF file size (${fileSizeMB}MB) exceeds the limit of 200MB`)
}
// 检查配额
if (quota <= 0 || quota - doc.numPages <= 0) {
throw new Error('MinerU解析配额不足请申请企业账户或自行部署剩余额度' + quota)
}
}
private createProcessedFileInfo(file: FileMetadata, outputPath: string): FileMetadata {
// 查找解压后的主要文件
let finalPath = ''
let finalName = file.origin_name.replace('.pdf', '.md')
try {
const files = fs.readdirSync(outputPath)
const mdFile = files.find((f) => f.endsWith('.md'))
if (mdFile) {
const originalMdPath = path.join(outputPath, mdFile)
const newMdPath = path.join(outputPath, finalName)
// 重命名文件为原始文件名
try {
fs.renameSync(originalMdPath, newMdPath)
finalPath = newMdPath
Logger.info(`Renamed markdown file from ${mdFile} to ${finalName}`)
} catch (renameError) {
Logger.warn(`Failed to rename file ${mdFile} to ${finalName}: ${renameError}`)
// 如果重命名失败,使用原文件
finalPath = originalMdPath
finalName = mdFile
}
}
} catch (error) {
Logger.warn(`Failed to read output directory ${outputPath}: ${error}`)
finalPath = path.join(outputPath, `${file.id}.md`)
}
return {
...file,
name: finalName,
path: finalPath,
ext: '.md',
size: fs.existsSync(finalPath) ? fs.statSync(finalPath).size : 0
}
}
private async downloadAndExtractFile(zipUrl: string, file: FileMetadata): Promise<{ path: string }> {
const dirPath = this.storageDir
const zipPath = path.join(dirPath, `${file.id}.zip`)
const extractPath = path.join(dirPath, `${file.id}`)
Logger.info(`Downloading MinerU result to: ${zipPath}`)
try {
// 下载ZIP文件
const response = await axios.get(zipUrl, { responseType: 'arraybuffer' })
fs.writeFileSync(zipPath, response.data)
Logger.info(`Downloaded ZIP file: ${zipPath}`)
// 确保提取目录存在
if (!fs.existsSync(extractPath)) {
fs.mkdirSync(extractPath, { recursive: true })
}
// 解压文件
const zip = new AdmZip(zipPath)
zip.extractAllTo(extractPath, true)
Logger.info(`Extracted files to: ${extractPath}`)
// 删除临时ZIP文件
fs.unlinkSync(zipPath)
return { path: extractPath }
} catch (error: any) {
Logger.error(`Failed to download and extract file: ${error.message}`)
throw new Error(error.message)
}
}
private async uploadFile(file: FileMetadata): Promise<string> {
try {
// 步骤1: 获取上传URL
const { batchId, fileUrls } = await this.getBatchUploadUrls(file)
Logger.info(`Got upload URLs for batch: ${batchId}`)
console.log('batchId:', batchId, 'fileurls:', fileUrls)
// 步骤2: 上传文件到获取的URL
await this.putFileToUrl(file.path, fileUrls[0])
Logger.info(`File uploaded successfully: ${file.path}`)
return batchId
} catch (error: any) {
Logger.error(`Failed to upload file ${file.path}: ${error.message}`)
throw new Error(error.message)
}
}
private async getBatchUploadUrls(file: FileMetadata): Promise<{ batchId: string; fileUrls: string[] }> {
const endpoint = `${this.provider.apiHost}/api/v4/file-urls/batch`
const payload = {
language: 'auto',
enable_formula: true,
enable_table: true,
files: [
{
name: file.origin_name,
is_ocr: true,
data_id: file.id
}
]
}
try {
const response = await fetch(endpoint, {
method: 'POST',
headers: {
'Content-Type': 'application/json',
Authorization: `Bearer ${this.provider.apiKey}`,
token: this.userId ?? '',
Accept: '*/*'
},
body: JSON.stringify(payload)
})
if (response.ok) {
const data: ApiResponse<BatchUploadResponse> = await response.json()
if (data.code === 0 && data.data) {
const { batch_id, file_urls } = data.data
return {
batchId: batch_id,
fileUrls: file_urls
}
} else {
throw new Error(`API returned error: ${data.msg || JSON.stringify(data)}`)
}
} else {
throw new Error(`HTTP ${response.status}: ${response.statusText}`)
}
} catch (error: any) {
Logger.error(`Failed to get batch upload URLs: ${error.message}`)
throw new Error(error.message)
}
}
private async putFileToUrl(filePath: string, uploadUrl: string): Promise<void> {
try {
const fileBuffer = await fs.promises.readFile(filePath)
const response = await fetch(uploadUrl, {
method: 'PUT',
body: fileBuffer,
headers: {
'Content-Type': 'application/pdf'
}
// headers: {
// 'Content-Length': fileBuffer.length.toString()
// }
})
if (!response.ok) {
// 克隆 response 以避免消费 body stream
const responseClone = response.clone()
try {
const responseBody = await responseClone.text()
const errorInfo = {
status: response.status,
statusText: response.statusText,
url: response.url,
type: response.type,
redirected: response.redirected,
headers: Object.fromEntries(response.headers.entries()),
body: responseBody
}
console.error('Response details:', errorInfo)
throw new Error(`Upload failed with status ${response.status}: ${responseBody}`)
} catch (parseError) {
throw new Error(`Upload failed with status ${response.status}. Could not parse response body.`)
}
}
Logger.info(`File uploaded successfully to: ${uploadUrl}`)
} catch (error: any) {
Logger.error(`Failed to upload file to URL ${uploadUrl}: ${error}`)
throw new Error(error.message)
}
}
private async getExtractResults(batchId: string): Promise<ExtractResultResponse> {
const endpoint = `${this.provider.apiHost}/api/v4/extract-results/batch/${batchId}`
try {
const response = await fetch(endpoint, {
method: 'GET',
headers: {
'Content-Type': 'application/json',
Authorization: `Bearer ${this.provider.apiKey}`,
token: this.userId ?? ''
}
})
if (response.ok) {
const data: ApiResponse<ExtractResultResponse> = await response.json()
if (data.code === 0 && data.data) {
return data.data
} else {
throw new Error(`API returned error: ${data.msg || JSON.stringify(data)}`)
}
} else {
throw new Error(`HTTP ${response.status}: ${response.statusText}`)
}
} catch (error: any) {
Logger.error(`Failed to get extract results for batch ${batchId}: ${error.message}`)
throw new Error(error.message)
}
}
private async waitForCompletion(
sourceId: string,
batchId: string,
fileName: string,
maxRetries: number = 60,
intervalMs: number = 5000
): Promise<ExtractFileResult> {
let retries = 0
while (retries < maxRetries) {
try {
const result = await this.getExtractResults(batchId)
// 查找对应文件的处理结果
const fileResult = result.extract_result.find((item) => item.file_name === fileName)
if (!fileResult) {
throw new Error(`File ${fileName} not found in batch results`)
}
// 检查处理状态
if (fileResult.state === 'done' && fileResult.full_zip_url) {
Logger.info(`Processing completed for file: ${fileName}`)
return fileResult
} else if (fileResult.state === 'failed') {
throw new Error(`Processing failed for file: ${fileName}, error: ${fileResult.err_msg}`)
} else if (fileResult.state === 'running') {
// 发送进度更新
if (fileResult.extract_progress) {
const progress = Math.round(
(fileResult.extract_progress.extracted_pages / fileResult.extract_progress.total_pages) * 100
)
await this.sendPreprocessProgress(sourceId, progress)
Logger.info(`File ${fileName} processing progress: ${progress}%`)
} else {
// 如果没有具体进度信息,发送一个通用进度
await this.sendPreprocessProgress(sourceId, 50)
Logger.info(`File ${fileName} is still processing...`)
}
}
} catch (error) {
Logger.warn(`Failed to check status for batch ${batchId}, retry ${retries + 1}/${maxRetries}`)
if (retries === maxRetries - 1) {
throw error
}
}
retries++
await new Promise((resolve) => setTimeout(resolve, intervalMs))
}
throw new Error(`Processing timeout for batch: ${batchId}`)
}
}

View File

@ -0,0 +1,187 @@
import fs from 'node:fs'
import { MistralClientManager } from '@main/services/MistralClientManager'
import { MistralService } from '@main/services/remotefile/MistralService'
import { Mistral } from '@mistralai/mistralai'
import { DocumentURLChunk } from '@mistralai/mistralai/models/components/documenturlchunk'
import { ImageURLChunk } from '@mistralai/mistralai/models/components/imageurlchunk'
import { OCRResponse } from '@mistralai/mistralai/models/components/ocrresponse'
import { FileMetadata, FileTypes, PreprocessProvider, Provider } from '@types'
import Logger from 'electron-log'
import path from 'path'
import BasePreprocessProvider from './BasePreprocessProvider'
type PreuploadResponse = DocumentURLChunk | ImageURLChunk
export default class MistralPreprocessProvider extends BasePreprocessProvider {
private sdk: Mistral
private fileService: MistralService
constructor(provider: PreprocessProvider) {
super(provider)
const clientManager = MistralClientManager.getInstance()
const aiProvider: Provider = {
id: provider.id,
type: 'mistral',
name: provider.name,
apiKey: provider.apiKey!,
apiHost: provider.apiHost!,
models: []
}
clientManager.initializeClient(aiProvider)
this.sdk = clientManager.getClient()
this.fileService = new MistralService(aiProvider)
}
private async preupload(file: FileMetadata): Promise<PreuploadResponse> {
let document: PreuploadResponse
Logger.info(`preprocess preupload started for local file: ${file.path}`)
if (file.ext.toLowerCase() === '.pdf') {
const uploadResponse = await this.fileService.uploadFile(file)
if (uploadResponse.status === 'failed') {
Logger.error('File upload failed:', uploadResponse)
throw new Error('Failed to upload file: ' + uploadResponse.displayName)
}
await this.sendPreprocessProgress(file.id, 15)
const fileUrl = await this.sdk.files.getSignedUrl({
fileId: uploadResponse.fileId
})
Logger.info('Got signed URL:', fileUrl)
await this.sendPreprocessProgress(file.id, 20)
document = {
type: 'document_url',
documentUrl: fileUrl.url
}
} else {
const base64Image = Buffer.from(fs.readFileSync(file.path)).toString('base64')
document = {
type: 'image_url',
imageUrl: `data:image/png;base64,${base64Image}`
}
}
if (!document) {
throw new Error('Unsupported file type')
}
return document
}
public async parseFile(sourceId: string, file: FileMetadata): Promise<{ processedFile: FileMetadata }> {
try {
const document = await this.preupload(file)
const result = await this.sdk.ocr.process({
model: this.provider.model!,
document: document,
includeImageBase64: true
})
if (result) {
await this.sendPreprocessProgress(sourceId, 100)
const processedFile = this.convertFile(result, file)
return {
processedFile
}
} else {
throw new Error('preprocess processing failed: OCR response is empty')
}
} catch (error) {
throw new Error('preprocess processing failed: ' + error)
}
}
private convertFile(result: OCRResponse, file: FileMetadata): FileMetadata {
// 使用统一的存储路径Data/Files/{file.id}/
const conversionId = file.id
const outputPath = path.join(this.storageDir, file.id)
// const outputPath = this.storageDir
const outputFileName = path.basename(file.path, path.extname(file.path))
fs.mkdirSync(outputPath, { recursive: true })
const markdownParts: string[] = []
let counter = 0
// Process each page
result.pages.forEach((page) => {
let pageMarkdown = page.markdown
// Process images from this page
page.images.forEach((image) => {
if (image.imageBase64) {
let imageFormat = 'jpeg' // default format
let imageBase64Data = image.imageBase64
// Check for data URL prefix more efficiently
const prefixEnd = image.imageBase64.indexOf(';base64,')
if (prefixEnd > 0) {
const prefix = image.imageBase64.substring(0, prefixEnd)
const formatIndex = prefix.indexOf('image/')
if (formatIndex >= 0) {
imageFormat = prefix.substring(formatIndex + 6)
}
imageBase64Data = image.imageBase64.substring(prefixEnd + 8)
}
const imageFileName = `img-${counter}.${imageFormat}`
const imagePath = path.join(outputPath, imageFileName)
// Save image file
try {
fs.writeFileSync(imagePath, Buffer.from(imageBase64Data, 'base64'))
// Update image reference in markdown
// Use relative path for better portability
const relativeImagePath = `./${imageFileName}`
// Find the start and end of the image markdown
const imgStart = pageMarkdown.indexOf(image.imageBase64)
if (imgStart >= 0) {
// Find the markdown image syntax around this base64
const mdStart = pageMarkdown.lastIndexOf('![', imgStart)
const mdEnd = pageMarkdown.indexOf(')', imgStart)
if (mdStart >= 0 && mdEnd >= 0) {
// Replace just this specific image reference
pageMarkdown =
pageMarkdown.substring(0, mdStart) +
`![Image ${counter}](${relativeImagePath})` +
pageMarkdown.substring(mdEnd + 1)
}
}
counter++
} catch (error) {
Logger.error(`Failed to save image ${imageFileName}:`, error)
}
}
})
markdownParts.push(pageMarkdown)
})
// Combine all markdown content with double newlines for readability
const combinedMarkdown = markdownParts.join('\n\n')
// Write the markdown content to a file
const mdFileName = `${outputFileName}.md`
const mdFilePath = path.join(outputPath, mdFileName)
fs.writeFileSync(mdFilePath, combinedMarkdown)
return {
id: conversionId,
name: file.name.replace(/\.[^/.]+$/, '.md'),
origin_name: file.origin_name,
path: mdFilePath,
created_at: new Date().toISOString(),
type: FileTypes.DOCUMENT,
ext: '.md',
size: fs.statSync(mdFilePath).size,
count: 1
} as FileMetadata
}
public checkQuota(): Promise<number> {
throw new Error('Method not implemented.')
}
}

View File

@ -0,0 +1,30 @@
import { FileMetadata, PreprocessProvider as Provider } from '@types'
import BasePreprocessProvider from './BasePreprocessProvider'
import PreprocessProviderFactory from './PreprocessProviderFactory'
export default class PreprocessProvider {
private sdk: BasePreprocessProvider
constructor(provider: Provider, userId?: string) {
this.sdk = PreprocessProviderFactory.create(provider, userId)
}
public async parseFile(
sourceId: string,
file: FileMetadata
): Promise<{ processedFile: FileMetadata; quota?: number }> {
return this.sdk.parseFile(sourceId, file)
}
public async checkQuota(): Promise<number> {
return this.sdk.checkQuota()
}
/**
*
* @param file
* @returns null
*/
public async checkIfAlreadyProcessed(file: FileMetadata): Promise<FileMetadata | null> {
return this.sdk.checkIfAlreadyProcessed(file)
}
}

View File

@ -0,0 +1,21 @@
import { PreprocessProvider } from '@types'
import BasePreprocessProvider from './BasePreprocessProvider'
import DefaultPreprocessProvider from './DefaultPreprocessProvider'
import Doc2xPreprocessProvider from './Doc2xPreprocessProvider'
import MineruPreprocessProvider from './MineruPreprocessProvider'
import MistralPreprocessProvider from './MistralPreprocessProvider'
export default class PreprocessProviderFactory {
static create(provider: PreprocessProvider, userId?: string): BasePreprocessProvider {
switch (provider.id) {
case 'doc2x':
return new Doc2xPreprocessProvider(provider)
case 'mistral':
return new MistralPreprocessProvider(provider)
case 'mineru':
return new MineruPreprocessProvider(provider, userId)
default:
return new DefaultPreprocessProvider(provider)
}
}
}

View File

@ -1,6 +1,6 @@
import { getFilesDir, getFileType, getTempDir } from '@main/utils/file' import { getFilesDir, getFileType, getTempDir } from '@main/utils/file'
import { documentExts, imageExts, MB } from '@shared/config/constant' import { documentExts, imageExts, MB } from '@shared/config/constant'
import { FileType } from '@types' import { FileMetadata } from '@types'
import * as crypto from 'crypto' import * as crypto from 'crypto'
import { import {
dialog, dialog,
@ -53,8 +53,9 @@ class FileStorage {
}) })
} }
findDuplicateFile = async (filePath: string): Promise<FileType | null> => { findDuplicateFile = async (filePath: string): Promise<FileMetadata | null> => {
const stats = fs.statSync(filePath) const stats = fs.statSync(filePath)
console.log('stats', stats, filePath)
const fileSize = stats.size const fileSize = stats.size
const files = await fs.promises.readdir(this.storageDir) const files = await fs.promises.readdir(this.storageDir)
@ -92,7 +93,7 @@ class FileStorage {
public selectFile = async ( public selectFile = async (
_: Electron.IpcMainInvokeEvent, _: Electron.IpcMainInvokeEvent,
options?: OpenDialogOptions options?: OpenDialogOptions
): Promise<FileType[] | null> => { ): Promise<FileMetadata[] | null> => {
const defaultOptions: OpenDialogOptions = { const defaultOptions: OpenDialogOptions = {
properties: ['openFile'] properties: ['openFile']
} }
@ -151,7 +152,7 @@ class FileStorage {
} }
} }
public uploadFile = async (_: Electron.IpcMainInvokeEvent, file: FileType): Promise<FileType> => { public uploadFile = async (_: Electron.IpcMainInvokeEvent, file: FileMetadata): Promise<FileMetadata> => {
const duplicateFile = await this.findDuplicateFile(file.path) const duplicateFile = await this.findDuplicateFile(file.path)
if (duplicateFile) { if (duplicateFile) {
@ -175,7 +176,7 @@ class FileStorage {
const stats = await fs.promises.stat(destPath) const stats = await fs.promises.stat(destPath)
const fileType = getFileType(ext) const fileType = getFileType(ext)
const fileMetadata: FileType = { const fileMetadata: FileMetadata = {
id: uuid, id: uuid,
origin_name, origin_name,
name: uuid + ext, name: uuid + ext,
@ -190,7 +191,7 @@ class FileStorage {
return fileMetadata return fileMetadata
} }
public getFile = async (_: Electron.IpcMainInvokeEvent, filePath: string): Promise<FileType | null> => { public getFile = async (_: Electron.IpcMainInvokeEvent, filePath: string): Promise<FileMetadata | null> => {
if (!fs.existsSync(filePath)) { if (!fs.existsSync(filePath)) {
return null return null
} }
@ -199,7 +200,7 @@ class FileStorage {
const ext = path.extname(filePath) const ext = path.extname(filePath)
const fileType = getFileType(ext) const fileType = getFileType(ext)
const fileInfo: FileType = { const fileInfo: FileMetadata = {
id: uuidv4(), id: uuidv4(),
origin_name: path.basename(filePath), origin_name: path.basename(filePath),
name: path.basename(filePath), name: path.basename(filePath),
@ -215,9 +216,19 @@ class FileStorage {
} }
public deleteFile = async (_: Electron.IpcMainInvokeEvent, id: string): Promise<void> => { public deleteFile = async (_: Electron.IpcMainInvokeEvent, id: string): Promise<void> => {
if (!fs.existsSync(path.join(this.storageDir, id))) {
return
}
await fs.promises.unlink(path.join(this.storageDir, id)) await fs.promises.unlink(path.join(this.storageDir, id))
} }
public deleteDir = async (_: Electron.IpcMainInvokeEvent, id: string): Promise<void> => {
if (!fs.existsSync(path.join(this.storageDir, id))) {
return
}
await fs.promises.rm(path.join(this.storageDir, id), { recursive: true })
}
public readFile = async (_: Electron.IpcMainInvokeEvent, id: string): Promise<string> => { public readFile = async (_: Electron.IpcMainInvokeEvent, id: string): Promise<string> => {
const filePath = path.join(this.storageDir, id) const filePath = path.join(this.storageDir, id)
@ -252,8 +263,8 @@ class FileStorage {
if (!fs.existsSync(this.tempDir)) { if (!fs.existsSync(this.tempDir)) {
fs.mkdirSync(this.tempDir, { recursive: true }) fs.mkdirSync(this.tempDir, { recursive: true })
} }
const tempFilePath = path.join(this.tempDir, `temp_file_${uuidv4()}_${fileName}`)
return tempFilePath return path.join(this.tempDir, `temp_file_${uuidv4()}_${fileName}`)
} }
public writeFile = async ( public writeFile = async (
@ -280,7 +291,7 @@ class FileStorage {
} }
} }
public saveBase64Image = async (_: Electron.IpcMainInvokeEvent, base64Data: string): Promise<FileType> => { public saveBase64Image = async (_: Electron.IpcMainInvokeEvent, base64Data: string): Promise<FileMetadata> => {
try { try {
if (!base64Data) { if (!base64Data) {
throw new Error('Base64 data is required') throw new Error('Base64 data is required')
@ -306,7 +317,7 @@ class FileStorage {
await fs.promises.writeFile(destPath, buffer) await fs.promises.writeFile(destPath, buffer)
const fileMetadata: FileType = { const fileMetadata: FileMetadata = {
id: uuid, id: uuid,
origin_name: uuid + ext, origin_name: uuid + ext,
name: uuid + ext, name: uuid + ext,
@ -465,7 +476,7 @@ class FileStorage {
_: Electron.IpcMainInvokeEvent, _: Electron.IpcMainInvokeEvent,
url: string, url: string,
isUseContentType?: boolean isUseContentType?: boolean
): Promise<FileType> => { ): Promise<FileMetadata> => {
try { try {
const response = await fetch(url) const response = await fetch(url)
if (!response.ok) { if (!response.ok) {
@ -507,7 +518,7 @@ class FileStorage {
const stats = await fs.promises.stat(destPath) const stats = await fs.promises.stat(destPath)
const fileType = getFileType(ext) const fileType = getFileType(ext)
const fileMetadata: FileType = { const fileMetadata: FileMetadata = {
id: uuid, id: uuid,
origin_name: filename, origin_name: filename,
name: uuid + ext, name: uuid + ext,

View File

@ -25,13 +25,15 @@ import Embeddings from '@main/knowledage/embeddings/Embeddings'
import { addFileLoader } from '@main/knowledage/loader' import { addFileLoader } from '@main/knowledage/loader'
import { NoteLoader } from '@main/knowledage/loader/noteLoader' import { NoteLoader } from '@main/knowledage/loader/noteLoader'
import Reranker from '@main/knowledage/reranker/Reranker' import Reranker from '@main/knowledage/reranker/Reranker'
import OcrProvider from '@main/ocr/OcrProvider'
import PreprocessProvider from '@main/preprocess/PreprocessProvider'
import { windowService } from '@main/services/WindowService' import { windowService } from '@main/services/WindowService'
import { getDataPath } from '@main/utils' import { getDataPath } from '@main/utils'
import { getAllFiles } from '@main/utils/file' import { getAllFiles } from '@main/utils/file'
import { MB } from '@shared/config/constant' import { MB } from '@shared/config/constant'
import type { LoaderReturn } from '@shared/config/types' import type { LoaderReturn } from '@shared/config/types'
import { IpcChannel } from '@shared/IpcChannel' import { IpcChannel } from '@shared/IpcChannel'
import { FileType, KnowledgeBaseParams, KnowledgeItem } from '@types' import { FileMetadata, KnowledgeBaseParams, KnowledgeItem } from '@types'
import Logger from 'electron-log' import Logger from 'electron-log'
import { v4 as uuidv4 } from 'uuid' import { v4 as uuidv4 } from 'uuid'
@ -39,12 +41,14 @@ export interface KnowledgeBaseAddItemOptions {
base: KnowledgeBaseParams base: KnowledgeBaseParams
item: KnowledgeItem item: KnowledgeItem
forceReload?: boolean forceReload?: boolean
userId?: string
} }
interface KnowledgeBaseAddItemOptionsNonNullableAttribute { interface KnowledgeBaseAddItemOptionsNonNullableAttribute {
base: KnowledgeBaseParams base: KnowledgeBaseParams
item: KnowledgeItem item: KnowledgeItem
forceReload: boolean forceReload: boolean
userId: string
} }
interface EvaluateTaskWorkload { interface EvaluateTaskWorkload {
@ -96,7 +100,13 @@ class KnowledgeService {
private knowledgeItemProcessingQueueMappingPromise: Map<LoaderTaskOfSet, () => void> = new Map() private knowledgeItemProcessingQueueMappingPromise: Map<LoaderTaskOfSet, () => void> = new Map()
private static MAXIMUM_WORKLOAD = 80 * MB private static MAXIMUM_WORKLOAD = 80 * MB
private static MAXIMUM_PROCESSING_ITEM_COUNT = 30 private static MAXIMUM_PROCESSING_ITEM_COUNT = 30
private static ERROR_LOADER_RETURN: LoaderReturn = { entriesAdded: 0, uniqueId: '', uniqueIds: [''], loaderType: '' } private static ERROR_LOADER_RETURN: LoaderReturn = {
entriesAdded: 0,
uniqueId: '',
uniqueIds: [''],
loaderType: '',
status: 'failed'
}
constructor() { constructor() {
this.initStorageDir() this.initStorageDir()
@ -150,6 +160,7 @@ class KnowledgeService {
} }
public delete = async (_: Electron.IpcMainInvokeEvent, id: string): Promise<void> => { public delete = async (_: Electron.IpcMainInvokeEvent, id: string): Promise<void> => {
console.log('id', id)
const dbPath = path.join(this.storageDir, id) const dbPath = path.join(this.storageDir, id)
if (fs.existsSync(dbPath)) { if (fs.existsSync(dbPath)) {
fs.rmSync(dbPath, { recursive: true }) fs.rmSync(dbPath, { recursive: true })
@ -162,28 +173,49 @@ class KnowledgeService {
this.workload >= KnowledgeService.MAXIMUM_WORKLOAD this.workload >= KnowledgeService.MAXIMUM_WORKLOAD
) )
} }
private fileTask( private fileTask(
ragApplication: RAGApplication, ragApplication: RAGApplication,
options: KnowledgeBaseAddItemOptionsNonNullableAttribute options: KnowledgeBaseAddItemOptionsNonNullableAttribute
): LoaderTask { ): LoaderTask {
const { base, item, forceReload } = options const { base, item, forceReload, userId } = options
const file = item.content as FileType const file = item.content as FileMetadata
const loaderTask: LoaderTask = { const loaderTask: LoaderTask = {
loaderTasks: [ loaderTasks: [
{ {
state: LoaderTaskItemState.PENDING, state: LoaderTaskItemState.PENDING,
task: () => task: async () => {
addFileLoader(ragApplication, file, base, forceReload) try {
// 添加预处理逻辑
const fileToProcess: FileMetadata = await this.preprocessing(file, base, item, userId)
// 使用处理后的文件进行加载
return addFileLoader(ragApplication, fileToProcess, base, forceReload)
.then((result) => { .then((result) => {
loaderTask.loaderDoneReturn = result loaderTask.loaderDoneReturn = result
return result return result
}) })
.catch((err) => { .catch((e) => {
Logger.error(err) Logger.error(`Error in addFileLoader for ${file.name}: ${e}`)
return KnowledgeService.ERROR_LOADER_RETURN const errorResult: LoaderReturn = {
}), ...KnowledgeService.ERROR_LOADER_RETURN,
message: e.message,
messageSource: 'embedding'
}
loaderTask.loaderDoneReturn = errorResult
return errorResult
})
} catch (e: any) {
Logger.error(`Preprocessing failed for ${file.name}: ${e}`)
const errorResult: LoaderReturn = {
...KnowledgeService.ERROR_LOADER_RETURN,
message: e.message,
messageSource: 'preprocess'
}
loaderTask.loaderDoneReturn = errorResult
return errorResult
}
},
evaluateTaskWorkload: { workload: file.size } evaluateTaskWorkload: { workload: file.size }
} }
], ],
@ -192,7 +224,6 @@ class KnowledgeService {
return loaderTask return loaderTask
} }
private directoryTask( private directoryTask(
ragApplication: RAGApplication, ragApplication: RAGApplication,
options: KnowledgeBaseAddItemOptionsNonNullableAttribute options: KnowledgeBaseAddItemOptionsNonNullableAttribute
@ -232,7 +263,11 @@ class KnowledgeService {
}) })
.catch((err) => { .catch((err) => {
Logger.error(err) Logger.error(err)
return KnowledgeService.ERROR_LOADER_RETURN return {
...KnowledgeService.ERROR_LOADER_RETURN,
message: `Failed to add dir loader: ${err.message}`,
messageSource: 'embedding'
}
}), }),
evaluateTaskWorkload: { workload: file.size } evaluateTaskWorkload: { workload: file.size }
}) })
@ -278,7 +313,11 @@ class KnowledgeService {
}) })
.catch((err) => { .catch((err) => {
Logger.error(err) Logger.error(err)
return KnowledgeService.ERROR_LOADER_RETURN return {
...KnowledgeService.ERROR_LOADER_RETURN,
message: `Failed to add url loader: ${err.message}`,
messageSource: 'embedding'
}
}) })
}, },
evaluateTaskWorkload: { workload: 2 * MB } evaluateTaskWorkload: { workload: 2 * MB }
@ -318,7 +357,11 @@ class KnowledgeService {
}) })
.catch((err) => { .catch((err) => {
Logger.error(err) Logger.error(err)
return KnowledgeService.ERROR_LOADER_RETURN return {
...KnowledgeService.ERROR_LOADER_RETURN,
message: `Failed to add sitemap loader: ${err.message}`,
messageSource: 'embedding'
}
}), }),
evaluateTaskWorkload: { workload: 20 * MB } evaluateTaskWorkload: { workload: 20 * MB }
} }
@ -364,7 +407,11 @@ class KnowledgeService {
}) })
.catch((err) => { .catch((err) => {
Logger.error(err) Logger.error(err)
return KnowledgeService.ERROR_LOADER_RETURN return {
...KnowledgeService.ERROR_LOADER_RETURN,
message: `Failed to add note loader: ${err.message}`,
messageSource: 'embedding'
}
}) })
}, },
evaluateTaskWorkload: { workload: contentBytes.length } evaluateTaskWorkload: { workload: contentBytes.length }
@ -430,10 +477,10 @@ class KnowledgeService {
}) })
} }
public add = (_: Electron.IpcMainInvokeEvent, options: KnowledgeBaseAddItemOptions): Promise<LoaderReturn> => { public add = async (_: Electron.IpcMainInvokeEvent, options: KnowledgeBaseAddItemOptions): Promise<LoaderReturn> => {
return new Promise((resolve) => { return new Promise((resolve) => {
const { base, item, forceReload = false } = options const { base, item, forceReload = false, userId = '' } = options
const optionsNonNullableAttribute = { base, item, forceReload } const optionsNonNullableAttribute = { base, item, forceReload, userId }
this.getRagApplication(base) this.getRagApplication(base)
.then((ragApplication) => { .then((ragApplication) => {
const task = (() => { const task = (() => {
@ -459,12 +506,20 @@ class KnowledgeService {
}) })
this.processingQueueHandle() this.processingQueueHandle()
} else { } else {
resolve(KnowledgeService.ERROR_LOADER_RETURN) resolve({
...KnowledgeService.ERROR_LOADER_RETURN,
message: 'Unsupported item type',
messageSource: 'embedding'
})
} }
}) })
.catch((err) => { .catch((err) => {
Logger.error(err) Logger.error(err)
resolve(KnowledgeService.ERROR_LOADER_RETURN) resolve({
...KnowledgeService.ERROR_LOADER_RETURN,
message: `Failed to add item: ${err.message}`,
messageSource: 'embedding'
})
}) })
}) })
} }
@ -497,6 +552,69 @@ class KnowledgeService {
} }
return await new Reranker(base).rerank(search, results) return await new Reranker(base).rerank(search, results)
} }
public getStorageDir = (): string => {
return this.storageDir
}
private preprocessing = async (
file: FileMetadata,
base: KnowledgeBaseParams,
item: KnowledgeItem,
userId: string
): Promise<FileMetadata> => {
let fileToProcess: FileMetadata = file
if (base.preprocessOrOcrProvider && file.ext.toLowerCase() === '.pdf') {
try {
let provider: PreprocessProvider | OcrProvider
if (base.preprocessOrOcrProvider.type === 'preprocess') {
provider = new PreprocessProvider(base.preprocessOrOcrProvider.provider, userId)
} else {
provider = new OcrProvider(base.preprocessOrOcrProvider.provider)
}
// 首先检查文件是否已经被预处理过
const alreadyProcessed = await provider.checkIfAlreadyProcessed(file)
if (alreadyProcessed) {
Logger.info(`File already preprocess processed, using cached result: ${file.path}`)
return alreadyProcessed
}
// 执行预处理
Logger.info(`Starting preprocess processing for scanned PDF: ${file.path}`)
const { processedFile, quota } = await provider.parseFile(item.id, file)
fileToProcess = processedFile
const mainWindow = windowService.getMainWindow()
mainWindow?.webContents.send('file-preprocess-finished', {
itemId: item.id,
quota: quota
})
} catch (err) {
Logger.error(`Preprocess processing failed: ${err}`)
// 如果预处理失败,使用原始文件
// fileToProcess = file
throw new Error(`Preprocess processing failed: ${err}`)
}
}
return fileToProcess
}
public checkQuota = async (
_: Electron.IpcMainInvokeEvent,
base: KnowledgeBaseParams,
userId: string
): Promise<number> => {
try {
if (base.preprocessOrOcrProvider && base.preprocessOrOcrProvider.type === 'preprocess') {
const provider = new PreprocessProvider(base.preprocessOrOcrProvider.provider, userId)
return await provider.checkQuota()
}
throw new Error('No preprocess provider configured')
} catch (err) {
Logger.error(`Failed to check quota: ${err}`)
throw new Error(`Failed to check quota: ${err}`)
}
}
} }
export default new KnowledgeService() export default new KnowledgeService()

View File

@ -0,0 +1,33 @@
import { Mistral } from '@mistralai/mistralai'
import { Provider } from '@types'
export class MistralClientManager {
private static instance: MistralClientManager
private client: Mistral | null = null
// eslint-disable-next-line @typescript-eslint/no-empty-function
private constructor() {}
public static getInstance(): MistralClientManager {
if (!MistralClientManager.instance) {
MistralClientManager.instance = new MistralClientManager()
}
return MistralClientManager.instance
}
public initializeClient(provider: Provider): void {
if (!this.client) {
this.client = new Mistral({
apiKey: provider.apiKey,
serverURL: provider.apiHost
})
}
}
public getClient(): Mistral {
if (!this.client) {
throw new Error('Mistral client not initialized. Call initializeClient first.')
}
return this.client
}
}

View File

@ -0,0 +1,13 @@
import { FileListResponse, FileMetadata, FileUploadResponse, Provider } from '@types'
export abstract class BaseFileService {
protected readonly provider: Provider
protected constructor(provider: Provider) {
this.provider = provider
}
abstract uploadFile(file: FileMetadata): Promise<FileUploadResponse>
abstract deleteFile(fileId: string): Promise<void>
abstract listFiles(): Promise<FileListResponse>
abstract retrieveFile(fileId: string): Promise<FileUploadResponse>
}

View File

@ -0,0 +1,41 @@
import { Provider } from '@types'
import { BaseFileService } from './BaseFileService'
import { GeminiService } from './GeminiService'
import { MistralService } from './MistralService'
export class FileServiceManager {
private static instance: FileServiceManager
private services: Map<string, BaseFileService> = new Map()
// eslint-disable-next-line @typescript-eslint/no-empty-function
private constructor() {}
static getInstance(): FileServiceManager {
if (!this.instance) {
this.instance = new FileServiceManager()
}
return this.instance
}
getService(provider: Provider): BaseFileService {
const type = provider.type
let service = this.services.get(type)
if (!service) {
switch (type) {
case 'gemini':
service = new GeminiService(provider)
break
case 'mistral':
service = new MistralService(provider)
break
default:
throw new Error(`Unsupported service type: ${type}`)
}
this.services.set(type, service)
}
return service
}
}

View File

@ -0,0 +1,190 @@
import { File, Files, FileState, GoogleGenAI } from '@google/genai'
import { FileListResponse, FileMetadata, FileUploadResponse, Provider } from '@types'
import Logger from 'electron-log'
import { v4 as uuidv4 } from 'uuid'
import { CacheService } from '../CacheService'
import { BaseFileService } from './BaseFileService'
export class GeminiService extends BaseFileService {
private static readonly FILE_LIST_CACHE_KEY = 'gemini_file_list'
private static readonly FILE_CACHE_DURATION = 48 * 60 * 60 * 1000
private static readonly LIST_CACHE_DURATION = 3000
protected readonly fileManager: Files
constructor(provider: Provider) {
super(provider)
this.fileManager = new GoogleGenAI({
vertexai: false,
apiKey: provider.apiKey,
httpOptions: {
baseUrl: provider.apiHost
}
}).files
}
async uploadFile(file: FileMetadata): Promise<FileUploadResponse> {
try {
const uploadResult = await this.fileManager.upload({
file: file.path,
config: {
mimeType: 'application/pdf',
name: file.id,
displayName: file.origin_name
}
})
// 根据文件状态设置响应状态
let status: 'success' | 'processing' | 'failed' | 'unknown'
switch (uploadResult.state) {
case FileState.ACTIVE:
status = 'success'
break
case FileState.PROCESSING:
status = 'processing'
break
case FileState.FAILED:
status = 'failed'
break
default:
status = 'unknown'
}
const response: FileUploadResponse = {
fileId: uploadResult.name || '',
displayName: file.origin_name,
status,
originalFile: {
type: 'gemini',
file: uploadResult
}
}
// 只缓存成功的文件
if (status === 'success') {
const cacheKey = `${GeminiService.FILE_LIST_CACHE_KEY}_${response.fileId}`
CacheService.set<FileUploadResponse>(cacheKey, response, GeminiService.FILE_CACHE_DURATION)
}
return response
} catch (error) {
Logger.error('Error uploading file to Gemini:', error)
return {
fileId: '',
displayName: file.origin_name,
status: 'failed',
originalFile: undefined
}
}
}
async retrieveFile(fileId: string): Promise<FileUploadResponse> {
try {
const cachedResponse = CacheService.get<FileUploadResponse>(`${GeminiService.FILE_LIST_CACHE_KEY}_${fileId}`)
Logger.info('[GeminiService] cachedResponse', cachedResponse)
if (cachedResponse) {
return cachedResponse
}
const files: File[] = []
for await (const f of await this.fileManager.list()) {
files.push(f)
}
Logger.info('[GeminiService] files', files)
const file = files
.filter((file) => file.state === FileState.ACTIVE)
.find((file) => file.name?.substring(6) === fileId) // 去掉 files/ 前缀
Logger.info('[GeminiService] file', file)
if (file) {
return {
fileId: fileId,
displayName: file.displayName || '',
status: 'success',
originalFile: {
type: 'gemini',
file
}
}
}
return {
fileId: fileId,
displayName: '',
status: 'failed',
originalFile: undefined
}
} catch (error) {
Logger.error('Error retrieving file from Gemini:', error)
return {
fileId: fileId,
displayName: '',
status: 'failed',
originalFile: undefined
}
}
}
async listFiles(): Promise<FileListResponse> {
try {
const cachedList = CacheService.get<FileListResponse>(GeminiService.FILE_LIST_CACHE_KEY)
if (cachedList) {
return cachedList
}
const geminiFiles: File[] = []
for await (const f of await this.fileManager.list()) {
geminiFiles.push(f)
}
const fileList: FileListResponse = {
files: geminiFiles
.filter((file) => file.state === FileState.ACTIVE)
.map((file) => {
// 更新单个文件的缓存
const fileResponse: FileUploadResponse = {
fileId: file.name || uuidv4(),
displayName: file.displayName || '',
status: 'success',
originalFile: {
type: 'gemini',
file
}
}
CacheService.set(
`${GeminiService.FILE_LIST_CACHE_KEY}_${file.name}`,
fileResponse,
GeminiService.FILE_CACHE_DURATION
)
return {
id: file.name || uuidv4(),
displayName: file.displayName || '',
size: Number(file.sizeBytes),
status: 'success',
originalFile: {
type: 'gemini',
file
}
}
})
}
// 更新文件列表缓存
CacheService.set(GeminiService.FILE_LIST_CACHE_KEY, fileList, GeminiService.LIST_CACHE_DURATION)
return fileList
} catch (error) {
Logger.error('Error listing files from Gemini:', error)
return { files: [] }
}
}
async deleteFile(fileId: string): Promise<void> {
try {
await this.fileManager.delete({ name: fileId })
Logger.info(`File ${fileId} deleted from Gemini`)
} catch (error) {
Logger.error('Error deleting file from Gemini:', error)
throw error
}
}
}

View File

@ -0,0 +1,104 @@
import fs from 'node:fs/promises'
import { Mistral } from '@mistralai/mistralai'
import { FileListResponse, FileMetadata, FileUploadResponse, Provider } from '@types'
import Logger from 'electron-log'
import { MistralClientManager } from '../MistralClientManager'
import { BaseFileService } from './BaseFileService'
export class MistralService extends BaseFileService {
private readonly client: Mistral
constructor(provider: Provider) {
super(provider)
const clientManager = MistralClientManager.getInstance()
clientManager.initializeClient(provider)
this.client = clientManager.getClient()
}
async uploadFile(file: FileMetadata): Promise<FileUploadResponse> {
try {
const fileBuffer = await fs.readFile(file.path)
const response = await this.client.files.upload({
file: {
fileName: file.origin_name,
content: new Uint8Array(fileBuffer)
},
purpose: 'ocr'
})
return {
fileId: response.id,
displayName: file.origin_name,
status: 'success',
originalFile: {
type: 'mistral',
file: response
}
}
} catch (error) {
Logger.error('Error uploading file:', error)
return {
fileId: '',
displayName: file.origin_name,
status: 'failed'
}
}
}
async listFiles(): Promise<FileListResponse> {
try {
const response = await this.client.files.list({})
return {
files: response.data.map((file) => ({
id: file.id,
displayName: file.filename || '',
size: file.sizeBytes,
status: 'success', // All listed files are processed,
originalFile: {
type: 'mistral',
file
}
}))
}
} catch (error) {
Logger.error('Error listing files:', error)
return { files: [] }
}
}
async deleteFile(fileId: string): Promise<void> {
try {
await this.client.files.delete({
fileId
})
Logger.info(`File ${fileId} deleted`)
} catch (error) {
Logger.error('Error deleting file:', error)
throw error
}
}
async retrieveFile(fileId: string): Promise<FileUploadResponse> {
try {
const response = await this.client.files.retrieve({
fileId
})
return {
fileId: response.id,
displayName: response.filename || '',
status: 'success' // Retrieved files are always processed
}
} catch (error) {
Logger.error('Error retrieving file:', error)
return {
fileId: fileId,
displayName: '',
status: 'failed',
originalFile: undefined
}
}
}
}

View File

@ -4,7 +4,7 @@ import path from 'node:path'
import { isLinux, isPortable } from '@main/constant' import { isLinux, isPortable } from '@main/constant'
import { audioExts, documentExts, imageExts, textExts, videoExts } from '@shared/config/constant' import { audioExts, documentExts, imageExts, textExts, videoExts } from '@shared/config/constant'
import { FileType, FileTypes } from '@types' import { FileMetadata, FileTypes } from '@types'
import { app } from 'electron' import { app } from 'electron'
import { v4 as uuidv4 } from 'uuid' import { v4 as uuidv4 } from 'uuid'
@ -130,7 +130,19 @@ export function getFileType(ext: string): FileTypes {
return fileTypeMap.get(ext) || FileTypes.OTHER return fileTypeMap.get(ext) || FileTypes.OTHER
} }
export function getAllFiles(dirPath: string, arrayOfFiles: FileType[] = []): FileType[] { export function getFileDir(filePath: string) {
return path.dirname(filePath)
}
export function getFileName(filePath: string) {
return path.basename(filePath)
}
export function getFileExt(filePath: string) {
return path.extname(filePath)
}
export function getAllFiles(dirPath: string, arrayOfFiles: FileMetadata[] = []): FileMetadata[] {
const files = fs.readdirSync(dirPath) const files = fs.readdirSync(dirPath)
files.forEach((file) => { files.forEach((file) => {
@ -152,7 +164,7 @@ export function getAllFiles(dirPath: string, arrayOfFiles: FileType[] = []): Fil
const name = path.basename(file) const name = path.basename(file)
const size = fs.statSync(fullPath).size const size = fs.statSync(fullPath).size
const fileItem: FileType = { const fileItem: FileMetadata = {
id: uuidv4(), id: uuidv4(),
name, name,
path: fullPath, path: fullPath,

View File

@ -49,7 +49,7 @@ export async function getBinaryPath(name?: string): Promise<string> {
const binaryName = await getBinaryName(name) const binaryName = await getBinaryName(name)
const binariesDir = path.join(os.homedir(), '.cherrystudio', 'bin') const binariesDir = path.join(os.homedir(), '.cherrystudio', 'bin')
const binariesDirExists = await fs.existsSync(binariesDir) const binariesDirExists = fs.existsSync(binariesDir)
return binariesDirExists ? path.join(binariesDir, binaryName) : binaryName return binariesDirExists ? path.join(binariesDir, binaryName) : binaryName
} }

View File

@ -2,7 +2,18 @@ import type { ExtractChunkData } from '@cherrystudio/embedjs-interfaces'
import { electronAPI } from '@electron-toolkit/preload' import { electronAPI } from '@electron-toolkit/preload'
import { UpgradeChannel } from '@shared/config/constant' import { UpgradeChannel } from '@shared/config/constant'
import { IpcChannel } from '@shared/IpcChannel' import { IpcChannel } from '@shared/IpcChannel'
import { FileType, KnowledgeBaseParams, KnowledgeItem, MCPServer, Shortcut, ThemeMode, WebDavConfig } from '@types' import {
FileListResponse,
FileMetadata,
FileUploadResponse,
KnowledgeBaseParams,
KnowledgeItem,
MCPServer,
Provider,
Shortcut,
ThemeMode,
WebDavConfig
} from '@types'
import { contextBridge, ipcRenderer, OpenDialogOptions, shell, webUtils } from 'electron' import { contextBridge, ipcRenderer, OpenDialogOptions, shell, webUtils } from 'electron'
import { Notification } from 'src/renderer/src/types/notification' import { Notification } from 'src/renderer/src/types/notification'
import { CreateDirectoryOptions } from 'webdav' import { CreateDirectoryOptions } from 'webdav'
@ -79,13 +90,25 @@ const api = {
}, },
file: { file: {
select: (options?: OpenDialogOptions) => ipcRenderer.invoke(IpcChannel.File_Select, options), select: (options?: OpenDialogOptions) => ipcRenderer.invoke(IpcChannel.File_Select, options),
upload: (file: FileType) => ipcRenderer.invoke(IpcChannel.File_Upload, file), upload: (file: FileMetadata) => ipcRenderer.invoke(IpcChannel.File_Upload, file),
delete: (fileId: string) => ipcRenderer.invoke(IpcChannel.File_Delete, fileId), delete: (fileId: string) => ipcRenderer.invoke(IpcChannel.File_Delete, fileId),
deleteDir: (dirPath: string) => ipcRenderer.invoke(IpcChannel.File_DeleteDir, dirPath),
read: (fileId: string) => ipcRenderer.invoke(IpcChannel.File_Read, fileId), read: (fileId: string) => ipcRenderer.invoke(IpcChannel.File_Read, fileId),
clear: () => ipcRenderer.invoke(IpcChannel.File_Clear), clear: () => ipcRenderer.invoke(IpcChannel.File_Clear),
get: (filePath: string) => ipcRenderer.invoke(IpcChannel.File_Get, filePath), get: (filePath: string) => ipcRenderer.invoke(IpcChannel.File_Get, filePath),
create: (fileName: string) => ipcRenderer.invoke(IpcChannel.File_Create, fileName), /**
*
* @param fileName
* @returns
*/
createTempFile: (fileName: string): Promise<string> => ipcRenderer.invoke(IpcChannel.File_CreateTempFile, fileName),
/**
*
* @param filePath
* @param data
*/
write: (filePath: string, data: Uint8Array | string) => ipcRenderer.invoke(IpcChannel.File_Write, filePath, data), write: (filePath: string, data: Uint8Array | string) => ipcRenderer.invoke(IpcChannel.File_Write, filePath, data),
writeWithId: (id: string, content: string) => ipcRenderer.invoke(IpcChannel.File_WriteWithId, id, content), writeWithId: (id: string, content: string) => ipcRenderer.invoke(IpcChannel.File_WriteWithId, id, content),
open: (options?: OpenDialogOptions) => ipcRenderer.invoke(IpcChannel.File_Open, options), open: (options?: OpenDialogOptions) => ipcRenderer.invoke(IpcChannel.File_Open, options),
openPath: (path: string) => ipcRenderer.invoke(IpcChannel.File_OpenPath, path), openPath: (path: string) => ipcRenderer.invoke(IpcChannel.File_OpenPath, path),
@ -93,12 +116,12 @@ const api = {
ipcRenderer.invoke(IpcChannel.File_Save, path, content, options), ipcRenderer.invoke(IpcChannel.File_Save, path, content, options),
selectFolder: () => ipcRenderer.invoke(IpcChannel.File_SelectFolder), selectFolder: () => ipcRenderer.invoke(IpcChannel.File_SelectFolder),
saveImage: (name: string, data: string) => ipcRenderer.invoke(IpcChannel.File_SaveImage, name, data), saveImage: (name: string, data: string) => ipcRenderer.invoke(IpcChannel.File_SaveImage, name, data),
binaryImage: (fileId: string) => ipcRenderer.invoke(IpcChannel.File_BinaryImage, fileId),
base64Image: (fileId: string) => ipcRenderer.invoke(IpcChannel.File_Base64Image, fileId), base64Image: (fileId: string) => ipcRenderer.invoke(IpcChannel.File_Base64Image, fileId),
saveBase64Image: (data: string) => ipcRenderer.invoke(IpcChannel.File_SaveBase64Image, data), saveBase64Image: (data: string) => ipcRenderer.invoke(IpcChannel.File_SaveBase64Image, data),
download: (url: string, isUseContentType?: boolean) => download: (url: string, isUseContentType?: boolean) =>
ipcRenderer.invoke(IpcChannel.File_Download, url, isUseContentType), ipcRenderer.invoke(IpcChannel.File_Download, url, isUseContentType),
copy: (fileId: string, destPath: string) => ipcRenderer.invoke(IpcChannel.File_Copy, fileId, destPath), copy: (fileId: string, destPath: string) => ipcRenderer.invoke(IpcChannel.File_Copy, fileId, destPath),
binaryImage: (fileId: string) => ipcRenderer.invoke(IpcChannel.File_BinaryImage, fileId),
base64File: (fileId: string) => ipcRenderer.invoke(IpcChannel.File_Base64File, fileId), base64File: (fileId: string) => ipcRenderer.invoke(IpcChannel.File_Base64File, fileId),
pdfInfo: (fileId: string) => ipcRenderer.invoke(IpcChannel.File_GetPdfInfo, fileId), pdfInfo: (fileId: string) => ipcRenderer.invoke(IpcChannel.File_GetPdfInfo, fileId),
getPathForFile: (file: File) => webUtils.getPathForFile(file) getPathForFile: (file: File) => webUtils.getPathForFile(file)
@ -120,31 +143,38 @@ const api = {
add: ({ add: ({
base, base,
item, item,
userId,
forceReload = false forceReload = false
}: { }: {
base: KnowledgeBaseParams base: KnowledgeBaseParams
item: KnowledgeItem item: KnowledgeItem
userId?: string
forceReload?: boolean forceReload?: boolean
}) => ipcRenderer.invoke(IpcChannel.KnowledgeBase_Add, { base, item, forceReload }), }) => ipcRenderer.invoke(IpcChannel.KnowledgeBase_Add, { base, item, forceReload, userId }),
remove: ({ uniqueId, uniqueIds, base }: { uniqueId: string; uniqueIds: string[]; base: KnowledgeBaseParams }) => remove: ({ uniqueId, uniqueIds, base }: { uniqueId: string; uniqueIds: string[]; base: KnowledgeBaseParams }) =>
ipcRenderer.invoke(IpcChannel.KnowledgeBase_Remove, { uniqueId, uniqueIds, base }), ipcRenderer.invoke(IpcChannel.KnowledgeBase_Remove, { uniqueId, uniqueIds, base }),
search: ({ search, base }: { search: string; base: KnowledgeBaseParams }) => search: ({ search, base }: { search: string; base: KnowledgeBaseParams }) =>
ipcRenderer.invoke(IpcChannel.KnowledgeBase_Search, { search, base }), ipcRenderer.invoke(IpcChannel.KnowledgeBase_Search, { search, base }),
rerank: ({ search, base, results }: { search: string; base: KnowledgeBaseParams; results: ExtractChunkData[] }) => rerank: ({ search, base, results }: { search: string; base: KnowledgeBaseParams; results: ExtractChunkData[] }) =>
ipcRenderer.invoke(IpcChannel.KnowledgeBase_Rerank, { search, base, results }) ipcRenderer.invoke(IpcChannel.KnowledgeBase_Rerank, { search, base, results }),
checkQuota: ({ base, userId }: { base: KnowledgeBaseParams; userId: string }) =>
ipcRenderer.invoke(IpcChannel.KnowledgeBase_Check_Quota, base, userId)
}, },
window: { window: {
setMinimumSize: (width: number, height: number) => setMinimumSize: (width: number, height: number) =>
ipcRenderer.invoke(IpcChannel.Windows_SetMinimumSize, width, height), ipcRenderer.invoke(IpcChannel.Windows_SetMinimumSize, width, height),
resetMinimumSize: () => ipcRenderer.invoke(IpcChannel.Windows_ResetMinimumSize) resetMinimumSize: () => ipcRenderer.invoke(IpcChannel.Windows_ResetMinimumSize)
}, },
gemini: { fileService: {
uploadFile: (file: FileType, { apiKey, baseURL }: { apiKey: string; baseURL: string }) => upload: (provider: Provider, file: FileMetadata): Promise<FileUploadResponse> =>
ipcRenderer.invoke(IpcChannel.Gemini_UploadFile, file, { apiKey, baseURL }), ipcRenderer.invoke(IpcChannel.FileService_Upload, provider, file),
base64File: (file: FileType) => ipcRenderer.invoke(IpcChannel.Gemini_Base64File, file), list: (provider: Provider): Promise<FileListResponse> => ipcRenderer.invoke(IpcChannel.FileService_List, provider),
retrieveFile: (file: FileType, apiKey: string) => ipcRenderer.invoke(IpcChannel.Gemini_RetrieveFile, file, apiKey), delete: (provider: Provider, fileId: string) => ipcRenderer.invoke(IpcChannel.FileService_Delete, provider, fileId),
listFiles: (apiKey: string) => ipcRenderer.invoke(IpcChannel.Gemini_ListFiles, apiKey), retrieve: (provider: Provider, fileId: string): Promise<FileUploadResponse> =>
deleteFile: (fileId: string, apiKey: string) => ipcRenderer.invoke(IpcChannel.Gemini_DeleteFile, fileId, apiKey) ipcRenderer.invoke(IpcChannel.FileService_Retrieve, provider, fileId)
},
selectionMenu: {
action: (action: string) => ipcRenderer.invoke('selection-menu:action', action)
}, },
vertexAI: { vertexAI: {

View File

@ -1,7 +1,7 @@
import { import {
Content, Content,
createPartFromUri,
File, File,
FileState,
FunctionCall, FunctionCall,
GenerateContentConfig, GenerateContentConfig,
GenerateImagesConfig, GenerateImagesConfig,
@ -10,7 +10,6 @@ import {
HarmCategory, HarmCategory,
Modality, Modality,
Model as GeminiModel, Model as GeminiModel,
Pager,
Part, Part,
SafetySetting, SafetySetting,
SendMessageParameters, SendMessageParameters,
@ -26,13 +25,13 @@ import {
isSupportedThinkingTokenGeminiModel, isSupportedThinkingTokenGeminiModel,
isVisionModel isVisionModel
} from '@renderer/config/models' } from '@renderer/config/models'
import { CacheService } from '@renderer/services/CacheService'
import { estimateTextTokens } from '@renderer/services/TokenService' import { estimateTextTokens } from '@renderer/services/TokenService'
import { import {
Assistant, Assistant,
EFFORT_RATIO, EFFORT_RATIO,
FileType, FileMetadata,
FileTypes, FileTypes,
FileUploadResponse,
GenerateImageParams, GenerateImageParams,
MCPCallToolResponse, MCPCallToolResponse,
MCPTool, MCPTool,
@ -198,7 +197,7 @@ export class GeminiAPIClient extends BaseApiClient<
* @param file - The file * @param file - The file
* @returns The part * @returns The part
*/ */
private async handlePdfFile(file: FileType): Promise<Part> { private async handlePdfFile(file: FileMetadata): Promise<Part> {
const smallFileSize = 20 * MB const smallFileSize = 20 * MB
const isSmallFile = file.size < smallFileSize const isSmallFile = file.size < smallFileSize
@ -213,26 +212,17 @@ export class GeminiAPIClient extends BaseApiClient<
} }
// Retrieve file from Gemini uploaded files // Retrieve file from Gemini uploaded files
const fileMetadata: File | undefined = await this.retrieveFile(file) const fileMetadata: FileUploadResponse = await window.api.fileService.retrieve(this.provider, file.id)
if (fileMetadata) { if (fileMetadata.status === 'success') {
return { const remoteFile = fileMetadata.originalFile?.file as File
fileData: { return createPartFromUri(remoteFile.uri!, remoteFile.mimeType!)
fileUri: fileMetadata.uri,
mimeType: fileMetadata.mimeType
} as Part['fileData']
}
} }
// If file is not found, upload it to Gemini // If file is not found, upload it to Gemini
const result = await this.uploadFile(file) const result = await window.api.fileService.upload(this.provider, file)
const remoteFile = result.originalFile?.file as File
return { return createPartFromUri(remoteFile.uri!, remoteFile.mimeType!)
fileData: {
fileUri: result.uri,
mimeType: result.mimeType
} as Part['fileData']
}
} }
/** /**
@ -767,61 +757,11 @@ export class GeminiAPIClient extends BaseApiClient<
return [...(sdkPayload.history || []), messageParam] return [...(sdkPayload.history || []), messageParam]
} }
private async uploadFile(file: FileType): Promise<File> { private async base64File(file: FileMetadata) {
return await this.sdkInstance!.files.upload({
file: file.path,
config: {
mimeType: 'application/pdf',
name: file.id,
displayName: file.origin_name
}
})
}
private async base64File(file: FileType) {
const { data } = await window.api.file.base64File(file.id + file.ext) const { data } = await window.api.file.base64File(file.id + file.ext)
return { return {
data, data,
mimeType: 'application/pdf' mimeType: 'application/pdf'
} }
} }
private async retrieveFile(file: FileType): Promise<File | undefined> {
const cachedResponse = CacheService.get<any>('gemini_file_list')
if (cachedResponse) {
return this.processResponse(cachedResponse, file)
}
const response = await this.sdkInstance!.files.list()
CacheService.set('gemini_file_list', response, 3000)
return this.processResponse(response, file)
}
private async processResponse(response: Pager<File>, file: FileType) {
for await (const f of response) {
if (f.state === FileState.ACTIVE) {
if (f.displayName === file.origin_name && Number(f.sizeBytes) === file.size) {
return f
}
}
}
return undefined
}
// @ts-ignore unused
private async listFiles(): Promise<File[]> {
const files: File[] = []
for await (const f of await this.sdkInstance!.files.list()) {
files.push(f)
}
return files
}
// @ts-ignore unused
private async deleteFile(fileId: string) {
await this.sdkInstance!.files.delete({ name: fileId })
}
} }

View File

@ -7,7 +7,7 @@ import {
} from '@renderer/config/models' } from '@renderer/config/models'
import { estimateTextTokens } from '@renderer/services/TokenService' import { estimateTextTokens } from '@renderer/services/TokenService'
import { import {
FileType, FileMetadata,
FileTypes, FileTypes,
MCPCallToolResponse, MCPCallToolResponse,
MCPTool, MCPTool,
@ -95,7 +95,7 @@ export class OpenAIResponseAPIClient extends OpenAIBaseClient<
return await sdk.responses.create(payload, options) return await sdk.responses.create(payload, options)
} }
private async handlePdfFile(file: FileType): Promise<OpenAI.Responses.ResponseInputFile | undefined> { private async handlePdfFile(file: FileMetadata): Promise<OpenAI.Responses.ResponseInputFile | undefined> {
if (file.size > 32 * MB) return undefined if (file.size > 32 * MB) return undefined
try { try {
const pageCount = await window.api.file.pdfInfo(file.id + file.ext) const pageCount = await window.api.file.pdfInfo(file.id + file.ext)

View File

@ -1,6 +1,6 @@
@font-face { @font-face {
font-family: 'iconfont'; /* Project id 4753420 */ font-family: 'iconfont'; /* Project id 4753420 */
src: url('iconfont.woff2?t=1742184675192') format('woff2'); src: url('iconfont.woff2?t=1742793497518') format('woff2');
} }
.iconfont { .iconfont {
@ -11,6 +11,18 @@
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
.icon-plugin:before {
content: '\e612';
}
.icon-tools:before {
content: '\e762';
}
.icon-OCRshibie:before {
content: '\e658';
}
.icon-obsidian:before { .icon-obsidian:before {
content: '\e677'; content: '\e677';
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
<svg xmlns="http://www.w3.org/2000/svg"
aria-label="macOS" role="img"
viewBox="0 0 512 512"><rect
width="512" height="512"
rx="15%"
fill="#ffffff"/><path d="M282 170v-4c-52 0-5 34 0 4zm24-18c7-21 43-23 47 3h-10c-3-15-28-16-28 11 0 15 23 24 28 6h10c-6 33-59 21-47-20zm-146-16h10v9c5-12 27-13 31 1 7-15 35-14 35 7v37h-11v-34c0-15-22-15-22 1v33h-11v-35c-2.447-9.36-14.915-11.23-20-3l-2 5v33h-10zm23 259c-47 0-76-33-76-86s29-85 76-85 77 33 77 85-29 86-77 86zm88-205c-29 7-33-30-3-31l14-1v-4c1-12-19-13-22-2h-10a14 14 0 012-7c8-14 41-14 41 8v37h-10v-9a18 18 0 01-12 9zm68 205c-36-2-61-19-63-49h24c23 72 146-5 25-30-19-4-33-13-39-24-38-74 109-96 113-20h-23c-7-49-98-22-65 12 14 14 43 13 64 22 50 23 26 91-36 89zM183 245c-32 0-52 25-52 64s20 64 52 64 53-24 53-64-20-64-53-64z"/></svg>

After

Width:  |  Height:  |  Size: 896 B

View File

@ -19,7 +19,7 @@ const Artifacts: FC<Props> = ({ html }) => {
* *
*/ */
const handleOpenInApp = async () => { const handleOpenInApp = async () => {
const path = await window.api.file.create('artifacts-preview.html') const path = await window.api.file.createTempFile('artifacts-preview.html')
await window.api.file.write(path, html) await window.api.file.write(path, html)
const filePath = `file://${path}` const filePath = `file://${path}`
const title = extractTitle(html) || 'Artifacts ' + t('chat.artifacts.button.preview') const title = extractTitle(html) || 'Artifacts ' + t('chat.artifacts.button.preview')
@ -35,7 +35,7 @@ const Artifacts: FC<Props> = ({ html }) => {
* *
*/ */
const handleOpenExternal = async () => { const handleOpenExternal = async () => {
const path = await window.api.file.create('artifacts-preview.html') const path = await window.api.file.createTempFile('artifacts-preview.html')
await window.api.file.write(path, html) await window.api.file.write(path, html)
const filePath = `file://${path}` const filePath = `file://${path}`

View File

@ -0,0 +1,7 @@
import { FC } from 'react'
const OcrIcon: FC<React.DetailedHTMLProps<React.HTMLAttributes<HTMLElement>, HTMLElement>> = (props) => {
return <i {...props} className={`iconfont icon-OCRshibie ${props.className}`} />
}
export default OcrIcon

View File

@ -0,0 +1,7 @@
import { FC } from 'react'
const ToolIcon: FC<React.DetailedHTMLProps<React.HTMLAttributes<HTMLElement>, HTMLElement>> = (props) => {
return <i {...props} className={`iconfont icon-plugin ${props.className}`} />
}
export default ToolIcon

View File

@ -0,0 +1,12 @@
import MacOSLogo from '@renderer/assets/images/providers/macos.svg'
export function getOcrProviderLogo(providerId: string) {
switch (providerId) {
case 'system':
return MacOSLogo
default:
return undefined
}
}
export const OCR_PROVIDER_CONFIG = {}

View File

@ -0,0 +1,37 @@
import Doc2xLogo from '@renderer/assets/images/ocr/doc2x.png'
import MinerULogo from '@renderer/assets/images/ocr/mineru.jpg'
import MistralLogo from '@renderer/assets/images/providers/mistral.png'
export function getPreprocessProviderLogo(providerId: string) {
switch (providerId) {
case 'doc2x':
return Doc2xLogo
case 'mistral':
return MistralLogo
case 'mineru':
return MinerULogo
default:
return undefined
}
}
export const PREPROCESS_PROVIDER_CONFIG = {
doc2x: {
websites: {
official: 'https://doc2x.noedgeai.com',
apiKey: 'https://open.noedgeai.com/apiKeys'
}
},
mistral: {
websites: {
official: 'https://mistral.ai',
apiKey: 'https://mistral.ai/api-keys'
}
},
mineru: {
websites: {
official: 'https://mineru.net/',
apiKey: 'https://mineru.net/apiManage'
}
}
}

View File

@ -1,4 +1,4 @@
import { FileType, KnowledgeItem, QuickPhrase, TranslateHistory } from '@renderer/types' import { FileMetadata, KnowledgeItem, QuickPhrase, TranslateHistory } from '@renderer/types'
// Import necessary types for blocks and new message structure // Import necessary types for blocks and new message structure
import type { Message as NewMessage, MessageBlock } from '@renderer/types/newMessage' import type { Message as NewMessage, MessageBlock } from '@renderer/types/newMessage'
import { Dexie, type EntityTable } from 'dexie' import { Dexie, type EntityTable } from 'dexie'
@ -7,7 +7,7 @@ import { upgradeToV5, upgradeToV7 } from './upgrades'
// Database declaration (move this to its own module also) // Database declaration (move this to its own module also)
export const db = new Dexie('CherryStudio') as Dexie & { export const db = new Dexie('CherryStudio') as Dexie & {
files: EntityTable<FileType, 'id'> files: EntityTable<FileMetadata, 'id'>
topics: EntityTable<{ id: string; messages: NewMessage[] }, 'id'> // Correct type for topics topics: EntityTable<{ id: string; messages: NewMessage[] }, 'id'> // Correct type for topics
settings: EntityTable<{ id: string; value: any }, 'id'> settings: EntityTable<{ id: string; value: any }, 'id'>
knowledge_notes: EntityTable<KnowledgeItem, 'id'> knowledge_notes: EntityTable<KnowledgeItem, 'id'>

View File

@ -1,7 +1,5 @@
/* eslint-disable react-hooks/rules-of-hooks */
import { db } from '@renderer/databases' import { db } from '@renderer/databases'
import KnowledgeQueue from '@renderer/queue/KnowledgeQueue' import KnowledgeQueue from '@renderer/queue/KnowledgeQueue'
import FileManager from '@renderer/services/FileManager'
import { getKnowledgeBaseParams } from '@renderer/services/KnowledgeService' import { getKnowledgeBaseParams } from '@renderer/services/KnowledgeService'
import { RootState } from '@renderer/store' import { RootState } from '@renderer/store'
import { import {
@ -19,10 +17,9 @@ import {
updateItemProcessingStatus, updateItemProcessingStatus,
updateNotes updateNotes
} from '@renderer/store/knowledge' } from '@renderer/store/knowledge'
import { FileType, KnowledgeBase, KnowledgeItem, ProcessingStatus } from '@renderer/types' import { FileMetadata, KnowledgeBase, KnowledgeItem, ProcessingStatus } from '@renderer/types'
import { runAsyncFunction } from '@renderer/utils' import { runAsyncFunction } from '@renderer/utils'
import { IpcChannel } from '@shared/IpcChannel' import { useCallback, useEffect, useState } from 'react'
import { useEffect, useState } from 'react'
import { useDispatch, useSelector } from 'react-redux' import { useDispatch, useSelector } from 'react-redux'
import { v4 as uuidv4 } from 'uuid' import { v4 as uuidv4 } from 'uuid'
@ -44,7 +41,7 @@ export const useKnowledge = (baseId: string) => {
} }
// 批量添加文件 // 批量添加文件
const addFiles = (files: FileType[]) => { const addFiles = (files: FileMetadata[]) => {
const filesItems: KnowledgeItem[] = files.map((file) => ({ const filesItems: KnowledgeItem[] = files.map((file) => ({
id: uuidv4(), id: uuidv4(),
type: 'file' as const, type: 'file' as const,
@ -56,6 +53,7 @@ export const useKnowledge = (baseId: string) => {
processingError: '', processingError: '',
retryCount: 0 retryCount: 0
})) }))
console.log('Adding files:', filesItems)
dispatch(addFilesAction({ baseId, items: filesItems })) dispatch(addFilesAction({ baseId, items: filesItems }))
setTimeout(() => KnowledgeQueue.checkAllBases(), 0) setTimeout(() => KnowledgeQueue.checkAllBases(), 0)
} }
@ -147,7 +145,7 @@ export const useKnowledge = (baseId: string) => {
} }
} }
if (item.type === 'file' && typeof item.content === 'object') { if (item.type === 'file' && typeof item.content === 'object') {
await FileManager.deleteFile(item.content.id) await window.api.file.deleteDir(item.content.id)
} }
} }
// 刷新项目 // 刷新项目
@ -190,41 +188,18 @@ export const useKnowledge = (baseId: string) => {
} }
// 获取特定项目的处理状态 // 获取特定项目的处理状态
const getProcessingStatus = (itemId: string) => { const getProcessingStatus = useCallback(
(itemId: string) => {
return base?.items.find((item) => item.id === itemId)?.processingStatus return base?.items.find((item) => item.id === itemId)?.processingStatus
} },
[base?.items]
)
// 获取特定类型的所有处理项 // 获取特定类型的所有处理项
const getProcessingItemsByType = (type: 'file' | 'url' | 'note') => { const getProcessingItemsByType = (type: 'file' | 'url' | 'note') => {
return base?.items.filter((item) => item.type === type && item.processingStatus !== undefined) || [] return base?.items.filter((item) => item.type === type && item.processingStatus !== undefined) || []
} }
// 获取目录处理进度
const getDirectoryProcessingPercent = (itemId?: string) => {
const [percent, setPercent] = useState<number>(0)
useEffect(() => {
if (!itemId) {
return
}
const cleanup = window.electron.ipcRenderer.on(
IpcChannel.DirectoryProcessingPercent,
(_, { itemId: id, percent }: { itemId: string; percent: number }) => {
if (itemId === id) {
setPercent(percent)
}
}
)
return () => {
cleanup()
}
}, [itemId])
return percent
}
// 清除已完成的项目 // 清除已完成的项目
const clearCompleted = () => { const clearCompleted = () => {
dispatch(clearCompletedProcessing({ baseId })) dispatch(clearCompletedProcessing({ baseId }))
@ -307,7 +282,6 @@ export const useKnowledge = (baseId: string) => {
refreshItem, refreshItem,
getProcessingStatus, getProcessingStatus,
getProcessingItemsByType, getProcessingItemsByType,
getDirectoryProcessingPercent,
clearCompleted, clearCompleted,
clearAll, clearAll,
removeItem, removeItem,

View File

@ -1,12 +1,12 @@
import FileManager from '@renderer/services/FileManager' import FileManager from '@renderer/services/FileManager'
import { FileType } from '@renderer/types' import { FileMetadata } from '@renderer/types'
import { isEmpty } from 'lodash' import { isEmpty } from 'lodash'
import { useEffect, useState } from 'react' import { useEffect, useState } from 'react'
import { useKnowledgeBases } from './useKnowledge' import { useKnowledgeBases } from './useKnowledge'
export const useKnowledgeFiles = () => { export const useKnowledgeFiles = () => {
const [knowledgeFiles, setKnowledgeFiles] = useState<FileType[]>([]) const [knowledgeFiles, setKnowledgeFiles] = useState<FileMetadata[]>([])
const { bases, updateKnowledgeBases } = useKnowledgeBases() const { bases, updateKnowledgeBases } = useKnowledgeBases()
useEffect(() => { useEffect(() => {
@ -16,7 +16,7 @@ export const useKnowledgeFiles = () => {
.filter((item) => item.type === 'file') .filter((item) => item.type === 'file')
.filter((item) => item.processingStatus === 'completed') .filter((item) => item.processingStatus === 'completed')
const files = fileItems.map((item) => item.content as FileType) const files = fileItems.map((item) => item.content as FileMetadata)
!isEmpty(files) && setKnowledgeFiles(files) !isEmpty(files) && setKnowledgeFiles(files)
}, [bases]) }, [bases])
@ -31,7 +31,7 @@ export const useKnowledgeFiles = () => {
? { ? {
...item, ...item,
content: { content: {
...(item.content as FileType), ...(item.content as FileMetadata),
size: 0 size: 0
} }
} }

View File

@ -0,0 +1,45 @@
import { RootState } from '@renderer/store'
import {
setDefaultOcrProvider as _setDefaultOcrProvider,
updateOcrProvider as _updateOcrProvider,
updateOcrProviders as _updateOcrProviders
} from '@renderer/store/ocr'
import { OcrProvider } from '@renderer/types'
import { useDispatch, useSelector } from 'react-redux'
export const useOcrProvider = (id: string) => {
const dispatch = useDispatch()
const ocrProviders = useSelector((state: RootState) => state.ocr.providers)
const provider = ocrProviders.find((provider) => provider.id === id)
if (!provider) {
throw new Error(`OCR provider with id ${id} not found`)
}
const updateOcrProvider = (ocrProvider: OcrProvider) => {
dispatch(_updateOcrProvider(ocrProvider))
}
return { provider, updateOcrProvider }
}
export const useOcrProviders = () => {
const dispatch = useDispatch()
const ocrProviders = useSelector((state: RootState) => state.ocr.providers)
return {
ocrProviders: ocrProviders,
updateOcrProviders: (ocrProviders: OcrProvider[]) => dispatch(_updateOcrProviders(ocrProviders))
}
}
export const useDefaultOcrProvider = () => {
const defaultProviderId = useSelector((state: RootState) => state.ocr.defaultProvider)
const { ocrProviders } = useOcrProviders()
const dispatch = useDispatch()
const provider = defaultProviderId ? ocrProviders.find((provider) => provider.id === defaultProviderId) : undefined
const setDefaultOcrProvider = (ocrProvider: OcrProvider) => {
dispatch(_setDefaultOcrProvider(ocrProvider.id))
}
const updateDefaultOcrProvider = (ocrProvider: OcrProvider) => {
dispatch(_updateOcrProvider(ocrProvider))
}
return { provider, setDefaultOcrProvider, updateDefaultOcrProvider }
}

View File

@ -0,0 +1,48 @@
import { RootState } from '@renderer/store'
import {
setDefaultPreprocessProvider as _setDefaultPreprocessProvider,
updatePreprocessProvider as _updatePreprocessProvider,
updatePreprocessProviders as _updatePreprocessProviders
} from '@renderer/store/preprocess'
import { PreprocessProvider } from '@renderer/types'
import { useDispatch, useSelector } from 'react-redux'
export const usePreprocessProvider = (id: string) => {
const dispatch = useDispatch()
const preprocessProviders = useSelector((state: RootState) => state.preprocess.providers)
const provider = preprocessProviders.find((provider) => provider.id === id)
if (!provider) {
throw new Error(`preprocess provider with id ${id} not found`)
}
const updatePreprocessProvider = (preprocessProvider: PreprocessProvider) => {
dispatch(_updatePreprocessProvider(preprocessProvider))
}
return { provider, updatePreprocessProvider }
}
export const usePreprocessProviders = () => {
const dispatch = useDispatch()
const preprocessProviders = useSelector((state: RootState) => state.preprocess.providers)
return {
preprocessProviders: preprocessProviders,
updatePreprocessProviders: (preprocessProviders: PreprocessProvider[]) =>
dispatch(_updatePreprocessProviders(preprocessProviders))
}
}
export const useDefaultPreprocessProvider = () => {
const defaultProviderId = useSelector((state: RootState) => state.preprocess.defaultProvider)
const { preprocessProviders } = usePreprocessProviders()
const dispatch = useDispatch()
const provider = defaultProviderId
? preprocessProviders.find((provider) => provider.id === defaultProviderId)
: undefined
const setDefaultPreprocessProvider = (preprocessProvider: PreprocessProvider) => {
dispatch(_setDefaultPreprocessProvider(preprocessProvider.id))
}
const updateDefaultPreprocessProvider = (preprocessProvider: PreprocessProvider) => {
dispatch(_updatePreprocessProvider(preprocessProvider))
}
return { provider, setDefaultPreprocessProvider, updateDefaultPreprocessProvider }
}

View File

@ -190,7 +190,7 @@
"input.translate": "Translate to {{target_language}}", "input.translate": "Translate to {{target_language}}",
"input.upload": "Upload image or document file", "input.upload": "Upload image or document file",
"input.upload.document": "Upload document file (model does not support images)", "input.upload.document": "Upload document file (model does not support images)",
"input.web_search": "Web search", "input.web_search": "Web Search",
"input.web_search.settings": "Web Search Settings", "input.web_search.settings": "Web Search Settings",
"input.web_search.button.ok": "Go to Settings", "input.web_search.button.ok": "Go to Settings",
"input.web_search.enable": "Enable web search", "input.web_search.enable": "Enable web search",
@ -406,9 +406,11 @@
"prompt": "Prompt", "prompt": "Prompt",
"provider": "Provider", "provider": "Provider",
"regenerate": "Regenerate", "regenerate": "Regenerate",
"refresh": "Refresh",
"rename": "Rename", "rename": "Rename",
"reset": "Reset", "reset": "Reset",
"save": "Save", "save": "Save",
"settings": "Settings",
"search": "Search", "search": "Search",
"select": "Select", "select": "Select",
"selectedMessages": "Selected {{count}} messages", "selectedMessages": "Selected {{count}} messages",
@ -423,7 +425,9 @@
"pinyin.asc": "Sort by Pinyin (A-Z)", "pinyin.asc": "Sort by Pinyin (A-Z)",
"pinyin.desc": "Sort by Pinyin (Z-A)" "pinyin.desc": "Sort by Pinyin (Z-A)"
}, },
"no_results": "No results" "no_results": "No results",
"enabled": "Enabled",
"disabled": "Disabled"
}, },
"docs": { "docs": {
"title": "Docs" "title": "Docs"
@ -498,6 +502,8 @@
"title": "Topics Search" "title": "Topics Search"
}, },
"knowledge": { "knowledge": {
"name_required": "Knowledge Base Name is required",
"embedding_model_required": "Knowledge Base Embedding Model is required",
"add": { "add": {
"title": "Add Knowledge Base" "title": "Add Knowledge Base"
}, },
@ -543,13 +549,21 @@
"rename": "Rename", "rename": "Rename",
"search": "Search knowledge base", "search": "Search knowledge base",
"search_placeholder": "Enter text to search", "search_placeholder": "Enter text to search",
"settings": "Knowledge Base Settings", "settings": {
"title": "Knowledge Base Settings",
"preprocessing": "Preprocessing",
"preprocessing_tooltip": "Preprocess uploaded files with OCR"
},
"sitemap_placeholder": "Enter Website Map URL", "sitemap_placeholder": "Enter Website Map URL",
"sitemaps": "Websites", "sitemaps": "Websites",
"source": "Source", "source": "Source",
"status": "Status", "status": "Status",
"status_completed": "Completed", "status_completed": "Completed",
"status_embedding_completed": "Embedding Completed",
"status_preprocess_completed": "Preprocessing Completed",
"status_failed": "Failed", "status_failed": "Failed",
"status_embedding_failed": "Embedding Failed",
"status_preprocess_failed": "Preprocessing Failed",
"status_new": "Added", "status_new": "Added",
"status_pending": "Pending", "status_pending": "Pending",
"status_processing": "Processing", "status_processing": "Processing",
@ -572,7 +586,9 @@
"dimensions_error_invalid": "Please enter embedding dimension size", "dimensions_error_invalid": "Please enter embedding dimension size",
"dimensions_size_too_large": "The embedding dimension cannot exceed the model's context limit ({{max_context}}).", "dimensions_size_too_large": "The embedding dimension cannot exceed the model's context limit ({{max_context}}).",
"dimensions_set_right": "⚠️ Please ensure the model supports the set embedding dimension size", "dimensions_set_right": "⚠️ Please ensure the model supports the set embedding dimension size",
"dimensions_default": "The model will use default embedding dimensions" "dimensions_default": "The model will use default embedding dimensions",
"quota": "{{name}} Left Quota: {{quota}}",
"quota_infinity": "{{name}} Quota: Unlimited"
}, },
"languages": { "languages": {
"arabic": "Arabic", "arabic": "Arabic",
@ -835,7 +851,7 @@
"notification": { "notification": {
"assistant": "Assistant Response", "assistant": "Assistant Response",
"knowledge.success": "Successfully added {{type}} to the knowledge base", "knowledge.success": "Successfully added {{type}} to the knowledge base",
"knowledge.error": "Failed to add {{type}} to knowledge base: {{error}}" "knowledge.error": "{{error}}"
}, },
"ollama": { "ollama": {
"keep_alive_time.description": "The time in minutes to keep the connection alive, default is 5 minutes.", "keep_alive_time.description": "The time in minutes to keep the connection alive, default is 5 minutes.",
@ -1828,6 +1844,27 @@
"tray.onclose": "Minimize to Tray on Close", "tray.onclose": "Minimize to Tray on Close",
"tray.show": "Show Tray Icon", "tray.show": "Show Tray Icon",
"tray.title": "Tray", "tray.title": "Tray",
"tool": {
"title": "Tools Settings",
"preprocessOrOcr.tooltip": "In Settings -> Tools, set a document preprocessing service provider or OCR. Document preprocessing can effectively improve the retrieval performance of complex format documents and scanned documents. OCR can only recognize text within images in documents or scanned PDF text.",
"preprocess": {
"title": "Pre Process",
"provider": "Pre Process Provider",
"provider_placeholder": "Choose a Pre Process provider"
},
"ocr": {
"title": "OCR",
"provider": "OCR Provider",
"provider_placeholder": "Choose an OCR provider",
"mac_system_ocr_options": {
"mode": {
"title": "Recognition Mode",
"accurate": "Accurate",
"fast": "Fast"
},
"min_confidence": "Minimum Confidence"
}
},
"websearch": { "websearch": {
"blacklist": "Blacklist", "blacklist": "Blacklist",
"blacklist_description": "Results from the following websites will not appear in search results", "blacklist_description": "Results from the following websites will not appear in search results",
@ -1848,6 +1885,8 @@
"description": "Tavily is a search engine tailored for AI agents, delivering real-time, accurate results, intelligent query suggestions, and in-depth research capabilities.", "description": "Tavily is a search engine tailored for AI agents, delivering real-time, accurate results, intelligent query suggestions, and in-depth research capabilities.",
"title": "Tavily" "title": "Tavily"
}, },
"content_limit": "Content length limit",
"content_limit_tooltip": "Limit the content length of the search results; content that exceeds the limit will be truncated.",
"title": "Web Search", "title": "Web Search",
"subscribe": "Blacklist Subscription", "subscribe": "Blacklist Subscription",
"subscribe_update": "Update", "subscribe_update": "Update",
@ -1857,10 +1896,6 @@
"subscribe_name.placeholder": "Alternative name used when the downloaded subscription feed has no name.", "subscribe_name.placeholder": "Alternative name used when the downloaded subscription feed has no name.",
"subscribe_add_success": "Subscription feed added successfully!", "subscribe_add_success": "Subscription feed added successfully!",
"subscribe_delete": "Delete", "subscribe_delete": "Delete",
"subscribe_add_failed": "Failed to add blacklist subscription",
"subscribe_update_success": "Blacklist subscription updated successfully",
"subscribe_update_failed": "Failed to update blacklist subscription",
"subscribe_source_update_failed": "Failed to update blacklist subscription source",
"overwrite": "Override search service", "overwrite": "Override search service",
"overwrite_tooltip": "Force use search service instead of LLM", "overwrite_tooltip": "Force use search service instead of LLM",
"apikey": "API key", "apikey": "API key",
@ -1892,6 +1927,7 @@
"rag_failed": "RAG failed" "rag_failed": "RAG failed"
} }
} }
}
}, },
"quickPhrase": { "quickPhrase": {
"title": "Quick Phrases", "title": "Quick Phrases",
@ -1938,7 +1974,8 @@
"service_tier.auto": "auto", "service_tier.auto": "auto",
"service_tier.default": "default", "service_tier.default": "default",
"service_tier.flex": "flex" "service_tier.flex": "flex"
} },
"mineru.api_key": "Mineru now offers a daily free quota of 500 pages, and you do not need to enter a key."
}, },
"translate": { "translate": {
"any.language": "Any language", "any.language": "Any language",

View File

@ -406,9 +406,11 @@
"prompt": "プロンプト", "prompt": "プロンプト",
"provider": "プロバイダー", "provider": "プロバイダー",
"regenerate": "再生成", "regenerate": "再生成",
"refresh": "更新",
"rename": "名前を変更", "rename": "名前を変更",
"reset": "リセット", "reset": "リセット",
"save": "保存", "save": "保存",
"settings": "設定",
"search": "検索", "search": "検索",
"select": "選択", "select": "選択",
"selectedMessages": "{{count}}件のメッセージを選択しました", "selectedMessages": "{{count}}件のメッセージを選択しました",
@ -423,7 +425,9 @@
"pinyin.asc": "ピンインで昇順ソート", "pinyin.asc": "ピンインで昇順ソート",
"pinyin.desc": "ピンインで降順ソート" "pinyin.desc": "ピンインで降順ソート"
}, },
"no_results": "検索結果なし" "no_results": "検索結果なし",
"enabled": "有効",
"disabled": "無効"
}, },
"docs": { "docs": {
"title": "ドキュメント" "title": "ドキュメント"
@ -543,7 +547,11 @@
"rename": "名前を変更", "rename": "名前を変更",
"search": "ナレッジベースを検索", "search": "ナレッジベースを検索",
"search_placeholder": "検索するテキストを入力", "search_placeholder": "検索するテキストを入力",
"settings": "ナレッジベース設定", "settings": {
"title": "ナレッジベース設定",
"preprocessing": "預処理",
"preprocessing_tooltip": "アップロードされたファイルのOCR預処理"
},
"sitemap_placeholder": "サイトマップURLを入力", "sitemap_placeholder": "サイトマップURLを入力",
"sitemaps": "サイトマップ", "sitemaps": "サイトマップ",
"source": "ソース", "source": "ソース",
@ -567,12 +575,20 @@
"urls": "URL", "urls": "URL",
"dimensions": "埋め込み次元", "dimensions": "埋め込み次元",
"dimensions_size_tooltip": "埋め込み次元のサイズは、数値が大きいほど埋め込み次元も大きくなりますが、消費するトークンも増えます。", "dimensions_size_tooltip": "埋め込み次元のサイズは、数値が大きいほど埋め込み次元も大きくなりますが、消費するトークンも増えます。",
"status_embedding_completed": "埋め込み完了",
"status_preprocess_completed": "前処理完了",
"status_embedding_failed": "埋め込み失敗",
"status_preprocess_failed": "前処理に失敗しました",
"dimensions_size_placeholder": " 埋め込み次元のサイズ1024", "dimensions_size_placeholder": " 埋め込み次元のサイズ1024",
"dimensions_auto_set": "埋め込み次元を自動設定", "dimensions_auto_set": "埋め込み次元を自動設定",
"dimensions_error_invalid": "埋め込み次元のサイズを入力してください", "dimensions_error_invalid": "埋め込み次元のサイズを入力してください",
"dimensions_size_too_large": "埋め込み次元はモデルのコンテキスト制限({{max_context}})を超えてはなりません。", "dimensions_size_too_large": "埋め込み次元はモデルのコンテキスト制限({{max_context}})を超えてはなりません。",
"dimensions_set_right": "⚠️ モデルが設定した埋め込み次元のサイズをサポートしていることを確認してください", "dimensions_set_right": "⚠️ モデルが設定した埋め込み次元のサイズをサポートしていることを確認してください",
"dimensions_default": "モデルはデフォルトの埋め込み次元を使用します" "dimensions_default": "モデルはデフォルトの埋め込み次元を使用します",
"quota": "{{name}} 残りクォータ: {{quota}}",
"quota_infinity": "{{name}} クォータ: 無制限",
"name_required": "ナレッジベース名は必須です",
"embedding_model_required": "ナレッジベース埋め込みモデルが必要です"
}, },
"languages": { "languages": {
"arabic": "アラビア語", "arabic": "アラビア語",
@ -835,7 +851,7 @@
"notification": { "notification": {
"assistant": "助手回應", "assistant": "助手回應",
"knowledge.success": "ナレッジベースに{{type}}を正常に追加しました", "knowledge.success": "ナレッジベースに{{type}}を正常に追加しました",
"knowledge.error": "ナレッジベースへの{{type}}の追加に失敗しました: {{error}}" "knowledge.error": "{{error}}"
}, },
"ollama": { "ollama": {
"keep_alive_time.description": "モデルがメモリに保持される時間デフォルト5分", "keep_alive_time.description": "モデルがメモリに保持される時間デフォルト5分",
@ -1805,17 +1821,12 @@
"theme.window.style.title": "ウィンドウスタイル", "theme.window.style.title": "ウィンドウスタイル",
"theme.window.style.transparent": "透明ウィンドウ", "theme.window.style.transparent": "透明ウィンドウ",
"title": "設定", "title": "設定",
"topic.position": "トピックの位置", "tool": {
"topic.position.left": "左", "title": "ツール設定",
"topic.position.right": "右",
"topic.show.time": "トピックの時間を表示",
"topic.pin_to_top": "固定トピックを上部に表示",
"tray.onclose": "閉じるときにトレイに最小化",
"tray.show": "トレイアイコンを表示",
"tray.title": "トレイ",
"websearch": { "websearch": {
"blacklist": "ブラックリスト", "blacklist": "ブラックリスト",
"blacklist_description": "以下のウェブサイトの結果は検索結果に表示されません", "blacklist_description": "以下のウェブサイトの結果は検索結果に表示されません",
"blacklist_tooltip": "以下の形式を使用してください(改行区切り)\nexample.com\nhttps://www.example.com\nhttps://example.com\n*://*.example.com",
"check": "チェック", "check": "チェック",
"check_failed": "検証に失敗しました", "check_failed": "検証に失敗しました",
"check_success": "検証に成功しました", "check_success": "検証に成功しました",
@ -1833,19 +1844,20 @@
"title": "Tavily" "title": "Tavily"
}, },
"title": "ウェブ検索", "title": "ウェブ検索",
"blacklist_tooltip": "マッチパターン: *://*.example.com/*\n正規表現: /example\\.(net|org)/",
"subscribe": "ブラックリスト購読", "subscribe": "ブラックリスト購読",
"subscribe_update": "更新", "subscribe_update": "更新",
"subscribe_add": "サブスクリプションを追加", "subscribe_add": "購読を追加",
"subscribe_url": "フィードのURL", "subscribe_url": "購読URL",
"subscribe_name": "代替名", "subscribe_name": "代替名",
"subscribe_name.placeholder": "ダウンロードしたフィードに名前がない場合に使用される代替名", "subscribe_name.placeholder": "ダウンロードした購読フィードに名前がない場合に使用される代替名",
"subscribe_add_success": "フィードの追加が成功しました!", "subscribe_add_success": "購読フィードが正常に追加されました!",
"subscribe_delete": "削除", "subscribe_delete": "削除",
"overwrite": "サービス検索を上書き", "overwrite": "検索サービスを上書き",
"overwrite_tooltip": "大規模言語モデルではなく、サービス検索を使用する", "overwrite_tooltip": "LLMの代わりに検索サービスを強制的に使用する",
"apikey": "API キー", "apikey": "APIキー",
"free": "無料", "free": "無料",
"content_limit": "コンテンツ制限",
"content_limit_tooltip": "検索結果のコンテンツの長さを制限します。制限を超えるコンテンツは切り捨てられます。",
"compression": { "compression": {
"title": "検索結果の圧縮", "title": "検索結果の圧縮",
"method": "圧縮方法", "method": "圧縮方法",
@ -1872,12 +1884,36 @@
"provider_not_found": "プロバイダーが見つかりません", "provider_not_found": "プロバイダーが見つかりません",
"rag_failed": "RAG に失敗しました" "rag_failed": "RAG に失敗しました"
} }
}
}, },
"subscribe_add_failed": "ブラックリスト購読の追加に失敗しました", "preprocess": {
"subscribe_update_success": "ブラックリスト購読が正常に更新されました", "title": "前処理",
"subscribe_update_failed": "ブラックリスト購読の更新に失敗しました", "provider": "プレプロセスプロバイダー",
"subscribe_source_update_failed": "ブラックリスト購読ソースの更新に失敗しました" "provider_placeholder": "前処理プロバイダーを選択してください"
}, },
"preprocessOrOcr.tooltip": "設定 → ツールで、ドキュメント前処理サービスプロバイダーまたはOCRを設定します。ドキュメント前処理は、複雑な形式のドキュメントやスキャンされたドキュメントの検索性能を効果的に向上させます。OCRは、ドキュメント内の画像内のテキストまたはスキャンされたPDFテキストのみを認識できます。",
"ocr": {
"title": "OCRオーシーアール",
"provider": "OCRプロバイダー",
"provider_placeholder": "OCRプロバイダーを選択",
"mac_system_ocr_options": {
"mode": {
"title": "認識モード",
"accurate": "正確",
"fast": "速い"
},
"min_confidence": "最小信頼度"
}
}
},
"topic.position": "トピックの位置",
"topic.position.left": "左",
"topic.position.right": "右",
"topic.show.time": "トピックの時間を表示",
"topic.pin_to_top": "固定トピックを上部に表示",
"tray.onclose": "閉じるときにトレイに最小化",
"tray.show": "トレイアイコンを表示",
"tray.title": "トレイ",
"general.auto_check_update.title": "自動更新", "general.auto_check_update.title": "自動更新",
"general.test_plan.title": "テストプラン", "general.test_plan.title": "テストプラン",
"general.test_plan.tooltip": "テストプランに参加すると、最新の機能をより早く体験できますが、同時により多くのリスクが伴います。データを事前にバックアップしてください。", "general.test_plan.tooltip": "テストプランに参加すると、最新の機能をより早く体験できますが、同時により多くのリスクが伴います。データを事前にバックアップしてください。",
@ -1941,7 +1977,8 @@
"assistant": "アシスタントメッセージ", "assistant": "アシスタントメッセージ",
"backup": "バックアップメッセージ", "backup": "バックアップメッセージ",
"knowledge_embed": "ナレッジベースメッセージ" "knowledge_embed": "ナレッジベースメッセージ"
} },
"mineru.api_key": "Mineruでは現在、1日500ページの無料クォータを提供しており、キーを入力する必要はありません。"
}, },
"translate": { "translate": {
"any.language": "任意の言語", "any.language": "任意の言語",

View File

@ -406,9 +406,11 @@
"prompt": "Промпт", "prompt": "Промпт",
"provider": "Провайдер", "provider": "Провайдер",
"regenerate": "Пересоздать", "regenerate": "Пересоздать",
"refresh": "Обновить",
"rename": "Переименовать", "rename": "Переименовать",
"reset": "Сбросить", "reset": "Сбросить",
"save": "Сохранить", "save": "Сохранить",
"settings": "Настройки",
"search": "Поиск", "search": "Поиск",
"select": "Выбрать", "select": "Выбрать",
"selectedMessages": "Выбрано {{count}} сообщений", "selectedMessages": "Выбрано {{count}} сообщений",
@ -423,7 +425,9 @@
"pinyin.asc": "Сортировать по пиньинь (А-Я)", "pinyin.asc": "Сортировать по пиньинь (А-Я)",
"pinyin.desc": "Сортировать по пиньинь (Я-А)" "pinyin.desc": "Сортировать по пиньинь (Я-А)"
}, },
"no_results": "Результатов не найдено" "no_results": "Результатов не найдено",
"enabled": "Включено",
"disabled": "Отключено"
}, },
"docs": { "docs": {
"title": "Документация" "title": "Документация"
@ -543,7 +547,11 @@
"rename": "Переименовать", "rename": "Переименовать",
"search": "Поиск в базе знаний", "search": "Поиск в базе знаний",
"search_placeholder": "Введите текст для поиска", "search_placeholder": "Введите текст для поиска",
"settings": "Настройки базы знаний", "settings": {
"title": "Настройки базы знаний",
"preprocessing": "Предварительная обработка",
"preprocessing_tooltip": "Предварительная обработка изображений с помощью OCR"
},
"sitemap_placeholder": "Введите URL карты сайта", "sitemap_placeholder": "Введите URL карты сайта",
"sitemaps": "Сайты", "sitemaps": "Сайты",
"source": "Источник", "source": "Источник",
@ -567,12 +575,20 @@
"urls": "URL-адреса", "urls": "URL-адреса",
"dimensions": "векторное пространство", "dimensions": "векторное пространство",
"dimensions_size_tooltip": "Размерность вложения, чем больше значение, тем больше размерность вложения, но и потребляемых токенов также становится больше.", "dimensions_size_tooltip": "Размерность вложения, чем больше значение, тем больше размерность вложения, но и потребляемых токенов также становится больше.",
"status_embedding_completed": "Вложение завершено",
"status_preprocess_completed": "Предварительная обработка завершена",
"status_embedding_failed": "Не удалось встроить",
"status_preprocess_failed": "Предварительная обработка не удалась",
"dimensions_size_placeholder": " Размерность эмбеддинга, например 1024", "dimensions_size_placeholder": " Размерность эмбеддинга, например 1024",
"dimensions_auto_set": "Автоматическая установка размерности эмбеддинга", "dimensions_auto_set": "Автоматическая установка размерности эмбеддинга",
"dimensions_error_invalid": "Пожалуйста, введите размерность эмбеддинга", "dimensions_error_invalid": "Пожалуйста, введите размерность эмбеддинга",
"dimensions_size_too_large": "Размерность вложения не может превышать ограничение контекста модели ({{max_context}})", "dimensions_size_too_large": "Размерность вложения не может превышать ограничение контекста модели ({{max_context}})",
"dimensions_set_right": "⚠️ Убедитесь, что модель поддерживает заданный размер эмбеддинга", "dimensions_set_right": "⚠️ Убедитесь, что модель поддерживает заданный размер эмбеддинга",
"dimensions_default": "Модель будет использовать размер эмбеддинга по умолчанию" "dimensions_default": "Модель будет использовать размер эмбеддинга по умолчанию",
"quota": "{{name}} Остаток квоты: {{quota}}",
"quota_infinity": "{{name}} Квота: Не ограничена",
"name_required": "Название базы знаний обязательно",
"embedding_model_required": "Модель встраивания базы знаний требуется"
}, },
"languages": { "languages": {
"arabic": "Арабский", "arabic": "Арабский",
@ -835,7 +851,7 @@
"notification": { "notification": {
"assistant": "Ответ ассистента", "assistant": "Ответ ассистента",
"knowledge.success": "Успешно добавлено {{type}} в базу знаний", "knowledge.success": "Успешно добавлено {{type}} в базу знаний",
"knowledge.error": "Не удалось добавить {{type}} в базу знаний: {{error}}" "knowledge.error": "{{error}}"
}, },
"ollama": { "ollama": {
"keep_alive_time.description": "Время в минутах, в течение которого модель остается активной, по умолчанию 5 минут.", "keep_alive_time.description": "Время в минутах, в течение которого модель остается активной, по умолчанию 5 минут.",
@ -1805,17 +1821,12 @@
"theme.window.style.title": "Стиль окна", "theme.window.style.title": "Стиль окна",
"theme.window.style.transparent": "Прозрачное окно", "theme.window.style.transparent": "Прозрачное окно",
"title": "Настройки", "title": "Настройки",
"topic.position": "Позиция топиков", "tool": {
"topic.position.left": "Слева", "title": "Настройки инструментов",
"topic.position.right": "Справа",
"topic.show.time": "Показывать время топика",
"topic.pin_to_top": "Закрепленные топики сверху",
"tray.onclose": "Свернуть в трей при закрытии",
"tray.show": "Показать значок в трее",
"tray.title": "Трей",
"websearch": { "websearch": {
"blacklist": "Черный список", "blacklist": "Черный список",
"blacklist_description": "Результаты из следующих веб-сайтов не будут отображаться в результатах поиска", "blacklist_description": "Результаты из следующих веб-сайтов не будут отображаться в результатах поиска",
"blacklist_tooltip": "Пожалуйста, используйте следующий формат (разделенный переносами строк)\nexample.com\nhttps://www.example.com\nhttps://example.com\n*://*.example.com",
"check": "проверка", "check": "проверка",
"check_failed": "Проверка не прошла", "check_failed": "Проверка не прошла",
"check_success": "Проверка успешна", "check_success": "Проверка успешна",
@ -1833,19 +1844,20 @@
"title": "Tavily" "title": "Tavily"
}, },
"title": "Поиск в Интернете", "title": "Поиск в Интернете",
"blacklist_tooltip": "Шаблон: *://*.example.com/*\nРегулярное выражение: /example\\.(net|org)/",
"subscribe": "Подписка на черный список", "subscribe": "Подписка на черный список",
"subscribe_update": "Обновить", "subscribe_update": "Обновить",
"subscribe_add": "Добавить", "subscribe_add": "Добавить подписку",
"subscribe_url": "URL подписки", "subscribe_url": "URL подписки",
"subscribe_name": "Альтернативное имя", "subscribe_name": "Альтернативное имя",
"subscribe_name.placeholder": "Альтернативное имя, если в подписке нет названия.", "subscribe_name.placeholder": "Альтернативное имя, используемое, когда в загруженной ленте подписки нет имени.",
"subscribe_add_success": "Подписка успешно добавлена!", "subscribe_add_success": "Лента подписки успешно добавлена!",
"subscribe_delete": "Удалить", "subscribe_delete": "Удалить",
"overwrite": "Переопределить провайдера поиска", "overwrite": "Переопределить поисковый сервис",
"overwrite_tooltip": "Использовать провайдера поиска вместо LLM", "overwrite_tooltip": "Принудительно использовать поисковый сервис вместо LLM",
"apikey": "API ключ", "apikey": "API ключ",
"free": "Бесплатно", "free": "Бесплатно",
"content_limit": "Ограничение длины контента",
"content_limit_tooltip": "Ограничить длину контента в результатах поиска; контент, превышающий лимит, будет усечен.",
"compression": { "compression": {
"title": "Сжатие результатов поиска", "title": "Сжатие результатов поиска",
"method": "Метод сжатия", "method": "Метод сжатия",
@ -1872,12 +1884,36 @@
"provider_not_found": "Поставщик не найден", "provider_not_found": "Поставщик не найден",
"rag_failed": "RAG не удалось" "rag_failed": "RAG не удалось"
} }
}
}, },
"subscribe_add_failed": "Не удалось добавить подписку на черный список", "preprocess": {
"subscribe_update_success": "Подписка на черный список успешно обновлена", "title": "Предварительная обработка",
"subscribe_update_failed": "Не удалось обновить подписку на черный список", "provider": "Предварительная обработка Поставщик",
"subscribe_source_update_failed": "Не удалось обновить источник подписки на черный список" "provider_placeholder": "Выберите поставщика услуг предварительной обработки"
}, },
"preprocessOrOcr.tooltip": "В настройках (Настройки -> Инструменты) укажите поставщика услуги предварительной обработки документов или OCR. Предварительная обработка документов может значительно повысить эффективность поиска для документов сложных форматов и отсканированных документов. OCR способен распознавать только текст внутри изображений в документах или текст в отсканированных PDF.",
"ocr": {
"title": "OCR (оптическое распознавание символов)",
"provider": "Поставщик OCR",
"provider_placeholder": "Выберите провайдера OCR",
"mac_system_ocr_options": {
"mode": {
"title": "Режим распознавания",
"accurate": "Точный",
"fast": "Быстро"
},
"min_confidence": "Минимальная достоверность"
}
}
},
"topic.position": "Позиция топиков",
"topic.position.left": "Слева",
"topic.position.right": "Справа",
"topic.show.time": "Показывать время топика",
"topic.pin_to_top": "Закрепленные топики сверху",
"tray.onclose": "Свернуть в трей при закрытии",
"tray.show": "Показать значок в трее",
"tray.title": "Трей",
"general.auto_check_update.title": "Автоматическое обновление", "general.auto_check_update.title": "Автоматическое обновление",
"general.test_plan.title": "Тестовый план", "general.test_plan.title": "Тестовый план",
"general.test_plan.tooltip": "Участвовать в тестовом плане, чтобы быстрее получать новые функции, но при этом возникает больше рисков, пожалуйста, сделайте резервную копию данных заранее", "general.test_plan.tooltip": "Участвовать в тестовом плане, чтобы быстрее получать новые функции, но при этом возникает больше рисков, пожалуйста, сделайте резервную копию данных заранее",
@ -1941,7 +1977,8 @@
"assistant": "Сообщение ассистента", "assistant": "Сообщение ассистента",
"backup": "Резервное сообщение", "backup": "Резервное сообщение",
"knowledge_embed": "Сообщение базы знаний" "knowledge_embed": "Сообщение базы знаний"
} },
"mineru.api_key": "Mineru теперь предлагает ежедневную бесплатную квоту в 500 страниц, и вам не нужно вводить ключ."
}, },
"translate": { "translate": {
"any.language": "Любой язык", "any.language": "Любой язык",

View File

@ -406,9 +406,11 @@
"prompt": "提示词", "prompt": "提示词",
"provider": "提供商", "provider": "提供商",
"regenerate": "重新生成", "regenerate": "重新生成",
"refresh": "刷新",
"rename": "重命名", "rename": "重命名",
"reset": "重置", "reset": "重置",
"save": "保存", "save": "保存",
"settings": "设置",
"search": "搜索", "search": "搜索",
"select": "选择", "select": "选择",
"selectedMessages": "选中 {{count}} 条消息", "selectedMessages": "选中 {{count}} 条消息",
@ -423,7 +425,9 @@
"pinyin.asc": "按拼音升序", "pinyin.asc": "按拼音升序",
"pinyin.desc": "按拼音降序" "pinyin.desc": "按拼音降序"
}, },
"no_results": "无结果" "no_results": "无结果",
"enabled": "已启用",
"disabled": "已禁用"
}, },
"docs": { "docs": {
"title": "帮助文档" "title": "帮助文档"
@ -551,7 +555,11 @@
"rename": "重命名", "rename": "重命名",
"search": "搜索知识库", "search": "搜索知识库",
"search_placeholder": "输入查询内容", "search_placeholder": "输入查询内容",
"settings": "知识库设置", "settings": {
"title": "知识库设置",
"preprocessing": "预处理",
"preprocessing_tooltip": "使用 OCR 预处理上传的文件"
},
"sitemap_placeholder": "请输入站点地图 URL", "sitemap_placeholder": "请输入站点地图 URL",
"sitemaps": "网站", "sitemaps": "网站",
"source": "来源", "source": "来源",
@ -571,8 +579,16 @@
"topN_placeholder": "未设置", "topN_placeholder": "未设置",
"topN_tooltip": "返回的匹配结果数量,数值越大,匹配结果越多,但消耗的 Token 也越多", "topN_tooltip": "返回的匹配结果数量,数值越大,匹配结果越多,但消耗的 Token 也越多",
"url_added": "网址已添加", "url_added": "网址已添加",
"url_placeholder": "请输入网址,多个网址用回车分隔", "url_placeholder": "请输入网址, 多个网址用回车分隔",
"urls": "网址" "urls": "网址",
"status_embedding_completed": "嵌入完成",
"status_preprocess_completed": "预处理完成",
"status_embedding_failed": "嵌入失败",
"status_preprocess_failed": "预处理失败",
"quota": "{{name}} 剩余额度:{{quota}}",
"quota_infinity": "{{name}} 剩余额度:无限制",
"name_required": "知识库名称为必填项",
"embedding_model_required": "知识库嵌入模型是必需的"
}, },
"languages": { "languages": {
"arabic": "阿拉伯文", "arabic": "阿拉伯文",
@ -835,7 +851,7 @@
"notification": { "notification": {
"assistant": "助手响应", "assistant": "助手响应",
"knowledge.success": "成功添加 {{type}} 到知识库", "knowledge.success": "成功添加 {{type}} 到知识库",
"knowledge.error": "添加 {{type}} 到知识库失败: {{error}}" "knowledge.error": "{{error}}"
}, },
"ollama": { "ollama": {
"keep_alive_time.description": "对话后模型在内存中保持的时间默认5 分钟)", "keep_alive_time.description": "对话后模型在内存中保持的时间默认5 分钟)",
@ -1670,7 +1686,7 @@
"title": "通知设置", "title": "通知设置",
"assistant": "助手消息", "assistant": "助手消息",
"backup": "备份", "backup": "备份",
"knowledge_embed": "知识嵌入" "knowledge_embed": "知识"
}, },
"provider": { "provider": {
"add.name": "提供商名称", "add.name": "提供商名称",
@ -1831,71 +1847,6 @@
"tray.onclose": "关闭时最小化到托盘", "tray.onclose": "关闭时最小化到托盘",
"tray.show": "显示托盘图标", "tray.show": "显示托盘图标",
"tray.title": "托盘", "tray.title": "托盘",
"websearch": {
"blacklist": "黑名单",
"blacklist_description": "在搜索结果中不会出现以下网站的结果",
"blacklist_tooltip": "请使用以下格式 (换行分隔)\n匹配模式: *://*.example.com/*\n正则表达式: /example\\.(net|org)/",
"check": "检测",
"check_failed": "验证失败",
"check_success": "验证成功",
"overwrite": "覆盖服务商搜索",
"overwrite_tooltip": "强制使用搜索服务商而不是大语言模型进行搜索",
"get_api_key": "点击这里获取密钥",
"no_provider_selected": "请选择搜索服务商后再检测",
"search_max_result": "搜索结果个数",
"search_provider": "搜索服务商",
"search_provider_placeholder": "选择一个搜索服务商",
"subscribe": "黑名单订阅",
"subscribe_update": "立即更新",
"subscribe_add": "添加订阅",
"subscribe_url": "订阅源地址",
"subscribe_name": "替代名字",
"subscribe_name.placeholder": "当下载的订阅源没有名称时所使用的替代名称",
"subscribe_add_success": "订阅源添加成功!",
"subscribe_delete": "删除订阅源",
"search_result_default": "默认",
"search_with_time": "搜索包含日期",
"tavily": {
"api_key": "Tavily API 密钥",
"api_key.placeholder": "请输入 Tavily API 密钥",
"description": "Tavily 是一个为 AI 代理量身定制的搜索引擎,提供实时、准确的结果、智能查询建议和深入的研究能力",
"title": "Tavily"
},
"title": "网络搜索",
"apikey": "API 密钥",
"free": "免费",
"compression": {
"title": "搜索结果压缩",
"method": "压缩方法",
"method.none": "不压缩",
"method.cutoff": "截断",
"cutoff.limit": "截断长度",
"cutoff.limit.placeholder": "输入长度",
"cutoff.limit.tooltip": "限制搜索结果的内容长度,超过限制的内容将被截断(例如 2000 字符)",
"cutoff.unit.char": "字符",
"cutoff.unit.token": "Token",
"method.rag": "RAG",
"rag.document_count": "文档数量",
"rag.document_count.default": "默认",
"rag.document_count.tooltip": "预期从单个搜索结果中提取的文档数量,实际提取的总数量是这个值乘以搜索结果数量。",
"rag.embedding_dimensions.auto_get": "自动获取维度",
"rag.embedding_dimensions.placeholder": "不设置维度",
"rag.embedding_dimensions.tooltip": "留空则不传递 dimensions 参数",
"info": {
"dimensions_auto_success": "维度自动获取成功,维度为 {{dimensions}}"
},
"error": {
"embedding_model_required": "请先选择嵌入模型",
"dimensions_auto_failed": "维度自动获取失败",
"provider_not_found": "未找到服务商",
"rag_failed": "RAG 失败"
}
},
"subscribe_add_failed": "添加黑名单订阅失败",
"subscribe_update_success": "黑名单订阅更新成功",
"subscribe_update_failed": "更新黑名单订阅失败",
"subscribe_source_update_failed": "更新黑名单订阅源失败"
},
"quickPhrase": { "quickPhrase": {
"title": "快捷短语", "title": "快捷短语",
"add": "添加短语", "add": "添加短语",
@ -1941,8 +1892,94 @@
"service_tier.auto": "自动", "service_tier.auto": "自动",
"service_tier.default": "默认", "service_tier.default": "默认",
"service_tier.flex": "灵活" "service_tier.flex": "灵活"
},
"tool": {
"title": "工具设置",
"preprocess": {
"title": "文档预处理",
"provider": "文档预处理服务商",
"provider_placeholder": "选择一个文档预处理服务商"
},
"ocr": {
"title": "OCR",
"provider": "OCR 服务商",
"provider_placeholder": "选择一个 OCR 服务商",
"mac_system_ocr_options": {
"mode": {
"title": "识别模式",
"accurate": "准确",
"fast": "快速"
},
"min_confidence": "最低置信度"
} }
}, },
"websearch": {
"blacklist": "黑名单",
"blacklist_description": "在搜索结果中不会出现以下网站的结果",
"blacklist_tooltip": "请使用以下格式(换行分隔)\n匹配模式: *://*.example.com/*\n正则表达式: /example\\.(net|org)/",
"check": "检测",
"check_failed": "验证失败",
"check_success": "验证成功",
"overwrite": "覆盖服务商搜索",
"overwrite_tooltip": "强制使用搜索服务商而不是大语言模型进行搜索",
"get_api_key": "点击这里获取密钥",
"no_provider_selected": "请选择搜索服务商后再检测",
"search_max_result": "搜索结果个数",
"search_provider": "搜索服务商",
"search_provider_placeholder": "选择一个搜索服务商",
"subscribe": "黑名单订阅",
"subscribe_update": "立即更新",
"subscribe_add": "添加订阅",
"subscribe_url": "订阅源地址",
"subscribe_name": "替代名字",
"subscribe_name.placeholder": "当下载的订阅源没有名称时所使用的替代名称",
"subscribe_add_success": "订阅源添加成功!",
"subscribe_delete": "删除订阅源",
"search_result_default": "默认",
"search_with_time": "搜索包含日期",
"tavily": {
"api_key": "Tavily API 密钥",
"api_key.placeholder": "请输入 Tavily API 密钥",
"description": "Tavily 是一个为 AI 代理量身定制的搜索引擎,提供实时、准确的结果、智能查询建议和深入的研究能力",
"title": "Tavily"
},
"title": "网络搜索",
"apikey": "API 密钥",
"free": "免费",
"content_limit": "内容长度限制",
"content_limit_tooltip": "限制搜索结果的内容长度, 超过限制的内容将被截断",
"compression": {
"title": "搜索结果压缩",
"method": "压缩方法",
"method.none": "不压缩",
"method.cutoff": "截断",
"cutoff.limit": "截断长度",
"cutoff.limit.placeholder": "输入长度",
"cutoff.limit.tooltip": "限制搜索结果的内容长度, 超过限制的内容将被截断(例如 2000 字符)",
"cutoff.unit.char": "字符",
"cutoff.unit.token": "Token",
"method.rag": "RAG",
"rag.document_count": "文档数量",
"rag.document_count.default": "默认",
"rag.document_count.tooltip": "预期从单个搜索结果中提取的文档数量,实际提取的总数量是这个值乘以搜索结果数量。",
"rag.embedding_dimensions.auto_get": "自动获取维度",
"rag.embedding_dimensions.placeholder": "不设置维度",
"rag.embedding_dimensions.tooltip": "留空则不传递 dimensions 参数",
"info": {
"dimensions_auto_success": "维度自动获取成功,维度为 {{dimensions}}"
},
"error": {
"embedding_model_required": "请先选择嵌入模型",
"dimensions_auto_failed": "维度自动获取失败",
"provider_not_found": "未找到服务商",
"rag_failed": "RAG 失败"
}
}
},
"preprocessOrOcr.tooltip": "在设置 -> 工具中设置文档预处理服务商或OCR文档预处理可以有效提升复杂格式文档与扫描版文档的检索效果OCR仅可识别文档内图片或扫描版PDF的文本"
},
"mineru.api_key": "MinerU现在提供每日500页的免费额度您不需要填写密钥。"
},
"translate": { "translate": {
"any.language": "任意语言", "any.language": "任意语言",
"target_language": "目标语言", "target_language": "目标语言",

View File

@ -406,9 +406,11 @@
"prompt": "提示詞", "prompt": "提示詞",
"provider": "供應商", "provider": "供應商",
"regenerate": "重新生成", "regenerate": "重新生成",
"refresh": "重新整理",
"rename": "重新命名", "rename": "重新命名",
"reset": "重設", "reset": "重設",
"save": "儲存", "save": "儲存",
"settings": "設定",
"search": "搜尋", "search": "搜尋",
"select": "選擇", "select": "選擇",
"selectedMessages": "選中 {{count}} 條訊息", "selectedMessages": "選中 {{count}} 條訊息",
@ -423,7 +425,9 @@
"pinyin.asc": "按拼音升序", "pinyin.asc": "按拼音升序",
"pinyin.desc": "按拼音降序" "pinyin.desc": "按拼音降序"
}, },
"no_results": "沒有結果" "no_results": "沒有結果",
"enabled": "已啟用",
"disabled": "已停用"
}, },
"docs": { "docs": {
"title": "說明文件" "title": "說明文件"
@ -543,7 +547,11 @@
"rename": "重新命名", "rename": "重新命名",
"search": "搜尋知識庫", "search": "搜尋知識庫",
"search_placeholder": "輸入查詢內容", "search_placeholder": "輸入查詢內容",
"settings": "知識庫設定", "settings": {
"title": "知識庫設定",
"preprocessing": "預處理",
"preprocessing_tooltip": "預處理上傳的文件"
},
"sitemap_placeholder": "請輸入網站地圖 URL", "sitemap_placeholder": "請輸入網站地圖 URL",
"sitemaps": "網站", "sitemaps": "網站",
"source": "來源", "source": "來源",
@ -567,12 +575,20 @@
"urls": "網址", "urls": "網址",
"dimensions": "嵌入維度", "dimensions": "嵌入維度",
"dimensions_size_tooltip": "嵌入維度大小,數值越大,嵌入維度越大,但消耗的 Token 也越多", "dimensions_size_tooltip": "嵌入維度大小,數值越大,嵌入維度越大,但消耗的 Token 也越多",
"dimensions_size_placeholder": "嵌入維度大小,例如 1024", "status_embedding_completed": "嵌入完成",
"status_preprocess_completed": "預處理完成",
"status_embedding_failed": "嵌入失敗",
"status_preprocess_failed": "預處理失敗",
"dimensions_size_placeholder": " 嵌入維度大小,例如 1024",
"dimensions_auto_set": "自動設定嵌入維度", "dimensions_auto_set": "自動設定嵌入維度",
"dimensions_error_invalid": "請輸入嵌入維度大小", "dimensions_error_invalid": "請輸入嵌入維度大小",
"dimensions_size_too_large": "嵌入維度不能超過模型上下文限制({{max_context}}", "dimensions_size_too_large": "嵌入維度不能超過模型上下文限制({{max_context}}",
"dimensions_set_right": "⚠️ 請確保模型支援所設置的嵌入維度大小", "dimensions_set_right": "⚠️ 請確保模型支援所設置的嵌入維度大小",
"dimensions_default": "模型將使用預設嵌入維度" "dimensions_default": "模型將使用預設嵌入維度",
"quota": "{{name}} 剩餘配額:{{quota}}",
"quota_infinity": "{{name}} 配額:無限制",
"name_required": "知識庫名稱為必填項目",
"embedding_model_required": "知識庫嵌入模型是必需的"
}, },
"languages": { "languages": {
"arabic": "阿拉伯文", "arabic": "阿拉伯文",
@ -1808,17 +1824,21 @@
"theme.window.style.title": "視窗樣式", "theme.window.style.title": "視窗樣式",
"theme.window.style.transparent": "透明視窗", "theme.window.style.transparent": "透明視窗",
"title": "設定", "title": "設定",
"topic.position": "話題位置", "tool": {
"topic.position.left": "左側", "title": "工具設定",
"topic.position.right": "右側",
"topic.show.time": "顯示話題時間",
"topic.pin_to_top": "固定話題置頂",
"tray.onclose": "關閉時最小化到系统匣",
"tray.show": "顯示系统匣圖示",
"tray.title": "系统匣",
"websearch": { "websearch": {
"blacklist": "黑名單",
"blacklist_description": "以下網站不會出現在搜尋結果中",
"blacklist_tooltip": "請使用以下格式 (換行符號分隔)\nexample.com\nhttps://www.example.com\nhttps://example.com\n*://*.example.com",
"check": "檢查",
"check_failed": "驗證失敗",
"check_success": "驗證成功", "check_success": "驗證成功",
"get_api_key": "點選這裡取得金鑰", "get_api_key": "點選這裡取得金鑰",
"no_provider_selected": "請選擇搜尋服務商後再檢查",
"search_max_result": "搜尋結果個數",
"search_provider": "搜尋服務商",
"search_provider_placeholder": "選擇一個搜尋服務商",
"search_result_default": "預設",
"search_with_time": "搜尋包含日期", "search_with_time": "搜尋包含日期",
"tavily": { "tavily": {
"api_key": "Tavily API 金鑰", "api_key": "Tavily API 金鑰",
@ -1826,29 +1846,21 @@
"description": "Tavily 是一個為 AI 代理量身訂製的搜尋引擎,提供即時、準確的結果、智慧查詢建議和深入的研究能力", "description": "Tavily 是一個為 AI 代理量身訂製的搜尋引擎,提供即時、準確的結果、智慧查詢建議和深入的研究能力",
"title": "Tavily" "title": "Tavily"
}, },
"blacklist": "黑名單", "title": "網路搜尋",
"blacklist_description": "以下網站不會出現在搜索結果中",
"search_max_result": "搜尋結果個數",
"search_result_default": "預設",
"check": "檢查",
"search_provider": "搜尋服務商",
"search_provider_placeholder": "選擇一個搜尋服務商",
"no_provider_selected": "請選擇搜索服務商後再檢查",
"check_failed": "驗證失敗",
"blacklist_tooltip": "匹配模式: *://*.example.com/*\n正则表达式: /example\\.(net|org)/",
"subscribe": "黑名單訂閱", "subscribe": "黑名單訂閱",
"subscribe_update": "更新", "subscribe_update": "更新",
"subscribe_add": "添加訂閱", "subscribe_add": "新增訂閱",
"subscribe_url": "訂閱源地址", "subscribe_url": "訂閱網址",
"subscribe_name": "替代名稱", "subscribe_name": "替代名稱",
"subscribe_name.placeholder": "下載的訂閱源沒有名稱時使用的替代名稱", "subscribe_name.placeholder": "下載的訂閱源沒有名稱時使用的替代名稱。",
"subscribe_add_success": "訂閱源添加成功!", "subscribe_add_success": "訂閱源新增成功!",
"subscribe_delete": "刪除", "subscribe_delete": "刪除",
"title": "網路搜尋", "overwrite": "覆蓋搜尋服務",
"overwrite": "覆蓋搜尋服務商", "overwrite_tooltip": "強制使用搜尋服務而不是 LLM",
"overwrite_tooltip": "強制使用搜尋服務商而不是大語言模型進行搜尋",
"apikey": "API 金鑰", "apikey": "API 金鑰",
"free": "免費", "free": "免費",
"content_limit": "內容長度限制",
"content_limit_tooltip": "限制搜尋結果的內容長度;超過限制的內容將被截斷。",
"compression": { "compression": {
"title": "搜尋結果壓縮", "title": "搜尋結果壓縮",
"method": "壓縮方法", "method": "壓縮方法",
@ -1875,12 +1887,36 @@
"provider_not_found": "未找到服務商", "provider_not_found": "未找到服務商",
"rag_failed": "RAG 失敗" "rag_failed": "RAG 失敗"
} }
}
}, },
"subscribe_add_failed": "加入黑名單訂閱失敗", "preprocess": {
"subscribe_update_success": "黑名單訂閱更新成功", "title": "前置處理",
"subscribe_update_failed": "更新黑名單訂閱失敗", "provider": "前置處理供應商",
"subscribe_source_update_failed": "更新黑名單訂閱來源失敗" "provider_placeholder": "選擇一個預處理供應商"
}, },
"preprocessOrOcr.tooltip": "在「設定」->「工具」中設定文件預處理服務供應商或OCR。文件預處理可有效提升複雜格式文件及掃描文件的檢索效能而OCR僅能辨識文件內圖片文字或掃描PDF文字。",
"ocr": {
"title": "光學字符識別",
"provider": "OCR 供應商",
"provider_placeholder": "選擇一個OCR服務提供商",
"mac_system_ocr_options": {
"mode": {
"title": "識別模式",
"accurate": "準確",
"fast": "快速"
},
"min_confidence": "最小置信度"
}
}
},
"topic.pin_to_top": "固定話題置頂",
"topic.position": "話題位置",
"topic.position.left": "左側",
"topic.position.right": "右側",
"topic.show.time": "顯示話題時間",
"tray.onclose": "關閉時最小化到系统匣",
"tray.show": "顯示系统匣圖示",
"tray.title": "系统匣",
"general.auto_check_update.title": "自動更新", "general.auto_check_update.title": "自動更新",
"general.test_plan.title": "測試計畫", "general.test_plan.title": "測試計畫",
"general.test_plan.tooltip": "參與測試計畫,體驗最新功能,但同時也帶來更多風險,請務必提前備份數據", "general.test_plan.tooltip": "參與測試計畫,體驗最新功能,但同時也帶來更多風險,請務必提前備份數據",
@ -1941,7 +1977,8 @@
"assistant": "助手訊息", "assistant": "助手訊息",
"backup": "備份訊息", "backup": "備份訊息",
"knowledge_embed": "知識庫訊息" "knowledge_embed": "知識庫訊息"
} },
"mineru.api_key": "Mineru 現在每天提供 500 頁的免費配額,且無需輸入金鑰。"
}, },
"translate": { "translate": {
"any.language": "任意語言", "any.language": "任意語言",

View File

@ -1,5 +1,5 @@
import FileManager from '@renderer/services/FileManager' import FileManager from '@renderer/services/FileManager'
import { FileType, FileTypes } from '@renderer/types' import { FileMetadata, FileTypes } from '@renderer/types'
import { formatFileSize } from '@renderer/utils' import { formatFileSize } from '@renderer/utils'
import { Col, Image, Row, Spin, Table } from 'antd' import { Col, Image, Row, Spin, Table } from 'antd'
import React, { memo } from 'react' import React, { memo } from 'react'
@ -7,7 +7,7 @@ import styled from 'styled-components'
interface ContentViewProps { interface ContentViewProps {
id: FileTypes | 'all' | string id: FileTypes | 'all' | string
files?: FileType[] files?: FileMetadata[]
dataSource?: any[] dataSource?: any[]
columns: any[] columns: any[]
} }

View File

@ -1,7 +1,7 @@
import { DeleteOutlined, ExclamationCircleOutlined } from '@ant-design/icons' import { DeleteOutlined, ExclamationCircleOutlined } from '@ant-design/icons'
import { handleDelete } from '@renderer/services/FileAction' import { handleDelete } from '@renderer/services/FileAction'
import FileManager from '@renderer/services/FileManager' import FileManager from '@renderer/services/FileManager'
import { FileType, FileTypes } from '@renderer/types' import { FileMetadata, FileTypes } from '@renderer/types'
import { formatFileSize } from '@renderer/utils' import { formatFileSize } from '@renderer/utils'
import { Col, Image, Row, Spin } from 'antd' import { Col, Image, Row, Spin } from 'antd'
import { t } from 'i18next' import { t } from 'i18next'
@ -16,14 +16,14 @@ interface FileItemProps {
list: { list: {
key: FileTypes | 'all' | string key: FileTypes | 'all' | string
file: React.ReactNode file: React.ReactNode
files?: FileType[] files?: FileMetadata[]
count?: number count?: number
size: string size: string
ext: string ext: string
created_at: string created_at: string
actions: React.ReactNode actions: React.ReactNode
}[] }[]
files?: FileType[] files?: FileMetadata[]
} }
const FileList: React.FC<FileItemProps> = ({ id, list, files }) => { const FileList: React.FC<FileItemProps> = ({ id, list, files }) => {

View File

@ -10,7 +10,7 @@ import ListItem from '@renderer/components/ListItem'
import db from '@renderer/databases' import db from '@renderer/databases'
import { handleDelete, handleRename, sortFiles, tempFilesSort } from '@renderer/services/FileAction' import { handleDelete, handleRename, sortFiles, tempFilesSort } from '@renderer/services/FileAction'
import FileManager from '@renderer/services/FileManager' import FileManager from '@renderer/services/FileManager'
import { FileType, FileTypes } from '@renderer/types' import { FileMetadata, FileTypes } from '@renderer/types'
import { formatFileSize } from '@renderer/utils' import { formatFileSize } from '@renderer/utils'
import { Button, Empty, Flex, Popconfirm } from 'antd' import { Button, Empty, Flex, Popconfirm } from 'antd'
import dayjs from 'dayjs' import dayjs from 'dayjs'
@ -31,7 +31,7 @@ const FilesPage: FC = () => {
const [sortField, setSortField] = useState<SortField>('created_at') const [sortField, setSortField] = useState<SortField>('created_at')
const [sortOrder, setSortOrder] = useState<SortOrder>('desc') const [sortOrder, setSortOrder] = useState<SortOrder>('desc')
const files = useLiveQuery<FileType[]>(() => { const files = useLiveQuery<FileMetadata[]>(() => {
if (fileType === 'all') { if (fileType === 'all') {
return db.files.orderBy('count').toArray().then(tempFilesSort) return db.files.orderBy('count').toArray().then(tempFilesSort)
} }

View File

@ -14,7 +14,7 @@ import {
} from '@ant-design/icons' } from '@ant-design/icons'
import CustomTag from '@renderer/components/CustomTag' import CustomTag from '@renderer/components/CustomTag'
import FileManager from '@renderer/services/FileManager' import FileManager from '@renderer/services/FileManager'
import { FileType } from '@renderer/types' import { FileMetadata } from '@renderer/types'
import { formatFileSize } from '@renderer/utils' import { formatFileSize } from '@renderer/utils'
import { Flex, Image, Tooltip } from 'antd' import { Flex, Image, Tooltip } from 'antd'
import { isEmpty } from 'lodash' import { isEmpty } from 'lodash'
@ -22,8 +22,8 @@ import { FC, useState } from 'react'
import styled from 'styled-components' import styled from 'styled-components'
interface Props { interface Props {
files: FileType[] files: FileMetadata[]
setFiles: (files: FileType[]) => void setFiles: (files: FileMetadata[]) => void
} }
const MAX_FILENAME_DISPLAY_LENGTH = 20 const MAX_FILENAME_DISPLAY_LENGTH = 20
@ -80,7 +80,7 @@ export const getFileIcon = (type?: string) => {
return <FileUnknownFilled /> return <FileUnknownFilled />
} }
export const FileNameRender: FC<{ file: FileType }> = ({ file }) => { export const FileNameRender: FC<{ file: FileMetadata }> = ({ file }) => {
const [visible, setVisible] = useState<boolean>(false) const [visible, setVisible] = useState<boolean>(false)
const isImage = (ext: string) => { const isImage = (ext: string) => {
return ['.png', '.jpg', '.jpeg', '.gif', '.bmp', '.webp'].includes(ext) return ['.png', '.jpg', '.jpeg', '.gif', '.bmp', '.webp'].includes(ext)

View File

@ -55,8 +55,8 @@ const WebSearchButton: FC<Props> = ({ ref, assistant, ToolbarButton }) => {
label: p.name, label: p.name,
description: WebSearchService.isWebSearchEnabled(p.id) description: WebSearchService.isWebSearchEnabled(p.id)
? hasObjectKey(p, 'apiKey') ? hasObjectKey(p, 'apiKey')
? t('settings.websearch.apikey') ? t('settings.tool.websearch.apikey')
: t('settings.websearch.free') : t('settings.tool.websearch.free')
: t('chat.input.web_search.enable_content'), : t('chat.input.web_search.enable_content'),
icon: <Globe />, icon: <Globe />,
isSelected: p.id === assistant?.webSearchProviderId, isSelected: p.id === assistant?.webSearchProviderId,
@ -81,7 +81,7 @@ const WebSearchButton: FC<Props> = ({ ref, assistant, ToolbarButton }) => {
items.push({ items.push({
label: t('chat.input.web_search.settings'), label: t('chat.input.web_search.settings'),
icon: <Settings />, icon: <Settings />,
action: () => navigate('/settings/web-search') action: () => navigate('/settings/tool/websearch')
}) })
items.unshift({ items.unshift({

View File

@ -182,7 +182,8 @@ const KnowledgeCitation: React.FC<{ citation: Citation }> = ({ citation }) => {
<WebSearchCardHeader> <WebSearchCardHeader>
{citation.showFavicon && <FileSearch width={16} />} {citation.showFavicon && <FileSearch width={16} />}
<CitationLink className="text-nowrap" href={citation.url} onClick={(e) => handleLinkClick(citation.url, e)}> <CitationLink className="text-nowrap" href={citation.url} onClick={(e) => handleLinkClick(citation.url, e)}>
{citation.title} {/* example title: User/path/example.pdf */}
{citation.title?.split('/').pop()}
</CitationLink> </CitationLink>
<CitationIndex>{citation.number}</CitationIndex> <CitationIndex>{citation.number}</CitationIndex>
{citation.content && <CopyButton content={citation.content} />} {citation.content && <CopyButton content={citation.content} />}

View File

@ -20,7 +20,7 @@ const StyledUpload = styled(Upload)`
` `
const MessageAttachments: FC<Props> = ({ block }) => { const MessageAttachments: FC<Props> = ({ block }) => {
// const handleCopyImage = async (image: FileType) => { // const handleCopyImage = async (image: FileMetadata) => {
// const data = await FileManager.readFile(image) // const data = await FileManager.readFile(image)
// const blob = new Blob([data], { type: 'image/png' }) // const blob = new Blob([data], { type: 'image/png' })
// const item = new ClipboardItem({ [blob.type]: blob }) // const item = new ClipboardItem({ [blob.type]: blob })

View File

@ -7,7 +7,7 @@ import FileManager from '@renderer/services/FileManager'
import PasteService from '@renderer/services/PasteService' import PasteService from '@renderer/services/PasteService'
import { useAppSelector } from '@renderer/store' import { useAppSelector } from '@renderer/store'
import { selectMessagesForTopic } from '@renderer/store/newMessage' import { selectMessagesForTopic } from '@renderer/store/newMessage'
import { FileType, FileTypes } from '@renderer/types' import { FileMetadata, FileTypes } from '@renderer/types'
import { Message, MessageBlock, MessageBlockStatus, MessageBlockType } from '@renderer/types/newMessage' import { Message, MessageBlock, MessageBlockStatus, MessageBlockType } from '@renderer/types/newMessage'
import { classNames, getFileExtension } from '@renderer/utils' import { classNames, getFileExtension } from '@renderer/utils'
import { getFilesFromDropEvent, isSendMessageKeyPressed } from '@renderer/utils/input' import { getFilesFromDropEvent, isSendMessageKeyPressed } from '@renderer/utils/input'
@ -36,7 +36,7 @@ interface Props {
const MessageBlockEditor: FC<Props> = ({ message, topicId, onSave, onResend, onCancel }) => { const MessageBlockEditor: FC<Props> = ({ message, topicId, onSave, onResend, onCancel }) => {
const allBlocks = findAllBlocks(message) const allBlocks = findAllBlocks(message)
const [editedBlocks, setEditedBlocks] = useState<MessageBlock[]>(allBlocks) const [editedBlocks, setEditedBlocks] = useState<MessageBlock[]>(allBlocks)
const [files, setFiles] = useState<FileType[]>([]) const [files, setFiles] = useState<FileMetadata[]>([])
const [isProcessing, setIsProcessing] = useState(false) const [isProcessing, setIsProcessing] = useState(false)
const [isFileDragging, setIsFileDragging] = useState(false) const [isFileDragging, setIsFileDragging] = useState(false)
const { assistant } = useAssistant(message.assistantId) const { assistant } = useAssistant(message.assistantId)

View File

@ -7,12 +7,13 @@ import { getProviderName } from '@renderer/services/ProviderService'
import { KnowledgeBase } from '@renderer/types' import { KnowledgeBase } from '@renderer/types'
import { Button, Empty, Tabs, Tag, Tooltip } from 'antd' import { Button, Empty, Tabs, Tag, Tooltip } from 'antd'
import { Book, Folder, Globe, Link, Notebook, Search, Settings } from 'lucide-react' import { Book, Folder, Globe, Link, Notebook, Search, Settings } from 'lucide-react'
import { FC, useState } from 'react' import { FC, useEffect, useState } from 'react'
import { useTranslation } from 'react-i18next' import { useTranslation } from 'react-i18next'
import styled from 'styled-components' import styled from 'styled-components'
import KnowledgeSearchPopup from './components/KnowledgeSearchPopup' import KnowledgeSearchPopup from './components/KnowledgeSearchPopup'
import KnowledgeSettingsPopup from './components/KnowledgeSettingsPopup' import KnowledgeSettings from './components/KnowledgeSettings'
import QuotaTag from './components/QuotaTag'
import KnowledgeDirectories from './items/KnowledgeDirectories' import KnowledgeDirectories from './items/KnowledgeDirectories'
import KnowledgeFiles from './items/KnowledgeFiles' import KnowledgeFiles from './items/KnowledgeFiles'
import KnowledgeNotes from './items/KnowledgeNotes' import KnowledgeNotes from './items/KnowledgeNotes'
@ -27,16 +28,46 @@ const KnowledgeContent: FC<KnowledgeContentProps> = ({ selectedBase }) => {
const { t } = useTranslation() const { t } = useTranslation()
const { base, urlItems, fileItems, directoryItems, noteItems, sitemapItems } = useKnowledge(selectedBase.id || '') const { base, urlItems, fileItems, directoryItems, noteItems, sitemapItems } = useKnowledge(selectedBase.id || '')
const [activeKey, setActiveKey] = useState('files') const [activeKey, setActiveKey] = useState('files')
const [quota, setQuota] = useState<number | undefined>(undefined)
const [progressMap, setProgressMap] = useState<Map<string, number>>(new Map())
const [preprocessMap, setPreprocessMap] = useState<Map<string, boolean>>(new Map())
const providerName = getProviderName(base?.model.provider || '') const providerName = getProviderName(base?.model.provider || '')
useEffect(() => {
const handlers = [
window.electron.ipcRenderer.on('file-preprocess-finished', (_, { itemId, quota }) => {
setPreprocessMap((prev) => new Map(prev).set(itemId, true))
if (quota) {
setQuota(quota)
}
}),
window.electron.ipcRenderer.on('file-preprocess-progress', (_, { itemId, progress }) => {
setProgressMap((prev) => new Map(prev).set(itemId, progress))
}),
window.electron.ipcRenderer.on('file-ocr-progress', (_, { itemId, progress }) => {
setProgressMap((prev) => new Map(prev).set(itemId, progress))
}),
window.electron.ipcRenderer.on('directory-processing-percent', (_, { itemId, percent }) => {
console.log('[Progress] Directory:', itemId, percent)
setProgressMap((prev) => new Map(prev).set(itemId, percent))
})
]
return () => {
handlers.forEach((cleanup) => cleanup())
}
}, [])
const knowledgeItems = [ const knowledgeItems = [
{ {
key: 'files', key: 'files',
title: t('files.title'), title: t('files.title'),
icon: activeKey === 'files' ? <Book size={16} color="var(--color-primary)" /> : <Book size={16} />, icon: activeKey === 'files' ? <Book size={16} color="var(--color-primary)" /> : <Book size={16} />,
items: fileItems, items: fileItems,
content: <KnowledgeFiles selectedBase={selectedBase} /> content: <KnowledgeFiles selectedBase={selectedBase} progressMap={progressMap} preprocessMap={preprocessMap} />
}, },
{ {
key: 'notes', key: 'notes',
@ -50,7 +81,7 @@ const KnowledgeContent: FC<KnowledgeContentProps> = ({ selectedBase }) => {
title: t('knowledge.directories'), title: t('knowledge.directories'),
icon: activeKey === 'directories' ? <Folder size={16} color="var(--color-primary)" /> : <Folder size={16} />, icon: activeKey === 'directories' ? <Folder size={16} color="var(--color-primary)" /> : <Folder size={16} />,
items: directoryItems, items: directoryItems,
content: <KnowledgeDirectories selectedBase={selectedBase} /> content: <KnowledgeDirectories selectedBase={selectedBase} progressMap={progressMap} />
}, },
{ {
key: 'urls', key: 'urls',
@ -93,7 +124,7 @@ const KnowledgeContent: FC<KnowledgeContentProps> = ({ selectedBase }) => {
<Button <Button
type="text" type="text"
icon={<Settings size={18} color="var(--color-icon)" />} icon={<Settings size={18} color="var(--color-icon)" />}
onClick={() => KnowledgeSettingsPopup.show({ base })} onClick={() => KnowledgeSettings.show({ base })}
size="small" size="small"
/> />
<div className="model-row"> <div className="model-row">
@ -106,6 +137,9 @@ const KnowledgeContent: FC<KnowledgeContentProps> = ({ selectedBase }) => {
</div> </div>
</Tooltip> </Tooltip>
{base.rerankModel && <Tag style={{ borderRadius: 20, margin: 0 }}>{base.rerankModel.name}</Tag>} {base.rerankModel && <Tag style={{ borderRadius: 20, margin: 0 }}>{base.rerankModel.name}</Tag>}
{base.preprocessOrOcrProvider && base.preprocessOrOcrProvider.type === 'preprocess' && (
<QuotaTag base={base} providerId={base.preprocessOrOcrProvider?.provider.id} quota={quota} />
)}
</div> </div>
</ModelInfo> </ModelInfo>
<HStack gap={8} alignItems="center"> <HStack gap={8} alignItems="center">
@ -264,7 +298,6 @@ export const StatusIconWrapper = styled.div`
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
padding-top: 2px;
` `
export const RefreshIcon = styled(RedoOutlined)` export const RefreshIcon = styled(RedoOutlined)`

View File

@ -15,7 +15,7 @@ import { useTranslation } from 'react-i18next'
import styled from 'styled-components' import styled from 'styled-components'
import AddKnowledgePopup from './components/AddKnowledgePopup' import AddKnowledgePopup from './components/AddKnowledgePopup'
import KnowledgeSettingsPopup from './components/KnowledgeSettingsPopup' import KnowledgeSettings from './components/KnowledgeSettings'
import KnowledgeContent from './KnowledgeContent' import KnowledgeContent from './KnowledgeContent'
const KnowledgePage: FC = () => { const KnowledgePage: FC = () => {
@ -55,10 +55,10 @@ const KnowledgePage: FC = () => {
} }
}, },
{ {
label: t('knowledge.settings'), label: t('knowledge.settings.title'),
key: 'settings', key: 'settings',
icon: <SettingOutlined />, icon: <SettingOutlined />,
onClick: () => KnowledgeSettingsPopup.show({ base }) onClick: () => KnowledgeSettings.show({ base })
}, },
{ type: 'divider' }, { type: 'divider' },
{ {

View File

@ -1,35 +1,31 @@
import { InfoCircleOutlined, WarningOutlined } from '@ant-design/icons'
import AiProvider from '@renderer/aiCore' import AiProvider from '@renderer/aiCore'
import { HStack } from '@renderer/components/Layout'
import { TopView } from '@renderer/components/TopView' import { TopView } from '@renderer/components/TopView'
import { DEFAULT_KNOWLEDGE_DOCUMENT_COUNT } from '@renderer/config/constant' import { DEFAULT_KNOWLEDGE_DOCUMENT_COUNT, isMac } from '@renderer/config/constant'
import { getEmbeddingMaxContext } from '@renderer/config/embedings'
import { isEmbeddingModel, isRerankModel } from '@renderer/config/models' import { isEmbeddingModel, isRerankModel } from '@renderer/config/models'
import { NOT_SUPPORTED_REANK_PROVIDERS } from '@renderer/config/providers' import { NOT_SUPPORTED_REANK_PROVIDERS } from '@renderer/config/providers'
// import { SUPPORTED_REANK_PROVIDERS } from '@renderer/config/providers' // import { SUPPORTED_REANK_PROVIDERS } from '@renderer/config/providers'
import { useKnowledgeBases } from '@renderer/hooks/useKnowledge' import { useKnowledgeBases } from '@renderer/hooks/useKnowledge'
import { useOcrProviders } from '@renderer/hooks/useOcr'
import { usePreprocessProviders } from '@renderer/hooks/usePreprocess'
import { useProviders } from '@renderer/hooks/useProvider' import { useProviders } from '@renderer/hooks/useProvider'
import { SettingHelpText } from '@renderer/pages/settings'
import { getKnowledgeBaseParams } from '@renderer/services/KnowledgeService' import { getKnowledgeBaseParams } from '@renderer/services/KnowledgeService'
import { getModelUniqId } from '@renderer/services/ModelService' import { getModelUniqId } from '@renderer/services/ModelService'
import { KnowledgeBase, Model } from '@renderer/types' import { KnowledgeBase, Model, OcrProvider, PreprocessProvider } from '@renderer/types'
import { getErrorMessage } from '@renderer/utils/error' import { getErrorMessage } from '@renderer/utils/error'
import { Flex, Form, Input, InputNumber, Modal, Select, Slider, Switch } from 'antd' import { Alert, Input, InputNumber, Menu, Modal, Select, Slider, Switch, Tooltip } from 'antd'
import { find, sortBy } from 'lodash' import { find, sortBy } from 'lodash'
import { nanoid } from 'nanoid' import { nanoid } from 'nanoid'
import { useMemo, useRef, useState } from 'react' import { useMemo, useRef, useState } from 'react'
import { useTranslation } from 'react-i18next' import { useTranslation } from 'react-i18next'
import styled from 'styled-components'
interface ShowParams { interface ShowParams {
title: string title: string
} }
interface FormData {
name: string
model: string
autoDims: boolean | undefined
dimensions: number | undefined
rerankModel: string | undefined
documentCount: number | undefined
}
interface Props extends ShowParams { interface Props extends ShowParams {
resolve: (data: any) => void resolve: (data: any) => void
} }
@ -38,10 +34,16 @@ const PopupContainer: React.FC<Props> = ({ title, resolve }) => {
const [open, setOpen] = useState(true) const [open, setOpen] = useState(true)
const [loading, setLoading] = useState(false) const [loading, setLoading] = useState(false)
const [autoDims, setAutoDims] = useState(true) const [autoDims, setAutoDims] = useState(true)
const [form] = Form.useForm<FormData>()
const { t } = useTranslation() const { t } = useTranslation()
const { providers } = useProviders() const { providers } = useProviders()
const { addKnowledgeBase } = useKnowledgeBases() const { addKnowledgeBase } = useKnowledgeBases()
const [newBase, setNewBase] = useState<KnowledgeBase>({} as KnowledgeBase)
const [dimensions, setDimensions] = useState<number | undefined>(undefined)
const [selectedMenu, setSelectedMenu] = useState('general')
const { preprocessProviders } = usePreprocessProviders()
const { ocrProviders } = useOcrProviders()
const [selectedProvider, setSelectedProvider] = useState<PreprocessProvider | OcrProvider | undefined>(undefined)
const embeddingModels = useMemo(() => { const embeddingModels = useMemo(() => {
return providers return providers
@ -94,14 +96,38 @@ const PopupContainer: React.FC<Props> = ({ title, resolve }) => {
.filter((group) => group.options.length > 0) .filter((group) => group.options.length > 0)
}, [providers, t]) }, [providers, t])
const preprocessOrOcrSelectOptions = useMemo(() => {
const preprocessOptions = {
label: t('settings.tool.preprocess.provider'),
title: t('settings.tool.preprocess.provider'),
options: preprocessProviders
// todo: 免费期结束后删除
.filter((p) => p.apiKey !== '' || p.id === 'mineru')
.map((p) => ({ value: p.id, label: p.name }))
}
const ocrOptions = {
label: t('settings.tool.ocr.provider'),
title: t('settings.tool.ocr.provider'),
options: ocrProviders.filter((p) => p.apiKey !== '').map((p) => ({ value: p.id, label: p.name }))
}
return isMac ? [preprocessOptions, ocrOptions] : [preprocessOptions]
}, [ocrProviders, preprocessProviders])
const onOk = async () => { const onOk = async () => {
try { try {
const values = await form.validateFields() if (!newBase.name?.trim()) {
const selectedEmbeddingModel = find(embeddingModels, JSON.parse(values.model)) as Model window.message.error(t('knowledge.name_required'))
return
}
if (!newBase.model) {
window.message.error(t('knowledge.embedding_model_required'))
return
}
// const values = await form.validateFields()
const selectedEmbeddingModel = find(embeddingModels, newBase.model) as Model
const selectedRerankModel = values.rerankModel const selectedRerankModel = newBase.rerankModel ? (find(rerankModels, newBase.rerankModel) as Model) : undefined
? (find(rerankModels, JSON.parse(values.rerankModel)) as Model)
: undefined
if (selectedEmbeddingModel) { if (selectedEmbeddingModel) {
setLoading(true) setLoading(true)
@ -110,46 +136,48 @@ const PopupContainer: React.FC<Props> = ({ title, resolve }) => {
if (!provider) { if (!provider) {
return return
} }
let finalDimensions: number // 用于存储最终确定的维度值
if (autoDims || values.dimensions === undefined) { if (autoDims || dimensions === undefined) {
try { try {
const aiProvider = new AiProvider(provider) const aiProvider = new AiProvider(provider)
values.dimensions = await aiProvider.getEmbeddingDimensions(selectedEmbeddingModel) finalDimensions = await aiProvider.getEmbeddingDimensions(selectedEmbeddingModel)
setDimensions(finalDimensions)
} catch (error) { } catch (error) {
console.error('Error getting embedding dimensions:', error) console.error('Error getting embedding dimensions:', error)
window.message.error(t('message.error.get_embedding_dimensions') + '\n' + getErrorMessage(error)) window.message.error(t('message.error.get_embedding_dimensions') + '\n' + getErrorMessage(error))
setLoading(false) setLoading(false)
return return
} }
} else if (typeof values.dimensions === 'string') { } else {
// 按理来说不应该是string的但是确实是string finalDimensions = dimensions
values.dimensions = parseInt(values.dimensions)
} }
const newBase: KnowledgeBase = { const _newBase = {
...newBase,
id: nanoid(), id: nanoid(),
name: values.name, name: newBase.name,
model: selectedEmbeddingModel, model: selectedEmbeddingModel,
rerankModel: selectedRerankModel, rerankModel: selectedRerankModel,
dimensions: autoDims ? undefined : values.dimensions, dimensions: finalDimensions,
documentCount: values.documentCount || DEFAULT_KNOWLEDGE_DOCUMENT_COUNT, documentCount: newBase.documentCount || DEFAULT_KNOWLEDGE_DOCUMENT_COUNT,
items: [], items: [],
created_at: Date.now(), created_at: Date.now(),
updated_at: Date.now(), updated_at: Date.now(),
version: 1 version: 1
} }
await window.api.knowledgeBase.create(getKnowledgeBaseParams(newBase)) await window.api.knowledgeBase.create(getKnowledgeBaseParams(_newBase))
addKnowledgeBase(newBase) addKnowledgeBase(_newBase as any)
setOpen(false) setOpen(false)
resolve(newBase) resolve(_newBase)
} }
} catch (error) { } catch (error) {
console.error('Validation failed:', error) console.error('Validation failed:', error)
} }
} }
const onCancel = () => { const onCancel = () => {
setOpen(false) setOpen(false)
} }
@ -158,8 +186,255 @@ const PopupContainer: React.FC<Props> = ({ title, resolve }) => {
resolve(null) resolve(null)
} }
const menuItems = [
{
key: 'general',
label: t('settings.general')
},
{
key: 'advanced',
label: t('settings.advanced.title')
}
]
const renderSettings = () => {
if (selectedMenu === 'general') {
return ( return (
<Modal <SettingsPanel>
<SettingsItem>
<div className="settings-label">{t('common.name')}</div>
<Input
ref={nameInputRef}
placeholder={t('common.name')}
onChange={(e) => {
if (e.target.value) {
setNewBase({ ...newBase, name: e.target.value })
}
}}
/>
</SettingsItem>
<SettingsItem>
<div className="settings-label">
{t('settings.tool.preprocess.title')} / {t('settings.tool.ocr.title')}
<Tooltip title={t('settings.tool.preprocessOrOcr.tooltip')} placement="right">
<InfoCircleOutlined style={{ marginLeft: 8 }} />
</Tooltip>
</div>
<Select
value={selectedProvider?.id}
style={{ width: '100%' }}
onChange={(value: string) => {
const type = preprocessProviders.find((p) => p.id === value) ? 'preprocess' : 'ocr'
const provider = (type === 'preprocess' ? preprocessProviders : ocrProviders).find(
(p) => p.id === value
)
if (!provider) {
setSelectedProvider(undefined)
setNewBase({
...newBase,
preprocessOrOcrProvider: undefined
})
return
}
setSelectedProvider(provider)
setNewBase({
...newBase,
preprocessOrOcrProvider: {
type: type,
provider: provider
}
})
}}
placeholder={t('settings.tool.preprocess.provider_placeholder')}
options={preprocessOrOcrSelectOptions}
allowClear
/>
</SettingsItem>
<SettingsItem>
<div className="settings-label">
{t('models.embedding_model')}
<Tooltip title={t('models.embedding_model_tooltip')} placement="right">
<InfoCircleOutlined style={{ marginLeft: 8 }} />
</Tooltip>
</div>
<Select
style={{ width: '100%' }}
options={embeddingSelectOptions}
placeholder={t('settings.models.empty')}
onChange={(value) => {
const model = value
? providers.flatMap((p) => p.models).find((m) => getModelUniqId(m) === value)
: undefined
if (!model) return
setNewBase({ ...newBase, model })
}}
/>
</SettingsItem>
<SettingsItem>
<div className="settings-label">
{t('models.rerank_model')}
<Tooltip title={t('models.rerank_model_tooltip')} placement="right">
<InfoCircleOutlined style={{ marginLeft: 8 }} />
</Tooltip>
</div>
<Select
style={{ width: '100%' }}
options={rerankSelectOptions}
placeholder={t('settings.models.empty')}
onChange={(value) => {
const rerankModel = value
? providers.flatMap((p) => p.models).find((m) => getModelUniqId(m) === value)
: undefined
setNewBase({ ...newBase, rerankModel })
}}
allowClear
/>
</SettingsItem>
<SettingsItem>
<div className="settings-label">
{t('knowledge.document_count')}
<Tooltip title={t('knowledge.document_count_help')}>
<InfoCircleOutlined style={{ marginLeft: 8 }} />
</Tooltip>
</div>
<Slider
style={{ width: '100%' }}
min={1}
max={30}
step={1}
defaultValue={DEFAULT_KNOWLEDGE_DOCUMENT_COUNT}
marks={{ 1: '1', 6: t('knowledge.document_count_default'), 30: '30' }}
onChange={(value) => setNewBase({ ...newBase, documentCount: value })}
/>
</SettingsItem>
{/* dimensions */}
<SettingsItem>
<div
className="settings-label"
style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', width: '100%' }}>
<span>
{t('knowledge.dimensions_auto_set')}
<Tooltip title={t('knowledge.dimensions_default')} placement="right">
<InfoCircleOutlined style={{ marginLeft: 8 }} />
</Tooltip>
</span>
<Switch
checked={autoDims}
onChange={(checked) => {
setAutoDims(checked)
if (checked) {
setDimensions(undefined)
}
}}
/>
</div>
</SettingsItem>
{!autoDims && (
<SettingsItem>
<div className="settings-label">
{t('knowledge.dimensions')}
<Tooltip title={t('knowledge.dimensions_size_tooltip')} placement="right">
<InfoCircleOutlined style={{ marginLeft: 8 }} />
</Tooltip>
</div>
<InputNumber
min={1}
style={{ width: '100%' }}
placeholder={t('knowledge.dimensions_size_placeholder')}
value={newBase.dimensions}
onChange={(value) => {
setDimensions(value === null ? undefined : value)
}}
/>
</SettingsItem>
)}
</SettingsPanel>
)
}
if (selectedMenu === 'advanced') {
return (
<SettingsPanel>
<SettingsItem>
<div className="settings-label">
{t('knowledge.chunk_size')}
<Tooltip title={t('knowledge.chunk_size_tooltip')} placement="right">
<InfoCircleOutlined style={{ marginLeft: 8 }} />
</Tooltip>
</div>
<InputNumber
style={{ width: '100%' }}
min={100}
value={newBase.chunkSize}
placeholder={t('knowledge.chunk_size_placeholder')}
onChange={(value) => {
const maxContext = getEmbeddingMaxContext(newBase.model.id)
if (!value || !maxContext || value <= maxContext) {
setNewBase({ ...newBase, chunkSize: value || undefined })
}
}}
/>
</SettingsItem>
<SettingsItem>
<div className="settings-label">
{t('knowledge.chunk_overlap')}
<Tooltip title={t('knowledge.chunk_overlap_tooltip')} placement="right">
<InfoCircleOutlined style={{ marginLeft: 8 }} />
</Tooltip>
</div>
<InputNumber
style={{ width: '100%' }}
min={0}
value={newBase.chunkOverlap}
placeholder={t('knowledge.chunk_overlap_placeholder')}
onChange={async (value) => {
if (!value || (newBase.chunkSize && newBase.chunkSize > value)) {
setNewBase({ ...newBase, chunkOverlap: value || undefined })
} else {
await window.message.error(t('message.error.chunk_overlap_too_large'))
}
}}
/>
</SettingsItem>
<SettingsItem>
<div className="settings-label">
{t('knowledge.threshold')}
<Tooltip title={t('knowledge.threshold_tooltip')} placement="right">
<InfoCircleOutlined style={{ marginLeft: 8 }} />
</Tooltip>
</div>
<InputNumber
style={{ width: '100%' }}
step={0.1}
min={0}
max={1}
value={newBase.threshold}
placeholder={t('knowledge.threshold_placeholder')}
onChange={(value) => setNewBase({ ...newBase, threshold: value || undefined })}
/>
</SettingsItem>
<Alert
message={t('knowledge.chunk_size_change_warning')}
type="warning"
showIcon
icon={<WarningOutlined />}
/>
</SettingsPanel>
)
}
return null
}
return (
<SettingsModal
title={title} title={title}
open={open} open={open}
onOk={onOk} onOk={onOk}
@ -168,95 +443,107 @@ const PopupContainer: React.FC<Props> = ({ title, resolve }) => {
afterOpenChange={(visible) => visible && nameInputRef.current?.focus()} afterOpenChange={(visible) => visible && nameInputRef.current?.focus()}
destroyOnClose destroyOnClose
centered centered
okButtonProps={{ loading }}> okButtonProps={{ loading }}
<Form form={form} layout="vertical"> width="min(800px, 70vw)"
<Form.Item styles={{
name="name" body: { padding: 0, height: '65vh' },
label={t('common.name')} header: {
rules={[{ required: true, message: t('message.error.enter.name') }]}> padding: '10px 15px',
<Input placeholder={t('common.name')} ref={nameInputRef} /> borderBottom: '0.5px solid var(--color-border)',
</Form.Item> margin: 0,
borderRadius: 0
<Form.Item },
name="model" content: {
label={t('models.embedding_model')} padding: 0,
tooltip={{ title: t('models.embedding_model_tooltip'), placement: 'right' }} overflow: 'hidden'
rules={[{ required: true, message: t('message.error.enter.model') }]}>
<Select style={{ width: '100%' }} options={embeddingSelectOptions} placeholder={t('settings.models.empty')} />
</Form.Item>
<Form.Item
name="rerankModel"
label={t('models.rerank_model')}
tooltip={{ title: t('models.rerank_model_tooltip'), placement: 'right' }}
rules={[{ required: false, message: t('message.error.enter.model') }]}>
<Select style={{ width: '100%' }} options={rerankSelectOptions} placeholder={t('settings.models.empty')} />
</Form.Item>
<SettingHelpText style={{ marginTop: -15, marginBottom: 20 }}>
{t('models.rerank_model_not_support_provider', {
provider: NOT_SUPPORTED_REANK_PROVIDERS.map((id) => t(`provider.${id}`))
})}
</SettingHelpText>
<Form.Item
name="documentCount"
label={t('knowledge.document_count')}
initialValue={DEFAULT_KNOWLEDGE_DOCUMENT_COUNT} // 设置初始值
tooltip={{ title: t('knowledge.document_count_help') }}>
<Slider min={1} max={30} step={1} marks={{ 1: '1', 6: t('knowledge.document_count_default'), 30: '30' }} />
</Form.Item>
<Form.Item
name="autoDims"
colon={false}
initialValue={true}
layout="horizontal"
label={t('knowledge.dimensions_auto_set')}
tooltip={t('knowledge.dimensions_default')}
style={{ marginBottom: 0, justifyContent: 'space-between' }}>
<Flex justify="flex-end" style={{ marginBottom: '1rem' }}>
<Switch
checked={autoDims}
onClick={() => {
form.setFieldValue('autoDims', !autoDims)
if (!autoDims) {
form.validateFields(['dimensions'])
} }
setAutoDims(!autoDims) }}>
}}></Switch> <HStack>
</Flex> <LeftMenu>
</Form.Item> <StyledMenu
defaultSelectedKeys={['general']}
<Form.Item mode="vertical"
name="dimensions" items={menuItems}
colon={false} onSelect={({ key }) => setSelectedMenu(key)}
layout="horizontal" />
initialValue={undefined} </LeftMenu>
label={t('knowledge.dimensions')} <SettingsContentPanel>{renderSettings()}</SettingsContentPanel>
tooltip={{ title: t('knowledge.dimensions_size_tooltip') }} </HStack>
dependencies={['model']} </SettingsModal>
style={{ display: autoDims ? 'none' : 'block' }}
rules={[
({ getFieldValue }) => ({
validator(_, value) {
if (getFieldValue('autoDims') || value > 0) {
return Promise.resolve()
} else {
return Promise.reject(t('knowledge.dimensions_error_invalid'))
}
}
})
]}>
<InputNumber min={1} style={{ width: '100%' }} placeholder={t('knowledge.dimensions_size_placeholder')} />
</Form.Item>
{!autoDims && (
<SettingHelpText style={{ marginTop: -15, marginBottom: 20 }}>
{t('knowledge.dimensions_set_right')}
</SettingHelpText>
)}
</Form>
</Modal>
) )
} }
const SettingsPanel = styled.div`
padding: 0 16px;
`
const SettingsItem = styled.div`
margin-bottom: 24px;
.settings-label {
font-size: 14px;
margin-bottom: 8px;
display: flex;
align-items: center;
}
`
const SettingsModal = styled(Modal)`
.ant-modal-title {
font-size: 14px;
}
.ant-modal-close {
top: 4px;
right: 4px;
}
.ant-menu-item {
height: 36px;
color: var(--color-text-2);
display: flex;
align-items: center;
border: 0.5px solid transparent;
border-radius: 6px;
.ant-menu-title-content {
line-height: 36px;
}
}
.ant-menu-item-active {
background-color: var(--color-background-soft) !important;
transition: none;
}
.ant-menu-item-selected {
background-color: var(--color-background-soft);
border: 0.5px solid var(--color-border);
.ant-menu-title-content {
color: var(--color-text-1);
font-weight: 500;
}
}
`
const LeftMenu = styled.div`
height: 65vh;
border-right: 0.5px solid var(--color-border);
`
const SettingsContentPanel = styled.div`
flex: 1;
padding: 16px 16px;
height: calc(65vh - 16px);
overflow-y: scroll;
`
const StyledMenu = styled(Menu)`
width: 220px;
padding: 5px;
background: transparent;
margin-top: 2px;
border-inline-end: none !important;
.ant-menu-item {
margin-bottom: 7px;
}
`
export default class AddKnowledgePopup { export default class AddKnowledgePopup {
static hide() { static hide() {
TopView.hide('AddKnowledgePopup') TopView.hide('AddKnowledgePopup')

View File

@ -3,7 +3,7 @@ import type { ExtractChunkData } from '@cherrystudio/embedjs-interfaces'
import { HStack } from '@renderer/components/Layout' import { HStack } from '@renderer/components/Layout'
import { TopView } from '@renderer/components/TopView' import { TopView } from '@renderer/components/TopView'
import { searchKnowledgeBase } from '@renderer/services/KnowledgeService' import { searchKnowledgeBase } from '@renderer/services/KnowledgeService'
import { FileType, KnowledgeBase } from '@renderer/types' import { FileMetadata, KnowledgeBase } from '@renderer/types'
import { Divider, Input, InputRef, List, message, Modal, Spin, Tooltip, Typography } from 'antd' import { Divider, Input, InputRef, List, message, Modal, Spin, Tooltip, Typography } from 'antd'
import { Search } from 'lucide-react' import { Search } from 'lucide-react'
import { useEffect, useRef, useState } from 'react' import { useEffect, useRef, useState } from 'react'
@ -23,7 +23,7 @@ interface Props extends ShowParams {
const PopupContainer: React.FC<Props> = ({ base, resolve }) => { const PopupContainer: React.FC<Props> = ({ base, resolve }) => {
const [open, setOpen] = useState(true) const [open, setOpen] = useState(true)
const [loading, setLoading] = useState(false) const [loading, setLoading] = useState(false)
const [results, setResults] = useState<Array<ExtractChunkData & { file: FileType | null }>>([]) const [results, setResults] = useState<Array<ExtractChunkData & { file: FileMetadata | null }>>([])
const [searchKeyword, setSearchKeyword] = useState('') const [searchKeyword, setSearchKeyword] = useState('')
const { t } = useTranslation() const { t } = useTranslation()
const searchInputRef = useRef<InputRef>(null) const searchInputRef = useRef<InputRef>(null)
@ -149,14 +149,17 @@ const PopupContainer: React.FC<Props> = ({ base, resolve }) => {
<List.Item> <List.Item>
<ResultItem> <ResultItem>
<MetadataContainer> <MetadataContainer>
<Text type="secondary" ellipsis> <Text type="secondary">
{t('knowledge.source')}:{' '} {t('knowledge.source')}:{' '}
{item.file ? ( {item.file ? (
<a href={`http://file/${item.file.name}`} target="_blank" rel="noreferrer"> <a href={`http://file/${item.file.name}`} target="_blank" rel="noreferrer">
{item.file.origin_name} {item.file.origin_name}
</a> </a>
) : ( ) : (
item.metadata.source // item.metadata.source
<a href={`http://file/${item.metadata.source}`} target="_blank" rel="noreferrer">
{item.metadata.source.split('/').pop() || item.metadata.source}
</a>
)} )}
</Text> </Text>
<ScoreTag>Score: {(item.score * 100).toFixed(1)}%</ScoreTag> <ScoreTag>Score: {(item.score * 100).toFixed(1)}%</ScoreTag>

View File

@ -0,0 +1,442 @@
import { InfoCircleOutlined, SettingOutlined, WarningOutlined } from '@ant-design/icons'
import { HStack } from '@renderer/components/Layout'
import { TopView } from '@renderer/components/TopView'
import { DEFAULT_KNOWLEDGE_DOCUMENT_COUNT, isMac } from '@renderer/config/constant'
import { getEmbeddingMaxContext } from '@renderer/config/embedings'
import { isEmbeddingModel, isRerankModel } from '@renderer/config/models'
import { useKnowledge } from '@renderer/hooks/useKnowledge'
import { useOcrProviders } from '@renderer/hooks/useOcr'
import { usePreprocessProviders } from '@renderer/hooks/usePreprocess'
import { useProviders } from '@renderer/hooks/useProvider'
import { getModelUniqId } from '@renderer/services/ModelService'
import { KnowledgeBase, PreprocessProvider } from '@renderer/types'
import { Alert, Input, InputNumber, Menu, Modal, Select, Slider, Tooltip } from 'antd'
import { sortBy } from 'lodash'
import { useState } from 'react'
import { useTranslation } from 'react-i18next'
import styled from 'styled-components'
interface ShowParams {
base: KnowledgeBase
}
interface Props extends ShowParams {
resolve: (data: any) => void
}
const PopupContainer: React.FC<Props> = ({ base: _base, resolve }) => {
const { preprocessProviders } = usePreprocessProviders()
const { ocrProviders } = useOcrProviders()
const [selectedProvider, setSelectedProvider] = useState<PreprocessProvider | undefined>(
_base.preprocessOrOcrProvider?.provider
)
const [open, setOpen] = useState(true)
const { t } = useTranslation()
const { providers } = useProviders()
const { base, updateKnowledgeBase } = useKnowledge(_base.id)
const [newBase, setNewBase] = useState<KnowledgeBase>(_base)
const [selectedMenu, setSelectedMenu] = useState('general')
if (!base) {
resolve(null)
return null
}
const selectOptions = providers
.filter((p) => p.models.length > 0)
.map((p) => ({
label: p.isSystem ? t(`provider.${p.id}`) : p.name,
title: p.name,
options: sortBy(p.models, 'name')
.filter((model) => isEmbeddingModel(model))
.map((m) => ({
label: m.name,
value: getModelUniqId(m)
}))
}))
.filter((group) => group.options.length > 0)
const rerankSelectOptions = providers
.filter((p) => p.models.length > 0)
.map((p) => ({
label: p.isSystem ? t(`provider.${p.id}`) : p.name,
title: p.name,
options: sortBy(p.models, 'name')
.filter((model) => isRerankModel(model))
.map((m) => ({
label: m.name,
value: getModelUniqId(m)
}))
}))
.filter((group) => group.options.length > 0)
const preprocessOptions = {
label: t('settings.tool.preprocess.provider'),
title: t('settings.tool.preprocess.provider'),
options: preprocessProviders
// todo: 免费期结束后删除
.filter((p) => p.apiKey !== '' || p.id === 'mineru')
.map((p) => ({ value: p.id, label: p.name }))
}
const ocrOptions = {
label: t('settings.tool.ocr.provider'),
title: t('settings.tool.ocr.provider'),
options: ocrProviders.filter((p) => p.apiKey !== '').map((p) => ({ value: p.id, label: p.name }))
}
const preprocessOrOcrSelectOptions = [
...(preprocessOptions.options.length > 0 ? [preprocessOptions] : []),
...(isMac && ocrOptions.options.length > 0 ? [ocrOptions] : [])
]
const onOk = async () => {
try {
console.log('newbase', newBase)
updateKnowledgeBase(newBase)
setOpen(false)
resolve(newBase)
} catch (error) {
console.error('Validation failed:', error)
}
}
const onCancel = () => {
setOpen(false)
}
const onClose = () => {
resolve(null)
}
const menuItems = [
{
key: 'general',
label: t('settings.general'),
icon: <SettingOutlined />
},
{
key: 'advanced',
label: t('settings.advanced.title'),
icon: <SettingOutlined />
}
]
const renderSettings = () => {
if (selectedMenu === 'general') {
return (
<SettingsPanel>
<SettingsItem>
<div className="settings-label">{t('common.name')}</div>
<Input
placeholder={t('common.name')}
defaultValue={base.name}
onChange={(e) => setNewBase({ ...newBase, name: e.target.value })}
/>
</SettingsItem>
<SettingsItem>
<div className="settings-label">
{t('settings.tool.preprocess.title')} / {t('settings.tool.ocr.title')}
<Tooltip title={t('settings.tool.preprocessOrOcr.tooltip')} placement="right">
<InfoCircleOutlined style={{ marginLeft: 8 }} />
</Tooltip>
</div>
<Select
value={selectedProvider?.id}
style={{ width: '100%' }}
onChange={(value: string) => {
const type = preprocessProviders.find((p) => p.id === value) ? 'preprocess' : 'ocr'
const provider = (type === 'preprocess' ? preprocessProviders : ocrProviders).find(
(p) => p.id === value
)
if (!provider) {
setSelectedProvider(undefined)
setNewBase({
...newBase,
preprocessOrOcrProvider: undefined
})
return
}
setSelectedProvider(provider)
setNewBase({
...newBase,
preprocessOrOcrProvider: {
type: type,
provider: provider
}
})
}}
placeholder={t('settings.tool.preprocess.provider_placeholder')}
options={preprocessOrOcrSelectOptions}
allowClear
/>
</SettingsItem>
<SettingsItem>
<div className="settings-label">
{t('models.embedding_model')}
<Tooltip title={t('models.embedding_model_tooltip')} placement="right">
<InfoCircleOutlined style={{ marginLeft: 8 }} />
</Tooltip>
</div>
<Select
style={{ width: '100%' }}
options={selectOptions}
placeholder={t('settings.models.empty')}
defaultValue={getModelUniqId(base.model)}
disabled
/>
</SettingsItem>
<SettingsItem>
<div className="settings-label">
{t('models.rerank_model')}
<Tooltip title={t('models.rerank_model_tooltip')} placement="right">
<InfoCircleOutlined style={{ marginLeft: 8 }} />
</Tooltip>
</div>
<Select
style={{ width: '100%' }}
defaultValue={getModelUniqId(base.rerankModel) || undefined}
options={rerankSelectOptions}
placeholder={t('settings.models.empty')}
onChange={(value) => {
const rerankModel = value
? providers.flatMap((p) => p.models).find((m) => getModelUniqId(m) === value)
: undefined
setNewBase({ ...newBase, rerankModel })
}}
allowClear
/>
</SettingsItem>
<SettingsItem>
<div className="settings-label">
{t('knowledge.document_count')}
<Tooltip title={t('knowledge.document_count_help')}>
<InfoCircleOutlined style={{ marginLeft: 8 }} />
</Tooltip>
</div>
<Slider
style={{ width: '100%' }}
min={1}
max={30}
step={1}
defaultValue={base.documentCount || DEFAULT_KNOWLEDGE_DOCUMENT_COUNT}
marks={{ 1: '1', 6: t('knowledge.document_count_default'), 30: '30' }}
onChange={(value) => setNewBase({ ...newBase, documentCount: value })}
/>
</SettingsItem>
</SettingsPanel>
)
}
if (selectedMenu === 'advanced') {
return (
<SettingsPanel>
<SettingsItem>
<div className="settings-label">
{t('knowledge.chunk_size')}
<Tooltip title={t('knowledge.chunk_size_tooltip')} placement="right">
<InfoCircleOutlined style={{ marginLeft: 8 }} />
</Tooltip>
</div>
<InputNumber
style={{ width: '100%' }}
min={100}
value={base.chunkSize}
placeholder={t('knowledge.chunk_size_placeholder')}
onChange={(value) => {
const maxContext = getEmbeddingMaxContext(base.model.id)
if (!value || !maxContext || value <= maxContext) {
setNewBase({ ...newBase, chunkSize: value || undefined })
}
}}
/>
</SettingsItem>
<SettingsItem>
<div className="settings-label">
{t('knowledge.chunk_overlap')}
<Tooltip title={t('knowledge.chunk_overlap_tooltip')} placement="right">
<InfoCircleOutlined style={{ marginLeft: 8 }} />
</Tooltip>
</div>
<InputNumber
style={{ width: '100%' }}
min={0}
value={base.chunkOverlap}
placeholder={t('knowledge.chunk_overlap_placeholder')}
onChange={async (value) => {
if (!value || (newBase.chunkSize && newBase.chunkSize > value)) {
setNewBase({ ...newBase, chunkOverlap: value || undefined })
}
await window.message.error(t('message.error.chunk_overlap_too_large'))
}}
/>
</SettingsItem>
<SettingsItem>
<div className="settings-label">
{t('knowledge.threshold')}
<Tooltip title={t('knowledge.threshold_tooltip')} placement="right">
<InfoCircleOutlined style={{ marginLeft: 8 }} />
</Tooltip>
</div>
<InputNumber
style={{ width: '100%' }}
step={0.1}
min={0}
max={1}
value={base.threshold}
placeholder={t('knowledge.threshold_placeholder')}
onChange={(value) => setNewBase({ ...newBase, threshold: value || undefined })}
/>
</SettingsItem>
<Alert
message={t('knowledge.chunk_size_change_warning')}
type="warning"
showIcon
icon={<WarningOutlined />}
/>
</SettingsPanel>
)
}
return null
}
KnowledgeSettings.hide = onCancel
return (
<SettingsModal
title={t('knowledge.settings.title')}
open={open}
onOk={onOk}
onCancel={onCancel}
afterClose={onClose}
destroyOnClose
maskClosable={false}
centered
width="min(800px, 70vw)"
styles={{
body: { padding: 0, height: '50vh' },
header: {
padding: '10px 15px',
borderBottom: '0.5px solid var(--color-border)',
margin: 0,
borderRadius: 0
},
content: {
padding: 0,
overflow: 'hidden'
}
}}>
<HStack>
<LeftMenu>
<StyledMenu
defaultSelectedKeys={['general']}
mode="vertical"
items={menuItems}
onSelect={({ key }) => setSelectedMenu(key)}
/>
</LeftMenu>
<SettingsContentPanel>{renderSettings()}</SettingsContentPanel>
</HStack>
</SettingsModal>
)
}
const TopViewKey = 'KnowledgeSettingsPopup'
const SettingsPanel = styled.div`
padding: 0 16px;
`
const SettingsItem = styled.div`
margin-bottom: 24px;
.settings-label {
font-size: 14px;
margin-bottom: 8px;
display: flex;
align-items: center;
}
`
const SettingsModal = styled(Modal)`
.ant-modal-title {
font-size: 14px;
}
.ant-modal-close {
top: 4px;
right: 4px;
}
.ant-menu-item {
height: 36px;
color: var(--color-text-2);
display: flex;
align-items: center;
border: 0.5px solid transparent;
border-radius: 6px;
.ant-menu-title-content {
line-height: 36px;
}
}
.ant-menu-item-active {
background-color: var(--color-background-soft) !important;
transition: none;
}
.ant-menu-item-selected {
background-color: var(--color-background-soft);
border: 0.5px solid var(--color-border);
.ant-menu-title-content {
color: var(--color-text-1);
font-weight: 500;
}
}
`
const LeftMenu = styled.div`
height: 50vh;
border-right: 0.5px solid var(--color-border);
`
const SettingsContentPanel = styled.div`
flex: 1;
padding: 16px 16px;
height: calc(50vh - 16px);
overflow-y: scroll;
`
const StyledMenu = styled(Menu)`
width: 220px;
padding: 5px;
background: transparent;
margin-top: 2px;
border-inline-end: none !important;
.ant-menu-item {
margin-bottom: 7px;
}
`
export default class KnowledgeSettings {
static hide() {
TopView.hide(TopViewKey)
}
static show(props: ShowParams) {
return new Promise<any>((resolve) => {
TopView.show(
<PopupContainer
{...props}
resolve={(v) => {
resolve(v)
TopView.hide(TopViewKey)
}}
/>,
TopViewKey
)
})
}
}

View File

@ -1,285 +0,0 @@
import { WarningOutlined } from '@ant-design/icons'
import { TopView } from '@renderer/components/TopView'
import { DEFAULT_KNOWLEDGE_DOCUMENT_COUNT } from '@renderer/config/constant'
import { getEmbeddingMaxContext } from '@renderer/config/embedings'
import { isEmbeddingModel, isRerankModel } from '@renderer/config/models'
import { NOT_SUPPORTED_REANK_PROVIDERS } from '@renderer/config/providers'
// import { SUPPORTED_REANK_PROVIDERS } from '@renderer/config/providers'
import { useKnowledge } from '@renderer/hooks/useKnowledge'
import { useProviders } from '@renderer/hooks/useProvider'
import { SettingHelpText } from '@renderer/pages/settings'
import { getModelUniqId } from '@renderer/services/ModelService'
import { KnowledgeBase } from '@renderer/types'
import { Alert, Button, Form, Input, InputNumber, Modal, Select, Slider } from 'antd'
import { sortBy } from 'lodash'
import { ChevronDown } from 'lucide-react'
import { useEffect, useState } from 'react'
import { useTranslation } from 'react-i18next'
interface ShowParams {
base: KnowledgeBase
}
interface FormData {
name: string
model: string
documentCount?: number
dimensions?: number
chunkSize?: number
chunkOverlap?: number
threshold?: number
rerankModel?: string
}
interface Props extends ShowParams {
resolve: (data: any) => void
}
const PopupContainer: React.FC<Props> = ({ base: _base, resolve }) => {
const [open, setOpen] = useState(true)
const [showAdvanced, setShowAdvanced] = useState(false)
const [form] = Form.useForm<FormData>()
const { t } = useTranslation()
const { providers } = useProviders()
const { base, updateKnowledgeBase } = useKnowledge(_base.id)
useEffect(() => {
form.setFieldsValue({ documentCount: base?.documentCount || 6 })
}, [base, form])
if (!base) {
resolve(null)
return null
}
const selectOptions = providers
.filter((p) => p.models.length > 0)
.map((p) => ({
label: p.isSystem ? t(`provider.${p.id}`) : p.name,
title: p.name,
options: sortBy(p.models, 'name')
.filter((model) => isEmbeddingModel(model) && !isRerankModel(model))
.map((m) => ({
label: m.name,
value: getModelUniqId(m)
}))
}))
.filter((group) => group.options.length > 0)
const rerankSelectOptions = providers
.filter((p) => p.models.length > 0)
.filter((p) => !NOT_SUPPORTED_REANK_PROVIDERS.includes(p.id))
.map((p) => ({
label: p.isSystem ? t(`provider.${p.id}`) : p.name,
title: p.name,
options: sortBy(p.models, 'name')
.filter((model) => isRerankModel(model))
.map((m) => ({
label: m.name,
value: getModelUniqId(m)
}))
}))
.filter((group) => group.options.length > 0)
const onOk = async () => {
try {
const values = await form.validateFields()
const newBase = {
...base,
name: values.name,
documentCount: values.documentCount || DEFAULT_KNOWLEDGE_DOCUMENT_COUNT,
dimensions: values.dimensions || base.dimensions,
chunkSize: values.chunkSize,
chunkOverlap: values.chunkOverlap,
threshold: values.threshold ?? undefined,
rerankModel: values.rerankModel
? providers.flatMap((p) => p.models).find((m) => getModelUniqId(m) === values.rerankModel)
: undefined
}
updateKnowledgeBase(newBase)
setOpen(false)
setTimeout(() => resolve(newBase), 350)
} catch (error) {
console.error('Validation failed:', error)
}
}
const onCancel = () => {
setOpen(false)
}
const onClose = () => {
resolve(null)
}
KnowledgeSettingsPopup.hide = onCancel
return (
<Modal
title={t('knowledge.settings')}
open={open}
onOk={onOk}
onCancel={onCancel}
afterClose={onClose}
destroyOnClose
maskClosable={false}
transitionName="animation-move-down"
centered>
<Form form={form} layout="vertical" className="compact-form">
<Form.Item
name="name"
label={t('common.name')}
initialValue={base.name}
rules={[{ required: true, message: t('message.error.enter.name') }]}>
<Input placeholder={t('common.name')} />
</Form.Item>
<Form.Item
name="model"
label={t('models.embedding_model')}
initialValue={getModelUniqId(base.model)}
tooltip={{ title: t('models.embedding_model_tooltip'), placement: 'right' }}
rules={[{ required: true, message: t('message.error.enter.model') }]}>
<Select style={{ width: '100%' }} options={selectOptions} placeholder={t('settings.models.empty')} disabled />
</Form.Item>
<Form.Item
name="rerankModel"
label={t('models.rerank_model')}
tooltip={{ title: t('models.rerank_model_tooltip'), placement: 'right' }}
initialValue={getModelUniqId(base.rerankModel) || undefined}
rules={[{ required: false, message: t('message.error.enter.model') }]}>
<Select
style={{ width: '100%' }}
options={rerankSelectOptions}
placeholder={t('settings.models.empty')}
allowClear
/>
</Form.Item>
<SettingHelpText style={{ marginTop: -15, marginBottom: 20 }}>
{t('models.rerank_model_not_support_provider', {
provider: NOT_SUPPORTED_REANK_PROVIDERS.map((id) => t(`provider.${id}`))
})}
</SettingHelpText>
<Form.Item
name="documentCount"
label={t('knowledge.document_count')}
tooltip={{ title: t('knowledge.document_count_help') }}>
<Slider min={1} max={30} step={1} marks={{ 1: '1', 6: t('knowledge.document_count_default'), 30: '30' }} />
</Form.Item>
<Button color="default" variant="filled" onClick={() => setShowAdvanced(!showAdvanced)}>
{t('common.advanced_settings')}
<ChevronDown
size={16}
style={{
transform: showAdvanced ? 'rotate(180deg)' : 'rotate(0deg)',
transition: 'transform 0.3s'
}}
/>
</Button>
<div style={{ display: showAdvanced ? 'block' : 'none', marginTop: 16 }}>
<Form.Item
name="chunkSize"
label={t('knowledge.chunk_size')}
layout="horizontal"
tooltip={{ title: t('knowledge.chunk_size_tooltip') }}
initialValue={base.chunkSize}
rules={[
{
validator(_, value) {
const maxContext = getEmbeddingMaxContext(base.model.id)
if (value && maxContext && value > maxContext) {
return Promise.reject(new Error(t('knowledge.chunk_size_too_large', { max_context: maxContext })))
}
return Promise.resolve()
}
}
]}>
<InputNumber
style={{ width: '100%' }}
min={100}
defaultValue={base.chunkSize}
placeholder={t('knowledge.chunk_size_placeholder')}
/>
</Form.Item>
<Form.Item
name="chunkOverlap"
label={t('knowledge.chunk_overlap')}
layout="horizontal"
initialValue={base.chunkOverlap}
tooltip={{ title: t('knowledge.chunk_overlap_tooltip') }}
rules={[
({ getFieldValue }) => ({
validator(_, value) {
if (!value || getFieldValue('chunkSize') > value) {
return Promise.resolve()
}
return Promise.reject(new Error(t('message.error.chunk_overlap_too_large')))
}
})
]}
dependencies={['chunkSize']}>
<InputNumber
style={{ width: '100%' }}
min={0}
defaultValue={base.chunkOverlap}
placeholder={t('knowledge.chunk_overlap_placeholder')}
/>
</Form.Item>
<Form.Item
name="threshold"
label={t('knowledge.threshold')}
layout="horizontal"
tooltip={{ title: t('knowledge.threshold_tooltip') }}
initialValue={base.threshold}
rules={[
{
validator(_, value) {
if (value && (value > 1 || value < 0)) {
return Promise.reject(new Error(t('knowledge.threshold_too_large_or_small')))
}
return Promise.resolve()
}
}
]}>
<InputNumber placeholder={t('knowledge.threshold_placeholder')} step={0.1} style={{ width: '100%' }} />
</Form.Item>
<Alert
message={t('knowledge.chunk_size_change_warning')}
type="warning"
showIcon
icon={<WarningOutlined />}
/>
</div>
</Form>
</Modal>
)
}
const TopViewKey = 'KnowledgeSettingsPopup'
export default class KnowledgeSettingsPopup {
static hide() {
TopView.hide(TopViewKey)
}
static show(props: ShowParams) {
return new Promise<any>((resolve) => {
TopView.show(
<PopupContainer
{...props}
resolve={(v) => {
resolve(v)
TopView.hide(TopViewKey)
}}
/>,
TopViewKey
)
})
}
}

View File

@ -0,0 +1,66 @@
import { usePreprocessProvider } from '@renderer/hooks/usePreprocess'
import { getStoreSetting } from '@renderer/hooks/useSettings'
import { getKnowledgeBaseParams } from '@renderer/services/KnowledgeService'
import { KnowledgeBase } from '@renderer/types'
import { Tag } from 'antd'
import { FC, useEffect, useState } from 'react'
import { useTranslation } from 'react-i18next'
const QuotaTag: FC<{ base: KnowledgeBase; providerId: string; quota?: number }> = ({
base,
providerId,
quota: _quota
}) => {
const { t } = useTranslation()
const { provider, updatePreprocessProvider } = usePreprocessProvider(providerId)
const [quota, setQuota] = useState<number | undefined>(_quota)
useEffect(() => {
const checkQuota = async () => {
if (provider.id !== 'mineru') return
// 使用用户的key时quota为无限
if (provider.apiKey) {
setQuota(-9999)
updatePreprocessProvider({ ...provider, quota: -9999 })
return
}
if (quota === undefined) {
const userId = getStoreSetting('userId')
const baseParams = getKnowledgeBaseParams(base)
try {
const response = await window.api.knowledgeBase.checkQuota({
base: baseParams,
userId: userId as string
})
setQuota(response)
} catch (error) {
console.error('[KnowledgeContent] Error checking quota:', error)
}
}
}
if (_quota) {
updatePreprocessProvider({ ...provider, quota: _quota })
return
}
checkQuota()
}, [_quota, base, provider, quota, updatePreprocessProvider])
return (
<>
{quota && (
<Tag color="orange" style={{ borderRadius: 20, margin: 0 }}>
{quota === -9999
? t('knowledge.quota_infinity', {
name: provider.name
})
: t('knowledge.quota', {
name: provider.name,
quota: quota
})}
</Tag>
)}
</>
)
}
export default QuotaTag

View File

@ -1,7 +1,7 @@
import { CheckCircleOutlined, CloseCircleOutlined } from '@ant-design/icons' import { CheckCircleOutlined, CloseCircleOutlined } from '@ant-design/icons'
import { KnowledgeBase, ProcessingStatus } from '@renderer/types' import { KnowledgeBase, ProcessingStatus } from '@renderer/types'
import { Progress, Tooltip } from 'antd' import { Progress, Tooltip } from 'antd'
import { FC } from 'react' import React, { FC, useMemo } from 'react'
import { useTranslation } from 'react-i18next' import { useTranslation } from 'react-i18next'
import styled from 'styled-components' import styled from 'styled-components'
@ -9,21 +9,37 @@ interface StatusIconProps {
sourceId: string sourceId: string
base: KnowledgeBase base: KnowledgeBase
getProcessingStatus: (sourceId: string) => ProcessingStatus | undefined getProcessingStatus: (sourceId: string) => ProcessingStatus | undefined
getProcessingPercent?: (sourceId: string) => number | undefined
type: string type: string
progress?: number
isPreprocessed?: boolean
} }
const StatusIcon: FC<StatusIconProps> = ({ sourceId, base, getProcessingStatus, getProcessingPercent, type }) => { const StatusIcon: FC<StatusIconProps> = ({
sourceId,
base,
getProcessingStatus,
type,
progress = 0,
isPreprocessed
}) => {
const { t } = useTranslation() const { t } = useTranslation()
const status = getProcessingStatus(sourceId) const status = getProcessingStatus(sourceId)
const percent = getProcessingPercent?.(sourceId)
const item = base.items.find((item) => item.id === sourceId) const item = base.items.find((item) => item.id === sourceId)
const errorText = item?.processingError const errorText = item?.processingError
console.log('[StatusIcon] Rendering for item:', item?.id, 'Status:', status, 'Progress:', progress)
const statusDisplay = useMemo(() => {
if (!status) { if (!status) {
if (item?.uniqueId) { if (item?.uniqueId) {
if (isPreprocessed && item.type === 'file') {
return ( return (
<Tooltip title={t('knowledge.status_completed')} placement="left"> <Tooltip title={t('knowledge.status_preprocess_completed')} placement="left">
<CheckCircleOutlined style={{ color: '#52c41a' }} />
</Tooltip>
)
}
return (
<Tooltip title={t('knowledge.status_embedding_completed')} placement="left">
<CheckCircleOutlined style={{ color: '#52c41a' }} /> <CheckCircleOutlined style={{ color: '#52c41a' }} />
</Tooltip> </Tooltip>
) )
@ -44,8 +60,8 @@ const StatusIcon: FC<StatusIconProps> = ({ sourceId, base, getProcessingStatus,
) )
case 'processing': { case 'processing': {
return type === 'directory' ? ( return type === 'directory' || type === 'file' ? (
<Progress type="circle" size={14} percent={Number(percent?.toFixed(0))} /> <Progress type="circle" size={14} percent={Number(progress?.toFixed(0))} />
) : ( ) : (
<Tooltip title={t('knowledge.status_processing')} placement="left"> <Tooltip title={t('knowledge.status_processing')} placement="left">
<StatusDot $status="processing" /> <StatusDot $status="processing" />
@ -67,6 +83,9 @@ const StatusIcon: FC<StatusIconProps> = ({ sourceId, base, getProcessingStatus,
default: default:
return null return null
} }
}, [status, item?.uniqueId, type, progress, errorText, t])
return statusDisplay
} }
const StatusDot = styled.div<{ $status: 'pending' | 'processing' | 'new' }>` const StatusDot = styled.div<{ $status: 'pending' | 'processing' | 'new' }>`
@ -91,4 +110,14 @@ const StatusDot = styled.div<{ $status: 'pending' | 'processing' | 'new' }>`
} }
` `
export default StatusIcon export default React.memo(StatusIcon, (prevProps, nextProps) => {
return (
prevProps.sourceId === nextProps.sourceId &&
prevProps.type === nextProps.type &&
prevProps.base.id === nextProps.base.id &&
prevProps.progress === nextProps.progress &&
prevProps.getProcessingStatus(prevProps.sourceId) === nextProps.getProcessingStatus(nextProps.sourceId) &&
prevProps.base.items.find((item) => item.id === prevProps.sourceId)?.processingError ===
nextProps.base.items.find((item) => item.id === nextProps.sourceId)?.processingError
)
})

View File

@ -26,6 +26,7 @@ import {
interface KnowledgeContentProps { interface KnowledgeContentProps {
selectedBase: KnowledgeBase selectedBase: KnowledgeBase
progressMap: Map<string, number>
} }
const getDisplayTime = (item: KnowledgeItem) => { const getDisplayTime = (item: KnowledgeItem) => {
@ -33,18 +34,12 @@ const getDisplayTime = (item: KnowledgeItem) => {
return dayjs(timestamp).format('MM-DD HH:mm') return dayjs(timestamp).format('MM-DD HH:mm')
} }
const KnowledgeDirectories: FC<KnowledgeContentProps> = ({ selectedBase }) => { const KnowledgeDirectories: FC<KnowledgeContentProps> = ({ selectedBase, progressMap }) => {
const { t } = useTranslation() const { t } = useTranslation()
const { const { base, directoryItems, refreshItem, removeItem, getProcessingStatus, addDirectory } = useKnowledge(
base, selectedBase.id || ''
directoryItems, )
refreshItem,
removeItem,
getProcessingStatus,
getDirectoryProcessingPercent,
addDirectory
} = useKnowledge(selectedBase.id || '')
const providerName = getProviderName(base?.model.provider || '') const providerName = getProviderName(base?.model.provider || '')
const disabled = !base?.version || !providerName const disabled = !base?.version || !providerName
@ -53,8 +48,6 @@ const KnowledgeDirectories: FC<KnowledgeContentProps> = ({ selectedBase }) => {
return null return null
} }
const getProgressingPercentForItem = (itemId: string) => getDirectoryProcessingPercent(itemId)
const handleAddDirectory = async () => { const handleAddDirectory = async () => {
if (disabled) { if (disabled) {
return return
@ -102,7 +95,7 @@ const KnowledgeDirectories: FC<KnowledgeContentProps> = ({ selectedBase }) => {
sourceId={item.id} sourceId={item.id}
base={base} base={base}
getProcessingStatus={getProcessingStatus} getProcessingStatus={getProcessingStatus}
getProcessingPercent={getProgressingPercentForItem} progress={progressMap.get(item.id)}
type="directory" type="directory"
/> />
</StatusIconWrapper> </StatusIconWrapper>

View File

@ -5,8 +5,8 @@ import FileItem from '@renderer/pages/files/FileItem'
import StatusIcon from '@renderer/pages/knowledge/components/StatusIcon' import StatusIcon from '@renderer/pages/knowledge/components/StatusIcon'
import FileManager from '@renderer/services/FileManager' import FileManager from '@renderer/services/FileManager'
import { getProviderName } from '@renderer/services/ProviderService' import { getProviderName } from '@renderer/services/ProviderService'
import { FileType, FileTypes, KnowledgeBase, KnowledgeItem } from '@renderer/types' import { FileMetadata, FileType, FileTypes, KnowledgeBase, KnowledgeItem } from '@renderer/types'
import { formatFileSize } from '@renderer/utils' import { formatFileSize, uuid } from '@renderer/utils'
import { bookExts, documentExts, textExts, thirdPartyApplicationExts } from '@shared/config/constant' import { bookExts, documentExts, textExts, thirdPartyApplicationExts } from '@shared/config/constant'
import { Button, Tooltip, Upload } from 'antd' import { Button, Tooltip, Upload } from 'antd'
import dayjs from 'dayjs' import dayjs from 'dayjs'
@ -30,6 +30,8 @@ const { Dragger } = Upload
interface KnowledgeContentProps { interface KnowledgeContentProps {
selectedBase: KnowledgeBase selectedBase: KnowledgeBase
progressMap: Map<string, number>
preprocessMap: Map<string, boolean>
} }
const fileTypes = [...bookExts, ...thirdPartyApplicationExts, ...documentExts, ...textExts] const fileTypes = [...bookExts, ...thirdPartyApplicationExts, ...documentExts, ...textExts]
@ -39,7 +41,7 @@ const getDisplayTime = (item: KnowledgeItem) => {
return dayjs(timestamp).format('MM-DD HH:mm') return dayjs(timestamp).format('MM-DD HH:mm')
} }
const KnowledgeFiles: FC<KnowledgeContentProps> = ({ selectedBase }) => { const KnowledgeFiles: FC<KnowledgeContentProps> = ({ selectedBase, progressMap, preprocessMap }) => {
const { t } = useTranslation() const { t } = useTranslation()
const [windowHeight, setWindowHeight] = useState(window.innerHeight) const [windowHeight, setWindowHeight] = useState(window.innerHeight)
@ -82,24 +84,47 @@ const KnowledgeFiles: FC<KnowledgeContentProps> = ({ selectedBase }) => {
if (disabled) { if (disabled) {
return return
} }
if (files) { if (files) {
const _files: FileType[] = files const _files: FileMetadata[] = files
.map((file) => ({ .map((file) => {
id: file.name, // 这个路径 filePath 很可能是在文件选择时的原始路径。
name: file.name, const filePath = window.api.file.getPathForFile(file)
path: window.api.file.getPathForFile(file), let nameFromPath = filePath
const lastSlash = filePath.lastIndexOf('/')
const lastBackslash = filePath.lastIndexOf('\\')
if (lastSlash !== -1 || lastBackslash !== -1) {
nameFromPath = filePath.substring(Math.max(lastSlash, lastBackslash) + 1)
}
// 从派生的文件名中获取扩展名
const extFromPath = nameFromPath.includes('.') ? `.${nameFromPath.split('.').pop()}` : ''
return {
id: uuid(),
name: nameFromPath, // 使用从路径派生的文件名
path: filePath,
size: file.size, size: file.size,
ext: `.${file.name.split('.').pop()}`.toLowerCase(), ext: extFromPath.toLowerCase(),
count: 1, count: 1,
origin_name: file.name, origin_name: file.name, // 保存 File 对象中原始的文件名
type: file.type as FileTypes, type: file.type as FileTypes,
created_at: new Date().toISOString() created_at: new Date().toISOString()
}))
.filter(({ ext }) => fileTypes.includes(ext))
const uploadedFiles = await FileManager.uploadFiles(_files)
addFiles(uploadedFiles)
} }
})
.filter(({ ext }) => fileTypes.includes(ext))
// const uploadedFiles = await FileManager.uploadFiles(_files)
addFiles(_files)
}
}
const showPreprocessIcon = (item: KnowledgeItem) => {
if (base.preprocessOrOcrProvider && item.isPreprocessed !== false) {
return true
}
if (!base.preprocessOrOcrProvider && item.isPreprocessed === true) {
return true
}
return false
} }
return ( return (
@ -161,6 +186,18 @@ const KnowledgeFiles: FC<KnowledgeContentProps> = ({ selectedBase }) => {
{item.uniqueId && ( {item.uniqueId && (
<Button type="text" icon={<RefreshIcon />} onClick={() => refreshItem(item)} /> <Button type="text" icon={<RefreshIcon />} onClick={() => refreshItem(item)} />
)} )}
{showPreprocessIcon(item) && (
<StatusIconWrapper>
<StatusIcon
sourceId={item.id}
base={base}
getProcessingStatus={getProcessingStatus}
type="file"
isPreprocessed={preprocessMap.get(item.id) || item.isPreprocessed || false}
progress={progressMap.get(item.id)}
/>
</StatusIconWrapper>
)}
<StatusIconWrapper> <StatusIconWrapper>
<StatusIcon <StatusIcon
sourceId={item.id} sourceId={item.id}

View File

@ -16,7 +16,7 @@ import FileManager from '@renderer/services/FileManager'
import { translateText } from '@renderer/services/TranslateService' import { translateText } from '@renderer/services/TranslateService'
import { useAppDispatch } from '@renderer/store' import { useAppDispatch } from '@renderer/store'
import { setGenerating } from '@renderer/store/runtime' import { setGenerating } from '@renderer/store/runtime'
import type { FileType } from '@renderer/types' import type { FileMetadata } from '@renderer/types'
import type { PaintingAction, PaintingsState } from '@renderer/types' import type { PaintingAction, PaintingsState } from '@renderer/types'
import { getErrorMessage, uuid } from '@renderer/utils' import { getErrorMessage, uuid } from '@renderer/utils'
import { Avatar, Button, Input, InputNumber, Radio, Segmented, Select, Slider, Switch, Tooltip, Upload } from 'antd' import { Avatar, Button, Input, InputNumber, Radio, Segmented, Select, Slider, Switch, Tooltip, Upload } from 'antd'
@ -47,7 +47,7 @@ const AihubmixPage: FC<{ Options: string[] }> = ({ Options }) => {
const [abortController, setAbortController] = useState<AbortController | null>(null) const [abortController, setAbortController] = useState<AbortController | null>(null)
const [spaceClickCount, setSpaceClickCount] = useState(0) const [spaceClickCount, setSpaceClickCount] = useState(0)
const [isTranslating, setIsTranslating] = useState(false) const [isTranslating, setIsTranslating] = useState(false)
const [fileMap, setFileMap] = useState<{ [key: string]: FileType }>({}) const [fileMap, setFileMap] = useState<{ [key: string]: FileMetadata }>({})
const { t } = useTranslation() const { t } = useTranslation()
const { theme } = useTheme() const { theme } = useTheme()
@ -127,7 +127,7 @@ const AihubmixPage: FC<{ Options: string[] }> = ({ Options }) => {
}) })
) )
return downloadedFiles.filter((file): file is FileType => file !== null) return downloadedFiles.filter((file): file is FileMetadata => file !== null)
} }
const onGenerate = async () => { const onGenerate = async () => {
@ -722,7 +722,7 @@ const AihubmixPage: FC<{ Options: string[] }> = ({ Options }) => {
listType="picture-card" listType="picture-card"
beforeUpload={(file) => { beforeUpload={(file) => {
const path = URL.createObjectURL(file) const path = URL.createObjectURL(file)
setFileMap({ ...fileMap, [path]: file as unknown as FileType }) setFileMap({ ...fileMap, [path]: file as unknown as FileMetadata })
updatePaintingState({ [item.key!]: path }) updatePaintingState({ [item.key!]: path })
return false // 阻止默认上传行为 return false // 阻止默认上传行为
}}> }}>

View File

@ -13,7 +13,7 @@ import { useRuntime } from '@renderer/hooks/useRuntime'
import FileManager from '@renderer/services/FileManager' import FileManager from '@renderer/services/FileManager'
import { useAppDispatch } from '@renderer/store' import { useAppDispatch } from '@renderer/store'
import { setGenerating } from '@renderer/store/runtime' import { setGenerating } from '@renderer/store/runtime'
import type { FileType, PaintingsState } from '@renderer/types' import type { FileMetadata, PaintingsState } from '@renderer/types'
import { uuid } from '@renderer/utils' import { uuid } from '@renderer/utils'
import { DmxapiPainting } from '@types' import { DmxapiPainting } from '@types'
import { Avatar, Button, Input, Radio, Segmented, Select, Switch, Tooltip } from 'antd' import { Avatar, Button, Input, Radio, Segmented, Select, Switch, Tooltip } from 'antd'
@ -70,7 +70,7 @@ const DmxapiPage: FC<{ Options: string[] }> = ({ Options }) => {
const location = useLocation() const location = useLocation()
interface FileMapType { interface FileMapType {
imageFiles?: FileType[] imageFiles?: FileMetadata[]
paths?: string[] paths?: string[]
} }
@ -195,19 +195,19 @@ const DmxapiPage: FC<{ Options: string[] }> = ({ Options }) => {
const currentFiles = prevFileMap.imageFiles || [] const currentFiles = prevFileMap.imageFiles || []
const currentPaths = prevFileMap.paths || [] const currentPaths = prevFileMap.paths || []
let newFiles: FileType[] let newFiles: FileMetadata[]
let newPaths: string[] let newPaths: string[]
if (index !== undefined) { if (index !== undefined) {
// 替换指定索引的图片 // 替换指定索引的图片
newFiles = [...currentFiles] newFiles = [...currentFiles]
newFiles[index] = file as FileType newFiles[index] = file as FileMetadata
newPaths = [...currentPaths] newPaths = [...currentPaths]
newPaths[index] = path newPaths[index] = path
} else { } else {
// 添加新图片到最后 // 添加新图片到最后
newFiles = [...currentFiles, file as FileType] newFiles = [...currentFiles, file as FileMetadata]
newPaths = [...currentPaths, path] newPaths = [...currentPaths, path]
} }
@ -465,7 +465,7 @@ const DmxapiPage: FC<{ Options: string[] }> = ({ Options }) => {
// 下载图像 // 下载图像
if (urls.length > 0) { if (urls.length > 0) {
const downloadedFiles = await downloadImages(urls) const downloadedFiles = await downloadImages(urls)
const validFiles = downloadedFiles.filter((file): file is FileType => file !== null) const validFiles = downloadedFiles.filter((file): file is FileMetadata => file !== null)
if (validFiles?.length > 0) { if (validFiles?.length > 0) {
if (painting.autoCreate && painting.files.length > 0) { if (painting.autoCreate && painting.files.length > 0) {

View File

@ -22,7 +22,7 @@ import FileManager from '@renderer/services/FileManager'
import { translateText } from '@renderer/services/TranslateService' import { translateText } from '@renderer/services/TranslateService'
import { useAppDispatch } from '@renderer/store' import { useAppDispatch } from '@renderer/store'
import { setGenerating } from '@renderer/store/runtime' import { setGenerating } from '@renderer/store/runtime'
import type { FileType, Painting } from '@renderer/types' import type { FileMetadata, Painting } from '@renderer/types'
import { getErrorMessage, uuid } from '@renderer/utils' import { getErrorMessage, uuid } from '@renderer/utils'
import { Button, Input, InputNumber, Radio, Select, Slider, Switch, Tooltip } from 'antd' import { Button, Input, InputNumber, Radio, Select, Slider, Switch, Tooltip } from 'antd'
import TextArea from 'antd/es/input/TextArea' import TextArea from 'antd/es/input/TextArea'
@ -229,7 +229,7 @@ const SiliconPage: FC<{ Options: string[] }> = ({ Options }) => {
}) })
) )
const validFiles = downloadedFiles.filter((file): file is FileType => file !== null) const validFiles = downloadedFiles.filter((file): file is FileMetadata => file !== null)
await FileManager.addFiles(validFiles) await FileManager.addFiles(validFiles)

View File

@ -1,7 +1,7 @@
import { DeleteOutlined } from '@ant-design/icons' import { DeleteOutlined } from '@ant-design/icons'
import IcImageUp from '@renderer/assets/images/paintings/ic_ImageUp.svg' import IcImageUp from '@renderer/assets/images/paintings/ic_ImageUp.svg'
import { useTheme } from '@renderer/context/ThemeProvider' import { useTheme } from '@renderer/context/ThemeProvider'
import type { FileType } from '@renderer/types' import { FileMetadata } from '@renderer/types'
import { Popconfirm, Upload } from 'antd' import { Popconfirm, Upload } from 'antd'
import { Button } from 'antd' import { Button } from 'antd'
import type { RcFile, UploadProps } from 'antd/es/upload' import type { RcFile, UploadProps } from 'antd/es/upload'
@ -10,7 +10,7 @@ import styled from 'styled-components'
interface ImageUploaderProps { interface ImageUploaderProps {
fileMap: { fileMap: {
imageFiles?: FileType[] imageFiles?: FileMetadata[]
paths?: string[] paths?: string[]
} }
maxImages: number maxImages: number

View File

@ -1,5 +1,5 @@
import { CacheService } from '@renderer/services/CacheService' import { CacheService } from '@renderer/services/CacheService'
import { FileType, TokenFluxPainting } from '@renderer/types' import { FileMetadata, TokenFluxPainting } from '@renderer/types'
import type { TokenFluxModel } from '../config/tokenFluxConfig' import type { TokenFluxModel } from '../config/tokenFluxConfig'
@ -230,7 +230,7 @@ export class TokenFluxService {
}) })
) )
return downloadedFiles.filter((file): file is FileType => file !== null) return downloadedFiles.filter((file): file is FileMetadata => file !== null)
} }
} }

View File

@ -239,10 +239,7 @@ const GeneralSettings: FC = () => {
<SettingDivider /> <SettingDivider />
<SettingRow> <SettingRow>
<SettingRowTitle>{t('settings.notification.knowledge_embed')}</SettingRowTitle> <SettingRowTitle>{t('settings.notification.knowledge_embed')}</SettingRowTitle>
<Switch <Switch checked={notificationSettings.knowledge} onChange={(v) => handleNotificationChange('knowledge', v)} />
checked={notificationSettings.knowledgeEmbed}
onChange={(v) => handleNotificationChange('knowledgeEmbed', v)}
/>
</SettingRow> </SettingRow>
</SettingGroup> </SettingGroup>
<SettingGroup theme={theme}> <SettingGroup theme={theme}>

View File

@ -252,7 +252,7 @@ const GithubCopilotSettings: FC<GithubCopilotSettingsProps> = ({ provider: initi
min={1} min={1}
max={60} max={60}
step={1} step={1}
marks={{ 1: '1', 10: t('settings.websearch.search_result_default'), 60: '60' }} marks={{ 1: '1', 10: t('settings.tool.websearch.search_result_default'), 60: '60' }}
onChangeComplete={(value) => updateProvider({ ...provider, rateLimit: value })} onChangeComplete={(value) => updateProvider({ ...provider, rateLimit: value })}
/> />
</SettingRow> </SettingRow>

View File

@ -3,11 +3,11 @@ import ModelSettings from '@renderer/pages/settings/ModelSettings/ModelSettings'
import { import {
Cloud, Cloud,
Command, Command,
Globe,
HardDrive, HardDrive,
Info, Info,
MonitorCog, MonitorCog,
Package, Package,
PencilRuler,
Rocket, Rocket,
Settings2, Settings2,
SquareTerminal, SquareTerminal,
@ -31,7 +31,7 @@ import QuickAssistantSettings from './QuickAssistantSettings'
import QuickPhraseSettings from './QuickPhraseSettings' import QuickPhraseSettings from './QuickPhraseSettings'
import SelectionAssistantSettings from './SelectionAssistantSettings/SelectionAssistantSettings' import SelectionAssistantSettings from './SelectionAssistantSettings/SelectionAssistantSettings'
import ShortcutSettings from './ShortcutSettings' import ShortcutSettings from './ShortcutSettings'
import WebSearchSettings from './WebSearchSettings' import ToolSettings from './ToolSettings'
const SettingsPage: FC = () => { const SettingsPage: FC = () => {
const { pathname } = useLocation() const { pathname } = useLocation()
@ -59,10 +59,10 @@ const SettingsPage: FC = () => {
{t('settings.model')} {t('settings.model')}
</MenuItem> </MenuItem>
</MenuItemLink> </MenuItemLink>
<MenuItemLink to="/settings/web-search"> <MenuItemLink to="/settings/tool">
<MenuItem className={isRoute('/settings/web-search')}> <MenuItem className={isRoute('/settings/tool')}>
<Globe size={18} /> <PencilRuler size={18} />
{t('settings.websearch.title')} {t('settings.tool.title')}
</MenuItem> </MenuItem>
</MenuItemLink> </MenuItemLink>
<MenuItemLink to="/settings/mcp"> <MenuItemLink to="/settings/mcp">
@ -124,9 +124,9 @@ const SettingsPage: FC = () => {
<Routes> <Routes>
<Route path="provider" element={<ProvidersList />} /> <Route path="provider" element={<ProvidersList />} />
<Route path="model" element={<ModelSettings />} /> <Route path="model" element={<ModelSettings />} />
<Route path="web-search" element={<WebSearchSettings />} /> <Route path="tool/*" element={<ToolSettings />} />
<Route path="mcp/*" element={<MCPSettings />} /> <Route path="mcp/*" element={<MCPSettings />} />
<Route path="general" element={<GeneralSettings />} /> <Route path="general/*" element={<GeneralSettings />} />
<Route path="display" element={<DisplaySettings />} /> <Route path="display" element={<DisplaySettings />} />
<Route path="shortcut" element={<ShortcutSettings />} /> <Route path="shortcut" element={<ShortcutSettings />} />
<Route path="quickAssistant" element={<QuickAssistantSettings />} /> <Route path="quickAssistant" element={<QuickAssistantSettings />} />

View File

@ -0,0 +1,168 @@
import { ExportOutlined } from '@ant-design/icons'
import { getOcrProviderLogo, OCR_PROVIDER_CONFIG } from '@renderer/config/ocrProviders'
import { useOcrProvider } from '@renderer/hooks/useOcr'
import { formatApiKeys } from '@renderer/services/ApiService'
import { OcrProvider } from '@renderer/types'
import { hasObjectKey } from '@renderer/utils'
import { Avatar, Divider, Flex, Input, InputNumber, Segmented } from 'antd'
import Link from 'antd/es/typography/Link'
import { FC, useEffect, useState } from 'react'
import { useTranslation } from 'react-i18next'
import styled from 'styled-components'
import {
SettingDivider,
SettingHelpLink,
SettingHelpText,
SettingHelpTextRow,
SettingRow,
SettingRowTitle,
SettingSubtitle,
SettingTitle
} from '../..'
interface Props {
provider: OcrProvider
}
const OcrProviderSettings: FC<Props> = ({ provider: _provider }) => {
const { provider: ocrProvider, updateOcrProvider } = useOcrProvider(_provider.id)
const { t } = useTranslation()
const [apiKey, setApiKey] = useState(ocrProvider.apiKey || '')
const [apiHost, setApiHost] = useState(ocrProvider.apiHost || '')
const [options, setOptions] = useState(ocrProvider.options || {})
const ocrProviderConfig = OCR_PROVIDER_CONFIG[ocrProvider.id]
const apiKeyWebsite = ocrProviderConfig?.websites?.apiKey
const officialWebsite = ocrProviderConfig?.websites?.official
useEffect(() => {
setApiKey(ocrProvider.apiKey ?? '')
setApiHost(ocrProvider.apiHost ?? '')
setOptions(ocrProvider.options ?? {})
}, [ocrProvider.apiKey, ocrProvider.apiHost, ocrProvider.options])
const onUpdateApiKey = () => {
if (apiKey !== ocrProvider.apiKey) {
updateOcrProvider({ ...ocrProvider, apiKey })
}
}
const onUpdateApiHost = () => {
let trimmedHost = apiHost?.trim() || ''
if (trimmedHost.endsWith('/')) {
trimmedHost = trimmedHost.slice(0, -1)
}
if (trimmedHost !== ocrProvider.apiHost) {
updateOcrProvider({ ...ocrProvider, apiHost: trimmedHost })
} else {
setApiHost(ocrProvider.apiHost || '')
}
}
const onUpdateOptions = (key: string, value: any) => {
const newOptions = { ...options, [key]: value }
setOptions(newOptions)
updateOcrProvider({ ...ocrProvider, options: newOptions })
}
return (
<>
<SettingTitle>
<Flex align="center" gap={8}>
<ProviderLogo shape="square" src={getOcrProviderLogo(ocrProvider.id)} size={16} />
<ProviderName> {ocrProvider.name}</ProviderName>
{officialWebsite && ocrProviderConfig?.websites && (
<Link target="_blank" href={ocrProviderConfig.websites.official}>
<ExportOutlined style={{ color: 'var(--color-text)', fontSize: '12px' }} />
</Link>
)}
</Flex>
</SettingTitle>
<Divider style={{ width: '100%', margin: '10px 0' }} />
{hasObjectKey(ocrProvider, 'apiKey') && (
<>
<SettingSubtitle style={{ marginTop: 5, marginBottom: 10 }}>{t('settings.provider.api_key')}</SettingSubtitle>
<Flex gap={8}>
<Input.Password
value={apiKey}
placeholder={t('settings.provider.api_key')}
onChange={(e) => setApiKey(formatApiKeys(e.target.value))}
onBlur={onUpdateApiKey}
spellCheck={false}
type="password"
autoFocus={apiKey === ''}
/>
</Flex>
<SettingHelpTextRow style={{ justifyContent: 'space-between', marginTop: 5 }}>
<SettingHelpLink target="_blank" href={apiKeyWebsite}>
{t('settings.provider.get_api_key')}
</SettingHelpLink>
<SettingHelpText>{t('settings.provider.api_key.tip')}</SettingHelpText>
</SettingHelpTextRow>
</>
)}
{hasObjectKey(ocrProvider, 'apiHost') && (
<>
<SettingSubtitle style={{ marginTop: 5, marginBottom: 10 }}>
{t('settings.provider.api_host')}
</SettingSubtitle>
<Flex>
<Input
value={apiHost}
placeholder={t('settings.provider.api_host')}
onChange={(e) => setApiHost(e.target.value)}
onBlur={onUpdateApiHost}
/>
</Flex>
</>
)}
{hasObjectKey(ocrProvider, 'options') && ocrProvider.id === 'system' && (
<>
<SettingDivider style={{ marginTop: 15, marginBottom: 12 }} />
<SettingRow>
<SettingRowTitle>{t('settings.tool.ocr.mac_system_ocr_options.mode.title')}</SettingRowTitle>
<Segmented
options={[
{
label: t('settings.tool.ocr.mac_system_ocr_options.mode.accurate'),
value: 1
},
{
label: t('settings.tool.ocr.mac_system_ocr_options.mode.fast'),
value: 0
}
]}
value={options.recognitionLevel}
onChange={(value) => onUpdateOptions('recognitionLevel', value)}
/>
</SettingRow>
<SettingDivider style={{ marginTop: 15, marginBottom: 12 }} />
<SettingRow>
<SettingRowTitle>{t('settings.tool.ocr.mac_system_ocr_options.min_confidence')}</SettingRowTitle>
<InputNumber
value={options.minConfidence}
onChange={(value) => onUpdateOptions('minConfidence', value)}
min={0}
max={1}
step={0.1}
/>
</SettingRow>
</>
)}
</>
)
}
const ProviderName = styled.span`
font-size: 14px;
font-weight: 500;
`
const ProviderLogo = styled(Avatar)`
border: 0.5px solid var(--color-border);
`
export default OcrProviderSettings

View File

@ -0,0 +1,58 @@
import { isMac } from '@renderer/config/constant'
import { useTheme } from '@renderer/context/ThemeProvider'
import { useDefaultOcrProvider, useOcrProviders } from '@renderer/hooks/useOcr'
import { PreprocessProvider } from '@renderer/types'
import { Select } from 'antd'
import { FC, useState } from 'react'
import { useTranslation } from 'react-i18next'
import { SettingContainer, SettingDivider, SettingGroup, SettingRow, SettingRowTitle, SettingTitle } from '../..'
import OcrProviderSettings from './OcrSettings'
const OcrSettings: FC = () => {
const { ocrProviders } = useOcrProviders()
const { provider: defaultProvider, setDefaultOcrProvider } = useDefaultOcrProvider()
const { t } = useTranslation()
const [selectedProvider, setSelectedProvider] = useState<PreprocessProvider | undefined>(defaultProvider)
const { theme: themeMode } = useTheme()
function updateSelectedOcrProvider(providerId: string) {
const provider = ocrProviders.find((p) => p.id === providerId)
if (!provider) {
return
}
setDefaultOcrProvider(provider)
setSelectedProvider(provider)
}
return (
<SettingContainer theme={themeMode}>
<SettingGroup theme={themeMode}>
<SettingTitle>{t('settings.tool.ocr.title')}</SettingTitle>
<SettingDivider />
<SettingRow>
<SettingRowTitle>{t('settings.tool.ocr.provider')}</SettingRowTitle>
<div style={{ display: 'flex', gap: '8px' }}>
<Select
value={selectedProvider?.id}
style={{ width: '200px' }}
onChange={(value: string) => updateSelectedOcrProvider(value)}
placeholder={t('settings.tool.ocr.provider_placeholder')}
options={ocrProviders.map((p) => ({
value: p.id,
label: p.name,
disabled: !isMac && p.id === 'system' // 在非 Mac 系统下禁用 system 选项
}))}
/>
</div>
</SettingRow>
</SettingGroup>
{selectedProvider && (
<SettingGroup theme={themeMode}>
<OcrProviderSettings provider={selectedProvider} />
</SettingGroup>
)}
</SettingContainer>
)
}
export default OcrSettings

View File

@ -0,0 +1,170 @@
import { ExportOutlined } from '@ant-design/icons'
import { getPreprocessProviderLogo, PREPROCESS_PROVIDER_CONFIG } from '@renderer/config/preprocessProviders'
import { usePreprocessProvider } from '@renderer/hooks/usePreprocess'
import { formatApiKeys } from '@renderer/services/ApiService'
import { PreprocessProvider } from '@renderer/types'
import { hasObjectKey } from '@renderer/utils'
import { Avatar, Divider, Flex, Input, InputNumber, Segmented } from 'antd'
import Link from 'antd/es/typography/Link'
import { FC, useEffect, useState } from 'react'
import { useTranslation } from 'react-i18next'
import styled from 'styled-components'
import {
SettingDivider,
SettingHelpLink,
SettingHelpText,
SettingHelpTextRow,
SettingRow,
SettingRowTitle,
SettingSubtitle,
SettingTitle
} from '../..'
interface Props {
provider: PreprocessProvider
}
const PreprocessProviderSettings: FC<Props> = ({ provider: _provider }) => {
const { provider: preprocessProvider, updatePreprocessProvider } = usePreprocessProvider(_provider.id)
const { t } = useTranslation()
const [apiKey, setApiKey] = useState(preprocessProvider.apiKey || '')
const [apiHost, setApiHost] = useState(preprocessProvider.apiHost || '')
const [options, setOptions] = useState(preprocessProvider.options || {})
const preprocessProviderConfig = PREPROCESS_PROVIDER_CONFIG[preprocessProvider.id]
const apiKeyWebsite = preprocessProviderConfig?.websites?.apiKey
const officialWebsite = preprocessProviderConfig?.websites?.official
useEffect(() => {
setApiKey(preprocessProvider.apiKey ?? '')
setApiHost(preprocessProvider.apiHost ?? '')
setOptions(preprocessProvider.options ?? {})
}, [preprocessProvider.apiKey, preprocessProvider.apiHost, preprocessProvider.options])
const onUpdateApiKey = () => {
if (apiKey !== preprocessProvider.apiKey) {
updatePreprocessProvider({ ...preprocessProvider, apiKey, quota: undefined })
}
}
const onUpdateApiHost = () => {
let trimmedHost = apiHost?.trim() || ''
if (trimmedHost.endsWith('/')) {
trimmedHost = trimmedHost.slice(0, -1)
}
if (trimmedHost !== preprocessProvider.apiHost) {
updatePreprocessProvider({ ...preprocessProvider, apiHost: trimmedHost })
} else {
setApiHost(preprocessProvider.apiHost || '')
}
}
const onUpdateOptions = (key: string, value: any) => {
const newOptions = { ...options, [key]: value }
setOptions(newOptions)
updatePreprocessProvider({ ...preprocessProvider, options: newOptions })
}
return (
<>
<SettingTitle>
<Flex align="center" gap={8}>
<ProviderLogo shape="square" src={getPreprocessProviderLogo(preprocessProvider.id)} size={16} />
<ProviderName> {preprocessProvider.name}</ProviderName>
{officialWebsite && preprocessProviderConfig?.websites && (
<Link target="_blank" href={preprocessProviderConfig.websites.official}>
<ExportOutlined style={{ color: 'var(--color-text)', fontSize: '12px' }} />
</Link>
)}
</Flex>
</SettingTitle>
<Divider style={{ width: '100%', margin: '10px 0' }} />
{hasObjectKey(preprocessProvider, 'apiKey') && (
<>
<SettingSubtitle style={{ marginTop: 5, marginBottom: 10 }}>{t('settings.provider.api_key')}</SettingSubtitle>
<Flex gap={8}>
<Input.Password
value={apiKey}
placeholder={
preprocessProvider.id === 'mineru' ? t('settings.mineru.api_key') : t('settings.provider.api_key')
}
onChange={(e) => setApiKey(formatApiKeys(e.target.value))}
onBlur={onUpdateApiKey}
spellCheck={false}
type="password"
autoFocus={apiKey === ''}
/>
</Flex>
<SettingHelpTextRow style={{ justifyContent: 'space-between', marginTop: 5 }}>
<SettingHelpLink target="_blank" href={apiKeyWebsite}>
{t('settings.provider.get_api_key')}
</SettingHelpLink>
<SettingHelpText>{t('settings.provider.api_key.tip')}</SettingHelpText>
</SettingHelpTextRow>
</>
)}
{hasObjectKey(preprocessProvider, 'apiHost') && (
<>
<SettingSubtitle style={{ marginTop: 5, marginBottom: 10 }}>
{t('settings.provider.api_host')}
</SettingSubtitle>
<Flex>
<Input
value={apiHost}
placeholder={t('settings.provider.api_host')}
onChange={(e) => setApiHost(e.target.value)}
onBlur={onUpdateApiHost}
/>
</Flex>
</>
)}
{hasObjectKey(preprocessProvider, 'options') && preprocessProvider.id === 'system' && (
<>
<SettingDivider style={{ marginTop: 15, marginBottom: 12 }} />
<SettingRow>
<SettingRowTitle>{t('settings.tool.preprocess.mac_system_ocr_options.mode.title')}</SettingRowTitle>
<Segmented
options={[
{
label: t('settings.tool.preprocess.mac_system_ocr_options.mode.accurate'),
value: 1
},
{
label: t('settings.tool.preprocess.mac_system_ocr_options.mode.fast'),
value: 0
}
]}
value={options.recognitionLevel}
onChange={(value) => onUpdateOptions('recognitionLevel', value)}
/>
</SettingRow>
<SettingDivider style={{ marginTop: 15, marginBottom: 12 }} />
<SettingRow>
<SettingRowTitle>{t('settings.tool.preprocess.mac_system_ocr_options.min_confidence')}</SettingRowTitle>
<InputNumber
value={options.minConfidence}
onChange={(value) => onUpdateOptions('minConfidence', value)}
min={0}
max={1}
step={0.1}
/>
</SettingRow>
</>
)}
</>
)
}
const ProviderName = styled.span`
font-size: 14px;
font-weight: 500;
`
const ProviderLogo = styled(Avatar)`
border: 0.5px solid var(--color-border);
`
export default PreprocessProviderSettings

View File

@ -0,0 +1,58 @@
import { isMac } from '@renderer/config/constant'
import { useTheme } from '@renderer/context/ThemeProvider'
import { useDefaultPreprocessProvider, usePreprocessProviders } from '@renderer/hooks/usePreprocess'
import { PreprocessProvider } from '@renderer/types'
import { Select } from 'antd'
import { FC, useState } from 'react'
import { useTranslation } from 'react-i18next'
import { SettingContainer, SettingDivider, SettingGroup, SettingRow, SettingRowTitle, SettingTitle } from '../..'
import PreprocessProviderSettings from './PreprocessSettings'
const PreprocessSettings: FC = () => {
const { preprocessProviders } = usePreprocessProviders()
const { provider: defaultProvider, setDefaultPreprocessProvider } = useDefaultPreprocessProvider()
const { t } = useTranslation()
const [selectedProvider, setSelectedProvider] = useState<PreprocessProvider | undefined>(defaultProvider)
const { theme: themeMode } = useTheme()
function updateSelectedPreprocessProvider(providerId: string) {
const provider = preprocessProviders.find((p) => p.id === providerId)
if (!provider) {
return
}
setDefaultPreprocessProvider(provider)
setSelectedProvider(provider)
}
return (
<SettingContainer theme={themeMode}>
<SettingGroup theme={themeMode}>
<SettingTitle>{t('settings.tool.preprocess.title')}</SettingTitle>
<SettingDivider />
<SettingRow>
<SettingRowTitle>{t('settings.tool.preprocess.provider')}</SettingRowTitle>
<div style={{ display: 'flex', gap: '8px' }}>
<Select
value={selectedProvider?.id}
style={{ width: '200px' }}
onChange={(value: string) => updateSelectedPreprocessProvider(value)}
placeholder={t('settings.tool.preprocess.provider_placeholder')}
options={preprocessProviders.map((p) => ({
value: p.id,
label: p.name,
disabled: !isMac && p.id === 'system' // 在非 Mac 系统下禁用 system 选项
}))}
/>
</div>
</SettingRow>
</SettingGroup>
{selectedProvider && (
<SettingGroup theme={themeMode}>
<PreprocessProviderSettings provider={selectedProvider} />
</SettingGroup>
)}
</SettingContainer>
)
}
export default PreprocessSettings

View File

@ -38,7 +38,7 @@ const PopupContainer: React.FC<Props> = ({ title, resolve }) => {
const name = values.name?.trim() || url const name = values.name?.trim() || url
if (!url) { if (!url) {
window.message.error(t('settings.websearch.url_required')) window.message.error(t('settings.tool.websearch.url_required'))
return return
} }
@ -46,7 +46,7 @@ const PopupContainer: React.FC<Props> = ({ title, resolve }) => {
try { try {
new URL(url) new URL(url)
} catch (e) { } catch (e) {
window.message.error(t('settings.websearch.url_invalid')) window.message.error(t('settings.tool.websearch.url_invalid'))
return return
} }
@ -71,7 +71,7 @@ const PopupContainer: React.FC<Props> = ({ title, resolve }) => {
colon={false} colon={false}
style={{ marginTop: 25 }} style={{ marginTop: 25 }}
onFinish={onFinish}> onFinish={onFinish}>
<Form.Item name="url" label={t('settings.websearch.subscribe_url')} rules={[{ required: true }]}> <Form.Item name="url" label={t('settings.tool.websearch.subscribe_url')} rules={[{ required: true }]}>
<Input <Input
placeholder="https://git.io/ublacklist" placeholder="https://git.io/ublacklist"
spellCheck={false} spellCheck={false}
@ -86,12 +86,12 @@ const PopupContainer: React.FC<Props> = ({ title, resolve }) => {
}} }}
/> />
</Form.Item> </Form.Item>
<Form.Item name="name" label={t('settings.websearch.subscribe_name')}> <Form.Item name="name" label={t('settings.tool.websearch.subscribe_name')}>
<Input placeholder={t('settings.websearch.subscribe_name.placeholder')} spellCheck={false} /> <Input placeholder={t('settings.tool.websearch.subscribe_name.placeholder')} spellCheck={false} />
</Form.Item> </Form.Item>
<Flex justify="end" style={{ marginBottom: 8 }}> <Flex justify="end" style={{ marginBottom: 8 }}>
<Button type="primary" htmlType="submit"> <Button type="primary" htmlType="submit">
{t('settings.websearch.subscribe_add')} {t('settings.tool.websearch.subscribe_add')}
</Button> </Button>
</Flex> </Flex>
</Form> </Form>

View File

@ -6,7 +6,7 @@ import { Slider, Switch } from 'antd'
import { t } from 'i18next' import { t } from 'i18next'
import { FC } from 'react' import { FC } from 'react'
import { SettingDivider, SettingGroup, SettingRow, SettingRowTitle, SettingTitle } from '..' import { SettingDivider, SettingGroup, SettingRow, SettingRowTitle, SettingTitle } from '../..'
const BasicSettings: FC = () => { const BasicSettings: FC = () => {
const { theme } = useTheme() const { theme } = useTheme()
@ -20,19 +20,19 @@ const BasicSettings: FC = () => {
<SettingTitle>{t('settings.general.title')}</SettingTitle> <SettingTitle>{t('settings.general.title')}</SettingTitle>
<SettingDivider /> <SettingDivider />
<SettingRow> <SettingRow>
<SettingRowTitle>{t('settings.websearch.search_with_time')}</SettingRowTitle> <SettingRowTitle>{t('settings.tool.websearch.search_with_time')}</SettingRowTitle>
<Switch checked={searchWithTime} onChange={(checked) => dispatch(setSearchWithTime(checked))} /> <Switch checked={searchWithTime} onChange={(checked) => dispatch(setSearchWithTime(checked))} />
</SettingRow> </SettingRow>
<SettingDivider style={{ marginTop: 15, marginBottom: 10 }} /> <SettingDivider style={{ marginTop: 15, marginBottom: 10 }} />
<SettingRow style={{ height: 40 }}> <SettingRow style={{ height: 40 }}>
<SettingRowTitle>{t('settings.websearch.search_max_result')}</SettingRowTitle> <SettingRowTitle>{t('settings.tool.websearch.search_max_result')}</SettingRowTitle>
<Slider <Slider
defaultValue={maxResults} defaultValue={maxResults}
style={{ width: '500px' }} style={{ width: '100%' }}
min={1} min={1}
max={50} max={50}
step={1} step={1}
marks={{ 1: '1', 5: t('settings.websearch.search_result_default'), 20: '20', 50: '50' }} marks={{ 1: '1', 5: t('settings.tool.websearch.search_result_default'), 20: '20', 50: '50' }}
onChangeComplete={(value) => dispatch(setMaxResult(value))} onChangeComplete={(value) => dispatch(setMaxResult(value))}
/> />
</SettingRow> </SettingRow>

View File

@ -10,7 +10,7 @@ import TextArea from 'antd/es/input/TextArea'
import { t } from 'i18next' import { t } from 'i18next'
import { FC, useEffect, useState } from 'react' import { FC, useEffect, useState } from 'react'
import { SettingDivider, SettingGroup, SettingRow, SettingRowTitle, SettingTitle } from '..' import { SettingDivider, SettingGroup, SettingRow, SettingRowTitle, SettingTitle } from '../..'
import AddSubscribePopup from './AddSubscribePopup' import AddSubscribePopup from './AddSubscribePopup'
type TableRowSelection<T extends object = object> = TableProps<T>['rowSelection'] type TableRowSelection<T extends object = object> = TableProps<T>['rowSelection']
@ -131,7 +131,7 @@ const BlacklistSettings: FC = () => {
console.error(`Error updating subscribe source ${source.url}:`, error) console.error(`Error updating subscribe source ${source.url}:`, error)
// 显示具体源更新失败的消息 // 显示具体源更新失败的消息
window.message.warning({ window.message.warning({
content: t('settings.websearch.subscribe_source_update_failed', { url: source.url }), content: t('settings.tool.websearch.subscribe_source_update_failed', { url: source.url }),
duration: 3 duration: 3
}) })
} }
@ -143,7 +143,7 @@ const BlacklistSettings: FC = () => {
setSubscribeValid(true) setSubscribeValid(true)
// 显示成功消息 // 显示成功消息
window.message.success({ window.message.success({
content: t('settings.websearch.subscribe_update_success'), content: t('settings.tool.websearch.subscribe_update_success'),
duration: 2 duration: 2
}) })
setTimeout(() => setSubscribeValid(false), 3000) setTimeout(() => setSubscribeValid(false), 3000)
@ -154,7 +154,7 @@ const BlacklistSettings: FC = () => {
} catch (error) { } catch (error) {
console.error('Error updating subscribes:', error) console.error('Error updating subscribes:', error)
window.message.error({ window.message.error({
content: t('settings.websearch.subscribe_update_failed'), content: t('settings.tool.websearch.subscribe_update_failed'),
duration: 2 duration: 2
}) })
} }
@ -165,7 +165,7 @@ const BlacklistSettings: FC = () => {
async function handleAddSubscribe() { async function handleAddSubscribe() {
setSubscribeChecking(true) setSubscribeChecking(true)
const result = await AddSubscribePopup.show({ const result = await AddSubscribePopup.show({
title: t('settings.websearch.subscribe_add') title: t('settings.tool.websearch.subscribe_add')
}) })
if (result && result.url) { if (result && result.url) {
@ -185,14 +185,14 @@ const BlacklistSettings: FC = () => {
setSubscribeValid(true) setSubscribeValid(true)
// 显示成功消息 // 显示成功消息
window.message.success({ window.message.success({
content: t('settings.websearch.subscribe_add_success'), content: t('settings.tool.websearch.subscribe_add_success'),
duration: 2 duration: 2
}) })
setTimeout(() => setSubscribeValid(false), 3000) setTimeout(() => setSubscribeValid(false), 3000)
} catch (error) { } catch (error) {
setSubscribeValid(false) setSubscribeValid(false)
window.message.error({ window.message.error({
content: t('settings.websearch.subscribe_add_failed'), content: t('settings.tool.websearch.subscribe_add_failed'),
duration: 2 duration: 2
}) })
} }
@ -218,32 +218,32 @@ const BlacklistSettings: FC = () => {
return ( return (
<> <>
<SettingGroup theme={theme}> <SettingGroup theme={theme}>
<SettingTitle>{t('settings.websearch.blacklist')}</SettingTitle> <SettingTitle>{t('settings.tool.websearch.blacklist')}</SettingTitle>
<SettingDivider /> <SettingDivider />
<SettingRow style={{ marginBottom: 10 }}> <SettingRow style={{ marginBottom: 10 }}>
<SettingRowTitle>{t('settings.websearch.blacklist_description')}</SettingRowTitle> <SettingRowTitle>{t('settings.tool.websearch.blacklist_description')}</SettingRowTitle>
</SettingRow> </SettingRow>
<TextArea <TextArea
value={blacklistInput} value={blacklistInput}
onChange={(e) => setBlacklistInput(e.target.value)} onChange={(e) => setBlacklistInput(e.target.value)}
placeholder={t('settings.websearch.blacklist_tooltip')} placeholder={t('settings.tool.websearch.blacklist_tooltip')}
autoSize={{ minRows: 4, maxRows: 8 }} autoSize={{ minRows: 4, maxRows: 8 }}
rows={4} rows={4}
/> />
<Button onClick={() => updateManualBlacklist(blacklistInput)} style={{ marginTop: 10 }}> <Button onClick={() => updateManualBlacklist(blacklistInput)} style={{ marginTop: 10 }}>
{t('common.save')} {t('common.save')}
</Button> </Button>
{errFormat && <Alert message={t('settings.websearch.blacklist_tooltip')} type="error" />} {errFormat && <Alert message={t('settings.tool.websearch.blacklist_tooltip')} type="error" />}
</SettingGroup> </SettingGroup>
<SettingGroup theme={theme}> <SettingGroup theme={theme}>
<SettingTitle> <SettingTitle>
{t('settings.websearch.subscribe')} {t('settings.tool.websearch.subscribe')}
<Button <Button
type={subscribeValid ? 'primary' : 'default'} type={subscribeValid ? 'primary' : 'default'}
ghost={subscribeValid} ghost={subscribeValid}
disabled={subscribeChecking} disabled={subscribeChecking}
onClick={handleAddSubscribe}> onClick={handleAddSubscribe}>
{t('settings.websearch.subscribe_add')} {t('settings.tool.websearch.subscribe_add')}
</Button> </Button>
</SettingTitle> </SettingTitle>
<SettingDivider /> <SettingDivider />
@ -266,11 +266,11 @@ const BlacklistSettings: FC = () => {
) : subscribeValid ? ( ) : subscribeValid ? (
<CheckOutlined /> <CheckOutlined />
) : ( ) : (
t('settings.websearch.subscribe_update') t('settings.tool.websearch.subscribe_update')
)} )}
</Button> </Button>
<Button style={{ width: 100 }} disabled={selectedRowKeys.length === 0} onClick={handleDeleteSubscribe}> <Button style={{ width: 100 }} disabled={selectedRowKeys.length === 0} onClick={handleDeleteSubscribe}>
{t('settings.websearch.subscribe_delete')} {t('settings.tool.websearch.subscribe_delete')}
</Button> </Button>
</SettingRow> </SettingRow>
</div> </div>

View File

@ -1,7 +1,7 @@
import { useWebSearchSettings } from '@renderer/hooks/useWebSearchProviders' import { useWebSearchSettings } from '@renderer/hooks/useWebSearchProviders'
import { SettingRow, SettingRowTitle } from '@renderer/pages/settings' import { SettingRow, SettingRowTitle } from '@renderer/pages/settings'
import { Input, Select, Space, Tooltip } from 'antd' import { Input, Select, Space, Tooltip } from 'antd'
import { Info } from 'lucide-react' import { ChevronDown, Info } from 'lucide-react'
import { useTranslation } from 'react-i18next' import { useTranslation } from 'react-i18next'
const INPUT_BOX_WIDTH = '200px' const INPUT_BOX_WIDTH = '200px'
@ -19,22 +19,22 @@ const CutoffSettings = () => {
} }
const unitOptions = [ const unitOptions = [
{ value: 'char', label: t('settings.websearch.compression.cutoff.unit.char') }, { value: 'char', label: t('settings.tool.websearch.compression.cutoff.unit.char') },
{ value: 'token', label: t('settings.websearch.compression.cutoff.unit.token') } { value: 'token', label: t('settings.tool.websearch.compression.cutoff.unit.token') }
] ]
return ( return (
<SettingRow> <SettingRow>
<SettingRowTitle> <SettingRowTitle>
{t('settings.websearch.compression.cutoff.limit')} {t('settings.tool.websearch.compression.cutoff.limit')}
<Tooltip title={t('settings.websearch.compression.cutoff.limit.tooltip')} placement="right"> <Tooltip title={t('settings.tool.websearch.compression.cutoff.limit.tooltip')} placement="right">
<Info size={16} color="var(--color-icon)" style={{ marginLeft: 5, cursor: 'pointer' }} /> <Info size={16} color="var(--color-icon)" style={{ marginLeft: 5, cursor: 'pointer' }} />
</Tooltip> </Tooltip>
</SettingRowTitle> </SettingRowTitle>
<Space.Compact style={{ width: INPUT_BOX_WIDTH }}> <Space.Compact style={{ width: INPUT_BOX_WIDTH }}>
<Input <Input
style={{ maxWidth: '60%' }} style={{ maxWidth: '60%' }}
placeholder={t('settings.websearch.compression.cutoff.limit.placeholder')} placeholder={t('settings.tool.websearch.compression.cutoff.limit.placeholder')}
value={compressionConfig?.cutoffLimit === undefined ? '' : compressionConfig.cutoffLimit} value={compressionConfig?.cutoffLimit === undefined ? '' : compressionConfig.cutoffLimit}
onChange={(e) => { onChange={(e) => {
const value = e.target.value const value = e.target.value
@ -50,6 +50,7 @@ const CutoffSettings = () => {
style={{ minWidth: '40%' }} style={{ minWidth: '40%' }}
onChange={handleCutoffUnitChange} onChange={handleCutoffUnitChange}
options={unitOptions} options={unitOptions}
suffixIcon={<ChevronDown size={16} color="var(--color-border)" />}
/> />
</Space.Compact> </Space.Compact>
</SettingRow> </SettingRow>

View File

@ -92,14 +92,14 @@ const RagSettings = () => {
const handleAutoGetDimensions = async () => { const handleAutoGetDimensions = async () => {
if (!compressionConfig?.embeddingModel) { if (!compressionConfig?.embeddingModel) {
Logger.log('[RagSettings] handleAutoGetDimensions: no embedding model') Logger.log('[RagSettings] handleAutoGetDimensions: no embedding model')
window.message.error(t('settings.websearch.compression.error.embedding_model_required')) window.message.error(t('settings.tool.websearch.compression.error.embedding_model_required'))
return return
} }
const provider = providers.find((p) => p.id === compressionConfig.embeddingModel?.provider) const provider = providers.find((p) => p.id === compressionConfig.embeddingModel?.provider)
if (!provider) { if (!provider) {
Logger.log('[RagSettings] handleAutoGetDimensions: provider not found') Logger.log('[RagSettings] handleAutoGetDimensions: provider not found')
window.message.error(t('settings.websearch.compression.error.provider_not_found')) window.message.error(t('settings.tool.websearch.compression.error.provider_not_found'))
return return
} }
@ -110,10 +110,10 @@ const RagSettings = () => {
updateCompressionConfig({ embeddingDimensions: dimensions }) updateCompressionConfig({ embeddingDimensions: dimensions })
window.message.success(t('settings.websearch.compression.info.dimensions_auto_success', { dimensions })) window.message.success(t('settings.tool.websearch.compression.info.dimensions_auto_success', { dimensions }))
} catch (error) { } catch (error) {
Logger.error('[RagSettings] handleAutoGetDimensions: failed to get embedding dimensions', error) Logger.error('[RagSettings] handleAutoGetDimensions: failed to get embedding dimensions', error)
window.message.error(t('settings.websearch.compression.error.dimensions_auto_failed')) window.message.error(t('settings.tool.websearch.compression.error.dimensions_auto_failed'))
} finally { } finally {
setLoadingDimensions(false) setLoadingDimensions(false)
} }
@ -146,11 +146,11 @@ const RagSettings = () => {
<InputNumber <InputNumber
value={compressionConfig?.embeddingDimensions} value={compressionConfig?.embeddingDimensions}
style={{ flex: 1 }} style={{ flex: 1 }}
placeholder={t('settings.websearch.compression.rag.embedding_dimensions.placeholder')} placeholder={t('settings.tool.websearch.compression.rag.embedding_dimensions.placeholder')}
min={0} min={0}
onChange={handleEmbeddingDimensionsChange} onChange={handleEmbeddingDimensionsChange}
/> />
<Tooltip title={t('settings.websearch.compression.rag.embedding_dimensions.auto_get')}> <Tooltip title={t('settings.tool.websearch.compression.rag.embedding_dimensions.auto_get')}>
<Button <Button
icon={<RefreshCw size={16} />} icon={<RefreshCw size={16} />}
loading={loadingDimensions} loading={loadingDimensions}
@ -178,8 +178,8 @@ const RagSettings = () => {
<SettingRow> <SettingRow>
<SettingRowTitle> <SettingRowTitle>
{t('settings.websearch.compression.rag.document_count')} {t('settings.tool.websearch.compression.rag.document_count')}
<Tooltip title={t('settings.websearch.compression.rag.document_count.tooltip')} placement="right"> <Tooltip title={t('settings.tool.websearch.compression.rag.document_count.tooltip')} placement="right">
<Info size={16} color="var(--color-icon)" style={{ marginLeft: 5, cursor: 'pointer' }} /> <Info size={16} color="var(--color-icon)" style={{ marginLeft: 5, cursor: 'pointer' }} />
</Tooltip> </Tooltip>
</SettingRowTitle> </SettingRowTitle>
@ -191,7 +191,7 @@ const RagSettings = () => {
step={1} step={1}
onChange={handleDocumentCountChange} onChange={handleDocumentCountChange}
marks={{ marks={{
1: t('settings.websearch.compression.rag.document_count.default'), 1: t('settings.tool.websearch.compression.rag.document_count.default'),
3: '3', 3: '3',
10: '10' 10: '10'
}} }}

View File

@ -11,9 +11,9 @@ const CompressionSettings = () => {
const { compressionConfig, updateCompressionConfig } = useWebSearchSettings() const { compressionConfig, updateCompressionConfig } = useWebSearchSettings()
const compressionMethodOptions = [ const compressionMethodOptions = [
{ value: 'none', label: t('settings.websearch.compression.method.none') }, { value: 'none', label: t('settings.tool.websearch.compression.method.none') },
{ value: 'cutoff', label: t('settings.websearch.compression.method.cutoff') }, { value: 'cutoff', label: t('settings.tool.websearch.compression.method.cutoff') },
{ value: 'rag', label: t('settings.websearch.compression.method.rag') } { value: 'rag', label: t('settings.tool.websearch.compression.method.rag') }
] ]
const handleCompressionMethodChange = (method: 'none' | 'cutoff' | 'rag') => { const handleCompressionMethodChange = (method: 'none' | 'cutoff' | 'rag') => {
@ -22,11 +22,11 @@ const CompressionSettings = () => {
return ( return (
<SettingGroup> <SettingGroup>
<SettingTitle>{t('settings.websearch.compression.title')}</SettingTitle> <SettingTitle>{t('settings.tool.websearch.compression.title')}</SettingTitle>
<SettingDivider /> <SettingDivider />
<SettingRow> <SettingRow>
<SettingRowTitle>{t('settings.websearch.compression.method')}</SettingRowTitle> <SettingRowTitle>{t('settings.tool.websearch.compression.method')}</SettingRowTitle>
<Select <Select
value={compressionConfig?.method || 'none'} value={compressionConfig?.method || 'none'}
style={{ width: '200px' }} style={{ width: '200px' }}

View File

@ -12,8 +12,15 @@ import { FC, useEffect, useState } from 'react'
import { useTranslation } from 'react-i18next' import { useTranslation } from 'react-i18next'
import styled from 'styled-components' import styled from 'styled-components'
import { SettingDivider, SettingHelpLink, SettingHelpText, SettingHelpTextRow, SettingSubtitle, SettingTitle } from '..' import {
import ApiCheckPopup from '../ProviderSettings/ApiCheckPopup' SettingDivider,
SettingHelpLink,
SettingHelpText,
SettingHelpTextRow,
SettingSubtitle,
SettingTitle
} from '../..'
import ApiCheckPopup from '../../ProviderSettings/ApiCheckPopup'
interface Props { interface Props {
provider: WebSearchProvider provider: WebSearchProvider
@ -74,7 +81,7 @@ const WebSearchProviderSetting: FC<Props> = ({ provider: _provider }) => {
async function checkSearch() { async function checkSearch() {
if (!provider) { if (!provider) {
window.message.error({ window.message.error({
content: t('settings.websearch.no_provider_selected'), content: t('settings.no_provider_selected'),
duration: 3, duration: 3,
icon: <Info size={18} />, icon: <Info size={18} />,
key: 'no-provider-selected' key: 'no-provider-selected'
@ -111,7 +118,9 @@ const WebSearchProviderSetting: FC<Props> = ({ provider: _provider }) => {
key: 'api-check', key: 'api-check',
style: { marginTop: '3vh' }, style: { marginTop: '3vh' },
duration: valid ? 2 : 8, duration: valid ? 2 : 8,
content: valid ? t('settings.websearch.check_success') : t('settings.websearch.check_failed') + errorMessage content: valid
? t('settings.tool.websearch.check_success')
: t('settings.tool.websearch.check_failed') + errorMessage
}) })
setApiValid(valid) setApiValid(valid)
@ -122,7 +131,7 @@ const WebSearchProviderSetting: FC<Props> = ({ provider: _provider }) => {
key: 'check-search-error', key: 'check-search-error',
style: { marginTop: '3vh' }, style: { marginTop: '3vh' },
duration: 8, duration: 8,
content: t('settings.websearch.check_failed') content: t('settings.tool.websearch.check_failed')
}) })
} finally { } finally {
setApiChecking(false) setApiChecking(false)
@ -169,12 +178,18 @@ const WebSearchProviderSetting: FC<Props> = ({ provider: _provider }) => {
type={apiValid ? 'primary' : 'default'} type={apiValid ? 'primary' : 'default'}
onClick={checkSearch} onClick={checkSearch}
disabled={apiChecking}> disabled={apiChecking}>
{apiChecking ? <LoadingOutlined spin /> : apiValid ? <CheckOutlined /> : t('settings.websearch.check')} {apiChecking ? (
<LoadingOutlined spin />
) : apiValid ? (
<CheckOutlined />
) : (
t('settings.tool.websearch.check')
)}
</Button> </Button>
</Flex> </Flex>
<SettingHelpTextRow style={{ justifyContent: 'space-between', marginTop: 5 }}> <SettingHelpTextRow style={{ justifyContent: 'space-between', marginTop: 5 }}>
<SettingHelpLink target="_blank" href={apiKeyWebsite}> <SettingHelpLink target="_blank" href={apiKeyWebsite}>
{t('settings.websearch.get_api_key')} {t('settings.tool.websearch.get_api_key')}
</SettingHelpLink> </SettingHelpLink>
<SettingHelpText>{t('settings.provider.api_key.tip')}</SettingHelpText> <SettingHelpText>{t('settings.provider.api_key.tip')}</SettingHelpText>
</SettingHelpTextRow> </SettingHelpTextRow>
@ -206,7 +221,8 @@ const WebSearchProviderSetting: FC<Props> = ({ provider: _provider }) => {
</SettingSubtitle> </SettingSubtitle>
<Flex> <Flex>
<Form <Form
layout="inline" layout="vertical"
style={{ width: '100%' }}
initialValues={{ initialValues={{
username: basicAuthUsername, username: basicAuthUsername,
password: basicAuthPassword password: basicAuthPassword

View File

@ -6,7 +6,7 @@ import { hasObjectKey } from '@renderer/utils'
import { FC, useState } from 'react' import { FC, useState } from 'react'
import { useTranslation } from 'react-i18next' import { useTranslation } from 'react-i18next'
import { SettingContainer, SettingDivider, SettingGroup, SettingRow, SettingRowTitle, SettingTitle } from '..' import { SettingContainer, SettingDivider, SettingGroup, SettingRow, SettingRowTitle, SettingTitle } from '../..'
import BasicSettings from './BasicSettings' import BasicSettings from './BasicSettings'
import BlacklistSettings from './BlacklistSettings' import BlacklistSettings from './BlacklistSettings'
import CompressionSettings from './CompressionSettings' import CompressionSettings from './CompressionSettings'
@ -33,19 +33,19 @@ const WebSearchSettings: FC = () => {
return ( return (
<SettingContainer theme={themeMode}> <SettingContainer theme={themeMode}>
<SettingGroup theme={themeMode}> <SettingGroup theme={themeMode}>
<SettingTitle>{t('settings.websearch.title')}</SettingTitle> <SettingTitle>{t('settings.tool.websearch.title')}</SettingTitle>
<SettingDivider /> <SettingDivider />
<SettingRow> <SettingRow>
<SettingRowTitle>{t('settings.websearch.search_provider')}</SettingRowTitle> <SettingRowTitle>{t('settings.tool.websearch.search_provider')}</SettingRowTitle>
<div style={{ display: 'flex', gap: '8px' }}> <div style={{ display: 'flex', gap: '8px' }}>
<Selector <Selector
size={14} size={14}
value={selectedProvider?.id} value={selectedProvider?.id}
onChange={(value: string) => updateSelectedWebSearchProvider(value)} onChange={(value: string) => updateSelectedWebSearchProvider(value)}
placeholder={t('settings.websearch.search_provider_placeholder')} placeholder={t('settings.tool.websearch.search_provider_placeholder')}
options={providers.map((p) => ({ options={providers.map((p) => ({
value: p.id, value: p.id,
label: `${p.name} (${hasObjectKey(p, 'apiKey') ? t('settings.websearch.apikey') : t('settings.websearch.free')})` label: `${p.name} (${hasObjectKey(p, 'apiKey') ? t('settings.tool.websearch.apikey') : t('settings.tool.websearch.free')})`
}))} }))}
/> />
</div> </div>

View File

@ -0,0 +1,58 @@
import { GlobalOutlined } from '@ant-design/icons'
import OcrIcon from '@renderer/components/Icons/OcrIcon'
import { HStack } from '@renderer/components/Layout'
import ListItem from '@renderer/components/ListItem'
import { FileCode } from 'lucide-react'
import { FC, useState } from 'react'
import { useTranslation } from 'react-i18next'
import styled from 'styled-components'
import OcrSettings from './OcrSettings'
import PreprocessSettings from './PreprocessSettings'
import WebSearchSettings from './WebSearchSettings'
const ToolSettings: FC = () => {
const { t } = useTranslation()
const [menu, setMenu] = useState<string>('web-search')
const menuItems = [
{ key: 'web-search', title: 'settings.tool.websearch.title', icon: <GlobalOutlined style={{ fontSize: 16 }} /> },
{ key: 'preprocess', title: 'settings.tool.preprocess.title', icon: <FileCode size={16} /> },
{ key: 'ocr', title: 'settings.tool.ocr.title', icon: <OcrIcon /> }
]
return (
<Container>
<MenuList>
{menuItems.map((item) => (
<ListItem
key={item.key}
title={t(item.title)}
active={menu === item.key}
onClick={() => setMenu(item.key)}
titleStyle={{ fontWeight: 500 }}
icon={item.icon}
/>
))}
</MenuList>
{menu == 'web-search' && <WebSearchSettings />}
{menu == 'preprocess' && <PreprocessSettings />}
{menu == 'ocr' && <OcrSettings />}
</Container>
)
}
const Container = styled(HStack)`
flex: 1;
`
const MenuList = styled.div`
display: flex;
flex-direction: column;
gap: 5px;
width: var(--settings-width);
padding: 12px;
border-right: 0.5px solid var(--color-border);
height: 100%;
.iconfont {
line-height: 16px;
}
`
export default ToolSettings

View File

@ -1,9 +1,15 @@
import Logger from '@renderer/config/logger' import Logger from '@renderer/config/logger'
import db from '@renderer/databases' import db from '@renderer/databases'
import { getStoreSetting } from '@renderer/hooks/useSettings'
import { getKnowledgeBaseParams } from '@renderer/services/KnowledgeService' import { getKnowledgeBaseParams } from '@renderer/services/KnowledgeService'
import { NotificationService } from '@renderer/services/NotificationService' import { NotificationService } from '@renderer/services/NotificationService'
import store from '@renderer/store' import store from '@renderer/store'
import { clearCompletedProcessing, updateBaseItemUniqueId, updateItemProcessingStatus } from '@renderer/store/knowledge' import {
clearCompletedProcessing,
updateBaseItemIsPreprocessed,
updateBaseItemUniqueId,
updateItemProcessingStatus
} from '@renderer/store/knowledge'
import { KnowledgeItem } from '@renderer/types' import { KnowledgeItem } from '@renderer/types'
import { uuid } from '@renderer/utils' import { uuid } from '@renderer/utils'
import type { LoaderReturn } from '@shared/config/types' import type { LoaderReturn } from '@shared/config/types'
@ -88,6 +94,7 @@ class KnowledgeQueue {
private async processItem(baseId: string, item: KnowledgeItem): Promise<void> { private async processItem(baseId: string, item: KnowledgeItem): Promise<void> {
const notificationService = NotificationService.getInstance() const notificationService = NotificationService.getInstance()
const userId = getStoreSetting('userId')
try { try {
if (item.retryCount && item.retryCount >= this.MAX_RETRIES) { if (item.retryCount && item.retryCount >= this.MAX_RETRIES) {
Logger.log(`[KnowledgeQueue] Item ${item.id} has reached max retries, skipping`) Logger.log(`[KnowledgeQueue] Item ${item.id} has reached max retries, skipping`)
@ -132,20 +139,37 @@ class KnowledgeQueue {
} }
break break
default: default:
result = await window.api.knowledgeBase.add({ base: baseParams, item: sourceItem }) result = await window.api.knowledgeBase.add({ base: baseParams, item: sourceItem, userId: userId as string })
break break
} }
if (!result) {
throw new Error(`[KnowledgeQueue] Backend processing returned null for item ${item.id}`)
}
if (result.status === 'failed') {
Logger.error(`[KnowledgeQueue] Backend processing error for item ${item.id}: ${result.message}`)
const errorPrefix =
result.messageSource === 'embedding'
? t('knowledge.status_embedding_failed')
: t('knowledge.status_preprocess_failed')
throw new Error(
result.message ? `${errorPrefix}: ${result.message}` : `Backend processing failed for item ${item.id}`
)
}
Logger.log(`[KnowledgeQueue] Successfully completed processing item ${item.id}`) Logger.log(`[KnowledgeQueue] Successfully completed processing item ${item.id}`)
notificationService.send({ notificationService.send({
id: uuid(), id: uuid(),
type: 'success', type: 'success',
title: t('knowledge.status_completed"'), title: t('knowledge.status_completed'),
message: t('notification.knowledge.success', { type: item.type }), message: t('notification.knowledge.success', { type: item.type }),
silent: false, silent: false,
timestamp: Date.now(), timestamp: Date.now(),
source: 'knowledgeEmbed' source: 'knowledge'
}) })
store.dispatch( store.dispatch(
@ -165,6 +189,13 @@ class KnowledgeQueue {
uniqueIds: result.uniqueIds uniqueIds: result.uniqueIds
}) })
) )
store.dispatch(
updateBaseItemIsPreprocessed({
baseId,
itemId: item.id,
isPreprocessed: base.preprocessOrOcrProvider ? true : false
})
)
} }
Logger.log(`[KnowledgeQueue] Updated uniqueId for item ${item.id} in base ${baseId} `) Logger.log(`[KnowledgeQueue] Updated uniqueId for item ${item.id} in base ${baseId} `)
@ -174,14 +205,13 @@ class KnowledgeQueue {
notificationService.send({ notificationService.send({
id: uuid(), id: uuid(),
type: 'error', type: 'error',
title: t('common.knowledge'), title: t('common.knowledge_base'),
message: t('notification.knowledge.error', { message: t('notification.knowledge.error', {
type: item.type,
error: error instanceof Error ? error.message : 'Unkown error' error: error instanceof Error ? error.message : 'Unkown error'
}), }),
silent: false, silent: false,
timestamp: Date.now(), timestamp: Date.now(),
source: 'knowledgeEmbed' source: 'knowledge'
}) })
store.dispatch( store.dispatch(

View File

@ -2,17 +2,17 @@ import Logger from '@renderer/config/logger'
import db from '@renderer/databases' import db from '@renderer/databases'
import i18n from '@renderer/i18n' import i18n from '@renderer/i18n'
import store from '@renderer/store' import store from '@renderer/store'
import { FileType } from '@renderer/types' import { FileMetadata } from '@renderer/types'
import { getFileDirectory } from '@renderer/utils' import { getFileDirectory } from '@renderer/utils'
import dayjs from 'dayjs' import dayjs from 'dayjs'
class FileManager { class FileManager {
static async selectFiles(options?: Electron.OpenDialogOptions): Promise<FileType[] | null> { static async selectFiles(options?: Electron.OpenDialogOptions): Promise<FileMetadata[] | null> {
const files = await window.api.file.select(options) const files = await window.api.file.select(options)
return files return files
} }
static async addFile(file: FileType): Promise<FileType> { static async addFile(file: FileMetadata): Promise<FileMetadata> {
const fileRecord = await db.files.get(file.id) const fileRecord = await db.files.get(file.id)
if (fileRecord) { if (fileRecord) {
@ -25,21 +25,21 @@ class FileManager {
return file return file
} }
static async addFiles(files: FileType[]): Promise<FileType[]> { static async addFiles(files: FileMetadata[]): Promise<FileMetadata[]> {
return Promise.all(files.map((file) => this.addFile(file))) return Promise.all(files.map((file) => this.addFile(file)))
} }
static async readBinaryImage(file: FileType): Promise<Buffer> { static async readBinaryImage(file: FileMetadata): Promise<Buffer> {
const fileData = await window.api.file.binaryImage(file.id + file.ext) const fileData = await window.api.file.binaryImage(file.id + file.ext)
return fileData.data return fileData.data
} }
static async readBase64File(file: FileType): Promise<string> { static async readBase64File(file: FileMetadata): Promise<string> {
const fileData = await window.api.file.base64File(file.id + file.ext) const fileData = await window.api.file.base64File(file.id + file.ext)
return fileData.data return fileData.data
} }
static async addBase64File(file: FileType): Promise<FileType> { static async addBase64File(file: FileMetadata): Promise<FileMetadata> {
Logger.log(`[FileManager] Adding base64 file: ${JSON.stringify(file)}`) Logger.log(`[FileManager] Adding base64 file: ${JSON.stringify(file)}`)
const base64File = await window.api.file.base64File(file.id + file.ext) const base64File = await window.api.file.base64File(file.id + file.ext)
@ -55,10 +55,11 @@ class FileManager {
return base64File return base64File
} }
static async uploadFile(file: FileType): Promise<FileType> { static async uploadFile(file: FileMetadata): Promise<FileMetadata> {
Logger.log(`[FileManager] Uploading file: ${JSON.stringify(file)}`) Logger.log(`[FileManager] Uploading file: ${JSON.stringify(file)}`)
const uploadFile = await window.api.file.upload(file) const uploadFile = await window.api.file.upload(file)
console.log('[FileManager] Uploaded file:', uploadFile)
const fileRecord = await db.files.get(uploadFile.id) const fileRecord = await db.files.get(uploadFile.id)
if (fileRecord) { if (fileRecord) {
@ -71,11 +72,11 @@ class FileManager {
return uploadFile return uploadFile
} }
static async uploadFiles(files: FileType[]): Promise<FileType[]> { static async uploadFiles(files: FileMetadata[]): Promise<FileMetadata[]> {
return Promise.all(files.map((file) => this.uploadFile(file))) return Promise.all(files.map((file) => this.uploadFile(file)))
} }
static async getFile(id: string): Promise<FileType | undefined> { static async getFile(id: string): Promise<FileMetadata | undefined> {
const file = await db.files.get(id) const file = await db.files.get(id)
if (file) { if (file) {
@ -86,7 +87,7 @@ class FileManager {
return file return file
} }
static getFilePath(file: FileType) { static getFilePath(file: FileMetadata) {
const filesPath = store.getState().runtime.filesPath const filesPath = store.getState().runtime.filesPath
return filesPath + '/' + file.id + file.ext return filesPath + '/' + file.id + file.ext
} }
@ -116,28 +117,28 @@ class FileManager {
} }
} }
static async deleteFiles(files: FileType[]): Promise<void> { static async deleteFiles(files: FileMetadata[]): Promise<void> {
await Promise.all(files.map((file) => this.deleteFile(file.id))) await Promise.all(files.map((file) => this.deleteFile(file.id)))
} }
static async allFiles(): Promise<FileType[]> { static async allFiles(): Promise<FileMetadata[]> {
return db.files.toArray() return db.files.toArray()
} }
static isDangerFile(file: FileType) { static isDangerFile(file: FileMetadata) {
return ['.sh', '.bat', '.cmd', '.ps1', '.vbs', 'reg'].includes(file.ext) return ['.sh', '.bat', '.cmd', '.ps1', '.vbs', 'reg'].includes(file.ext)
} }
static getSafePath(file: FileType) { static getSafePath(file: FileMetadata) {
return this.isDangerFile(file) ? getFileDirectory(file.path) : file.path return this.isDangerFile(file) ? getFileDirectory(file.path) : file.path
} }
static getFileUrl(file: FileType) { static getFileUrl(file: FileMetadata) {
const filesPath = store.getState().runtime.filesPath const filesPath = store.getState().runtime.filesPath
return 'file://' + filesPath + '/' + file.name return 'file://' + filesPath + '/' + file.name
} }
static async updateFile(file: FileType) { static async updateFile(file: FileMetadata) {
if (!file.origin_name.includes(file.ext)) { if (!file.origin_name.includes(file.ext)) {
file.origin_name = file.origin_name + file.ext file.origin_name = file.origin_name + file.ext
} }
@ -145,7 +146,7 @@ class FileManager {
await db.files.update(file.id, file) await db.files.update(file.id, file)
} }
static formatFileName(file: FileType) { static formatFileName(file: FileMetadata) {
if (!file || !file.origin_name) { if (!file || !file.origin_name) {
return '' return ''
} }

View File

@ -4,7 +4,7 @@ import { DEFAULT_KNOWLEDGE_DOCUMENT_COUNT, DEFAULT_KNOWLEDGE_THRESHOLD } from '@
import { getEmbeddingMaxContext } from '@renderer/config/embedings' import { getEmbeddingMaxContext } from '@renderer/config/embedings'
import Logger from '@renderer/config/logger' import Logger from '@renderer/config/logger'
import store from '@renderer/store' import store from '@renderer/store'
import { FileType, KnowledgeBase, KnowledgeBaseParams, KnowledgeReference } from '@renderer/types' import { FileMetadata, KnowledgeBase, KnowledgeBaseParams, KnowledgeReference } from '@renderer/types'
import { ExtractResults } from '@renderer/utils/extract' import { ExtractResults } from '@renderer/utils/extract'
import { isEmpty } from 'lodash' import { isEmpty } from 'lodash'
@ -48,12 +48,17 @@ export const getKnowledgeBaseParams = (base: KnowledgeBase): KnowledgeBaseParams
rerankBaseURL: rerankHost, rerankBaseURL: rerankHost,
rerankApiKey: rerankAiProvider.getApiKey() || 'secret', rerankApiKey: rerankAiProvider.getApiKey() || 'secret',
rerankModel: base.rerankModel?.id, rerankModel: base.rerankModel?.id,
rerankModelProvider: rerankProvider.name.toLowerCase() rerankModelProvider: rerankProvider.name.toLowerCase(),
// topN: base.topN,
// preprocessing: base.preprocessing,
preprocessOrOcrProvider: base.preprocessOrOcrProvider
// topN: base.topN // topN: base.topN
} }
} }
export const getFileFromUrl = async (url: string): Promise<FileType | null> => { export const getFileFromUrl = async (url: string): Promise<FileMetadata | null> => {
console.log('getFileFromUrl', url)
let fileName = '' let fileName = ''
if (url && url.includes('CherryStudio')) { if (url && url.includes('CherryStudio')) {
@ -65,9 +70,11 @@ export const getFileFromUrl = async (url: string): Promise<FileType | null> => {
fileName = url.split('\\Data\\Files\\')[1] fileName = url.split('\\Data\\Files\\')[1]
} }
} }
console.log('fileName', fileName)
if (fileName) { if (fileName) {
const fileId = fileName.split('.')[0] const actualFileName = fileName.split(/[/\\]/).pop() || fileName
console.log('actualFileName', actualFileName)
const fileId = actualFileName.split('.')[0]
const file = await FileManager.getFile(fileId) const file = await FileManager.getFile(fileId)
if (file) { if (file) {
return file return file
@ -77,7 +84,7 @@ export const getFileFromUrl = async (url: string): Promise<FileType | null> => {
return null return null
} }
export const getKnowledgeSourceUrl = async (item: ExtractChunkData & { file: FileType | null }) => { export const getKnowledgeSourceUrl = async (item: ExtractChunkData & { file: FileMetadata | null }) => {
if (item.metadata.source.startsWith('http')) { if (item.metadata.source.startsWith('http')) {
return item.metadata.source return item.metadata.source
} }
@ -93,7 +100,7 @@ export const searchKnowledgeBase = async (
query: string, query: string,
base: KnowledgeBase, base: KnowledgeBase,
rewrite?: string rewrite?: string
): Promise<Array<ExtractChunkData & { file: FileType | null }>> => { ): Promise<Array<ExtractChunkData & { file: FileMetadata | null }>> => {
try { try {
const baseParams = getKnowledgeBaseParams(base) const baseParams = getKnowledgeBaseParams(base)
const documentCount = base.documentCount || DEFAULT_KNOWLEDGE_DOCUMENT_COUNT const documentCount = base.documentCount || DEFAULT_KNOWLEDGE_DOCUMENT_COUNT
@ -125,6 +132,7 @@ export const searchKnowledgeBase = async (
return await Promise.all( return await Promise.all(
limitedResults.map(async (item) => { limitedResults.map(async (item) => {
const file = await getFileFromUrl(item.metadata.source) const file = await getFileFromUrl(item.metadata.source)
console.log('Knowledge search item:', item, 'File:', file)
return { ...item, file } return { ...item, file }
}) })
) )

View File

@ -6,7 +6,7 @@ import { fetchMessagesSummary } from '@renderer/services/ApiService'
import store from '@renderer/store' import store from '@renderer/store'
import { messageBlocksSelectors, removeManyBlocks } from '@renderer/store/messageBlock' import { messageBlocksSelectors, removeManyBlocks } from '@renderer/store/messageBlock'
import { selectMessagesForTopic } from '@renderer/store/newMessage' import { selectMessagesForTopic } from '@renderer/store/newMessage'
import type { Assistant, FileType, Model, Topic, Usage } from '@renderer/types' import type { Assistant, FileMetadata, Model, Topic, Usage } from '@renderer/types'
import { FileTypes } from '@renderer/types' import { FileTypes } from '@renderer/types'
import type { Message, MessageBlock } from '@renderer/types/newMessage' import type { Message, MessageBlock } from '@renderer/types/newMessage'
import { AssistantMessageStatus, MessageBlockStatus, MessageBlockType } from '@renderer/types/newMessage' import { AssistantMessageStatus, MessageBlockStatus, MessageBlockType } from '@renderer/types/newMessage'
@ -65,7 +65,7 @@ export function deleteMessageFiles(message: Message) {
message.blocks?.forEach((blockId) => { message.blocks?.forEach((blockId) => {
const block = messageBlocksSelectors.selectById(state, blockId) const block = messageBlocksSelectors.selectById(state, blockId)
if (block && (block.type === MessageBlockType.IMAGE || block.type === MessageBlockType.FILE)) { if (block && (block.type === MessageBlockType.IMAGE || block.type === MessageBlockType.FILE)) {
const fileData = (block as any).file as FileType | undefined const fileData = (block as any).file as FileMetadata | undefined
if (fileData) { if (fileData) {
FileManager.deleteFiles([fileData]) FileManager.deleteFiles([fileData])
} }
@ -115,7 +115,7 @@ export function getUserMessage({
topic: Topic topic: Topic
type?: Message['type'] type?: Message['type']
content?: string content?: string
files?: FileType[] files?: FileMetadata[]
knowledgeBaseIds?: string[] knowledgeBaseIds?: string[]
mentions?: Model[] mentions?: Model[]
usage?: Usage usage?: Usage

View File

@ -1,5 +1,5 @@
import Logger from '@renderer/config/logger' import Logger from '@renderer/config/logger'
import { FileType } from '@renderer/types' import { FileMetadata } from '@renderer/types'
import { getFileExtension } from '@renderer/utils' import { getFileExtension } from '@renderer/utils'
// Track last focused component // Track last focused component
@ -27,7 +27,7 @@ export const handlePaste = async (
isVisionModel: boolean, isVisionModel: boolean,
isGenerateImageModel: boolean, isGenerateImageModel: boolean,
supportExts: string[], supportExts: string[],
setFiles: (updater: (prevFiles: FileType[]) => FileType[]) => void, setFiles: (updater: (prevFiles: FileMetadata[]) => FileMetadata[]) => void,
setText?: (text: string) => void, setText?: (text: string) => void,
pasteLongTextAsFile?: boolean, pasteLongTextAsFile?: boolean,
pasteLongTextThreshold?: number, pasteLongTextThreshold?: number,
@ -44,7 +44,7 @@ export const handlePaste = async (
// 长文本直接转文件,阻止默认粘贴 // 长文本直接转文件,阻止默认粘贴
event.preventDefault() event.preventDefault()
const tempFilePath = await window.api.file.create('pasted_text.txt') const tempFilePath = await window.api.file.createTempFile('pasted_text.txt')
await window.api.file.write(tempFilePath, clipboardText) await window.api.file.write(tempFilePath, clipboardText)
const selectedFile = await window.api.file.get(tempFilePath) const selectedFile = await window.api.file.get(tempFilePath)
if (selectedFile) { if (selectedFile) {
@ -70,7 +70,7 @@ export const handlePaste = async (
if (!filePath) { if (!filePath) {
// 图像生成也支持图像编辑 // 图像生成也支持图像编辑
if (file.type.startsWith('image/') && (isVisionModel || isGenerateImageModel)) { if (file.type.startsWith('image/') && (isVisionModel || isGenerateImageModel)) {
const tempFilePath = await window.api.file.create(file.name) const tempFilePath = await window.api.file.createTempFile(file.name)
const arrayBuffer = await file.arrayBuffer() const arrayBuffer = await file.arrayBuffer()
const uint8Array = new Uint8Array(arrayBuffer) const uint8Array = new Uint8Array(arrayBuffer)
await window.api.file.write(tempFilePath, uint8Array) await window.api.file.write(tempFilePath, uint8Array)

View File

@ -1,4 +1,4 @@
import { Assistant, FileType, FileTypes, Usage } from '@renderer/types' import { Assistant, FileMetadata, FileTypes, Usage } from '@renderer/types'
import type { Message } from '@renderer/types/newMessage' import type { Message } from '@renderer/types/newMessage'
import { findFileBlocks, getMainTextContent, getThinkingContent } from '@renderer/utils/messageUtils/find' import { findFileBlocks, getMainTextContent, getThinkingContent } from '@renderer/utils/messageUtils/find'
import { flatten, takeRight } from 'lodash' import { flatten, takeRight } from 'lodash'
@ -13,7 +13,7 @@ interface MessageItem {
content: string content: string
} }
async function getFileContent(file: FileType) { async function getFileContent(file: FileMetadata) {
if (!file) { if (!file) {
return '' return ''
} }
@ -67,7 +67,7 @@ export function estimateTextTokens(text: string) {
* @param file - * @param file -
* @returns token * @returns token
*/ */
export function estimateImageTokens(file: FileType) { export function estimateImageTokens(file: FileMetadata) {
return Math.floor(file.size / 100) return Math.floor(file.size / 100)
} }
@ -79,7 +79,7 @@ export function estimateImageTokens(file: FileType) {
* *
* @param {Object} params - * @param {Object} params -
* @param {string} [params.content] - * @param {string} [params.content] -
* @param {FileType[]} [params.files] - * @param {FileMetadata[]} [params.files] -
* @returns {Promise<Usage>} Usage prompt_tokenscompletion_tokenstotal_tokens * @returns {Promise<Usage>} Usage prompt_tokenscompletion_tokenstotal_tokens
*/ */
export async function estimateUserPromptUsage({ export async function estimateUserPromptUsage({
@ -87,7 +87,7 @@ export async function estimateUserPromptUsage({
files files
}: { }: {
content?: string content?: string
files?: FileType[] files?: FileMetadata[]
}): Promise<Usage> { }): Promise<Usage> {
let imageTokens = 0 let imageTokens = 0

View File

@ -17,7 +17,9 @@ import migrate from './migrate'
import minapps from './minapps' import minapps from './minapps'
import newMessagesReducer from './newMessage' import newMessagesReducer from './newMessage'
import nutstore from './nutstore' import nutstore from './nutstore'
import ocr from './ocr'
import paintings from './paintings' import paintings from './paintings'
import preprocess from './preprocess'
import runtime from './runtime' import runtime from './runtime'
import selectionStore from './selectionStore' import selectionStore from './selectionStore'
import settings from './settings' import settings from './settings'
@ -33,6 +35,7 @@ const rootReducer = combineReducers({
llm, llm,
settings, settings,
runtime, runtime,
ocr,
shortcuts, shortcuts,
knowledge, knowledge,
minapps, minapps,
@ -41,6 +44,7 @@ const rootReducer = combineReducers({
copilot, copilot,
selectionStore, selectionStore,
// messages: messagesReducer, // messages: messagesReducer,
preprocess,
messages: newMessagesReducer, messages: newMessagesReducer,
messageBlocks: messageBlocksReducer, messageBlocks: messageBlocksReducer,
inputTools: inputToolsReducer inputTools: inputToolsReducer
@ -50,7 +54,7 @@ const persistedReducer = persistReducer(
{ {
key: 'cherry-studio', key: 'cherry-studio',
storage, storage,
version: 117, version: 118,
blacklist: ['runtime', 'messages', 'messageBlocks'], blacklist: ['runtime', 'messages', 'messageBlocks'],
migrate migrate
}, },

Some files were not shown because too many files have changed in this diff Show More