Commit Graph

2779 Commits

Author SHA1 Message Date
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
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 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 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
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
eeee0717 f03b7e1eff fix: knowledge citation display 2025-06-14 18:02:51 +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
eeee0717 e4a546a776 Merge remote-tracking branch 'upstream/main' into feat-knowlege-ocr 2025-06-14 15:57:54 +08:00
Wang Jiyuan c644e4afa8 feat: add prompt variables docs on topic naming modal popup (#7175) 2025-06-14 14:59:29 +08:00
Wang Jiyuan 0a498460d6 fix: remove margin-bottom for loading animation (#7191)
* fix: remove margin-bottom for loading animation

* fix: just need to remove the margin-bottom of the last block
2025-06-14 14:57:31 +08:00
Wang Jiyuan bd4333ab9a fix: transparent background on translate dropdown (#7189) 2025-06-14 14:18:25 +08:00
Wang Jiyuan 9138aecdf0 fix: missing topic prompt on resend/regenerate and duplicate prevention (#7173)
* fix: completion doesn't include topic prompt

* fix: Multiple additions of topic prompts

* fix: improve logic

* fix: improve logic
2025-06-14 13:37:48 +08:00
Wang Jiyuan e4e4dcbd1e fix: model_name prompt var always use default model (#7178)
* fix: model_name prompt var always use default mode

* fix: incorrect model name
2025-06-14 13:35:32 +08:00
kangfenmao 3f2140807f Merge branch 'main' into feat-knowlege-ocr 2025-06-14 13:19:13 +08:00
Wang Jiyuan c9f12c2e49 feat: add prompt variable "username" (#7174) 2025-06-14 13:08:32 +08:00
suyao 71ef510ac0 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.
2025-06-14 12:31:38 +08:00
suyao 68840ff907 refactor: simplify development environment setup by removing redundant first setup check for userData path 2025-06-14 12:17:45 +08:00
fullex 27354d82e2 fix(SelectionAssistant): make add custom action button bigger (#7185)
fix: make add custom action button bigger
2025-06-14 11:43:13 +08:00
suyao d015faa8ab Merge branch 'feat-knowlege-ocr' of https://github.com/eeee0717/cherry-studio into feat/ocr 2025-06-13 22:27:48 +08:00
suyao 593dc903fd feat: enhance development environment setup by ensuring userData path is set only once during initial setup 2025-06-13 22:26:35 +08:00
eeee0717 bff7ccc479 fix: FileMetaData replace FileType 2025-06-13 21:25:39 +08:00
eeee0717 401ca04896 Merge branch 'main' into feat-knowlege-ocr 2025-06-13 21:10:12 +08:00
suyao 2378587684 chore: update package.json to include pdf-to-img dependency and add TODO comment in MacSysOcrProvider for future optimization 2025-06-13 20:48:01 +08:00
eeee0717 7cd2738ea0 feat: add quota tag 2025-06-13 20:46:12 +08:00
eeee0717 07c8dfa996 fix: quota tag 2025-06-13 19:56:17 +08:00
eeee0717 f34a8231b0 fix 2025-06-13 18:48:44 +08:00
eeee0717 7c03228816 Merge branch 'main' into feat-knowlege-ocr 2025-06-13 18:42:48 +08:00
eeee0717 7f63201f67 feat: add quota 2025-06-13 18:32:28 +08:00
MyPrototypeWhat 9411866727 refactor(ImageBlock): enhance loading state presentation and improve … (#7160)
* refactor(ImageBlock): enhance loading state presentation and improve layout responsiveness

- Wrapped the loading spinner in a new SpinnerWrapper for better alignment and presentation during streaming and processing states.
- Updated the ImageBlockGroup to use `repeat(auto-fit, minmax(...))` for more flexible grid layout, improving responsiveness across different screen sizes.

These changes enhance the user experience by providing a clearer loading indication and a more adaptable layout for image blocks.

* style(ImageBlockGroup): comment out child styling for future adjustments

- Commented out the child styling rules in ImageBlockGroup to allow for potential layout modifications without removing the code entirely.
- This change prepares the component for further enhancements while maintaining existing functionality.

* refactor(ImageBlock): replace loading spinner with Ant Design Skeleton component

- Updated the loading state presentation in ImageBlock by replacing the custom spinner with Ant Design's Skeleton component for a more consistent UI experience.
- Removed the SpinnerWrapper and simplified the return statement for better readability.
- This change enhances the visual feedback during image loading while maintaining the component's functionality.

---------

Co-authored-by: lizhixuan <zhixuan.li@banosuperapp.com>
2025-06-13 17:55:40 +08:00
one c7fd1ac373 fix(TopicRenaming): captured activeTopic.id is outdated and causes accidental topic changing after renaming (#7157)
* fix(TopicRenaming): captured activeTopic.id is outdated and causes accidental topic changing after renaming

* fix: prevent topic changing on auto renaming

* fix: filter out main text on summarizing
2025-06-13 17:24:24 +08:00
eeee0717 bed0da6d31 feat: add quota 2025-06-13 15:14:25 +08:00
one faf14ff10b fix(MermaidPreview): re-render mermaid on display change (#7058)
* fix(MermaidPreview): re-render mermaid on display change

* test: add tests for MermaidPreview
2025-06-13 13:52:50 +08:00
one 3b3b3c961e refactor(CodeEditor): remove the right border of gutters (#7137)
refactor: remove the right border of gutters
2025-06-13 11:02:22 +08:00
beyondkmp 06d495c7e1 feat: Enhance AppUpdater for Windows installation directory support (#7135)
- Added support for setting the installation directory for the autoUpdater on Windows using NsisUpdater.
- Imported the 'path' module to dynamically determine the installation path based on the executable location.
- This change improves the updater's functionality and ensures a smoother installation experience for Windows users.

Co-authored-by: beyondkmp <beyondkmkp@gmail.com>
2025-06-13 10:52:25 +08:00
Wang Jiyuan cdc9347011 fix: token usage always display when assistant msg generation aborted (#7121)
* fix: token usage always display when assistant msg generation aborted

* remove console.log
2025-06-13 00:48:21 +08:00
Xin Rui e264b5b052 feat: Support reasoning control for Doubao/Mistral models. (#7116)
* feat: Support reasoning control for Doubao models.

* feat: Enhance model handling and support for Doubao and Gemini in API clients

- Added support for Doubao thinking modes in OpenAIAPIClient and GeminiAPIClient.
- Introduced GEMINI_FLASH_MODEL_REGEX for model identification.
- Updated models.ts to include new Doubao and Gemini model regex patterns.
- Added new image asset for ChatGPT in models.
- Enhanced reasoning control and token budget handling for Doubao models.
- Improved the Inputbar's ThinkingButton component to accommodate new thinking options.

---------

Co-authored-by: suyao <sy20010504@gmail.com>
2025-06-13 00:03:58 +08:00
one 28696c0dad fix: start animation only if the topic should be renamed (#7125) 2025-06-12 22:43:44 +08:00