Northern_Lights/cherry-studio
1
0
Fork 0
mirror of https://github.com/CherryHQ/cherry-studio.git synced 2025-12-26 20:12:38 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fix: update default assistant settings to disable temperature (#12069)

Browse Source 
* fix: update default assistant settings to disable temperature

* fix: typecheck

* fix: typecheck

* refactor(settings): use DEFAULT_ASSISTANT_SETTINGS constant for reset

Replace hardcoded default settings with DEFAULT_ASSISTANT_SETTINGS constant to improve maintainability

* fix(AssistantService): set default maxTokens to DEFAULT_MAX_TOKENS

* docs(AssistantService): add jsdoc for getAssistantSettings function

* refactor(AssistantService): use default settings constants for fallback values

* refactor(AssistantService): update default assistant settings type

Add defaultModel field and mark settings as const satisfies AssistantSettings

* refactor(AssistantService): reorder and add new default assistant settings

Add reasoning_effort_cache and qwenThinkMode fields

* docs(AssistantService): add jsdoc comments for default assistant settings

Explain purpose of DEFAULT_ASSISTANT_SETTINGS template and clarify difference between template values and actual settings

* docs(AssistantService): move default assistant settings docs to function

The documentation about current settings inheritance was moved from createTranslateAssistant to the dedicated getDefaultAssistantSettings function where it belongs. This improves code organization and makes the documentation more accurate by placing it with the relevant function.

* docs(AssistantService): clarify getDefaultAssistant behavior in jsdoc

Explain the difference between this temporary instance and the actual default assistant from Redux store

* fix: change default enableTemperature value to false

The default value for enableTemperature was incorrectly set to true, which could lead to unexpected behavior. This change aligns it with the intended default behavior.

---------

Co-authored-by: icarus <eurfelux@gmail.com>
This commit is contained in:
SuYao 2025-12-23 12:13:01 +08:00 committed by GitHub
parent 7a862974c2
commit d1c93e4eae
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 84 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/renderer/src/pages/settings/AssistantSettings/AssistantModelSettings.tsx
View File

@ -41,7 +41,7 @@ const AssistantModelSettings: FC<Props> = ({ assistant, updateAssistant, updateA
const [customParameters, setCustomParameters] = useState<AssistantSettingCustomParameters[]>(
assistant?.settings?.customParameters ?? []
)
const [enableTemperature, setEnableTemperature] = useState(assistant?.settings?.enableTemperature ?? true)
const [enableTemperature, setEnableTemperature] = useState(assistant?.settings?.enableTemperature ?? false)
const customParametersRef = useRef(customParameters)
@ -168,7 +168,7 @@ const AssistantModelSettings: FC<Props> = ({ assistant, updateAssistant, updateA
const onReset = () => {
setTemperature(DEFAULT_ASSISTANT_SETTINGS.temperature)
setEnableTemperature(DEFAULT_ASSISTANT_SETTINGS.enableTemperature ?? true)
setEnableTemperature(DEFAULT_ASSISTANT_SETTINGS.enableTemperature ?? false)
setContextCount(DEFAULT_ASSISTANT_SETTINGS.contextCount)
setEnableMaxTokens(DEFAULT_ASSISTANT_SETTINGS.enableMaxTokens ?? false)
setMaxTokens(DEFAULT_ASSISTANT_SETTINGS.maxTokens ?? 0)

18
src/renderer/src/pages/settings/ModelSettings/DefaultAssistantSettings.tsx
View File

@ -4,9 +4,10 @@ import { ResetIcon } from '@renderer/components/Icons'
import { HStack } from '@renderer/components/Layout'
import Selector from '@renderer/components/Selector'
import { TopView } from '@renderer/components/TopView'
import { DEFAULT_CONTEXTCOUNT, DEFAULT_MAX_TOKENS, DEFAULT_TEMPERATURE } from '@renderer/config/constant'
import { DEFAULT_CONTEXTCOUNT, DEFAULT_TEMPERATURE } from '@renderer/config/constant'
import { useTheme } from '@renderer/context/ThemeProvider'
import { useDefaultAssistant } from '@renderer/hooks/useAssistant'
import { DEFAULT_ASSISTANT_SETTINGS } from '@renderer/services/AssistantService'
import type { AssistantSettings as AssistantSettingsType } from '@renderer/types'
import { getLeadingEmoji, modalConfirm } from '@renderer/utils'
import { Button, Col, Divider, Flex, Input, InputNumber, Modal, Popover, Row, Slider, Switch, Tooltip } from 'antd'
@ -21,7 +22,7 @@ import { SettingContainer, SettingRow, SettingSubtitle } from '..'
const AssistantSettings: FC = () => {
const { defaultAssistant, updateDefaultAssistant } = useDefaultAssistant()
const [temperature, setTemperature] = useState(defaultAssistant.settings?.temperature ?? DEFAULT_TEMPERATURE)
const [enableTemperature, setEnableTemperature] = useState(defaultAssistant.settings?.enableTemperature ?? true)
const [enableTemperature, setEnableTemperature] = useState(defaultAssistant.settings?.enableTemperature ?? false)
const [contextCount, setContextCount] = useState(defaultAssistant.settings?.contextCount ?? DEFAULT_CONTEXTCOUNT)
const [enableMaxTokens, setEnableMaxTokens] = useState(defaultAssistant?.settings?.enableMaxTokens ?? false)
const [maxTokens, setMaxTokens] = useState(defaultAssistant?.settings?.maxTokens ?? 0)
@ -81,18 +82,7 @@ const AssistantSettings: FC = () => {
setToolUseMode('function')
updateDefaultAssistant({
...defaultAssistant,
settings: {
...defaultAssistant.settings,
temperature: DEFAULT_TEMPERATURE,
enableTemperature: true,
contextCount: DEFAULT_CONTEXTCOUNT,
enableMaxTokens: false,
maxTokens: DEFAULT_MAX_TOKENS,
streamOutput: true,
topP: 1,
enableTopP: false,
toolUseMode: 'function'
}
settings: { ...DEFAULT_ASSISTANT_SETTINGS }
})
}

95
src/renderer/src/services/AssistantService.ts
View File

@ -27,21 +27,51 @@ import { uuid } from '@renderer/utils'
const logger = loggerService.withContext('AssistantService')
/**
* Default assistant settings configuration template.
*
* **Important**: This defines the DEFAULT VALUES for assistant settings, NOT the current settings
* of the default assistant. To get the actual settings of the default assistant, use `getDefaultAssistantSettings()`.
*
* Provides sensible defaults for all assistant settings with a focus on minimal parameter usage:
* - **Temperature disabled**: Use provider defaults by default
* - **MaxTokens disabled**: Use provider defaults by default
* - **TopP disabled**: Use provider defaults by default
* - **Streaming enabled**: Provides real-time response for better UX
* - **Standard context count**: Balanced memory usage and conversation length
*/
export const DEFAULT_ASSISTANT_SETTINGS = {
temperature: DEFAULT_TEMPERATURE,
enableTemperature: true,
contextCount: DEFAULT_CONTEXTCOUNT,
maxTokens: DEFAULT_MAX_TOKENS,
enableMaxTokens: false,
maxTokens: 0,
streamOutput: true,
temperature: DEFAULT_TEMPERATURE,
enableTemperature: false,
topP: 1,
enableTopP: false,
// It would gracefully fallback to prompt if not supported by model.
toolUseMode: 'function',
contextCount: DEFAULT_CONTEXTCOUNT,
streamOutput: true,
defaultModel: undefined,
customParameters: [],
reasoning_effort: 'default'
reasoning_effort: 'default',
reasoning_effort_cache: undefined,
qwenThinkMode: undefined,
// It would gracefully fallback to prompt if not supported by model.
toolUseMode: 'function'
} as const satisfies AssistantSettings
/**
* Creates a temporary default assistant instance.
*
* **Important**: This creates a NEW temporary assistant instance with DEFAULT_ASSISTANT_SETTINGS,
* NOT the actual default assistant from Redux store. This is used as a template for creating
* new assistants or as a fallback when no assistant is specified.
*
* To get the actual default assistant from Redux store (with current user settings), use:
* ```typescript
* const defaultAssistant = store.getState().assistants.defaultAssistant
* ```
*
* @returns New temporary assistant instance with default settings
*/
export function getDefaultAssistant(): Assistant {
return {
id: 'default',
@ -56,6 +86,14 @@ export function getDefaultAssistant(): Assistant {
}
}
/**
* Creates a default translate assistant.
*
* @param targetLanguage - Target language for translation
* @param text - Text to be translated
* @param _settings - Optional settings to override default assistant settings
* @returns Configured translate assistant
*/
export function getDefaultTranslateAssistant(
targetLanguage: TranslateLanguage,
text: string,
@ -106,6 +144,17 @@ export function getDefaultTranslateAssistant(
return translateAssistant
}
/**
* Gets the CURRENT SETTINGS of the default assistant.
*
* **Important**: This returns the actual current settings of the default assistant (user-configured),
* NOT the DEFAULT_ASSISTANT_SETTINGS template. The settings may have been modified by the user
* from their initial default values.
*
* To get the template of default values, use DEFAULT_ASSISTANT_SETTINGS directly.
*
* @returns Current settings of the default assistant from store state
*/
export function getDefaultAssistantSettings() {
return store.getState().assistants.defaultAssistant.settings
}
@ -165,6 +214,18 @@ export function getProviderByModelId(modelId?: string) {
return providers.find((p) => p.models.find((m) => m.id === _modelId)) as Provider
}
/**
* Retrieves and normalizes assistant settings with special transformation handling.
*
* **Special Transformations:**
* 1. **Context Count**: Converts `MAX_CONTEXT_COUNT` to `UNLIMITED_CONTEXT_COUNT` for internal processing
* 2. **Max Tokens**: Only returns a value when `enableMaxTokens` is true, otherwise returns `undefined`
* 3. **Max Tokens Validation**: Ensures maxTokens > 0, falls back to `DEFAULT_MAX_TOKENS` if invalid
* 4. **Fallback Defaults**: Applies system defaults for all undefined/missing settings
*
* @param assistant - The assistant instance to extract settings from
* @returns Normalized assistant settings with all transformations applied
*/
export const getAssistantSettings = (assistant: Assistant): AssistantSettings => {
const contextCount = assistant?.settings?.contextCount ?? DEFAULT_CONTEXTCOUNT
const getAssistantMaxTokens = () => {
@ -181,16 +242,16 @@ export const getAssistantSettings = (assistant: Assistant): AssistantSettings =>
return {
contextCount: contextCount === MAX_CONTEXT_COUNT ? UNLIMITED_CONTEXT_COUNT : contextCount,
temperature: assistant?.settings?.temperature ?? DEFAULT_TEMPERATURE,
enableTemperature: assistant?.settings?.enableTemperature ?? true,
topP: assistant?.settings?.topP ?? 1,
enableTopP: assistant?.settings?.enableTopP ?? false,
enableMaxTokens: assistant?.settings?.enableMaxTokens ?? false,
enableTemperature: assistant?.settings?.enableTemperature ?? DEFAULT_ASSISTANT_SETTINGS.enableTemperature,
topP: assistant?.settings?.topP ?? DEFAULT_ASSISTANT_SETTINGS.topP,
enableTopP: assistant?.settings?.enableTopP ?? DEFAULT_ASSISTANT_SETTINGS.enableTopP,
enableMaxTokens: assistant?.settings?.enableMaxTokens ?? DEFAULT_ASSISTANT_SETTINGS.enableMaxTokens,
maxTokens: getAssistantMaxTokens(),
streamOutput: assistant?.settings?.streamOutput ?? true,
toolUseMode: assistant?.settings?.toolUseMode ?? 'function',
defaultModel: assistant?.defaultModel ?? undefined,
reasoning_effort: assistant?.settings?.reasoning_effort ?? 'default',
customParameters: assistant?.settings?.customParameters ?? []
streamOutput: assistant?.settings?.streamOutput ?? DEFAULT_ASSISTANT_SETTINGS.streamOutput,
toolUseMode: assistant?.settings?.toolUseMode ?? DEFAULT_ASSISTANT_SETTINGS.toolUseMode,
defaultModel: assistant?.defaultModel ?? DEFAULT_ASSISTANT_SETTINGS.defaultModel,
reasoning_effort: assistant?.settings?.reasoning_effort ?? DEFAULT_ASSISTANT_SETTINGS.reasoning_effort,
customParameters: assistant?.settings?.customParameters ?? DEFAULT_ASSISTANT_SETTINGS.customParameters
}
}