Commit Graph

3254 Commits

Author SHA1 Message Date
eeee0717 51d64293d6 fix 2025-06-16 15:31:07 +08:00
eeee0717 6f38702cab Merge remote-tracking branch 'upstream/main' into feat-knowlege-ocr 2025-06-16 15:30:49 +08:00
eeee0717 62669732a0 fix 2025-06-16 15:15:23 +08:00
eeee0717 3c8d13fc43 Merge branch 'main' into feat-knowlege-ocr 2025-06-16 15:06:18 +08:00
eeee0717 c7bfec9098 fix: use user key show unlimited 2025-06-16 15:05:56 +08:00
one eb89ca5415 fix: gemini generateImage model detection (#7241)
* fix: gemini generateImage model detection

* refactor: use base name for websearch model detection
2025-06-16 13:06:52 +08:00
SuYao eb650aa586 fix: enable stream output in assistant settings for chat completion (#7240) 2025-06-16 12:51:09 +08:00
自由的世界人 ce32fd32b6 fix: include image files in block retrieval for improved file handling (#7231) 2025-06-16 12:04:45 +08:00
Murphy 00e395f252 feat: Add PDF file support for OpenAI vision models (#7217)
* feat: add base64 PDF support for OpenAI vision models

Signed-off-by: MurphyLo <1335758958@qq.com>

* sort imports in OpenAIResponseAPIClient.ts

* sort imports in OpenAIResponseAPIClient.ts

* remove pdf-parse

* modify pdfPageCount implementation to use officeparser built-in pdf.js

* chore: update yarn.lock to remove pdf-parse dependency

---------

Signed-off-by: MurphyLo <1335758958@qq.com>
Co-authored-by: suyao <sy20010504@gmail.com>
2025-06-16 11:09:51 +08:00
fullex b6b1b43094 fix(SelectionService): Win10 showing problem & AlwaysOnTop level (#7215)
refactor(SelectionService): enhance logging and adjust window behavior for Windows compatibility

- Updated logInfo method to include a forceShow parameter for improved logging control.
- Ensured toolbar window is set to always on top when shown.
- Commented out setOpacity calls to prevent transparency issues on Windows 10.
2025-06-16 09:54:20 +08:00
自由的世界人 68ae88dc1b fix: prevent update button from rendering when auto-check for updates… (#7212)
fix: prevent update button from rendering when auto-check for updates is disabled
2025-06-16 00:22:38 +08:00
George·Dong acf78e8383 refactor: optimize notion export (#7228)
* fix(export): Initial fix for the multi-level list export issue in Notion

* fix(getMessageTitle): optimize loading message

* refactor(notion export): optimize notion export

- import notion-helper
- strengthen the robustness of the Notion Export function

* fix(i18n): optimize notion export infos
2025-06-15 23:18:36 +08:00
Wang Jiyuan bd87b8a002 feat: use variables in topic naming and improve default prompt (#7083)
* feat: use variables in topic naming

* feat: use structured conversation string

* feat: add i18n

* feat: add i18n

* feat: implement summaries for other providers

* fix: adjust new version

* feat: Structure the conversation as a JSON string when naming the topic

* fix: improve logic

* fix: improve prompts

* update fetchMessageSummary
2025-06-15 22:40:37 +08:00
suyao b4b71ee099 chore: re-add pdfjs-dist dependency in package.json
- Restored pdfjs-dist version 4.10.38 to package.json to maintain PDF rendering functionality after its removal in a previous commit.
v1.5.0-rc.0
2025-06-15 21:28:15 +08:00
suyao 95d9e2ced4 chore: restore pdfjs-dist dependency in package.json
- Re-added pdfjs-dist version 4.10.38 to package.json to ensure PDF rendering functionality is available.
2025-06-15 21:11:20 +08:00
suyao c578e29621 chore: update package.json to remove redundant canvas patches
- Removed duplicate canvas dependency patches from package.json.
- Retained the necessary patch for @langchain/core to ensure compatibility.
2025-06-15 21:01:57 +08:00
suyao 4530872372 chore: update dependencies and improve OCR functionality
- Added @cherrystudio/pdf-to-img-napi dependency to package.json and yarn.lock for enhanced PDF processing.
- Updated pdfjs-dist to version 4.10.38 for improved PDF rendering capabilities.
- Modified MacSysOcrProvider to utilize the new pdf-to-img-napi module for OCR processing of PDF files.
- Removed unnecessary Windows build steps from the release workflow to streamline the process.
2025-06-15 21:00:04 +08:00
suyao f907f7fe5e chore: enhance Windows build support in release workflow
- Added support for Windows 11 ARM architecture in the release workflow.
- Introduced a new step to install dependencies specific to Windows 11 ARM.
- Updated the canvas rebuild step to conditionally execute for Windows 11 ARM alongside existing Windows builds.
2025-06-15 19:50:38 +08:00
suyao f32ccd0fba chore: add pdfjs-dist dependency to package.json and yarn.lock
- Added pdfjs-dist version 4.2.67 to both package.json and yarn.lock to support PDF rendering functionality.
2025-06-15 19:03:27 +08:00
suyao 79f63dd954 refactor: remove canvas and pdfjs-dist dependencies and related image cropping logic
- Eliminated the canvas and pdfjs-dist dependencies from package.json and yarn.lock.
- Removed the image cropping functionality from BaseOcrProvider, simplifying the OCR process in MacSysOcrProvider.
- Updated the NSIS configuration in electron-builder.yml to reflect these changes.
2025-06-15 18:42:29 +08:00
eeee0717 8589cda241 Merge branch 'main' into feat-knowlege-ocr 2025-06-15 18:11:20 +08:00
kangfenmao 7cf7368ae3 lint(SyncServersPopup): fix SyncServersPopup lint error 2025-06-15 14:11:29 +08:00
Aichaellee 9001a96fff feat:add lanyun mcp server 2025-06-15 11:17:02 +08:00
suyao 4e03c489b0 chore: enhance canvas rebuild steps for Windows in release workflow
- Updated the canvas rebuild step to specify architecture for Windows x64 and added a new step for Windows ARM64.
- Ensures compatibility with both x64 and ARM64 architectures during the build process.
2025-06-15 04:37:05 +08:00
suyao 574975f32d chore: add canvas rebuild step for Windows in release workflow
- Introduced a new step to rebuild the canvas module for Windows to ensure compatibility during the build process.
- This step is conditionally executed based on the operating system in the workflow.
2025-06-15 03:59:27 +08:00
suyao dc3e28b414 chore: add Windows dependencies installation step in release workflow
- Introduced a new step to install necessary dependencies for Windows, including GTK and libjpeg-turbo.
- Updated the release workflow to ensure compatibility with Windows builds.
2025-06-15 03:26:12 +08:00
suyao ba35ec1b4c chore: update app-builder-lib patch and enhance installAppDependencies method
- Updated the resolution and checksum for the app-builder-lib patch in yarn.lock.
- Modified installAppDependencies method to accept excludeReBuildModules parameter.
- Adjusted platformPackager to pass excludeReBuildModules during dependency installation.
- Updated yarn.js to correctly reference excludeReBuildModules from options.
2025-06-15 02:50:47 +08:00
Wang Jiyuan 9ea4d1f99f fix: send message shortcut doesn't work when editing existing message (#6934)
* fix: send message shortcut doesn't work when editing existing message

* fix: resend shortcut only apply on user msg
2025-06-14 23:11:52 +08:00
Chen Tao fc62a5bdc2 fix: 7127 (#7196) 2025-06-14 23:01:45 +08:00
one 06b543039f chore(ci): remove --fix from lint (#7159)
* chore(ci): remove --fix from lint

* fix: lint errors
2025-06-14 22:58:49 +08:00
Doekin 1c354ffa0a fix(ImageGenerationMiddleware): correctly process image URLs (#7198) 2025-06-14 22:39:32 +08:00
one 163e28d9ba fix(model): qwen3 model detection (#7201) 2025-06-14 21:24:34 +08:00
suyao 9329eeb2c3 chore: remove Windows dependencies from release workflow 2025-06-14 21:11:29 +08:00
suyao 8b1743419d Merge branch 'feat-knowlege-ocr' of https://github.com/CherryHQ/cherry-studio into feat/ocr 2025-06-14 21:10:20 +08:00
suyao a9b251e11b chore: add brew update step for macOS dependencies installation in release workflow 2025-06-14 21:09:29 +08:00
suyao a05b0502bb chore: update dependencies installation for macOS and Ubuntu in release workflow 2025-06-14 20:47:42 +08:00
suyao 58dc927347 chore: add excludeReBuildModules for Windows build configuration 2025-06-14 20:35:17 +08:00
eeee0717 63718b7405 fix: remove windows dependencies 2025-06-14 20:10:22 +08:00
eeee0717 f5dfe3c7c0 Merge remote-tracking branch 'origin/feat-knowlege-ocr' into feat-knowlege-ocr 2025-06-14 19:57:25 +08:00
suyao e318f8023a chore: remove duplicate pdfjs-dist entry from dependencies 2025-06-14 19:44:59 +08:00
suyao d0a9a47d31 Merge branch 'main' into feat/ocr 2025-06-14 19:41:44 +08:00
beyondkmp fd9ff4a432 fix: update app-builder-lib patch and adjust minimumSystemVersion handling (#7197)
- Updated the resolution and checksum for the app-builder-lib patch in yarn.lock.
- Modified macPackager.js and updateInfoBuilder.js to correctly reference LSMinimumSystemVersion.
- Enhanced ArchiveTarget.js and NsisTarget.js to include minimumSystemVersion in updateInfo if specified.
2025-06-14 19:39:28 +08:00
eeee0717 2db480f97a fix: add windows dependencies 2025-06-14 18:45:31 +08:00
eeee0717 e7531a26bf fix: move pdfjs-dist to dependencies 2025-06-14 18:08:57 +08:00
eeee0717 f03b7e1eff fix: knowledge citation display 2025-06-14 18:02:51 +08:00
suyao fcd999e3b4 Merge branch 'feat-knowlege-ocr' of https://github.com/eeee0717/cherry-studio into feat/ocr 2025-06-14 17:21:53 +08:00
suyao 62251f456b chore: remove macOS-only OCR package from build configuration and scripts 2025-06-14 17:19:48 +08:00
eeee0717 0d4ee05d13 fix: use MAIN_VITE_MINERU_API_KEY 2025-06-14 17:17:01 +08:00
eeee0717 a2172a1d6b fix: use MAIN_VITE_MINERU_API_KEY and ocr only use in macos 2025-06-14 17:07:57 +08:00
eeee0717 1d626af789 chore: change VITE_MINERU_API_KEY to RENDERER_VITE_MINERU_API_KEY 2025-06-14 16:39:13 +08:00