diff --git a/src/renderer/src/hooks/useSettings.ts b/src/renderer/src/hooks/useSettings.ts index 5eea046d0..66d9615ee 100644 --- a/src/renderer/src/hooks/useSettings.ts +++ b/src/renderer/src/hooks/useSettings.ts @@ -6,13 +6,13 @@ import { setAutoCheckUpdate as _setAutoCheckUpdate, setLaunchOnBoot, setLaunchToTray, + setPinTopicsToTop, setSendMessageShortcut as _setSendMessageShortcut, setSidebarIcons, setTargetLanguage, setTheme, SettingsState, setTopicPosition, - setPinTopicsToTop, setTray as _setTray, setTrayOnClose, setWindowStyle diff --git a/src/renderer/src/pages/knowledge/components/KnowledgeSettings.tsx b/src/renderer/src/pages/knowledge/components/KnowledgeSettings.tsx index 2f224eddc..a7437bef6 100644 --- a/src/renderer/src/pages/knowledge/components/KnowledgeSettings.tsx +++ b/src/renderer/src/pages/knowledge/components/KnowledgeSettings.tsx @@ -262,18 +262,6 @@ const PopupContainer: React.FC = ({ base: _base, resolve }) => { /> - -
{t('knowledge.topN')}
- setNewBase({ ...newBase, topN: value || undefined })} - /> -
- = ({ + ) : imageCover ? ( + imageCover ) : ( - imageCover ? - imageCover: - (
{t('paintings.image_placeholder')}
) - )} +
{t('paintings.image_placeholder')}
+ )} )} {isLoading && ( diff --git a/yarn.lock b/yarn.lock index 79fe95e4a..8e731bfad 100644 --- a/yarn.lock +++ b/yarn.lock @@ -700,6 +700,17 @@ __metadata: languageName: node linkType: hard +"@cherrystudio/mac-system-ocr@npm:^0.2.2": + version: 0.2.2 + resolution: "@cherrystudio/mac-system-ocr@npm:0.2.2" + dependencies: + bindings: "npm:^1.5.0" + node-api-headers: "npm:^1.0.1" + node-gyp: "npm:latest" + conditions: os=darwin + languageName: node + linkType: hard + "@chevrotain/cst-dts-gen@npm:11.0.3": version: 11.0.3 resolution: "@chevrotain/cst-dts-gen@npm:11.0.3" @@ -3397,6 +3408,17 @@ __metadata: languageName: node linkType: hard +"@mistralai/mistralai@npm:^1.6.0": + version: 1.6.1 + resolution: "@mistralai/mistralai@npm:1.6.1" + dependencies: + zod-to-json-schema: "npm:^3.24.1" + peerDependencies: + zod: ">= 3" + checksum: 10c0/3e9adc13fc3d19cd6961e2f325a2fe358dca8b43e2e6aa5a3a4ae88baf799f4b33835bb84d36b941629861bfc098cc8717898d19a5409826304ba61ae287d69c + languageName: node + linkType: hard + "@mixmark-io/domino@npm:^2.2.0": version: 2.2.0 resolution: "@mixmark-io/domino@npm:2.2.0" @@ -5932,6 +5954,7 @@ __metadata: "@cherrystudio/embedjs-loader-web": "npm:^0.1.31" "@cherrystudio/embedjs-loader-xml": "npm:^0.1.31" "@cherrystudio/embedjs-openai": "npm:^0.1.31" + "@cherrystudio/mac-system-ocr": "npm:^0.2.2" "@electron-toolkit/eslint-config-prettier": "npm:^3.0.0" "@electron-toolkit/eslint-config-ts": "npm:^3.0.0" "@electron-toolkit/preload": "npm:^3.0.0" @@ -5945,6 +5968,7 @@ __metadata: "@hello-pangea/dnd": "npm:^16.6.0" "@kangfenmao/keyv-storage": "npm:^0.1.0" "@langchain/community": "npm:^0.3.36" + "@mistralai/mistralai": "npm:^1.6.0" "@modelcontextprotocol/sdk": "npm:^1.11.4" "@mozilla/readability": "npm:^0.6.0" "@notionhq/client": "npm:^2.2.15" @@ -6032,6 +6056,8 @@ __metadata: openai: "patch:openai@npm%3A4.96.0#~/.yarn/patches/openai-npm-4.96.0-0665b05cb9.patch" os-proxy-config: "npm:^1.1.2" p-queue: "npm:^8.1.0" + pdf-to-img: "npm:^4.4.0" + pdfjs-dist: "npm:4.2.67" playwright: "npm:^1.52.0" prettier: "npm:^3.5.3" proxy-agent: "npm:^6.5.0" @@ -6738,6 +6764,15 @@ __metadata: languageName: node linkType: hard +"bindings@npm:^1.5.0": + version: 1.5.0 + resolution: "bindings@npm:1.5.0" + dependencies: + file-uri-to-path: "npm:1.0.0" + checksum: 10c0/3dab2491b4bb24124252a91e656803eac24292473e56554e35bbfe3cc1875332cfa77600c3bac7564049dc95075bf6fcc63a4609920ff2d64d0fe405fcf0d4ba + languageName: node + linkType: hard + "birecord@npm:^0.1.1": version: 0.1.1 resolution: "birecord@npm:0.1.1" @@ -8681,6 +8716,13 @@ __metadata: languageName: node linkType: hard +"detect-libc@npm:^2.0.0": + version: 2.0.4 + resolution: "detect-libc@npm:2.0.4" + checksum: 10c0/c15541f836eba4b1f521e4eecc28eefefdbc10a94d3b8cb4c507689f332cc111babb95deda66f2de050b22122113189986d5190be97d51b5a2b23b938415e67c + languageName: node + linkType: hard + "detect-libc@npm:^2.0.1": version: 2.0.3 resolution: "detect-libc@npm:2.0.3" @@ -10349,6 +10391,13 @@ __metadata: languageName: node linkType: hard +"file-uri-to-path@npm:1.0.0": + version: 1.0.0 + resolution: "file-uri-to-path@npm:1.0.0" + checksum: 10c0/3b545e3a341d322d368e880e1c204ef55f1d45cdea65f7efc6c6ce9e0c4d22d802d5629320eb779d006fe59624ac17b0e848d83cc5af7cd101f206cb704f5519 + languageName: node + linkType: hard + "file-url@npm:^2.0.0": version: 2.0.2 resolution: "file-url@npm:2.0.2" @@ -14625,6 +14674,13 @@ __metadata: languageName: node linkType: hard +"napi-build-utils@npm:^2.0.0": + version: 2.0.0 + resolution: "napi-build-utils@npm:2.0.0" + checksum: 10c0/5833aaeb5cc5c173da47a102efa4680a95842c13e0d9cc70428bd3ee8d96bb2172f8860d2811799b5daa5cbeda779933601492a2028a6a5351c6d0fcf6de83db + languageName: node + linkType: hard + "natural-compare@npm:^1.4.0": version: 1.4.0 resolution: "natural-compare@npm:1.4.0" @@ -14669,6 +14725,15 @@ __metadata: languageName: node linkType: hard +"node-abi@npm:^3.3.0": + version: 3.75.0 + resolution: "node-abi@npm:3.75.0" + dependencies: + semver: "npm:^7.3.5" + checksum: 10c0/c43a2409407df3737848fd96202b0a49e15039994aecce963969e9ef7342a8fc544aba94e0bfd8155fb9de5f5fe9a4b6ccad8bf509e7c46caf096fc4491d63f2 + languageName: node + linkType: hard + "node-abi@npm:^3.45.0": version: 3.74.0 resolution: "node-abi@npm:3.74.0" @@ -15552,6 +15617,13 @@ __metadata: languageName: node linkType: hard +"path2d@npm:^0.2.0": + version: 0.2.2 + resolution: "path2d@npm:0.2.2" + checksum: 10c0/1bb76c7f275d07f1bc7ca12171d828e91bf8a12596f0765a52e9d4d47fe1a428455dc1dd4c9002924a9bc554f6ac25e09a6c22eaecf32e5e33fba2985b5168f8 + languageName: node + linkType: hard + "pathe@npm:^2.0.1, pathe@npm:^2.0.3": version: 2.0.3 resolution: "pathe@npm:2.0.3" @@ -15926,6 +15998,28 @@ __metadata: languageName: node linkType: hard +"prebuild-install@npm:^7.1.1": + version: 7.1.3 + resolution: "prebuild-install@npm:7.1.3" + dependencies: + detect-libc: "npm:^2.0.0" + expand-template: "npm:^2.0.3" + github-from-package: "npm:0.0.0" + minimist: "npm:^1.2.3" + mkdirp-classic: "npm:^0.5.3" + napi-build-utils: "npm:^2.0.0" + node-abi: "npm:^3.3.0" + pump: "npm:^3.0.0" + rc: "npm:^1.2.7" + simple-get: "npm:^4.0.0" + tar-fs: "npm:^2.0.0" + tunnel-agent: "npm:^0.6.0" + bin: + prebuild-install: bin.js + checksum: 10c0/25919a42b52734606a4036ab492d37cfe8b601273d8dfb1fa3c84e141a0a475e7bad3ab848c741d2f810cef892fcf6059b8c7fe5b29f98d30e0c29ad009bedff + languageName: node + linkType: hard + "prelude-ls@npm:^1.2.1": version: 1.2.1 resolution: "prelude-ls@npm:1.2.1" @@ -17990,6 +18084,17 @@ __metadata: languageName: node linkType: hard +"simple-get@npm:^4.0.0": + version: 4.0.1 + resolution: "simple-get@npm:4.0.1" + dependencies: + decompress-response: "npm:^6.0.0" + once: "npm:^1.3.1" + simple-concat: "npm:^1.0.0" + checksum: 10c0/b0649a581dbca741babb960423248899203165769747142033479a7dc5e77d7b0fced0253c731cd57cf21e31e4d77c9157c3069f4448d558ebc96cf9e1eebcf0 + languageName: node + linkType: hard + "simple-update-notifier@npm:2.0.0": version: 2.0.0 resolution: "simple-update-notifier@npm:2.0.0"