diff --git a/src/renderer/src/pages/agents/components/MyAgents.tsx b/src/renderer/src/pages/agents/components/MyAgents.tsx index 845a6a6e..a7b85663 100644 --- a/src/renderer/src/pages/agents/components/MyAgents.tsx +++ b/src/renderer/src/pages/agents/components/MyAgents.tsx @@ -1,6 +1,6 @@ import { DeleteOutlined, EditOutlined, PlusOutlined, SortAscendingOutlined } from '@ant-design/icons' -import AssistantSettingsPopup from '@renderer/components/AssistantSettings' import { useAgents } from '@renderer/hooks/useAgents' +import AssistantSettingsPopup from '@renderer/pages/settings/AssistantSettings' import { createAssistantFromAgent } from '@renderer/services/AssistantService' import { Agent } from '@renderer/types' import { Col } from 'antd' diff --git a/src/renderer/src/pages/home/Messages/Prompt.tsx b/src/renderer/src/pages/home/Messages/Prompt.tsx index b605763f..7056091c 100644 --- a/src/renderer/src/pages/home/Messages/Prompt.tsx +++ b/src/renderer/src/pages/home/Messages/Prompt.tsx @@ -1,4 +1,4 @@ -import AssistantSettingsPopup from '@renderer/components/AssistantSettings' +import AssistantSettingsPopup from '@renderer/pages/settings/AssistantSettings' import { Assistant } from '@renderer/types' import { FC } from 'react' import { useTranslation } from 'react-i18next' diff --git a/src/renderer/src/pages/home/Navbar.tsx b/src/renderer/src/pages/home/Navbar.tsx index a522728b..1f310065 100644 --- a/src/renderer/src/pages/home/Navbar.tsx +++ b/src/renderer/src/pages/home/Navbar.tsx @@ -1,6 +1,5 @@ import { FormOutlined, SearchOutlined } from '@ant-design/icons' import { Navbar, NavbarLeft, NavbarRight } from '@renderer/components/app/Navbar' -import AssistantSettingsPopup from '@renderer/components/AssistantSettings' import { HStack } from '@renderer/components/Layout' import AppStorePopover from '@renderer/components/Popups/AppStorePopover' import SearchPopup from '@renderer/components/Popups/SearchPopup' @@ -9,6 +8,7 @@ import { useAssistant } from '@renderer/hooks/useAssistant' import { useSettings } from '@renderer/hooks/useSettings' import { useShortcut } from '@renderer/hooks/useShortcuts' import { useShowAssistants, useShowTopics } from '@renderer/hooks/useStore' +import AssistantSettingsPopup from '@renderer/pages/settings/AssistantSettings' import { EVENT_NAMES, EventEmitter } from '@renderer/services/EventService' import { Assistant, Topic } from '@renderer/types' import { FC } from 'react' diff --git a/src/renderer/src/pages/home/Tabs/AssistantsTab.tsx b/src/renderer/src/pages/home/Tabs/AssistantsTab.tsx index 13ab80dd..4caba9cb 100644 --- a/src/renderer/src/pages/home/Tabs/AssistantsTab.tsx +++ b/src/renderer/src/pages/home/Tabs/AssistantsTab.tsx @@ -1,11 +1,11 @@ import { DeleteOutlined, EditOutlined, MinusCircleOutlined, PlusOutlined, SaveOutlined } from '@ant-design/icons' -import AssistantSettingsPopup from '@renderer/components/AssistantSettings' import DragableList from '@renderer/components/DragableList' import CopyIcon from '@renderer/components/Icons/CopyIcon' import Scrollbar from '@renderer/components/Scrollbar' import { useAgents } from '@renderer/hooks/useAgents' import { useAssistant, useAssistants } from '@renderer/hooks/useAssistant' import { useSettings } from '@renderer/hooks/useSettings' +import AssistantSettingsPopup from '@renderer/pages/settings/AssistantSettings' import { getDefaultTopic } from '@renderer/services/AssistantService' import { EVENT_NAMES, EventEmitter } from '@renderer/services/EventService' import { useAppSelector } from '@renderer/store' diff --git a/src/renderer/src/components/AssistantSettings/AssistantMessagesSettings.tsx b/src/renderer/src/pages/settings/AssistantSettings/AssistantMessagesSettings.tsx similarity index 100% rename from src/renderer/src/components/AssistantSettings/AssistantMessagesSettings.tsx rename to src/renderer/src/pages/settings/AssistantSettings/AssistantMessagesSettings.tsx diff --git a/src/renderer/src/components/AssistantSettings/AssistantModelSettings.tsx b/src/renderer/src/pages/settings/AssistantSettings/AssistantModelSettings.tsx similarity index 97% rename from src/renderer/src/components/AssistantSettings/AssistantModelSettings.tsx rename to src/renderer/src/pages/settings/AssistantSettings/AssistantModelSettings.tsx index 90cfd212..645564ca 100644 --- a/src/renderer/src/components/AssistantSettings/AssistantModelSettings.tsx +++ b/src/renderer/src/pages/settings/AssistantSettings/AssistantModelSettings.tsx @@ -1,5 +1,7 @@ import { PlusOutlined, QuestionCircleOutlined } from '@ant-design/icons' +import ModelAvatar from '@renderer/components/Avatar/ModelAvatar' import { HStack } from '@renderer/components/Layout' +import SelectModelPopup from '@renderer/components/Popups/SelectModelPopup' import { DEFAULT_CONTEXTCOUNT, DEFAULT_TEMPERATURE } from '@renderer/config/constant' import { SettingRow } from '@renderer/pages/settings' import { Assistant, AssistantSettings } from '@renderer/types' @@ -8,9 +10,6 @@ import { FC, useState } from 'react' import { useTranslation } from 'react-i18next' import styled from 'styled-components' -import ModelAvatar from '../Avatar/ModelAvatar' -import SelectModelPopup from '../Popups/SelectModelPopup' - interface Props { assistant: Assistant updateAssistant: (assistant: Assistant) => void @@ -126,14 +125,14 @@ const AssistantModelSettings: FC = ({ assistant, updateAssistant, updateA onChangeComplete={onTemperatureChange} value={typeof temperature === 'number' ? temperature : 0} marks={{ 0: '0', 0.7: '0.7', 2: '2' }} - step={0.1} + step={0.01} /> = ({ assistant, updateAssistant, updateA onChangeComplete={onTopPChange} value={typeof topP === 'number' ? topP : 1} marks={{ 0: '0', 1: '1' }} - step={0.1} + step={0.01} /> diff --git a/src/renderer/src/components/AssistantSettings/AssistantPromptSettings.tsx b/src/renderer/src/pages/settings/AssistantSettings/AssistantPromptSettings.tsx similarity index 96% rename from src/renderer/src/components/AssistantSettings/AssistantPromptSettings.tsx rename to src/renderer/src/pages/settings/AssistantSettings/AssistantPromptSettings.tsx index fee30d33..8bb19899 100644 --- a/src/renderer/src/components/AssistantSettings/AssistantPromptSettings.tsx +++ b/src/renderer/src/pages/settings/AssistantSettings/AssistantPromptSettings.tsx @@ -1,3 +1,4 @@ +import { Box, HStack } from '@renderer/components/Layout' import { Assistant, AssistantSettings } from '@renderer/types' import { Button, Input } from 'antd' import TextArea from 'antd/es/input/TextArea' @@ -5,8 +6,6 @@ import { useState } from 'react' import { useTranslation } from 'react-i18next' import styled from 'styled-components' -import { Box, HStack } from '../Layout' - interface Props { assistant: Assistant updateAssistant: (assistant: Assistant) => void diff --git a/src/renderer/src/components/AssistantSettings/index.tsx b/src/renderer/src/pages/settings/AssistantSettings/index.tsx similarity index 97% rename from src/renderer/src/components/AssistantSettings/index.tsx rename to src/renderer/src/pages/settings/AssistantSettings/index.tsx index 3c023adc..49477b76 100644 --- a/src/renderer/src/components/AssistantSettings/index.tsx +++ b/src/renderer/src/pages/settings/AssistantSettings/index.tsx @@ -1,3 +1,5 @@ +import { HStack } from '@renderer/components/Layout' +import { TopView } from '@renderer/components/TopView' import { useAgent } from '@renderer/hooks/useAgents' import { useAssistant } from '@renderer/hooks/useAssistant' import { Assistant } from '@renderer/types' @@ -6,8 +8,6 @@ import { useState } from 'react' import { useTranslation } from 'react-i18next' import styled from 'styled-components' -import { HStack } from '../Layout' -import { TopView } from '../TopView' import AssistantMessagesSettings from './AssistantMessagesSettings' import AssistantModelSettings from './AssistantModelSettings' import AssistantPromptSettings from './AssistantPromptSettings' diff --git a/src/renderer/src/pages/settings/ModalSettings/DefaultAssistantSettings.tsx b/src/renderer/src/pages/settings/ModalSettings/DefaultAssistantSettings.tsx index 505ae511..d2f06585 100644 --- a/src/renderer/src/pages/settings/ModalSettings/DefaultAssistantSettings.tsx +++ b/src/renderer/src/pages/settings/ModalSettings/DefaultAssistantSettings.tsx @@ -116,14 +116,14 @@ const AssistantSettings: FC = () => { onChangeComplete={onTemperatureChange} value={typeof temperature === 'number' ? temperature : 0} marks={{ 0: '0', 0.7: '0.7', 2: '2' }} - step={0.1} + step={0.01} /> { onChangeComplete={onTopPChange} value={typeof topP === 'number' ? topP : 1} marks={{ 0: '0', 0.5: '0.5', 1: '1' }} - step={0.1} + step={0.01} />