From 68840ff90776d777656f7c0cdf469903d39c9040 Mon Sep 17 00:00:00 2001 From: suyao Date: Sat, 14 Jun 2025 12:17:45 +0800 Subject: [PATCH 1/3] refactor: simplify development environment setup by removing redundant first setup check for userData path --- src/main/config.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/config.ts b/src/main/config.ts index a3a05d601..84dc1b846 100644 --- a/src/main/config.ts +++ b/src/main/config.ts @@ -4,12 +4,10 @@ import { getDataPath } from './utils' const isDev = process.env.NODE_ENV === 'development' -let isFirstSetupDev = true - -if (isDev && isFirstSetupDev) { +if (isDev) { app.setPath('userData', app.getPath('userData') + 'Dev') - isFirstSetupDev = false } + export const DATA_PATH = getDataPath() export const titleBarOverlayDark = { From 8992c2788b8fe66a29421c72c69d9ce15b5d5f15 Mon Sep 17 00:00:00 2001 From: suyao Date: Sat, 14 Jun 2025 12:29:28 +0800 Subject: [PATCH 2/3] chore(package.json): reorder and reintroduce embedjs dependencies for consistency --- package.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index a279743dd..4bbc376e3 100644 --- a/package.json +++ b/package.json @@ -58,18 +58,6 @@ "prepare": "husky" }, "dependencies": { - "@cherrystudio/embedjs": "^0.1.31", - "@cherrystudio/embedjs-libsql": "^0.1.31", - "@cherrystudio/embedjs-loader-csv": "^0.1.31", - "@cherrystudio/embedjs-loader-image": "^0.1.31", - "@cherrystudio/embedjs-loader-markdown": "^0.1.31", - "@cherrystudio/embedjs-loader-msoffice": "^0.1.31", - "@cherrystudio/embedjs-loader-pdf": "^0.1.31", - "@cherrystudio/embedjs-loader-sitemap": "^0.1.31", - "@cherrystudio/embedjs-loader-web": "^0.1.31", - "@cherrystudio/embedjs-loader-xml": "^0.1.31", - "@cherrystudio/embedjs-ollama": "^0.1.31", - "@cherrystudio/embedjs-openai": "^0.1.31", "@libsql/client": "0.14.0", "@libsql/win32-x64-msvc": "^0.4.7", "@strongtz/win32-arm64-msvc": "^0.4.7", @@ -87,6 +75,18 @@ "@agentic/tavily": "^7.3.3", "@ant-design/v5-patch-for-react-19": "^1.0.3", "@anthropic-ai/sdk": "^0.41.0", + "@cherrystudio/embedjs": "^0.1.31", + "@cherrystudio/embedjs-libsql": "^0.1.31", + "@cherrystudio/embedjs-loader-csv": "^0.1.31", + "@cherrystudio/embedjs-loader-image": "^0.1.31", + "@cherrystudio/embedjs-loader-markdown": "^0.1.31", + "@cherrystudio/embedjs-loader-msoffice": "^0.1.31", + "@cherrystudio/embedjs-loader-pdf": "^0.1.31", + "@cherrystudio/embedjs-loader-sitemap": "^0.1.31", + "@cherrystudio/embedjs-loader-web": "^0.1.31", + "@cherrystudio/embedjs-loader-xml": "^0.1.31", + "@cherrystudio/embedjs-ollama": "^0.1.31", + "@cherrystudio/embedjs-openai": "^0.1.31", "@electron-toolkit/eslint-config-prettier": "^3.0.0", "@electron-toolkit/eslint-config-ts": "^3.0.0", "@electron-toolkit/preload": "^3.0.0", From 71ef510ac0aedddc9e048223fff3c55ccd67e332 Mon Sep 17 00:00:00 2001 From: suyao Date: Sat, 14 Jun 2025 12:31:38 +0800 Subject: [PATCH 3/3] refactor(FilesPage): remove unused imports and simplify provider handling - Eliminated unused imports including FilePdfOutlined and useProviders hook. - Removed mapping of mistralProviders from the file type options, streamlining the component's logic. --- src/renderer/src/pages/files/FilesPage.tsx | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/renderer/src/pages/files/FilesPage.tsx b/src/renderer/src/pages/files/FilesPage.tsx index d339aa776..c4fea54e5 100644 --- a/src/renderer/src/pages/files/FilesPage.tsx +++ b/src/renderer/src/pages/files/FilesPage.tsx @@ -2,7 +2,6 @@ import { DeleteOutlined, EditOutlined, ExclamationCircleOutlined, - FilePdfOutlined, SortAscendingOutlined, SortDescendingOutlined } from '@ant-design/icons' @@ -11,7 +10,6 @@ import ListItem from '@renderer/components/ListItem' import TextEditPopup from '@renderer/components/Popups/TextEditPopup' import Logger from '@renderer/config/logger' import db from '@renderer/databases' -import { useProviders } from '@renderer/hooks/useProvider' import FileManager from '@renderer/services/FileManager' import store from '@renderer/store' import { FileMetadata, FileTypes } from '@renderer/types' @@ -35,8 +33,6 @@ const FilesPage: FC = () => { const [fileType, setFileType] = useState('document') const [sortField, setSortField] = useState('created_at') const [sortOrder, setSortOrder] = useState('desc') - const { providers } = useProviders() - const mistralProviders = providers.filter((provider) => provider.type === 'mistral') const tempFilesSort = (files: FileMetadata[]) => { return files.sort((a, b) => { const aIsTemp = a.origin_name.startsWith('temp_file') @@ -205,11 +201,6 @@ const FilesPage: FC = () => { { key: FileTypes.DOCUMENT, label: t('files.document'), icon: }, { key: FileTypes.IMAGE, label: t('files.image'), icon: }, { key: FileTypes.TEXT, label: t('files.text'), icon: }, - ...mistralProviders.map((provider) => ({ - key: 'mistral_' + provider.id, - label: provider.name, - icon: - })), { key: 'all', label: t('files.all'), icon: } ]