Northern_Lights/cherry-studio
1
0
Fork 0
mirror of https://github.com/CherryHQ/cherry-studio.git synced 2025-12-28 05:11:24 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

fix(memory): fix global memory settings submit failure (#12147)

Browse Source
This commit is contained in:
Shemol 2025-12-27 18:00:20 +08:00 committed by GitHub
parent 723fa11647
commit 2008d70707
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/renderer/src/pages/settings/MemorySettings/MemorySettingsModal.tsx
View File

@ -3,7 +3,7 @@ import InputEmbeddingDimension from '@renderer/components/InputEmbeddingDimensio
import ModelSelector from '@renderer/components/ModelSelector'
import { InfoTooltip } from '@renderer/components/TooltipIcons'
import { isEmbeddingModel, isRerankModel } from '@renderer/config/models'
import { getModel, useModel } from '@renderer/hooks/useModel'
import { useModel } from '@renderer/hooks/useModel'
import { useProviders } from '@renderer/hooks/useProvider'
import { getModelUniqId } from '@renderer/services/ModelService'
import { selectMemoryConfig, updateMemoryConfig } from '@renderer/store/memory'
@ -55,8 +55,12 @@ const MemorySettingsModal: FC<MemorySettingsModalProps> = ({ visible, onSubmit,
const handleFormSubmit = async (values: formValue) => {
try {
// Convert model IDs back to Model objects
const llmModel = getModel(values.llmModel)
const embeddingModel = getModel(values.embeddingModel)
// values.llmModel and values.embeddingModel are JSON strings from getModelUniqId()
// e.g., '{"id":"gpt-4","provider":"openai"}'
// We need to find models by comparing with getModelUniqId() result
const allModels = providers.flatMap((p) => p.models)
const llmModel = allModels.find((m) => getModelUniqId(m) === values.llmModel)
const embeddingModel = allModels.find((m) => getModelUniqId(m) === values.embeddingModel)
if (embeddingModel) {
setLoading(true)
@ -141,7 +145,9 @@ const MemorySettingsModal: FC<MemorySettingsModalProps> = ({ visible, onSubmit,
shouldUpdate={(prevValues, currentValues) => prevValues.embeddingModel !== currentValues.embeddingModel}>
{({ getFieldValue }) => {
const embeddingModelId = getFieldValue('embeddingModel')
const embeddingModel = getModel(embeddingModelId)
// embeddingModelId is a JSON string from getModelUniqId(), find model by comparing
const allModels = providers.flatMap((p) => p.models)
const embeddingModel = allModels.find((m) => getModelUniqId(m) === embeddingModelId)
return (
<Form.Item
label={