Skip to content

armgit / dify

Public Imported from GitHub
0

Build Agentic workflows, RAG pipelines, with rich AI model and tool support on one collaborative workspace. Deploy on cloud, VPC, or self-hosted, so teams move from prototype to production without rebuilding the stack.

fix(api): remove omitted tenant default models (#42572)

林玮 (Jade Lin)8e5b09701134
diff --git a/api/controllers/console/workspace/models.py b/api/controllers/console/workspace/models.py
index 463b9e65f5e..85488610667 100644
--- a/api/controllers/console/workspace/models.py
+++ b/api/controllers/console/workspace/models.py
@@ -23,6 +23,7 @@ from controllers.console.wraps import (
with_current_tenant_id,
with_current_user,
)
+from core.entities.model_entities import DefaultModelSetting
from core.entities.provider_entities import CredentialConfiguration
from extensions.ext_database import db
from fields.base import ResponseModel
@@ -233,25 +234,16 @@ class DefaultModelApi(Resource):
@model_validate(ParserPostDefault)
def post(self, req_data: ParserPostDefault, tenant_id: str):
model_provider_service = ModelProviderService()
- model_settings = req_data.model_settings
- for model_setting in model_settings:
- if model_setting.provider is None:
- continue
-
- try:
- model_provider_service.update_default_model_of_model_type(
- tenant_id=tenant_id,
- model_type=model_setting.model_type,
- provider=model_setting.provider,
- model=cast(str, model_setting.model),
- )
- except Exception as ex:
- logger.exception(
- "Failed to update default model, model type: %s, model: %s",
- model_setting.model_type,
- model_setting.model,
- )
- raise ex
+ model_settings = [
+ DefaultModelSetting(
+ model_type=setting.model_type,
+ provider=setting.provider,
+ model=setting.model,
+ )
+ for setting in req_data.model_settings
+ if setting.provider is not None and setting.model is not None
+ ]
+ model_provider_service.update_default_models(tenant_id=tenant_id, model_settings=model_settings)
return SimpleResultResponse(result="success").model_dump(mode="json")
diff --git a/api/core/entities/model_entities.py b/api/core/entities/model_entities.py
index 4aa4c61cafb..cfd90739460 100644
--- a/api/core/entities/model_entities.py
+++ b/api/core/entities/model_entities.py
@@ -116,3 +116,9 @@ class DefaultModelEntity(BaseModel):
# pydantic configs
model_config = ConfigDict(protected_namespaces=())
+
+
+class DefaultModelSetting(BaseModel):
+ model_type: ModelType
+ provider: str
+ model: str
diff --git a/api/core/provider_manager.py b/api/core/provider_manager.py
index e4b39ff7189..837beffc37c 100644
--- a/api/core/provider_manager.py
+++ b/api/core/provider_manager.py
@@ -16,7 +16,7 @@ from sqlalchemy.exc import IntegrityError
from configs import dify_config
from core.db.session_factory import session_factory
-from core.entities.model_entities import DefaultModelEntity, DefaultModelProviderEntity
+from core.entities.model_entities import DefaultModelEntity, DefaultModelProviderEntity, DefaultModelSetting
from core.entities.provider_configuration import ProviderConfiguration, ProviderConfigurations, ProviderModelBundle
from core.entities.provider_entities import (
CredentialConfiguration,
@@ -930,16 +930,7 @@ class ProviderManager:
:return:
"""
provider_configurations = self.get_configurations(tenant_id)
- if provider not in provider_configurations:
- raise ValueError(f"Provider {provider} does not exist.")
-
- # get available models from provider_configurations
- available_models = provider_configurations.get_models(model_type=model_type, only_active=True)
-
- # check if the model is exist in available models
- model_names = [model.model for model in available_models]
- if model not in model_names:
- raise ValueError(f"Model {model} does not exist.")
+ self._validate_default_model(provider_configurations, model_type, provider, model)
stmt = select(TenantDefaultModel).where(
TenantDefaultModel.tenant_id == tenant_id,
TenantDefaultModel.model_type == model_type,
@@ -965,6 +956,50 @@ class ProviderManager:
return default_model
+ def replace_default_model_records(self, tenant_id: str, model_settings: Sequence[DefaultModelSetting]) -> None:
+ """Replace a tenant's defaults atomically, deleting model types omitted from the settings."""
+ if model_settings:
+ provider_configurations = self.get_configurations(tenant_id)
+ # Provider resolution can perform external I/O, so validate before opening the write transaction.
+ for setting in model_settings:
+ self._validate_default_model(
+ provider_configurations, setting.model_type, setting.provider, setting.model
+ )
+
+ settings_by_type = {setting.model_type: setting for setting in model_settings}
+ with session_factory.create_session() as session, session.begin():
+ default_models = session.scalars(
+ select(TenantDefaultModel).where(TenantDefaultModel.tenant_id == tenant_id)
+ )
+ for default_model in default_models:
+ replacement = settings_by_type.pop(default_model.model_type, None)
+ if replacement is None:
+ session.delete(default_model)
+ else:
+ default_model.provider_name = replacement.provider
+ default_model.model_name = replacement.model
+
+ session.add_all(
+ TenantDefaultModel(
+ tenant_id=tenant_id,
+ model_type=setting.model_type,
+ provider_name=setting.provider,
+ model_name=setting.model,
+ )
+ for setting in settings_by_type.values()
+ )
+
+ @staticmethod
+ def _validate_default_model(
+ provider_configurations: ProviderConfigurations, model_type: ModelType, provider: str, model: str
+ ) -> None:
+ if provider not in provider_configurations:
+ raise ValueError(f"Provider {provider} does not exist.")
+
+ available_models = provider_configurations.get_models(model_type=model_type, only_active=True)
+ if model not in [available_model.model for available_model in available_models]:
+ raise ValueError(f"Model {model} does not exist.")
+
@staticmethod
def _get_all_providers(tenant_id: str) -> dict[str, list[Provider]]:
provider_name_to_provider_records_dict = defaultdict(list)
diff --git a/api/services/model_provider_service.py b/api/services/model_provider_service.py
index 4804af7e508..ea052a348fa 100644
--- a/api/services/model_provider_service.py
+++ b/api/services/model_provider_service.py
@@ -1,5 +1,6 @@
import logging
from collections import defaultdict
+from collections.abc import Sequence
from dataclasses import dataclass, field
from typing import TYPE_CHECKING, Any
@@ -10,7 +11,7 @@ if TYPE_CHECKING:
from configs import dify_config
from core.db.session_factory import session_factory
-from core.entities.model_entities import ModelWithProviderEntity, ProviderModelWithStatusEntity
+from core.entities.model_entities import DefaultModelSetting, ModelWithProviderEntity, ProviderModelWithStatusEntity
from core.entities.provider_entities import CredentialConfiguration
from core.helper.position_helper import is_filtered
from core.plugin.entities.plugin import PluginInstallationSource
@@ -852,6 +853,12 @@ class ModelProviderService:
tenant_id=tenant_id, model_type=model_type_enum, provider=provider, model=model
)
+ def update_default_models(self, tenant_id: str, model_settings: Sequence[DefaultModelSetting]) -> None:
+ """Replace all configured default models for the workspace."""
+ self._get_provider_manager(tenant_id).replace_default_model_records(
+ tenant_id=tenant_id, model_settings=model_settings
+ )
+
def get_model_provider_icon(
self, tenant_id: str, provider: str, icon_type: str, lang: str
) -> tuple[bytes | None, str | None]:
diff --git a/api/tests/unit_tests/controllers/console/workspace/test_models.py b/api/tests/unit_tests/controllers/console/workspace/test_models.py
index 38f4d21db0d..d67f7122bef 100644
--- a/api/tests/unit_tests/controllers/console/workspace/test_models.py
+++ b/api/tests/unit_tests/controllers/console/workspace/test_models.py
@@ -1,8 +1,10 @@
from inspect import unwrap
-from unittest.mock import patch
+from unittest.mock import MagicMock, Mock, patch
import pytest
from flask import Flask
+from sqlalchemy import select
+from sqlalchemy.orm import Session
from controllers.console.workspace.models import (
DefaultModelApi,
@@ -25,9 +27,12 @@ from controllers.console.workspace.models import (
ParserSwitch,
ParserValidate,
)
+from core.entities.model_entities import DefaultModelSetting
+from core.provider_manager import ProviderManager
from graphon.model_runtime.entities.model_entities import ModelType
from graphon.model_runtime.errors.validate import CredentialsValidateFailedError
from models import Account
+from models.provider import TenantDefaultModel
from tests.unit_tests.model_factories import make_account
@@ -78,11 +83,93 @@ class TestDefaultModelApi:
with (
app.test_request_context("/", json=payload),
- patch("controllers.console.workspace.models.ModelProviderService"),
+ patch("controllers.console.workspace.models.ModelProviderService") as service,
):
result = method(api, ParserPostDefault.model_validate(payload), "tenant1")
assert result["result"] == "success"
+ service.return_value.update_default_models.assert_called_once_with(
+ tenant_id="tenant1",
+ model_settings=[DefaultModelSetting(model_type=ModelType.LLM, provider="openai", model="gpt-4")],
+ )
+
+ @pytest.mark.parametrize(
+ "cleared_setting",
+ [
+ None,
+ {"model_type": ModelType.TEXT_EMBEDDING},
+ {"model_type": ModelType.TEXT_EMBEDDING, "provider": None, "model": None},
+ {"model_type": ModelType.TEXT_EMBEDDING, "model": "text-embedding-3-small"},
+ {"model_type": ModelType.TEXT_EMBEDDING, "provider": "openai"},
+ ],
+ )
+ def test_post_removes_unconfigured_defaults(
+ self, app: Flask, sqlite_session: Session, cleared_setting: dict[str, str | None] | None
+ ) -> None:
+ sqlite_session.add_all(
+ [
+ TenantDefaultModel(
+ tenant_id="tenant1",
+ model_type=ModelType.TEXT_EMBEDDING,
+ provider_name="openai",
+ model_name="text-embedding-3-small",
+ ),
+ TenantDefaultModel(
+ tenant_id="other-tenant",
+ model_type=ModelType.TEXT_EMBEDDING,
+ provider_name="openai",
+ model_name="text-embedding-3-small",
+ ),
+ ]
+ )
+ sqlite_session.commit()
+ model_settings: list[dict[str, str | None]] = [
+ {"model_type": ModelType.LLM, "provider": "openai", "model": "gpt-4"}
+ ]
+ if cleared_setting is not None:
+ model_settings.append(cleared_setting)
+ payload = ParserPostDefault.model_validate({"model_settings": model_settings})
+ manager = ProviderManager(model_runtime=Mock())
+ configurations = MagicMock()
+ configurations.__contains__.return_value = True
+ configurations.get_models.return_value = [Mock(model="gpt-4")]
+ api = DefaultModelApi()
+
+ with (
+ app.test_request_context("/"),
+ patch("services.model_provider_service.create_plugin_provider_manager", return_value=manager),
+ patch.object(manager, "get_configurations", return_value=configurations),
+ ):
+ result = unwrap(api.post)(api, payload, "tenant1")
+
+ assert result["result"] == "success"
+ sqlite_session.expire_all()
+ assert {
+ (record.tenant_id, record.model_type, record.model_name)
+ for record in sqlite_session.scalars(select(TenantDefaultModel))
+ } == {
+ ("tenant1", ModelType.LLM, "gpt-4"),
+ ("other-tenant", ModelType.TEXT_EMBEDDING, "text-embedding-3-small"),
+ }
+
+ def test_post_empty_settings_clears_defaults(self, app: Flask, sqlite_session: Session) -> None:
+ sqlite_session.add(
+ TenantDefaultModel(
+ tenant_id="tenant1", model_type=ModelType.LLM, provider_name="openai", model_name="gpt-4"
+ )
+ )
+ sqlite_session.commit()
+ manager = ProviderManager(model_runtime=Mock())
+ api = DefaultModelApi()
+
+ with (
+ app.test_request_context("/"),
+ patch("services.model_provider_service.create_plugin_provider_manager", return_value=manager),
+ ):
+ result = unwrap(api.post)(api, ParserPostDefault(model_settings=[]), "tenant1")
+
+ assert result["result"] == "success"
+ assert sqlite_session.scalar(select(TenantDefaultModel)) is None
def test_get_returns_empty_when_no_default(self, app: Flask):
api = DefaultModelApi()
diff --git a/api/tests/unit_tests/core/test_provider_manager.py b/api/tests/unit_tests/core/test_provider_manager.py
index bb40efc0ae9..8f364f37f90 100644
--- a/api/tests/unit_tests/core/test_provider_manager.py
+++ b/api/tests/unit_tests/core/test_provider_manager.py
@@ -9,6 +9,7 @@ from sqlalchemy import Engine, event, select
from sqlalchemy.orm import Session, sessionmaker
from core import provider_manager as provider_manager_module
+from core.entities.model_entities import DefaultModelSetting
from core.entities.provider_entities import (
CustomConfiguration,
CustomProviderConfiguration,
@@ -973,6 +974,156 @@ def test_update_default_model_record_creates_record_with_origin_model_type(provi
assert {record.tenant_id for record in persisted_defaults} == {"tenant-id", "other-tenant"}
[email protected]("clear_all", [False, True])
+def test_replace_default_model_records_removes_omitted_types_only_for_current_tenant(
+ provider_db: Session, clear_all: bool
+) -> None:
+ manager = _build_provider_manager()
+ existing_default = TenantDefaultModel(
+ tenant_id="tenant-id",
+ provider_name="anthropic",
+ model_name="claude-3-sonnet",
+ model_type=ModelType.LLM,
+ )
+ omitted_default = TenantDefaultModel(
+ tenant_id="tenant-id",
+ provider_name="openai",
+ model_name="text-embedding-3-small",
+ model_type=ModelType.TEXT_EMBEDDING,
+ )
+ other_tenant_default = TenantDefaultModel(
+ tenant_id="other-tenant",
+ provider_name="openai",
+ model_name="text-embedding-3-small",
+ model_type=ModelType.TEXT_EMBEDDING,
+ )
+ provider_db.add_all([existing_default, omitted_default, other_tenant_default])
+ provider_db.commit()
+ configurations = MagicMock()
+ configurations.__contains__.return_value = True
+ configurations.get_models.side_effect = lambda model_type, **_kwargs: {
+ ModelType.LLM: [Mock(model="gpt-4")],
+ ModelType.RERANK: [Mock(model="rerank-v3")],
+ }[model_type]
+ settings = (
+ []
+ if clear_all
+ else [
+ DefaultModelSetting(model_type=ModelType.LLM, provider="openai", model="gpt-4"),
+ DefaultModelSetting(model_type=ModelType.RERANK, provider="cohere", model="rerank-v3"),
+ ]
+ )
+
+ with patch.object(manager, "get_configurations", return_value=configurations) as get_configurations:
+ manager.replace_default_model_records("tenant-id", settings)
+
+ provider_db.expire_all()
+ defaults = list(provider_db.scalars(select(TenantDefaultModel)))
+ expected_defaults = {("other-tenant", ModelType.TEXT_EMBEDDING, "openai", "text-embedding-3-small")}
+ expected_defaults.update(("tenant-id", setting.model_type, setting.provider, setting.model) for setting in settings)
+ assert {
+ (record.tenant_id, record.model_type, record.provider_name, record.model_name) for record in defaults
+ } == expected_defaults
+ if clear_all:
+ get_configurations.assert_not_called()
+ else:
+ persisted_default = provider_db.get(TenantDefaultModel, existing_default.id)
+ assert persisted_default is not None
+ assert persisted_default.model_name == "gpt-4"
+
+
+ ("provider", "model", "error"),
+ [
+ ("missing-provider", "text-embedding-3-small", "Provider missing-provider does not exist"),
+ ("openai", "missing-model", "Model missing-model does not exist"),
+ ],
+)
+def test_replace_default_model_records_preserves_defaults_when_validation_fails(
+ provider_db: Session, provider: str, model: str, error: str
+) -> None:
+ manager = _build_provider_manager()
+ existing_defaults = [
+ TenantDefaultModel(
+ tenant_id="tenant-id", provider_name="anthropic", model_name="claude-3-sonnet", model_type=ModelType.LLM
+ ),
+ TenantDefaultModel(
+ tenant_id="tenant-id", provider_name="cohere", model_name="rerank-v3", model_type=ModelType.RERANK
+ ),
+ ]
+ provider_db.add_all(existing_defaults)
+ provider_db.commit()
+ original_defaults = {(record.id, record.provider_name, record.model_name) for record in existing_defaults}
+ configurations = MagicMock()
+ configurations.__contains__.side_effect = lambda name: name == "openai"
+ configurations.get_models.side_effect = lambda model_type, **_kwargs: {
+ ModelType.LLM: [Mock(model="gpt-4")],
+ ModelType.TEXT_EMBEDDING: [Mock(model="text-embedding-3-small")],
+ }[model_type]
+
+ with (
+ patch.object(manager, "get_configurations", return_value=configurations),
+ pytest.raises(ValueError, match=error),
+ ):
+ manager.replace_default_model_records(
+ "tenant-id",
+ [
+ DefaultModelSetting(model_type=ModelType.LLM, provider="openai", model="gpt-4"),
+ DefaultModelSetting(model_type=ModelType.TEXT_EMBEDDING, provider=provider, model=model),
+ ],
+ )
+
+ provider_db.expire_all()
+ assert {
+ (record.id, record.provider_name, record.model_name)
+ for record in provider_db.scalars(select(TenantDefaultModel))
+ } == original_defaults
+
+
+def test_replace_default_model_records_rolls_back_when_persistence_fails(provider_db: Session) -> None:
+ manager = _build_provider_manager()
+ existing_defaults = [
+ TenantDefaultModel(
+ tenant_id="tenant-id", provider_name="anthropic", model_name="claude-3-sonnet", model_type=ModelType.LLM
+ ),
+ TenantDefaultModel(
+ tenant_id="tenant-id", provider_name="cohere", model_name="rerank-v3", model_type=ModelType.RERANK
+ ),
+ ]
+ provider_db.add_all(existing_defaults)
+ provider_db.commit()
+ original_defaults = {(record.id, record.provider_name, record.model_name) for record in existing_defaults}
+ configurations = MagicMock()
+ configurations.__contains__.return_value = True
+ configurations.get_models.return_value = [Mock(model="gpt-4"), Mock(model="text-embedding-3-small")]
+
+ def fail_after_flush(_session: Session, _flush_context: object) -> None:
+ raise RuntimeError("Persistence failed")
+
+ with Session(bind=provider_db.get_bind()) as write_session:
+ event.listen(write_session, "after_flush", fail_after_flush)
+ with (
+ patch.object(manager, "get_configurations", return_value=configurations),
+ patch.object(provider_manager_module.session_factory, "create_session", return_value=write_session),
+ pytest.raises(RuntimeError, match="Persistence failed"),
+ ):
+ manager.replace_default_model_records(
+ "tenant-id",
+ [
+ DefaultModelSetting(model_type=ModelType.LLM, provider="openai", model="gpt-4"),
+ DefaultModelSetting(
+ model_type=ModelType.TEXT_EMBEDDING, provider="openai", model="text-embedding-3-small"
+ ),
+ ],
+ )
+
+ provider_db.expire_all()
+ assert {
+ (record.id, record.provider_name, record.model_name)
+ for record in provider_db.scalars(select(TenantDefaultModel))
+ } == original_defaults
+
+
def test_get_all_providers_normalizes_provider_names_with_model_provider_id(provider_db: Session) -> None:
openai_provider = Provider(
tenant_id="tenant-id",
diff --git a/oxlint-suppressions.json b/oxlint-suppressions.json
index 4bdd3ebfec8..ee49b34c4e0 100644
--- a/oxlint-suppressions.json
+++ b/oxlint-suppressions.json
@@ -5303,7 +5303,7 @@
"count": 1
},
"typescript/no-explicit-any": {
- "count": 6
+ "count": 5
}
},
"web/service/datasets.ts": {
diff --git a/web/app/components/header/account-setting/model-provider-page/hooks.ts b/web/app/components/header/account-setting/model-provider-page/hooks.ts
index 6729ba706db..66c633886f0 100644
--- a/web/app/components/header/account-setting/model-provider-page/hooks.ts
+++ b/web/app/components/header/account-setting/model-provider-page/hooks.ts
@@ -32,7 +32,7 @@ import { CustomConfigurationStatusEnum, ModelStatusEnum, ModelTypeEnum } from '.
type UseDefaultModelAndModelList = (
defaultModel: DefaultModelResponse | undefined,
modelList: ProviderWithModelsResponse[],
-) => [DefaultModel | undefined, (model: DefaultModel) => void]
+) => [DefaultModel | undefined, (model: DefaultModel | undefined) => void, () => void]
export const useSystemDefaultModelAndModelList: UseDefaultModelAndModelList = (
defaultModel,
modelList,
@@ -68,14 +68,18 @@ export const useSystemDefaultModelAndModelList: UseDefaultModelAndModelList = (
defaultModelSourceKey === currentDefaultModelKey ? defaultModelState : currentDefaultModel
const handleDefaultModelChange = useCallback(
- (model: DefaultModel) => {
+ (model: DefaultModel | undefined) => {
setDefaultModelSourceKey(currentDefaultModelKey)
setDefaultModelState(model)
},
[currentDefaultModelKey],
)
- return [selectedDefaultModel, handleDefaultModelChange]
+ return [
+ selectedDefaultModel,
+ handleDefaultModelChange,
+ () => handleDefaultModelChange(currentDefaultModel),
+ ]
}
export const useLanguage = () => {
diff --git a/web/app/components/header/account-setting/model-provider-page/model-selector/__tests__/model-selector-trigger.spec.tsx b/web/app/components/header/account-setting/model-provider-page/model-selector/__tests__/model-selector-trigger.spec.tsx
index 21777436d45..4c2300f55de 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-selector/__tests__/model-selector-trigger.spec.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-selector/__tests__/model-selector-trigger.spec.tsx
@@ -149,6 +149,65 @@ describe('ModelSelectorTrigger', () => {
})
})
+ describe('Clearing the selection', () => {
+ it('clears without opening the model picker or submitting the containing form', async () => {
+ const user = userEvent.setup()
+ const onClear = vi.fn()
+ const onOpenChange = vi.fn()
+ const onSubmit = vi.fn((event) => event.preventDefault())
+ renderComponent(
+ <form onSubmit={onSubmit}>
+ <Popover onOpenChange={onOpenChange}>
+ <ModelSelectorTrigger
+ currentProvider={createModel()}
+ currentModel={createModelItem()}
+ defaultModel={{ provider: 'openai', model: 'gpt-4' }}
+ onClear={onClear}
+ clearLabel="Reset model"
+ />
+ </Popover>
+ </form>,
+ )
+
+ await user.click(screen.getByRole('button', { name: 'Reset model' }))
+
+ expect(onClear).toHaveBeenCalledTimes(1)
+ expect(onOpenChange).not.toHaveBeenCalled()
+ expect(onSubmit).not.toHaveBeenCalled()
+ await user.click(getTrigger())
+ expect(onOpenChange).toHaveBeenCalledWith(true, expect.anything())
+ })
+
+ it.each([{ disabled: true }, { loading: true }])(
+ 'prevents clearing when unavailable: %o',
+ async (props) => {
+ const user = userEvent.setup()
+ const onClear = vi.fn()
+ render(
+ <ModelSelectorTrigger
+ currentProvider={createModel()}
+ currentModel={createModelItem()}
+ defaultModel={{ provider: 'openai', model: 'gpt-4' }}
+ onClear={onClear}
+ clearLabel="Reset model"
+ {...props}
+ />,
+ )
+
+ const clearButton = screen.getByRole('button', { name: 'Reset model' })
+ expect(clearButton).toBeDisabled()
+ await user.click(clearButton)
+ expect(onClear).not.toHaveBeenCalled()
+ },
+ )
+
+ it('does not offer clear for an empty selection', () => {
+ render(<ModelSelectorTrigger onClear={vi.fn()} clearLabel="Reset model" />)
+
+ expect(screen.queryByRole('button', { name: 'Reset model' })).not.toBeInTheDocument()
+ })
+ })
+
describe('Status Handling', () => {
it('should show status badge when selected model is not active and enabled', () => {
render(
diff --git a/web/app/components/header/account-setting/model-provider-page/model-selector/index.tsx b/web/app/components/header/account-setting/model-provider-page/model-selector/index.tsx
index 03194f327a4..669912065a9 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-selector/index.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-selector/index.tsx
@@ -31,6 +31,8 @@ type ModelSelectorBaseProps = {
className?: string
popupClassName?: string
onValueChange?: (model: ModelSelectorValue) => void
+ onClear?: () => void
+ clearLabel?: string
onHide?: () => void
disabled?: boolean
loading?: boolean
@@ -57,6 +59,8 @@ function ModelSelectorRoot({
className,
popupClassName,
onValueChange,
+ onClear,
+ clearLabel,
onHide,
disabled,
loading,
@@ -142,6 +146,8 @@ function ModelSelectorRoot({
currentProvider={currentProvider}
currentModel={currentModel}
defaultModel={value}
+ onClear={onClear}
+ clearLabel={clearLabel}
disabled={disabled || loading}
loading={loading}
size={size}
diff --git a/web/app/components/header/account-setting/model-provider-page/model-selector/model-selector-trigger.tsx b/web/app/components/header/account-setting/model-provider-page/model-selector/model-selector-trigger.tsx
index 0148368e5ac..7dc2da9f14d 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-selector/model-selector-trigger.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-selector/model-selector-trigger.tsx
@@ -1,5 +1,6 @@
import type { ModelSelectorModel, ModelSelectorProvider, ModelSelectorValue } from './types'
import { cn } from '@langgenius/dify-ui/cn'
+import { IconButton } from '@langgenius/dify-ui/icon-button'
import { PopoverTrigger } from '@langgenius/dify-ui/popover'
import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
import { useQuery } from '@tanstack/react-query'
@@ -18,6 +19,8 @@ type ModelSelectorTriggerProps = {
currentProvider?: ModelSelectorProvider
currentModel?: ModelSelectorModel
defaultModel?: ModelSelectorValue
+ onClear?: () => void
+ clearLabel?: string
disabled?: boolean
loading?: boolean
size?: 'small' | 'medium'
@@ -33,6 +36,8 @@ function ModelSelectorTrigger({
currentProvider,
currentModel,
defaultModel,
+ onClear,
+ clearLabel,
disabled,
loading = false,
size = 'medium',
@@ -45,6 +50,7 @@ function ModelSelectorTrigger({
}: ModelSelectorTriggerProps) {
const { t } = useTranslation()
+ const showClear = !!defaultModel && !!onClear
const isSelected = !!currentProvider && !!currentModel
const isDeprecated = !isSelected && !!defaultModel
const isEmpty = !isSelected && !defaultModel
@@ -94,7 +100,7 @@ function ModelSelectorTrigger({
? tooltipLabel
: undefined
- return (
+ const trigger = (
<Tooltip>
<TooltipTrigger
disabled={!triggerTooltipLabel || isDisabled}
@@ -126,7 +132,13 @@ function ModelSelectorTrigger({
/>
}
>
- <span className="flex min-w-0 grow items-center gap-0.5">
+ <span
+ className={cn(
+ 'flex min-w-0 grow items-center gap-0.5',
+ showClear &&
+ 'group-focus-within/model-selector-clearable:mr-6 group-hover/model-selector-clearable:mr-6',
+ )}
+ >
{isEmpty ? (
<span
className={cn(
@@ -190,6 +202,7 @@ function ModelSelectorTrigger({
<span
className={cn(
'flex shrink-0 items-center gap-0.75 rounded-md border border-text-warning px-1.25 py-0.5',
+ 'group-focus-within/model-selector-clearable:hidden group-focus-within/model-selector-trigger:hidden group-hover/model-selector-clearable:hidden group-hover/model-selector-trigger:hidden',
isCreditsExhausted && 'min-w-5 justify-center bg-components-badge-bg-dimm',
)}
>
@@ -201,7 +214,7 @@ function ModelSelectorTrigger({
)}
{isDeprecated && !isStatusUnavailable && showDeprecatedWarnIcon && (
- <span className="flex shrink-0 items-center gap-0.75 rounded-md border border-text-warning bg-components-badge-bg-dimm px-1.25 py-0.5">
+ <span className="flex shrink-0 items-center gap-0.75 rounded-md border border-text-warning bg-components-badge-bg-dimm px-1.25 py-0.5 group-focus-within/model-selector-clearable:hidden group-focus-within/model-selector-trigger:hidden group-hover/model-selector-clearable:hidden group-hover/model-selector-trigger:hidden">
<span aria-hidden className="i-ri-alert-fill size-3 text-text-warning" />
<span className="system-xs-medium whitespace-nowrap text-text-warning">
{statusLabel}
@@ -210,7 +223,7 @@ function ModelSelectorTrigger({
)}
</span>
</span>
- {!isDisabled && shape !== 'split' && (isActive || isEmpty) && (
+ {!isDisabled && shape !== 'split' && (
<span
aria-hidden="true"
className="i-ri-arrow-down-s-line size-4 shrink-0 text-text-quaternary transition-colors group-hover/model-selector-trigger:text-text-secondary group-data-popup-open/model-selector-trigger:text-text-secondary"
@@ -224,6 +237,32 @@ function ModelSelectorTrigger({
)}
</Tooltip>
)
+
+ if (!showClear) return trigger
+
+ return (
+ <div
+ className={cn(
+ 'group/model-selector-clearable relative min-w-0',
+ shape === 'split' ? 'flex-1' : 'w-full',
+ )}
+ >
+ {trigger}
+ <IconButton
+ aria-label={clearLabel ?? t(($) => $['operation.reset'], { ns: 'common' })}
+ size="sm"
+ disabled={isDisabled}
+ onClick={onClear}
+ className={cn(
+ 'pointer-events-none absolute top-1/2 -translate-y-1/2 opacity-0 group-focus-within/model-selector-clearable:pointer-events-auto group-focus-within/model-selector-clearable:opacity-100 group-hover/model-selector-clearable:pointer-events-auto group-hover/model-selector-clearable:opacity-100',
+ 'text-text-quaternary hover:bg-transparent hover:text-text-tertiary focus-visible:bg-components-input-bg-hover focus-visible:ring-inset',
+ shape === 'split' ? 'right-1' : size === 'small' ? 'right-4.5' : 'right-5',
+ )}
+ >
+ <span aria-hidden="true" className="i-ri-close-circle-fill size-4" />
+ </IconButton>
+ </div>
+ )
}
export { ModelSelectorTrigger }
diff --git a/web/app/components/header/account-setting/model-provider-page/system-model-selector/__tests__/index.spec.tsx b/web/app/components/header/account-setting/model-provider-page/system-model-selector/__tests__/index.spec.tsx
index fab82b7341e..c2f99512fc3 100644
--- a/web/app/components/header/account-setting/model-provider-page/system-model-selector/__tests__/index.spec.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/system-model-selector/__tests__/index.spec.tsx
@@ -25,6 +25,7 @@ vi.mock('react-i18next', async () => {
'modelProvider.ttsModel.tip': 'TTS model tip',
'operation.cancel': 'Cancel',
'operation.save': 'Save',
+ 'operation.reset': 'Reset',
loading: 'Loading',
'actionMsg.modifiedSuccessfully': 'Modified successfully',
})
@@ -64,37 +65,64 @@ vi.mock('@/app/notifications', async (importOriginal) => {
}
})
-vi.mock('../../hooks', () => ({
- useSystemDefaultModelAndModelList: (defaultModel: DefaultModelResponse | undefined) => [
- defaultModel || {
- model: '',
- provider: { provider: '', icon_small: { en_US: '', zh_Hans: '' } },
- },
- vi.fn(),
- ],
- useUpdateModelList: () => mockUpdateModelList,
- useInvalidateDefaultModel: () => mockInvalidateDefaultModel,
-}))
+vi.mock('../../hooks', async (importOriginal) => {
+ const actual = await importOriginal<typeof import('../../hooks')>()
+ return {
+ ...actual,
+ useUpdateModelList: () => mockUpdateModelList,
+ useInvalidateDefaultModel: () => mockInvalidateDefaultModel,
+ }
+})
-vi.mock('@/service/common', () => ({
- updateDefaultModel: mockUpdateDefaultModel,
-}))
+vi.mock('@/service/console', async (importOriginal) => {
+ const actual = await importOriginal<typeof import('@/service/console')>()
+ return {
+ ...actual,
+ consoleClient: {
+ workspaces: {
+ current: {
+ defaultModel: { post: mockUpdateDefaultModel },
+ },
+ },
+ },
+ }
+})
vi.mock('../../model-selector', () => ({
ModelSelector: (props: {
hideProviderSettingsFooter?: boolean
onConfigureEmptyState?: () => void
showModelMeta?: boolean
+ value?: { model: string; provider: string }
+ onClear?: () => void
+ clearLabel?: string
+ disabled?: boolean
onValueChange: (model: { model: string; provider: string }) => void
}) => {
mockModelSelectorProps.push(props)
return (
<div>
- <button onClick={() => props.onValueChange({ model: 'test', provider: 'test' })}>
+ <output>{props.value?.model ?? 'No model selected'}</output>
+ {props.value && props.onClear && (
+ <button
+ type="button"
+ aria-label={props.clearLabel}
+ disabled={props.disabled}
+ onClick={props.onClear}
+ >
+ Clear
+ </button>
+ )}
+ <button
+ type="button"
+ onClick={() => props.onValueChange({ model: 'test', provider: 'test' })}
+ >
Mock Model Selector
</button>
{props.onConfigureEmptyState && (
- <button onClick={props.onConfigureEmptyState}>Mock Configure Empty State</button>
+ <button type="button" onClick={props.onConfigureEmptyState}>
+ Mock Configure Empty State
+ </button>
)}
</div>
)
@@ -319,6 +347,116 @@ describe('SystemModel', () => {
expect(mockUpdateModelList).not.toHaveBeenCalled()
})
+ it.each([
+ ['System Reasoning Model', ModelTypeEnum.textGeneration, 'textGenerationDefaultModel'],
+ ['Embedding Model', ModelTypeEnum.textEmbedding, 'embeddingsDefaultModel'],
+ ['Rerank Model', ModelTypeEnum.rerank, 'rerankDefaultModel'],
+ ['Speech to Text Model', ModelTypeEnum.speech2text, 'speech2textDefaultModel'],
+ ['TTS Model', ModelTypeEnum.tts, 'ttsDefaultModel'],
+ ] as const)(
+ 'saves a reset %s as null without changing other defaults',
+ async (label, modelType, prop) => {
+ const user = userEvent.setup()
+ render(
+ <SystemModel {...defaultProps} {...{ [prop]: { ...mockModel, model_type: modelType } }} />,
+ )
+
+ await user.click(screen.getByRole('button', { name: /system model settings/i }))
+ await user.click(screen.getByRole('button', { name: `Reset ${label}` }))
+
+ expect(screen.queryByRole('button', { name: `Reset ${label}` })).not.toBeInTheDocument()
+ expect(mockUpdateDefaultModel).not.toHaveBeenCalled()
+ await user.click(screen.getByRole('button', { name: 'Save' }))
+
+ await waitFor(() => {
+ expect(mockUpdateDefaultModel).toHaveBeenCalledWith({
+ body: {
+ model_settings: [
+ {
+ model_type: ModelTypeEnum.textGeneration,
+ provider: modelType === ModelTypeEnum.textGeneration ? null : 'openai',
+ model: modelType === ModelTypeEnum.textGeneration ? null : 'gpt-4',
+ },
+ { model_type: ModelTypeEnum.textEmbedding, provider: null, model: null },
+ { model_type: ModelTypeEnum.rerank, provider: null, model: null },
+ { model_type: ModelTypeEnum.speech2text, provider: null, model: null },
+ { model_type: ModelTypeEnum.tts, provider: null, model: null },
+ ],
+ },
+ })
+ })
+ },
+ )
+
+ it('saves a replacement selected after resetting a model', async () => {
+ const user = userEvent.setup()
+ render(<SystemModel {...defaultProps} />)
+
+ await user.click(screen.getByRole('button', { name: /system model settings/i }))
+ await user.click(screen.getByRole('button', { name: 'Reset System Reasoning Model' }))
+ await user.click(screen.getAllByRole('button', { name: 'Mock Model Selector' })[0]!)
+ expect(screen.getByRole('button', { name: 'Reset System Reasoning Model' })).toBeEnabled()
+ await user.click(screen.getByRole('button', { name: 'Save' }))
+
+ await waitFor(() => {
+ expect(mockUpdateDefaultModel).toHaveBeenCalledWith({
+ body: {
+ model_settings: expect.arrayContaining([
+ { model_type: ModelTypeEnum.textGeneration, provider: 'test', model: 'test' },
+ ]),
+ },
+ })
+ })
+ })
+
+ it('restores the saved model when a reset is cancelled and the dialog is reopened', async () => {
+ const user = userEvent.setup()
+ render(<SystemModel {...defaultProps} />)
+
+ await user.click(screen.getByRole('button', { name: /system model settings/i }))
+ await user.click(screen.getByRole('button', { name: 'Reset System Reasoning Model' }))
+ expect(screen.queryByText('gpt-4')).not.toBeInTheDocument()
+ await user.click(screen.getByRole('button', { name: 'Cancel' }))
+ await waitFor(() => {
+ expect(screen.queryByRole('button', { name: 'Save' })).not.toBeInTheDocument()
+ })
+ await user.click(screen.getByRole('button', { name: /system model settings/i }))
+
+ expect(await screen.findByText('gpt-4')).toBeInTheDocument()
+ expect(screen.getByRole('button', { name: 'Reset System Reasoning Model' })).toBeEnabled()
+ expect(mockUpdateDefaultModel).not.toHaveBeenCalled()
+ })
+
+ it('keeps a saved reset when reopened before refreshed defaults arrive', async () => {
+ const user = userEvent.setup()
+ render(<SystemModel {...defaultProps} />)
+
+ await user.click(screen.getByRole('button', { name: /system model settings/i }))
+ await user.click(screen.getByRole('button', { name: 'Reset System Reasoning Model' }))
+ await user.click(screen.getByRole('button', { name: 'Save' }))
+ await waitFor(() => {
+ expect(screen.queryByRole('button', { name: 'Save' })).not.toBeInTheDocument()
+ })
+ await user.click(screen.getByRole('button', { name: /system model settings/i }))
+
+ expect(
+ screen.queryByRole('button', { name: 'Reset System Reasoning Model' }),
+ ).not.toBeInTheDocument()
+ expect(screen.queryByText('gpt-4')).not.toBeInTheDocument()
+ expect(screen.getAllByText('No model selected')).toHaveLength(5)
+ })
+
+ it('hides reset for unconfigured model types', async () => {
+ const user = userEvent.setup()
+ render(<SystemModel {...defaultProps} />)
+
+ await user.click(screen.getByRole('button', { name: /system model settings/i }))
+
+ expect(screen.getByRole('button', { name: 'Reset System Reasoning Model' })).toBeEnabled()
+ for (const label of ['Embedding Model', 'Rerank Model', 'Speech to Text Model', 'TTS Model'])
+ expect(screen.queryByRole('button', { name: `Reset ${label}` })).not.toBeInTheDocument()
+ })
+
it('should disable save without model config permission', async () => {
mockWorkspacePermissionKeys = []
render(<SystemModel {...defaultProps} />)
@@ -326,6 +464,9 @@ describe('SystemModel', () => {
fireEvent.click(screen.getByRole('button', { name: /system model settings/i }))
await waitFor(() => {
expect(screen.getByRole('button', { name: /save/i })).toBeDisabled()
+ expect(
+ screen.queryByRole('button', { name: 'Reset System Reasoning Model' }),
+ ).not.toBeInTheDocument()
})
})
diff --git a/web/app/components/header/account-setting/model-provider-page/system-model-selector/index.tsx b/web/app/components/header/account-setting/model-provider-page/system-model-selector/index.tsx
index 491b6721e64..ae2af7f9d1b 100644
--- a/web/app/components/header/account-setting/model-provider-page/system-model-selector/index.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/system-model-selector/index.tsx
@@ -12,8 +12,7 @@ import { useTranslation } from 'react-i18next'
import { Infotip } from '@/app/components/base/infotip'
import { toast } from '@/app/notifications'
import { workspacePermissionKeysAtom } from '@/context/permission-state'
-import { updateDefaultModel } from '@/service/common'
-import { consoleQuery } from '@/service/console'
+import { consoleClient, consoleQuery } from '@/service/console'
import { hasPermission } from '@/utils/permission'
import { ModelTypeEnum } from '../declarations'
import {
@@ -78,10 +77,6 @@ const SystemModel: FC<SystemModelSelectorProps> = ({
const [activeDialog, setActiveDialog] = useQueryState('dialog', systemModelDialogQueryParser)
const [manuallyOpen, setManuallyOpen] = useState(false)
const open = manuallyOpen || activeDialog === 'system-models'
- const handleOpenChange = (nextOpen: boolean) => {
- setManuallyOpen(nextOpen)
- if (!nextOpen && activeDialog === 'system-models') void setActiveDialog(null)
- }
const { data: embeddingModelList = [], isPending: isEmbeddingModelListLoading } = useQuery(
consoleQuery.workspaces.current.models.modelTypes.byModelType.get.queryOptions({
input: { params: { model_type: ModelTypeEnum.textEmbedding } },
@@ -111,18 +106,37 @@ const SystemModel: FC<SystemModelSelectorProps> = ({
}),
)
const [changedModelTypes, setChangedModelTypes] = useState<ModelTypeEnum[]>([])
- const [currentTextGenerationDefaultModel, changeCurrentTextGenerationDefaultModel] =
- useSystemDefaultModelAndModelList(textGenerationDefaultModel, textGenerationModelList)
- const [currentEmbeddingsDefaultModel, changeCurrentEmbeddingsDefaultModel] =
- useSystemDefaultModelAndModelList(embeddingsDefaultModel, embeddingModelList)
- const [currentRerankDefaultModel, changeCurrentRerankDefaultModel] =
+ const [
+ currentTextGenerationDefaultModel,
+ changeCurrentTextGenerationDefaultModel,
+ resetTextGenerationDefaultModel,
+ ] = useSystemDefaultModelAndModelList(textGenerationDefaultModel, textGenerationModelList)
+ const [
+ currentEmbeddingsDefaultModel,
+ changeCurrentEmbeddingsDefaultModel,
+ resetEmbeddingsDefaultModel,
+ ] = useSystemDefaultModelAndModelList(embeddingsDefaultModel, embeddingModelList)
+ const [currentRerankDefaultModel, changeCurrentRerankDefaultModel, resetRerankDefaultModel] =
useSystemDefaultModelAndModelList(rerankDefaultModel, rerankModelList)
- const [currentSpeech2textDefaultModel, changeCurrentSpeech2textDefaultModel] =
- useSystemDefaultModelAndModelList(speech2textDefaultModel, speech2textModelList)
- const [currentTTSDefaultModel, changeCurrentTTSDefaultModel] = useSystemDefaultModelAndModelList(
- ttsDefaultModel,
- ttsModelList,
- )
+ const [
+ currentSpeech2textDefaultModel,
+ changeCurrentSpeech2textDefaultModel,
+ resetSpeech2textDefaultModel,
+ ] = useSystemDefaultModelAndModelList(speech2textDefaultModel, speech2textModelList)
+ const [currentTTSDefaultModel, changeCurrentTTSDefaultModel, resetTTSDefaultModel] =
+ useSystemDefaultModelAndModelList(ttsDefaultModel, ttsModelList)
+ const handleOpenChange = (nextOpen: boolean) => {
+ if (!nextOpen) {
+ resetTextGenerationDefaultModel()
+ resetEmbeddingsDefaultModel()
+ resetRerankDefaultModel()
+ resetSpeech2textDefaultModel()
+ resetTTSDefaultModel()
+ setChangedModelTypes([])
+ }
+ setManuallyOpen(nextOpen)
+ if (!nextOpen && activeDialog === 'system-models') void setActiveDialog(null)
+ }
const isSystemModelListLoading =
open &&
(isEmbeddingModelListLoading ||
@@ -139,7 +153,7 @@ const SystemModel: FC<SystemModelSelectorProps> = ({
return undefined
}
- const handleChangeDefaultModel = (modelType: ModelTypeEnum, model: DefaultModel) => {
+ const handleChangeDefaultModel = (modelType: ModelTypeEnum, model: DefaultModel | undefined) => {
if (modelType === ModelTypeEnum.textGeneration) changeCurrentTextGenerationDefaultModel(model)
else if (modelType === ModelTypeEnum.textEmbedding) changeCurrentEmbeddingsDefaultModel(model)
else if (modelType === ModelTypeEnum.rerank) changeCurrentRerankDefaultModel(model)
@@ -150,10 +164,9 @@ const SystemModel: FC<SystemModelSelectorProps> = ({
setChangedModelTypes([...changedModelTypes, modelType])
}
const handleSave = async () => {
- if (isSystemModelListLoading) return
+ if (!canManageSystemDefaultModel || isSystemModelListLoading) return
- const res = await updateDefaultModel({
- url: '/workspaces/current/default-model',
+ const res = await consoleClient.workspaces.current.defaultModel.post({
body: {
model_settings: [
ModelTypeEnum.textGeneration,
@@ -164,15 +177,17 @@ const SystemModel: FC<SystemModelSelectorProps> = ({
].map((modelType) => {
return {
model_type: modelType,
- provider: getCurrentDefaultModelByModelType(modelType)?.provider,
- model: getCurrentDefaultModelByModelType(modelType)?.model,
+ provider: getCurrentDefaultModelByModelType(modelType)?.provider ?? null,
+ model: getCurrentDefaultModelByModelType(modelType)?.model ?? null,
}
}),
},
})
if (res.result === 'success') {
toast.success(t(($) => $['actionMsg.modifiedSuccessfully'], { ns: 'common' }))
- handleOpenChange(false)
+ setManuallyOpen(false)
+ if (activeDialog === 'system-models') void setActiveDialog(null)
+ setChangedModelTypes([])
const allModelTypes = [
ModelTypeEnum.textGeneration,
@@ -186,6 +201,13 @@ const SystemModel: FC<SystemModelSelectorProps> = ({
}
}
+ const getResetProps = (modelType: ModelTypeEnum, labelKey: SystemModelLabelKey) => ({
+ onClear: canManageSystemDefaultModel
+ ? () => handleChangeDefaultModel(modelType, undefined)
+ : undefined,
+ clearLabel: `${t(($) => $['operation.reset'], { ns: 'common' })} ${t(($) => $[labelKey], { ns: 'common' })}`,
+ })
+
const renderModelLabel = (labelKey: SystemModelLabelKey, tipKey: SystemModelTipKey) => {
const tipText = t(($) => $[tipKey], { ns: 'common' })
@@ -221,6 +243,14 @@ const SystemModel: FC<SystemModelSelectorProps> = ({
</Button>
<Dialog open={open} onOpenChange={handleOpenChange}>
<DialogContent
+ render={
+ <form
+ onSubmit={(event) => {
+ event.preventDefault()
+ void handleSave()
+ }}
+ />
+ }
backdropProps={{ forceRender: true }}
className="flex max-h-[calc(100dvh-2rem)] w-120 max-w-120 flex-col overflow-hidden rounded-2xl p-0"
>
@@ -264,6 +294,10 @@ const SystemModel: FC<SystemModelSelectorProps> = ({
)}
<div>
<ModelSelector
+ {...getResetProps(
+ ModelTypeEnum.textGeneration,
+ 'modelProvider.systemReasoningModel.key',
+ )}
value={currentTextGenerationDefaultModel}
models={textGenerationModelList}
hideProviderSettingsFooter={hideProviderSettingsFooter}
@@ -283,6 +317,10 @@ const SystemModel: FC<SystemModelSelectorProps> = ({
)}
<div>
<ModelSelector
+ {...getResetProps(
+ ModelTypeEnum.textEmbedding,
+ 'modelProvider.embeddingModel.key',
+ )}
value={currentEmbeddingsDefaultModel}
models={embeddingModelList}
hideProviderSettingsFooter={hideProviderSettingsFooter}
@@ -302,6 +340,7 @@ const SystemModel: FC<SystemModelSelectorProps> = ({
)}
<div>
<ModelSelector
+ {...getResetProps(ModelTypeEnum.rerank, 'modelProvider.rerankModel.key')}
value={currentRerankDefaultModel}
models={rerankModelList}
hideProviderSettingsFooter={hideProviderSettingsFooter}
@@ -321,6 +360,10 @@ const SystemModel: FC<SystemModelSelectorProps> = ({
)}
<div>
<ModelSelector
+ {...getResetProps(
+ ModelTypeEnum.speech2text,
+ 'modelProvider.speechToTextModel.key',
+ )}
value={currentSpeech2textDefaultModel}
models={speech2textModelList}
hideProviderSettingsFooter={hideProviderSettingsFooter}
@@ -337,6 +380,7 @@ const SystemModel: FC<SystemModelSelectorProps> = ({
{renderModelLabel('modelProvider.ttsModel.key', 'modelProvider.ttsModel.tip')}
<div>
<ModelSelector
+ {...getResetProps(ModelTypeEnum.tts, 'modelProvider.ttsModel.key')}
value={currentTTSDefaultModel}
models={ttsModelList}
hideProviderSettingsFooter={hideProviderSettingsFooter}
@@ -357,7 +401,7 @@ const SystemModel: FC<SystemModelSelectorProps> = ({
<Button
className="min-w-18"
variant="primary"
- onClick={handleSave}
+ type="submit"
disabled={!canManageSystemDefaultModel || isSystemModelListLoading}
>
{t(($) => $['operation.save'], { ns: 'common' })}
diff --git a/web/service/common.ts b/web/service/common.ts
index 4bcb6b372bb..30f4f5fea8c 100644
--- a/web/service/common.ts
+++ b/web/service/common.ts
@@ -156,16 +156,6 @@ export const fetchDefaultModal = (url: string): Promise<{ data: DefaultModelResp
return get<{ data: DefaultModelResponse }>(url)
}
-export const updateDefaultModel = ({
- url,
- body,
-}: {
- url: string
- body: any
-}): Promise<CommonResponse> => {
- return post<CommonResponse>(url, { body })
-}
-
export const fetchModelParameterRules = (url: string): Promise<{ data: ModelParameterRule[] }> => {
return get<{ data: ModelParameterRule[] }>(url)
}