diff --git a/src/renderer/src/components/ModelList/ModelEditContent.tsx b/src/renderer/src/components/ModelList/ModelEditContent.tsx index 640c44fae6..7701e68331 100644 --- a/src/renderer/src/components/ModelList/ModelEditContent.tsx +++ b/src/renderer/src/components/ModelList/ModelEditContent.tsx @@ -73,7 +73,6 @@ const ModelEditContent: FC = ({ provider, model, onUpdate open={open} onCancel={handleClose} footer={null} - maskClosable={false} transitionName="animation-move-down" centered afterOpenChange={(visible) => { diff --git a/src/renderer/src/config/models.ts b/src/renderer/src/config/models.ts index 34b692dbf6..1a9e3bdb0d 100644 --- a/src/renderer/src/config/models.ts +++ b/src/renderer/src/config/models.ts @@ -1272,7 +1272,7 @@ export const SYSTEM_MODELS: Record = { provider: 'moonshot', group: 'moonshot-v1', owned_by: 'moonshot', - type: ['text', 'function_calling'] + capabilities: [{ type: 'text' }, { type: 'function_calling' }] }, { id: 'kimi-k2-0711-preview', @@ -1280,7 +1280,7 @@ export const SYSTEM_MODELS: Record = { provider: 'moonshot', group: 'kimi-k2', owned_by: 'moonshot', - type: ['text', 'function_calling'], + capabilities: [{ type: 'text' }, { type: 'function_calling' }], pricing: { input_per_million_tokens: 0.6, output_per_million_tokens: 2.5, diff --git a/src/renderer/src/pages/home/ChatNavbar.tsx b/src/renderer/src/pages/home/ChatNavbar.tsx index 0172153e35..b82f0d6e38 100644 --- a/src/renderer/src/pages/home/ChatNavbar.tsx +++ b/src/renderer/src/pages/home/ChatNavbar.tsx @@ -1,7 +1,6 @@ import { NavbarHeader } from '@renderer/components/app/Navbar' import { HStack } from '@renderer/components/Layout' import SearchPopup from '@renderer/components/Popups/SearchPopup' -import { isMac } from '@renderer/config/constant' import { useAssistant } from '@renderer/hooks/useAssistant' import { useFullscreen } from '@renderer/hooks/useFullscreen' import { modelGenerating } from '@renderer/hooks/useRuntime' @@ -95,9 +94,7 @@ const HeaderNavbar: FC = ({ activeAssistant, setActiveAssistant, activeTo )} {!showAssistants && ( - toggleShowAssistants()} - style={{ marginRight: 8, marginLeft: isMac && !isFullscreen ? 4 : -12 }}> + toggleShowAssistants()} style={{ marginRight: 8 }}> diff --git a/src/renderer/src/pages/settings/AssistantSettings/AssistantModelSettings.tsx b/src/renderer/src/pages/settings/AssistantSettings/AssistantModelSettings.tsx index fa3be6ab3f..ec98126daf 100644 --- a/src/renderer/src/pages/settings/AssistantSettings/AssistantModelSettings.tsx +++ b/src/renderer/src/pages/settings/AssistantSettings/AssistantModelSettings.tsx @@ -180,6 +180,7 @@ const AssistantModelSettings: FC = ({ assistant, updateAssistant, updateA model: selectedModel, defaultModel: selectedModel }) + // TODO: 需要根据配置来设置默认值 if (selectedModel.name.includes('kimi-k2')) { setTemperature(0.6) setTimeout(() => updateAssistantSettings({ temperature: 0.6 }), 500) diff --git a/src/renderer/src/store/migrate.ts b/src/renderer/src/store/migrate.ts index e835c25631..9803f89f55 100644 --- a/src/renderer/src/store/migrate.ts +++ b/src/renderer/src/store/migrate.ts @@ -1858,6 +1858,12 @@ const migrateConfig = { } }) }) + + const lanyunProvider = state.llm.providers.find((provider) => provider.id === 'lanyun') + if (lanyunProvider && lanyunProvider.models.length === 0) { + updateProvider(state, 'lanyun', { models: SYSTEM_MODELS.lanyun }) + } + return state } catch (error) { logger.error('migrate 123 error', error as Error)