diff --git a/web/src/pages/memories/hooks.ts b/web/src/pages/memories/hooks.ts index a338d31ee..e024b8787 100644 --- a/web/src/pages/memories/hooks.ts +++ b/web/src/pages/memories/hooks.ts @@ -3,7 +3,6 @@ import message from '@/components/ui/message'; import { useSetModalState } from '@/hooks/common-hooks'; import { useHandleSearchChange } from '@/hooks/logic-hooks'; -import { useNavigatePage } from '@/hooks/logic-hooks/navigate-hooks'; import memoryService, { updateMemoryById } from '@/services/memory-service'; import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'; import { useDebounce } from 'ahooks'; @@ -25,35 +24,21 @@ import { export const useCreateMemory = () => { const { t } = useTranslation(); - const { - data, - isError, - mutateAsync: createMemoryMutation, - } = useMutation({ - mutationKey: ['createMemory'], - mutationFn: async (props) => { + const createMemory = useCallback( + async (props: ICreateMemoryProps): Promise => { const { data: response } = await memoryService.createMemory(props); if (response.code !== 0) { throw new Error(response.message || 'Failed to create memory'); } + if (response.code === 0) { + message.success(t('message.created')); + } return response.data; }, - onSuccess: () => { - message.success(t('message.created')); - }, - onError: (error) => { - message.error(t('message.error', { error: error.message })); - }, - }); - - const createMemory = useCallback( - (props: ICreateMemoryProps) => { - return createMemoryMutation(props); - }, - [createMemoryMutation], + [t], ); - return { data, isError, createMemory }; + return { createMemory }; }; export const useFetchMemoryList = () => { @@ -223,7 +208,6 @@ export const useUpdateMemory = () => { export const useRenameMemory = () => { const [memory, setMemory] = useState({} as IMemory); - const { navigateToMemory } = useNavigatePage(); const { visible: openCreateModal, hideModal: hideChatRenameModal, @@ -250,19 +234,11 @@ export const useRenameMemory = () => { const onMemoryRenameOk = useCallback( async (data: ICreateMemoryProps, callBack?: () => void) => { - let res; + // let res; setLoading(true); if (memory?.id) { try { - // const reponse = await memoryService.getMemoryDetail({ - // id: memory?.id, - // }); - // const detail = reponse.data?.data; - // console.log('detail-->', detail); - - // eslint-disable-next-line @typescript-eslint/no-unused-vars - // const { id, created_by, update_time, ...memoryDataTemp } = detail; - res = await updateMemory({ + await updateMemory({ // ...memoryDataTemp, name: data.name, id: memory?.id, @@ -271,7 +247,7 @@ export const useRenameMemory = () => { console.error('error', e); } } else { - res = await createMemory(data); + await createMemory(data); } // if (res && !memory?.id) { // navigateToMemory(res?.id)(); @@ -280,7 +256,7 @@ export const useRenameMemory = () => { setLoading(false); handleHideModal(); }, - [memory, createMemory, handleHideModal, navigateToMemory, updateMemory], + [memory, createMemory, handleHideModal, updateMemory], ); return { memoryRenameLoading: loading, diff --git a/web/src/pages/memory/memory-setting/advanced-settings-form.tsx b/web/src/pages/memory/memory-setting/advanced-settings-form.tsx index 26e70e484..2243cdb61 100644 --- a/web/src/pages/memory/memory-setting/advanced-settings-form.tsx +++ b/web/src/pages/memory/memory-setting/advanced-settings-form.tsx @@ -10,17 +10,17 @@ import { useState } from 'react'; import { z } from 'zod'; export const advancedSettingsFormSchema = { - permission: z.string().optional(), + permissions: z.string().optional(), storage_type: z.enum(['table', 'graph']).optional(), - forget_policy: z.enum(['lru', 'fifo']).optional(), + forgetting_policy: z.enum(['lru', 'fifo']).optional(), temperature: z.number().optional(), system_prompt: z.string().optional(), user_prompt: z.string().optional(), }; export const defaultAdvancedSettingsForm = { - permission: 'me', + permissions: 'me', storage_type: 'table', - forget_policy: 'fifo', + forgetting_policy: 'fifo', temperature: 0.7, system_prompt: '', user_prompt: '', @@ -40,120 +40,120 @@ export const AdvancedSettingsForm = () => { )} {t('memory.config.advancedSettings')} - {/* {showAdvancedSettings && ( */} - <> - ( - { - console.log(value); - field.onChange(value); - }} - > -
- - -
-
- - -
-
- ), - }} - /> - - - ( -
- + ( + { + onValueChange={(value) => { + console.log(value); field.onChange(value); }} - max={1} - step={0.01} - min={0} - disabled={false} - > - -
- ), - }} - /> - - - - {/* )} */} + > +
+ + +
+
+ + +
+ + ), + }} + /> + + + ( +
+ { + field.onChange(value); + }} + max={1} + step={0.01} + min={0} + disabled={false} + > + +
+ ), + }} + /> + + + + )} ); }; diff --git a/web/src/pages/memory/memory-setting/index.tsx b/web/src/pages/memory/memory-setting/index.tsx index 0eae5eaf4..4e1abb876 100644 --- a/web/src/pages/memory/memory-setting/index.tsx +++ b/web/src/pages/memory/memory-setting/index.tsx @@ -58,6 +58,7 @@ export default function MemoryMessage() { system_prompt: data?.system_prompt || '', user_prompt: data?.user_prompt || '', forgetting_policy: data?.forgetting_policy || 'fifo', + storage_type: data?.storage_type || 'table', permissions: data?.permissions || 'me', }); }, [data, form]);