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(agent): initialize model in new agent snapshot (#42781)

yyh4af693ccef7f
diff --git a/api/services/agent/roster_service.py b/api/services/agent/roster_service.py
index 1f53c5861d4..2f0b4e0295a 100644
--- a/api/services/agent/roster_service.py
+++ b/api/services/agent/roster_service.py
@@ -395,10 +395,9 @@ class AgentRosterService:
Unlike :meth:`create_roster_agent`, this does not commit: the caller
(``AppService.create_app``) owns the surrounding transaction so the App
- row and its backing Agent are persisted atomically. A default (empty)
- Agent Soul is seeded; the user configures model/prompt/tools afterward in
- the Composer. Importers may provide a portable Soul and provenance while
- retaining the same one-App-to-one-Agent transaction boundary.
+ row and its backing Agent are persisted atomically. The caller supplies
+ the initial Agent Soul, or an empty one is seeded. Importers may provide
+ a portable Soul and provenance while retaining the same transaction boundary.
"""
soul = initial_soul or AgentSoulConfig()
agent = Agent(
diff --git a/api/services/app_service.py b/api/services/app_service.py
index 33a30fb2018..193f6cb05c5 100644
--- a/api/services/app_service.py
+++ b/api/services/app_service.py
@@ -37,7 +37,9 @@ from models.agent import (
WorkflowAgentBindingType,
WorkflowAgentNodeBinding,
)
+from models.agent_config_entities import AgentSoulConfig, AgentSoulModelConfig
from models.model import App, AppMode, AppModelConfig, IconType, Site, load_annotation_reply_config
+from models.provider_ids import ModelProviderID
from models.skill import AgentSkillBinding
from models.workflow import Workflow
from services.agent.errors import AgentAccessNotReadyError, AgentNameConflictError
@@ -47,6 +49,7 @@ from services.agent.workspace_service import AgentWorkspaceService
from services.billing_service import BillingService
from services.enterprise import rbac_service as enterprise_rbac_service
from services.enterprise.enterprise_service import EnterpriseService
+from services.model_provider_service import ModelProviderService
from services.openapi.visibility import apply_openapi_gate, is_openapi_visible
from services.rbac_agent_access_service import initialize_agent_rbac_access
from services.system_feature_service import SystemFeatureService
@@ -563,6 +566,22 @@ class AppService:
"""
app_mode = AppMode.value_of(params.mode)
app_template = default_app_templates[app_mode]
+ initial_agent_soul: AgentSoulConfig | None = None
+ if app_mode == AppMode.AGENT:
+ default_model = ModelProviderService().get_default_model_selection(
+ tenant_id, ModelType.LLM, session=session
+ )
+ if default_model is not None:
+ agent_provider, agent_model = default_model
+ try:
+ provider_id = ModelProviderID(agent_provider)
+ initial_agent_soul = AgentSoulConfig(
+ model=AgentSoulModelConfig(
+ plugin_id=provider_id.plugin_id, model_provider=str(provider_id), model=agent_model
+ )
+ )
+ except ValueError:
+ logger.warning("Invalid Agent default model, tenant_id: %s", tenant_id, exc_info=True)
# get model config
default_model_config = app_template.get("model_config")
@@ -673,8 +692,7 @@ class AppService:
# Agent App type is backed 1:1 by a roster Agent (linked via Agent.app_id).
# Created in the same transaction so the App and its backing Agent persist
- # atomically; the Agent Soul (model/prompt/tools) is configured afterward
- # in the Composer.
+ # atomically; the Agent Soul starts with the workspace model selection.
backing_agent: Agent | None = None
if app_mode == AppMode.AGENT:
from services.agent.roster_service import AgentRosterService
@@ -691,6 +709,7 @@ class AppService:
icon_type=icon_type,
icon=params.icon,
icon_background=params.icon_background,
+ initial_soul=initial_agent_soul,
)
except IntegrityError as exc:
session.rollback()
diff --git a/api/services/model_provider_service.py b/api/services/model_provider_service.py
index ea052a348fa..9aee8eb87a5 100644
--- a/api/services/model_provider_service.py
+++ b/api/services/model_provider_service.py
@@ -5,6 +5,7 @@ from dataclasses import dataclass, field
from typing import TYPE_CHECKING, Any
from sqlalchemy import and_, select
+from sqlalchemy.orm import Session
if TYPE_CHECKING:
from models.account import Account
@@ -72,6 +73,31 @@ class ModelProviderService:
def _get_provider_manager(tenant_id: str) -> ProviderManager:
return create_plugin_provider_manager(tenant_id=tenant_id)
+ def get_default_model_selection(
+ self, tenant_id: str, model_type: ModelType, *, session: Session
+ ) -> tuple[str, str] | None:
+ """Resolve a workspace default without creating or committing a default-model record."""
+ saved_model = session.execute(
+ select(TenantDefaultModel.provider_name, TenantDefaultModel.model_name).where(
+ TenantDefaultModel.tenant_id == tenant_id,
+ TenantDefaultModel.model_type == model_type,
+ )
+ ).one_or_none()
+ if saved_model is not None:
+ return saved_model.provider_name, saved_model.model_name
+
+ try:
+ configurations = self._get_provider_manager(tenant_id).get_configurations(tenant_id)
+ available_models = configurations.get_models(model_type=model_type, only_active=True)
+ except Exception:
+ logger.warning("Could not resolve available default model, tenant_id: %s", tenant_id, exc_info=True)
+ return None
+ if not available_models:
+ return None
+
+ first_model = available_models[0]
+ return first_model.provider.provider, first_model.model
+
def _get_provider_configuration(self, tenant_id: str, provider: str):
"""
Get provider configuration or raise exception if not found.
diff --git a/api/tests/unit_tests/services/test_app_service.py b/api/tests/unit_tests/services/test_app_service.py
index 7ab02093684..5299d75c1c4 100644
--- a/api/tests/unit_tests/services/test_app_service.py
+++ b/api/tests/unit_tests/services/test_app_service.py
@@ -17,6 +17,7 @@ from models import Account, Tenant
from models.account import TenantAccountJoin, TenantAccountRole
from models.agent import (
Agent,
+ AgentConfigSnapshot,
AgentIconType,
AgentScope,
AgentSource,
@@ -24,7 +25,9 @@ from models.agent import (
WorkflowAgentBindingType,
WorkflowAgentNodeBinding,
)
+from models.agent_config_entities import AgentSoulConfig
from models.model import App, AppMode, AppModelConfig, IconType
+from models.provider import TenantDefaultModel
from models.workflow import Workflow, WorkflowType
from services.agent.errors import AgentAccessNotReadyError, AgentNameConflictError
from services.app_service import AppListParams, AppService, CreateAppParams
@@ -116,6 +119,107 @@ def _persist_agent_app(
class TestCreateAppTransactionBoundary:
+ def test_agent_app_seeds_workspace_default_model_in_initial_snapshot(
+ self, sqlite_session: Session, config_overrides: Callable[..., None]
+ ) -> None:
+ config_overrides(DEPLOYMENT_EDITION=DeploymentEdition.COMMUNITY)
+ account = _persist_account(sqlite_session)
+ tenant_id = account.current_tenant_id or ""
+ sqlite_session.add(
+ TenantDefaultModel(
+ tenant_id=tenant_id,
+ model_type=ModelType.LLM,
+ provider_name="langgenius/openai/openai",
+ model_name="gpt-4o",
+ )
+ )
+ sqlite_session.commit()
+
+ with (
+ patch("services.app_service.app_was_created.send"),
+ patch("services.app_service.enterprise_rbac_service.try_sync_creator_access_policy_member_bindings"),
+ patch("services.app_service.SystemFeatureService.is_webapp_auth_enabled", return_value=False),
+ ):
+ app = AppService().create_app(
+ tenant_id,
+ CreateAppParams(name="Agent with default model", mode=AppMode.AGENT.value),
+ account,
+ session=sqlite_session,
+ )
+
+ agent = sqlite_session.scalar(select(Agent).where(Agent.app_id == app.id))
+ assert agent is not None
+ snapshot = sqlite_session.get(AgentConfigSnapshot, agent.active_config_snapshot_id)
+ assert snapshot is not None
+ model = AgentSoulConfig.model_validate(snapshot.config_snapshot_dict).model
+ assert model is not None
+ assert model.plugin_id == "langgenius/openai"
+ assert model.model_provider == "langgenius/openai/openai"
+ assert model.model == "gpt-4o"
+ assert agent.active_config_has_model is True
+
+ def test_agent_app_without_available_default_keeps_initial_model_empty(
+ self, sqlite_session: Session, config_overrides: Callable[..., None]
+ ) -> None:
+ config_overrides(DEPLOYMENT_EDITION=DeploymentEdition.COMMUNITY)
+ account = _persist_account(sqlite_session)
+ tenant_id = account.current_tenant_id or ""
+
+ with (
+ patch("services.app_service.ModelProviderService.get_default_model_selection", return_value=None),
+ patch("services.app_service.app_was_created.send"),
+ patch("services.app_service.enterprise_rbac_service.try_sync_creator_access_policy_member_bindings"),
+ patch("services.app_service.SystemFeatureService.is_webapp_auth_enabled", return_value=False),
+ ):
+ app = AppService().create_app(
+ tenant_id,
+ CreateAppParams(name="Agent without default model", mode=AppMode.AGENT.value),
+ account,
+ session=sqlite_session,
+ )
+
+ agent = sqlite_session.scalar(select(Agent).where(Agent.app_id == app.id))
+ assert agent is not None
+ snapshot = sqlite_session.get(AgentConfigSnapshot, agent.active_config_snapshot_id)
+ assert snapshot is not None
+ assert AgentSoulConfig.model_validate(snapshot.config_snapshot_dict).model is None
+ assert agent.active_config_has_model is False
+
+ def test_agent_app_with_invalid_default_provider_still_creates_empty_snapshot(
+ self, sqlite_session: Session, config_overrides: Callable[..., None]
+ ) -> None:
+ config_overrides(DEPLOYMENT_EDITION=DeploymentEdition.COMMUNITY)
+ account = _persist_account(sqlite_session)
+ tenant_id = account.current_tenant_id or ""
+ sqlite_session.add(
+ TenantDefaultModel(
+ tenant_id=tenant_id,
+ model_type=ModelType.LLM,
+ provider_name="invalid/provider",
+ model_name="gpt-4o",
+ )
+ )
+ sqlite_session.commit()
+
+ with (
+ patch("services.app_service.app_was_created.send"),
+ patch("services.app_service.enterprise_rbac_service.try_sync_creator_access_policy_member_bindings"),
+ patch("services.app_service.SystemFeatureService.is_webapp_auth_enabled", return_value=False),
+ ):
+ app = AppService().create_app(
+ tenant_id,
+ CreateAppParams(name="Agent with invalid default", mode=AppMode.AGENT.value),
+ account,
+ session=sqlite_session,
+ )
+
+ agent = sqlite_session.scalar(select(Agent).where(Agent.app_id == app.id))
+ assert agent is not None
+ snapshot = sqlite_session.get(AgentConfigSnapshot, agent.active_config_snapshot_id)
+ assert snapshot is not None
+ assert AgentSoulConfig.model_validate(snapshot.config_snapshot_dict).model is None
+ assert agent.active_config_has_model is False
+
def test_commits_database_state_before_external_side_effects(
self, sqlite_session: Session, config_overrides: Callable[..., None]
) -> None:
diff --git a/api/tests/unit_tests/services/test_model_provider_service.py b/api/tests/unit_tests/services/test_model_provider_service.py
index fd2137de20a..ce2dd7c1bcb 100644
--- a/api/tests/unit_tests/services/test_model_provider_service.py
+++ b/api/tests/unit_tests/services/test_model_provider_service.py
@@ -969,6 +969,57 @@ class TestModelProviderServiceListingsAndDefaults:
else:
provider_configuration.get_model_schema.assert_not_called()
+ def test_get_default_model_selection_uses_saved_workspace_choice(self, sqlite_session: Session) -> None:
+ sqlite_session.add(
+ TenantDefaultModel(
+ tenant_id="tenant-1",
+ model_type=ModelType.LLM,
+ provider_name="langgenius/openai/openai",
+ model_name="gpt-4o",
+ )
+ )
+ sqlite_session.commit()
+ service, manager = _create_service_with_mocked_manager()
+
+ result = service.get_default_model_selection("tenant-1", ModelType.LLM, session=sqlite_session)
+
+ assert result == ("langgenius/openai/openai", "gpt-4o")
+ manager.get_configurations.assert_not_called()
+
+ def test_get_default_model_selection_uses_first_active_model_without_writing(self, sqlite_session: Session) -> None:
+ service, manager = _create_service_with_mocked_manager()
+ configurations = manager.get_configurations.return_value
+ configurations.get_models.return_value = [
+ SimpleNamespace(model="gpt-4o", provider=SimpleNamespace(provider="langgenius/openai/openai"))
+ ]
+
+ result = service.get_default_model_selection("tenant-1", ModelType.LLM, session=sqlite_session)
+
+ assert result == ("langgenius/openai/openai", "gpt-4o")
+ configurations.get_models.assert_called_once_with(model_type=ModelType.LLM, only_active=True)
+ assert sqlite_session.query(TenantDefaultModel).filter_by(tenant_id="tenant-1").first() is None
+
+ def test_get_default_model_selection_returns_none_when_provider_discovery_fails(
+ self, sqlite_session: Session
+ ) -> None:
+ service, manager = _create_service_with_mocked_manager()
+ manager.get_configurations.side_effect = RuntimeError("provider unavailable")
+
+ result = service.get_default_model_selection("tenant-1", ModelType.LLM, session=sqlite_session)
+
+ assert result is None
+
+ def test_get_default_model_selection_returns_none_when_no_active_models(self, sqlite_session: Session) -> None:
+ service, manager = _create_service_with_mocked_manager()
+ manager.get_configurations.return_value.get_models.return_value = []
+
+ result = service.get_default_model_selection("tenant-1", ModelType.LLM, session=sqlite_session)
+
+ assert result is None
+ manager.get_configurations.return_value.get_models.assert_called_once_with(
+ model_type=ModelType.LLM, only_active=True
+ )
+
def test_get_default_model_of_model_type_should_return_response_when_manager_returns_model(self) -> None:
service, manager = _create_service_with_mocked_manager()
manager.get_default_model.return_value = SimpleNamespace(
diff --git a/e2e/features/agent-v2/configure-persistence.feature b/e2e/features/agent-v2/configure-persistence.feature
index cfb556a3108..ca17f8ee67c 100644
--- a/e2e/features/agent-v2/configure-persistence.feature
+++ b/e2e/features/agent-v2/configure-persistence.feature
@@ -1,5 +1,12 @@
@agent-v2 @authenticated @core
Feature: Agent v2 configure persistence
+ @prepared @configure-persistence
+ Scenario: A new Agent shows the workspace default model in Configure
+ Given I am signed in as the default E2E admin
+ And an Agent v2 test agent has been created via API
+ When I open the Agent v2 configure page
+ Then I should see the workspace default chat model in the Agent v2 model selector
+
@prepared @configure-persistence @agent-decision-model
Scenario: Selecting a compatible model in Configure persists after refresh
Given I am signed in as the default E2E admin
@@ -7,14 +14,10 @@ Feature: Agent v2 configure persistence
And an Agent v2 test agent has been created via API
When I open the Agent v2 configure page
And I select the agent-decision E2E model in the Agent v2 model selector
- And I fill the Agent v2 prompt editor with the normal E2E prompt
- Then the Agent v2 configuration should be saved automatically
- And the Agent v2 draft should use the agent-decision E2E model
- And the normal Agent v2 draft should use the normal E2E prompt
+ Then I should see the agent-decision E2E model in the Agent v2 model selector
+ And the Agent v2 configuration should be saved automatically
When I refresh the current page
Then I should see the agent-decision E2E model in the Agent v2 model selector
- And I should see the normal E2E prompt in the Agent v2 prompt editor
- And the Agent v2 draft should use the agent-decision E2E model
@prepared @configure-persistence @stable-model
Scenario: Persisted Agent v2 instructions remain visible after refresh
diff --git a/e2e/features/step-definitions/agent-v2/configure.steps.ts b/e2e/features/step-definitions/agent-v2/configure.steps.ts
index afb4dcbcd80..bce268be4f0 100644
--- a/e2e/features/step-definitions/agent-v2/configure.steps.ts
+++ b/e2e/features/step-definitions/agent-v2/configure.steps.ts
@@ -29,6 +29,12 @@ const concurrentAgentPrompts = [concurrentFirstAgentPrompt, concurrentSecondAgen
const getPromptEditor = (page: Page) =>
page.getByRole('region', { name: 'Prompt' }).getByRole('textbox', { name: 'Prompt' })
+const getAgentModelSelector = (page: Page) =>
+ page
+ .getByRole('region', { name: 'Configure' })
+ .getByRole('group', { name: 'Model' })
+ .getByRole('button', { name: /^(?!Model Settings$).+/ })
+
async function fillAgentPromptEditor(page: Page, prompt: string) {
const promptSection = page.getByRole('region', { name: 'Prompt' })
@@ -37,7 +43,7 @@ async function fillAgentPromptEditor(page: Page, prompt: string) {
}
async function selectAgentModel(page: Page, modelName: string) {
- await page.getByRole('button', { name: 'Configure model' }).click()
+ await getAgentModelSelector(page).click()
await page.getByPlaceholder('Search model').fill(modelName)
const escapedModelName = modelName.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
await page.getByRole('button', { name: new RegExp(`${escapedModelName}(?:\\s|$)`) }).click()
@@ -290,6 +296,20 @@ Then(
},
)
+Then(
+ 'I should see the workspace default chat model in the Agent v2 model selector',
+ async function (this: DifyWorld) {
+ const response = await this.getConsoleClient().workspaces.current.defaultModel.get({
+ query: { model_type: 'llm' },
+ })
+ if (!response.data) throw new Error('The workspace default chat model is not configured.')
+
+ await expect(getAgentModelSelector(this.getPage())).toContainText(response.data.model, {
+ timeout: 30_000,
+ })
+ },
+)
+
Then(
'I should see the stable E2E model in the Agent v2 model selector',
async function (this: DifyWorld) {
@@ -297,7 +317,7 @@ Then(
if (!stableModel)
throw new Error('Stable chat model fixture setup must run before asserting the Agent model.')
- await expect(this.getPage().getByText(stableModel.name, { exact: true })).toBeVisible({
+ await expect(getAgentModelSelector(this.getPage())).toContainText(stableModel.name, {
timeout: 30_000,
})
},
@@ -312,7 +332,7 @@ Then(
'Agent-decision chat model fixture setup must run before asserting the Agent model.',
)
- await expect(this.getPage().getByText(model.name, { exact: true })).toBeVisible({
+ await expect(getAgentModelSelector(this.getPage())).toContainText(model.name, {
timeout: 30_000,
})
},
diff --git a/web/features/agent-v2/agent-composer/provider.tsx b/web/features/agent-v2/agent-composer/provider.tsx
index 54812b73307..2822ee37260 100644
--- a/web/features/agent-v2/agent-composer/provider.tsx
+++ b/web/features/agent-v2/agent-composer/provider.tsx
@@ -9,11 +9,9 @@ import { agentComposerDraftAtom, agentComposerSavedDraftAtom } from './store'
export function AgentComposerProvider({
children,
initialDraft,
- initialSavedDraft = initialDraft,
}: {
children: ReactNode
initialDraft?: AgentSoulConfigFormState
- initialSavedDraft?: AgentSoulConfigFormState
}) {
const draft = initialDraft ?? defaultAgentSoulConfigFormState
@@ -21,7 +19,7 @@ export function AgentComposerProvider({
<ScopeProvider
atoms={[
[agentComposerDraftAtom, draft],
- [agentComposerSavedDraftAtom, initialSavedDraft ?? draft],
+ [agentComposerSavedDraftAtom, draft],
]}
name="AgentComposer"
>
diff --git a/web/features/agent-v2/agent-detail/configure/__tests__/page.spec.tsx b/web/features/agent-v2/agent-detail/configure/__tests__/page.spec.tsx
index 1365fe704cf..c6597e09d95 100644
--- a/web/features/agent-v2/agent-detail/configure/__tests__/page.spec.tsx
+++ b/web/features/agent-v2/agent-detail/configure/__tests__/page.spec.tsx
@@ -150,9 +150,6 @@ vi.mock('@tanstack/react-query', async (importOriginal) => {
useQuery: vi.fn((options: { queryKey?: readonly string[] }) => {
const queryKey = options.queryKey?.[0]
- if (queryKey === 'default-model') {
- return { data: { data: modelHooksState.defaultTextGenerationModel }, isPending: false }
- }
if (queryKey === 'agent') return mocks.queryState.agent
if (queryKey === 'composer') return mocks.queryState.composer
if (queryKey === 'version') return mocks.queryState.version
@@ -215,13 +212,6 @@ vi.mock('@/service/console', () => ({
queryOptions: () => ({ queryKey: ['system-features'] }),
},
},
- workspaces: {
- current: {
- defaultModel: {
- get: { queryOptions: () => ({ queryKey: ['default-model'] }) },
- },
- },
- },
agent: {
get: {
key: () => ['agents'],
@@ -327,7 +317,6 @@ vi.mock('../components/orchestrate', async () => {
return {
AgentOrchestratePanel: (props: {
bottomAction?: ReactNode
- currentModel?: { model: string }
isBuildDraftActive?: boolean
onExitVersions?: () => void
onOpenVersions?: () => void
@@ -344,7 +333,6 @@ vi.mock('../components/orchestrate', async () => {
<span>{`readonly:${props.readOnly ? 'yes' : 'no'}`}</span>
<span>{`publish:${props.showPublishBar ? 'yes' : 'no'}`}</span>
<span>{`prompt:${prompt}`}</span>
- <span>{`model:${props.currentModel?.model ?? 'none'}`}</span>
<button type="button" onClick={() => setPrompt('edited draft prompt')}>
edit prompt
</button>
@@ -2352,62 +2340,7 @@ describe('AgentConfigurePage', () => {
expect(screen.getByRole('button', { name: 'discard build draft' })).toBeDisabled()
})
- it('should save the workspace default model before starting a build', async () => {
- const queryClient = createQueryClient()
- mocks.queryState.composer = {
- data: {
- agent_soul: {
- prompt: {
- system_prompt: 'draft prompt',
- },
- },
- },
- isFetching: false,
- isError: false,
- isPending: false,
- isSuccess: true,
- refetch: vi.fn(),
- }
- mocks.queryState.buildDraft = {
- data: undefined as unknown,
- dataUpdatedAt: 0,
- error: new Response(null, { status: 404 }),
- isFetching: false,
- isError: true,
- isPending: false,
- isSuccess: false,
- refetch: vi.fn(),
- }
-
- render(
- <QueryClientProvider client={queryClient}>
- <AgentConfigurePage agentId="agent-1" />
- </QueryClientProvider>,
- )
-
- fireEvent.click(screen.getByRole('button', { name: 'send build message' }))
-
- await waitFor(() => {
- expect(mocks.checkoutBuildDraft).toHaveBeenCalled()
- })
- expect(mocks.saveComposerDraft).toHaveBeenCalledWith(
- expect.objectContaining({
- body: expect.objectContaining({
- agent_soul: expect.objectContaining({
- model: expect.objectContaining({
- model_provider: 'langgenius/openai/openai',
- model: 'gpt-4o-mini',
- }),
- }),
- }),
- }),
- expect.anything(),
- )
- expectFirstMockCallBefore(mocks.saveComposerDraft, mocks.checkoutBuildDraft)
- })
-
- it('should require a model when neither the draft nor the workspace has one', async () => {
- modelHooksState.defaultTextGenerationModel = undefined
+ it('should require an explicit model even when the workspace has a default', async () => {
const queryClient = createQueryClient()
mocks.queryState.composer = {
data: {
@@ -3447,9 +3380,6 @@ describe('AgentConfigurePage', () => {
</QueryClientProvider>,
)
- expect(screen.getByRole('region', { name: 'orchestrate-panel' })).toHaveTextContent(
- 'model:none',
- )
await user.click(screen.getByRole('button', { name: 'discard build draft' }))
await waitFor(() =>
@@ -3471,11 +3401,6 @@ describe('AgentConfigurePage', () => {
expect.any(Object),
)
expect(screen.getByRole('region', { name: 'build-chat' })).toHaveTextContent('build:none')
- await waitFor(() => {
- expect(screen.getByRole('region', { name: 'orchestrate-panel' })).toHaveTextContent(
- 'model:gpt-4o-mini',
- )
- })
})
it('should keep exiting build draft when debug conversation refresh fails after discarding build draft', async () => {
diff --git a/web/features/agent-v2/agent-detail/configure/__tests__/use-agent-configure-sync.spec.tsx b/web/features/agent-v2/agent-detail/configure/__tests__/use-agent-configure-sync.spec.tsx
index c8cfdf01181..e9c22835a37 100644
--- a/web/features/agent-v2/agent-detail/configure/__tests__/use-agent-configure-sync.spec.tsx
+++ b/web/features/agent-v2/agent-detail/configure/__tests__/use-agent-configure-sync.spec.tsx
@@ -13,7 +13,6 @@ import { defaultAgentSoulConfigFormState } from '@/features/agent-v2/agent-compo
import {
agentComposerDraftAtom,
agentComposerSavedDraftAtom,
- isAgentComposerDirtyAtom,
} from '@/features/agent-v2/agent-composer/store'
import { agentComposerFilesAtom } from '@/features/agent-v2/agent-composer/store-modules/files'
import { agentComposerPromptAtom } from '@/features/agent-v2/agent-composer/store-modules/prompt'
@@ -241,7 +240,6 @@ function renderUseAgentConfigureSync({
agentName = 'Agent',
baseConfig,
currentModel,
- savedDraft,
enabled = true,
publishEnabled,
suspend = false,
@@ -249,7 +247,6 @@ function renderUseAgentConfigureSync({
agentName?: Parameters<typeof useAgentConfigureSync>[0]['agentName']
baseConfig?: Parameters<typeof useAgentConfigureSync>[0]['baseConfig']
currentModel?: AgentSoulConfigFormState['model']
- savedDraft?: AgentSoulConfigFormState
enabled?: boolean
publishEnabled?: boolean
suspend?: boolean
@@ -269,7 +266,7 @@ function renderUseAgentConfigureSync({
? { ...defaultAgentSoulConfigFormState, model: currentModel }
: defaultAgentSoulConfigFormState
store.set(agentComposerDraftAtom, initialDraft)
- store.set(agentComposerSavedDraftAtom, savedDraft ?? initialDraft)
+ store.set(agentComposerSavedDraftAtom, initialDraft)
const pendingRender = new Promise<void>(() => {})
const wrapper = ({ children }: PropsWithChildren) => (
<QueryClientProvider client={queryClient}>
@@ -502,105 +499,6 @@ describe('useAgentConfigureSync', () => {
)
})
- it('autosaves an initialized default model without another edit', async () => {
- const { store } = renderUseAgentConfigureSync({
- currentModel: configuredModel,
- savedDraft: defaultAgentSoulConfigFormState,
- })
-
- await act(async () => {
- await vi.advanceTimersByTimeAsync(5000)
- })
-
- expect(composerPutMutationFn).toHaveBeenCalledExactlyOnceWith(
- expect.objectContaining({
- body: expect.objectContaining({
- agent_soul: expect.objectContaining({
- model: expect.objectContaining({
- model_provider: configuredModel.provider,
- model: configuredModel.model,
- }),
- }),
- }),
- }),
- )
- expect(store.get(isAgentComposerDirtyAtom)).toBe(false)
- })
-
- it('serializes a newly selected model after an in-flight default model save', async () => {
- const savingDefault = createDeferredPromise<{ agent_soul: Record<string, unknown> }>()
- composerPutMutationFn.mockReturnValueOnce(savingDefault.promise)
- const { store } = renderUseAgentConfigureSync({
- currentModel: configuredModel,
- savedDraft: defaultAgentSoulConfigFormState,
- })
- await act(async () => {
- await vi.advanceTimersByTimeAsync(5000)
- })
- expect(composerPutMutationFn).toHaveBeenCalledTimes(1)
-
- const selectedModel = { ...configuredModel, model: 'gpt-4o' }
- act(() => {
- store.set(agentComposerDraftAtom, {
- ...store.get(agentComposerDraftAtom),
- model: selectedModel,
- })
- })
- await act(async () => {
- await vi.advanceTimersByTimeAsync(5000)
- })
- expect(composerPutMutationFn).toHaveBeenCalledTimes(1)
-
- const savingSelection = createDeferredPromise<{ agent_soul: Record<string, unknown> }>()
- composerPutMutationFn.mockReturnValueOnce(savingSelection.promise)
- await act(async () => {
- savingDefault.resolve({ agent_soul: {} })
- })
-
- expect(store.get(agentComposerDraftAtom).model).toEqual(selectedModel)
- expect(store.get(isAgentComposerDirtyAtom)).toBe(true)
- expect(composerPutMutationFn).toHaveBeenNthCalledWith(
- 2,
- expect.objectContaining({
- body: expect.objectContaining({
- agent_soul: expect.objectContaining({
- model: expect.objectContaining({ model: selectedModel.model }),
- }),
- }),
- }),
- )
-
- await act(async () => {
- savingSelection.resolve({ agent_soul: {} })
- })
- expect(store.get(agentComposerDraftAtom).model).toEqual(selectedModel)
- expect(store.get(isAgentComposerDirtyAtom)).toBe(false)
- })
-
- it('autosaves an existing dirty model when saving becomes enabled', async () => {
- const { rerender } = renderUseAgentConfigureSync({
- currentModel: configuredModel,
- savedDraft: defaultAgentSoulConfigFormState,
- enabled: false,
- })
- await act(async () => {
- await vi.advanceTimersByTimeAsync(5000)
- })
- expect(composerPutMutationFn).not.toHaveBeenCalled()
-
- rerender({
- agentName: 'Agent',
- baseConfig: undefined,
- currentModel: configuredModel,
- enabled: true,
- suspend: false,
- })
- await act(async () => {
- await vi.advanceTimersByTimeAsync(5000)
- })
- expect(composerPutMutationFn).toHaveBeenCalledTimes(1)
- })
-
it('should cancel pending autosave when the draft returns to the saved baseline', async () => {
const { queryClient, store } = renderUseAgentConfigureSync()
queryClient.setQueryData(['agent-detail', 'agent-1'], {
diff --git a/web/features/agent-v2/agent-detail/configure/components/__tests__/composer-provider.spec.tsx b/web/features/agent-v2/agent-detail/configure/components/__tests__/composer-provider.spec.tsx
deleted file mode 100644
index ba376559752..00000000000
--- a/web/features/agent-v2/agent-detail/configure/components/__tests__/composer-provider.spec.tsx
+++ /dev/null
@@ -1,170 +0,0 @@
-import type { AgentSoulConfig } from '@dify/contracts/api/console/agent/types.gen'
-import type {
- DefaultModelDataResponse,
- SimpleProviderEntityResponse,
-} from '@dify/contracts/api/console/workspaces/types.gen'
-import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
-import { act, render, screen } from '@testing-library/react'
-import userEvent from '@testing-library/user-event'
-import { useAtom, useAtomValue } from 'jotai'
-import { beforeEach, describe, expect, it, vi } from 'vite-plus/test'
-import {
- agentComposerSavedDraftAtom,
- isAgentComposerDirtyAtom,
-} from '@/features/agent-v2/agent-composer/store'
-import { agentComposerModelAtom } from '@/features/agent-v2/agent-composer/store-modules/model'
-import { AgentConfigureComposerProvider } from '../composer-provider'
-
-const mocks = vi.hoisted(() => ({
- getDefaultModel: vi.fn<() => Promise<DefaultModelDataResponse>>(),
-}))
-
-vi.mock('@/service/console', () => ({
- consoleQuery: {
- workspaces: {
- current: {
- defaultModel: {
- get: {
- queryOptions: ({ enabled }: { enabled: boolean }) => ({
- queryKey: ['default-model'],
- queryFn: mocks.getDefaultModel,
- enabled,
- }),
- },
- },
- },
- },
- },
-}))
-
-function ModelEditor() {
- const [model, setModel] = useAtom(agentComposerModelAtom)
- const savedDraft = useAtomValue(agentComposerSavedDraftAtom)
- const isDirty = useAtomValue(isAgentComposerDirtyAtom)
-
- return (
- <div>
- <label>
- Model
- <input
- value={model?.model ?? ''}
- onChange={(event) =>
- setModel({ provider: 'langgenius/openai/openai', model: event.target.value })
- }
- />
- </label>
- <output aria-label="Saved model">{savedDraft?.model?.model ?? 'None'}</output>
- <output aria-label="Unsaved changes">{String(isDirty)}</output>
- </div>
- )
-}
-
-function renderComposer(initialConfig: AgentSoulConfig = {}, initializeDefaultModel = true) {
- const queryClient = new QueryClient({ defaultOptions: { queries: { retry: false } } })
- render(
- <QueryClientProvider client={queryClient}>
- <AgentConfigureComposerProvider
- initialConfig={initialConfig}
- initializeDefaultModel={initializeDefaultModel}
- >
- <ModelEditor />
- </AgentConfigureComposerProvider>
- </QueryClientProvider>,
- )
- return queryClient
-}
-
-const provider: SimpleProviderEntityResponse = {
- provider: 'langgenius/openai/openai',
- label: { en_US: 'OpenAI', zh_Hans: 'OpenAI' },
- supported_model_types: ['llm'],
- tenant_id: 'workspace-1',
-}
-
-const defaultModel: DefaultModelDataResponse = {
- data: { model: 'gpt-4o-mini', model_type: 'llm', provider },
-}
-
-describe('Agent configure default model initialization', () => {
- beforeEach(() => {
- vi.clearAllMocks()
- mocks.getDefaultModel.mockResolvedValue(defaultModel)
- })
-
- it('waits for the default before exposing an editable draft and preserves the unsaved baseline', async () => {
- let resolve!: (value: DefaultModelDataResponse) => void
- mocks.getDefaultModel.mockReturnValue(
- new Promise((promiseResolve) => {
- resolve = promiseResolve
- }),
- )
- renderComposer()
-
- expect(screen.queryByRole('textbox', { name: 'Model' })).not.toBeInTheDocument()
-
- await act(async () => resolve(defaultModel))
-
- expect(await screen.findByRole('textbox', { name: 'Model' })).toHaveValue('gpt-4o-mini')
- expect(screen.getByLabelText('Saved model')).toHaveTextContent('None')
- expect(screen.getByLabelText('Unsaved changes')).toHaveTextContent('true')
- })
-
- it('preserves an explicitly configured model without fetching the default', () => {
- renderComposer({
- model: {
- model: 'configured-model',
- model_provider: 'openai',
- plugin_id: 'langgenius/openai',
- },
- })
-
- expect(screen.getByRole('textbox', { name: 'Model' })).toHaveValue('configured-model')
- expect(screen.getByLabelText('Saved model')).toHaveTextContent('configured-model')
- expect(screen.getByLabelText('Unsaved changes')).toHaveTextContent('false')
- expect(mocks.getDefaultModel).not.toHaveBeenCalled()
- })
-
- it('leaves model-less configurations unchanged when initialization is disabled', () => {
- renderComposer({}, false)
-
- expect(screen.getByRole('textbox', { name: 'Model' })).toHaveValue('')
- expect(screen.getByLabelText('Unsaved changes')).toHaveTextContent('false')
- expect(mocks.getDefaultModel).not.toHaveBeenCalled()
- })
-
- it.each(['missing', 'error'] as const)(
- 'allows manual selection when the default is %s',
- async (result) => {
- const user = userEvent.setup()
- if (result === 'missing') mocks.getDefaultModel.mockResolvedValue({ data: null })
- else mocks.getDefaultModel.mockRejectedValue(new Error('Default model unavailable'))
- renderComposer()
-
- const input = await screen.findByRole('textbox', { name: 'Model' })
- expect(input).toHaveValue('')
- await user.type(input, 'manual-model')
-
- expect(input).toHaveValue('manual-model')
- expect(screen.getByLabelText('Unsaved changes')).toHaveTextContent('true')
- },
- )
-
- it('preserves the user selection when another consumer refreshes the default model', async () => {
- const user = userEvent.setup()
- const queryClient = renderComposer()
- const input = await screen.findByRole('textbox', { name: 'Model' })
- await user.clear(input)
- await user.type(input, 'manual-model')
-
- mocks.getDefaultModel.mockResolvedValue({
- data: { model: 'new-default', model_type: 'llm', provider },
- })
- await act(async () => {
- await queryClient.query({ queryKey: ['default-model'], queryFn: mocks.getDefaultModel })
- })
-
- expect(input).toHaveValue('manual-model')
- expect(screen.getByLabelText('Saved model')).toHaveTextContent('None')
- expect(screen.getByLabelText('Unsaved changes')).toHaveTextContent('true')
- })
-})
diff --git a/web/features/agent-v2/agent-detail/configure/components/composer-provider.tsx b/web/features/agent-v2/agent-detail/configure/components/composer-provider.tsx
deleted file mode 100644
index 06cac7f6c92..00000000000
--- a/web/features/agent-v2/agent-detail/configure/components/composer-provider.tsx
+++ /dev/null
@@ -1,65 +0,0 @@
-'use client'
-
-import type { AgentSoulConfig } from '@dify/contracts/api/console/agent/types.gen'
-import type { ReactNode } from 'react'
-import type { AgentSoulConfigFormState } from '@/features/agent-v2/agent-composer/form-state'
-import { useQuery } from '@tanstack/react-query'
-import { useState } from 'react'
-import { useTranslation } from 'react-i18next'
-import { agentSoulConfigToFormState } from '@/features/agent-v2/agent-composer/conversions'
-import { AgentComposerProvider } from '@/features/agent-v2/agent-composer/provider'
-import { consoleQuery } from '@/service/console'
-import { AgentConfigurePageLoading } from './page-loading'
-
-export function AgentConfigureComposerProvider({
- children,
- initialConfig,
- initializeDefaultModel,
-}: {
- children: ReactNode
- initialConfig?: AgentSoulConfig
- initializeDefaultModel: boolean
-}) {
- const { t } = useTranslation(['agentV2'])
- const [session, setSession] = useState<{
- draft: AgentSoulConfigFormState
- savedDraft: AgentSoulConfigFormState
- }>()
- const savedDraft = agentSoulConfigToFormState(initialConfig)
- const needsDefaultModel = initializeDefaultModel && !savedDraft.model
- const defaultModelQuery = useQuery(
- consoleQuery.workspaces.current.defaultModel.get.queryOptions({
- input: { query: { model_type: 'llm' } },
- enabled: !session && needsDefaultModel,
- }),
- )
-
- if (!session) {
- if (needsDefaultModel && defaultModelQuery.isPending) {
- return <AgentConfigurePageLoading label={t(($) => $['agentDetail.sections.configure'])} />
- }
-
- const defaultModel = defaultModelQuery.data?.data
- // Capture defaults once for this keyed form session. Later query responses must not reset edits.
- setSession({
- savedDraft,
- draft:
- needsDefaultModel && defaultModel
- ? {
- ...savedDraft,
- model: {
- provider: defaultModel.provider.provider,
- model: defaultModel.model,
- },
- }
- : savedDraft,
- })
- return null
- }
-
- return (
- <AgentComposerProvider initialDraft={session.draft} initialSavedDraft={session.savedDraft}>
- {children}
- </AgentComposerProvider>
- )
-}
diff --git a/web/features/agent-v2/agent-detail/configure/components/composer-session.tsx b/web/features/agent-v2/agent-detail/configure/components/composer-session.tsx
index 98a8506aff1..3d86b600afd 100644
--- a/web/features/agent-v2/agent-detail/configure/components/composer-session.tsx
+++ b/web/features/agent-v2/agent-detail/configure/components/composer-session.tsx
@@ -16,6 +16,7 @@ import { useTranslation } from 'react-i18next'
import { LoadingPlaceholder } from '@/app/components/base/loading-placeholder'
import { toast } from '@/app/notifications'
import { agentSoulConfigToFormState } from '@/features/agent-v2/agent-composer/conversions'
+import { AgentComposerProvider } from '@/features/agent-v2/agent-composer/provider'
import { rebaseAgentComposerDraftAtom } from '@/features/agent-v2/agent-composer/store'
import { agentComposerModelAtom } from '@/features/agent-v2/agent-composer/store-modules/model'
import {
@@ -38,7 +39,6 @@ import {
} from '../use-agent-configure-build-draft'
import { useAgentConfigureSessionController } from '../use-agent-configure-session-controller'
import { useAgentConfigureSync } from '../use-agent-configure-sync'
-import { AgentConfigureComposerProvider } from './composer-provider'
import { AgentConfigureClearSessionConfirmDialog } from './confirm-clear-session-dialog'
import { AgentOrchestratePanel } from './orchestrate'
import { AgentBuildDraftBar } from './orchestrate/build-draft-bar'
@@ -225,15 +225,9 @@ function AgentConfigurePageComposerSession({
]}
name="AgentConfigureConversation"
>
- <AgentConfigureComposerProvider
+ <AgentComposerProvider
key={composerSessionKey}
- initialConfig={buildDraft.agentSoulConfig}
- initializeDefaultModel={
- configureData.capabilities.canEdit &&
- configureData.composerQuery.isSuccess &&
- !isViewingVersion &&
- !buildDraft.isActive
- }
+ initialDraft={agentSoulConfigToFormState(buildDraft.agentSoulConfig)}
>
<AgentConfigurePageComposerContent
agentId={agentId}
@@ -253,7 +247,7 @@ function AgentConfigurePageComposerSession({
onRefreshPreviewConversation={refreshPreviewConversation}
onSelectVersion={onSelectVersion}
/>
- </AgentConfigureComposerProvider>
+ </AgentComposerProvider>
</ScopeProvider>
)
}
@@ -355,7 +349,7 @@ function AgentConfigurePageComposerContent({
},
[rebaseComposerDraft],
)
- const [currentModel, setCurrentModel] = useAtom(agentComposerModelAtom)
+ const [currentModel, setConfigureModel] = useAtom(agentComposerModelAtom)
const { isPublishing, publishDraft, saveDraft } = useAgentConfigureSync({
agentId,
agentName: agentQuery.data?.name,
@@ -517,7 +511,7 @@ function AgentConfigurePageComposerContent({
/>
) : undefined
}
- onSelectModel={setCurrentModel}
+ onSelectModel={setConfigureModel}
onPublish={publishDraft}
onOpenVersions={() => {
workingDirectoryPanel.closeWorkingDirectory()
diff --git a/web/features/agent-v2/agent-detail/configure/components/orchestrate/model-config/__tests__/field.spec.tsx b/web/features/agent-v2/agent-detail/configure/components/orchestrate/model-config/__tests__/field.spec.tsx
index ea14afe9321..8f604fc036d 100644
--- a/web/features/agent-v2/agent-detail/configure/components/orchestrate/model-config/__tests__/field.spec.tsx
+++ b/web/features/agent-v2/agent-detail/configure/components/orchestrate/model-config/__tests__/field.spec.tsx
@@ -3,15 +3,9 @@ import type { AgentComposerModel } from '@/features/agent-v2/agent-composer/form
import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
import { act, render, screen, waitFor } from '@testing-library/react'
import userEvent from '@testing-library/user-event'
-import {
- ConfigurationMethodEnum,
- ModelStatusEnum,
- ModelTypeEnum,
-} from '@/app/components/header/account-setting/model-provider-page/declarations'
import { AgentModelField } from '../field'
const providerSummary = vi.hoisted(() => vi.fn())
-const credentialPanelState = vi.hoisted(() => vi.fn())
const modelList = vi.hoisted(() => vi.fn<() => Promise<{ data: ProviderWithModelsResponse[] }>>())
@@ -27,7 +21,7 @@ vi.mock('@/service/use-common', () => ({
vi.mock(
'@/app/components/header/account-setting/model-provider-page/provider-added-card/use-credential-panel-state',
() => ({
- useCredentialPanelState: credentialPanelState,
+ useCredentialPanelState: () => ({ variant: 'api-unavailable', hasCredentials: false }),
}),
)
@@ -81,7 +75,6 @@ describe('AgentModelField', () => {
beforeEach(() => {
vi.clearAllMocks()
providerSummary.mockResolvedValue({ data: [] })
- credentialPanelState.mockReturnValue({ variant: 'api-unavailable', hasCredentials: false })
})
it('disables model controls until the catalog loads without selecting a model', async () => {
@@ -94,6 +87,20 @@ describe('AgentModelField', () => {
)
const { onSelect } = renderField()
+ const modelGroup = screen.getByRole('group', {
+ name: 'agentV2.agentDetail.configure.model.label',
+ })
+ expect(modelGroup.tagName).toBe('FIELDSET')
+ expect(modelGroup).toHaveAttribute(
+ 'aria-labelledby',
+ screen.getByText('agentV2.agentDetail.configure.model.label').id,
+ )
+ expect(modelGroup).toContainElement(
+ screen.getByRole('button', { name: 'plugin.detailPanel.configureModel' }),
+ )
+ expect(modelGroup).toContainElement(
+ screen.getByRole('button', { name: 'common.modelProvider.modelSettings' }),
+ )
expect(screen.getByRole('button', { name: 'plugin.detailPanel.configureModel' })).toBeDisabled()
expect(
screen.getByRole('button', { name: 'common.modelProvider.modelSettings' }),
@@ -131,6 +138,12 @@ describe('AgentModelField', () => {
const { onSelect } = renderField({ provider: 'openai', model: 'gpt-4' })
const trigger = screen.getByRole('button', { name: 'gpt-4' })
const settings = screen.getByRole('button', { name: 'common.modelProvider.modelSettings' })
+ const modelGroup = screen.getByRole('group', {
+ name: 'agentV2.agentDetail.configure.model.label',
+ })
+
+ expect(modelGroup).toContainElement(trigger)
+ expect(modelGroup).toContainElement(settings)
expect(trigger).toBeDisabled()
expect(settings).toBeDisabled()
@@ -154,71 +167,6 @@ describe('AgentModelField', () => {
expect(onSelect).not.toHaveBeenCalled()
})
- it.each(['compatible', 'incompatible'] as const)(
- 'waits for the catalog after provider metadata before showing a %s model status',
- async (compatibility) => {
- const modelId = compatibility === 'compatible' ? 'gemini-3.8-flash' : 'gemini-2.0-flash'
- const modelLabel = compatibility === 'compatible' ? 'Gemini 3.8 Flash' : 'Gemini 2.0 Flash'
- const provider: ProviderWithModelsResponse = {
- tenant_id: 'test-workspace',
- provider: 'google',
- label: { en_US: 'Google', zh_Hans: 'Google' },
- icon_small: { en_US: '', zh_Hans: '' },
- icon_small_dark: { en_US: '', zh_Hans: '' },
- status: ModelStatusEnum.active,
- models: [
- {
- model: modelId,
- label: { en_US: modelLabel, zh_Hans: modelLabel },
- model_type: ModelTypeEnum.textGeneration,
- features: [],
- fetch_from: ConfigurationMethodEnum.predefinedModel,
- status: ModelStatusEnum.active,
- model_properties: { mode: 'chat' },
- load_balancing_enabled: false,
- },
- ],
- }
- let resolveCatalog!: (value: { data: ProviderWithModelsResponse[] }) => void
- modelList.mockImplementation(
- () =>
- new Promise((resolve) => {
- resolveCatalog = resolve
- }),
- )
- providerSummary.mockResolvedValue({ data: [provider] })
- credentialPanelState.mockReturnValue({ variant: 'api-active', hasCredentials: true })
- const { queryClient, onSelect } = renderField({ provider: 'google', model: modelId })
-
- await waitFor(() => {
- expect(queryClient.getQueryState(['providers'])?.status).toBe('success')
- })
- expect(screen.getByRole('button', { name: modelId })).toBeDisabled()
- expect(
- screen.queryByText('common.modelProvider.selector.incompatible'),
- ).not.toBeInTheDocument()
-
- await act(async () => {
- resolveCatalog({ data: [provider] })
- })
- await waitFor(() => {
- expect(screen.getByRole('button', { name: new RegExp(modelLabel) })).toBeEnabled()
- })
- if (compatibility === 'compatible') {
- expect(screen.getByRole('button', { name: modelLabel })).toHaveAttribute(
- 'data-model-status',
- 'active',
- )
- expect(
- screen.queryByText('common.modelProvider.selector.incompatible'),
- ).not.toBeInTheDocument()
- } else {
- expect(screen.getByText('common.modelProvider.selector.incompatible')).toBeInTheDocument()
- }
- expect(onSelect).not.toHaveBeenCalled()
- },
- )
-
it('keeps a failed initial load disabled and lets the user retry', async () => {
const user = userEvent.setup()
modelList.mockRejectedValueOnce(new Error('Unavailable')).mockResolvedValue({ data: [] })
diff --git a/web/features/agent-v2/agent-detail/configure/components/orchestrate/model-config/field.tsx b/web/features/agent-v2/agent-detail/configure/components/orchestrate/model-config/field.tsx
index a97eaf62050..82200a9eca9 100644
--- a/web/features/agent-v2/agent-detail/configure/components/orchestrate/model-config/field.tsx
+++ b/web/features/agent-v2/agent-detail/configure/components/orchestrate/model-config/field.tsx
@@ -3,7 +3,7 @@
import type { FormValue } from '@/app/components/header/account-setting/model-provider-page/declarations'
import type { AgentComposerModel } from '@/features/agent-v2/agent-composer/form-state'
import { Button } from '@langgenius/dify-ui/button'
-import { Field, FieldLabel } from '@langgenius/dify-ui/field'
+import { Fieldset, FieldsetLegend } from '@langgenius/dify-ui/fieldset'
import { useQuery } from '@tanstack/react-query'
import { useTranslation } from 'react-i18next'
import { ModelTypeEnum } from '@/app/components/header/account-setting/model-provider-page/declarations'
@@ -40,10 +40,10 @@ export function AgentModelField({ currentModel, onSelect }: AgentModelFieldProps
(providerUnavailable && providerQuery.isError)
return (
- <Field name="model" className="gap-0 pb-4">
- <FieldLabel className="system-sm-semibold-uppercase! text-text-secondary">
+ <Fieldset className="grid gap-0 pb-4">
+ <FieldsetLegend className="mb-0 w-fit py-1 system-sm-semibold-uppercase! text-text-secondary">
{t(($) => $['agentDetail.configure.model.label'])}
- </FieldLabel>
+ </FieldsetLegend>
{readOnly ? (
<div className="flex h-8 w-full min-w-0 items-center rounded-lg bg-components-input-bg-disabled px-3 system-sm-regular text-components-input-text-filled">
<span className="truncate">{currentModel?.model}</span>
@@ -93,6 +93,6 @@ export function AgentModelField({ currentModel, onSelect }: AgentModelFieldProps
</Button>
</div>
)}
- </Field>
+ </Fieldset>
)
}
diff --git a/web/features/agent-v2/agent-detail/configure/use-agent-configure-build-draft.ts b/web/features/agent-v2/agent-detail/configure/use-agent-configure-build-draft.ts
index c9946d25c2e..e8090f3049f 100644
--- a/web/features/agent-v2/agent-detail/configure/use-agent-configure-build-draft.ts
+++ b/web/features/agent-v2/agent-detail/configure/use-agent-configure-build-draft.ts
@@ -405,13 +405,7 @@ export function useAgentConfigureBuildDraftActions({
queryKey: buildDraftQueryOptions.queryKey,
})
rebaseComposerDraft(nextAgentSoulConfig)
- if (
- shouldRefetchComposer ||
- !nextAgentSoulConfig?.model?.model ||
- !nextAgentSoulConfig.model.model_provider
- ) {
- onComposerRebased?.()
- }
+ if (shouldRefetchComposer) onComposerRebased?.()
},
[
buildDraftQueryOptions.queryKey,
diff --git a/web/features/agent-v2/agent-detail/configure/use-agent-configure-sync.ts b/web/features/agent-v2/agent-detail/configure/use-agent-configure-sync.ts
index f7dcacaa3bc..1fa46a29692 100644
--- a/web/features/agent-v2/agent-detail/configure/use-agent-configure-sync.ts
+++ b/web/features/agent-v2/agent-detail/configure/use-agent-configure-sync.ts
@@ -374,7 +374,7 @@ export function useAgentConfigureSync({
)
useEffect(() => {
- const scheduleDirtyDraftSave = () => {
+ return store.sub(agentComposerDraftAtom, () => {
const agentSoulDraft = getAgentSoulDraft()
const agentSoulDraftKey = JSON.stringify(agentSoulDraft)
const isDirty = store.get(isAgentComposerDirtyAtom)
@@ -389,11 +389,8 @@ export function useAgentConfigureSync({
}
debouncedSaveDraft()
- }
-
- scheduleDirtyDraftSave()
- return store.sub(agentComposerDraftAtom, scheduleDirtyDraftSave)
- }, [debouncedSaveDraft, enabled, getAgentSoulDraft, store])
+ })
+ }, [debouncedSaveDraft, getAgentSoulDraft, store])
useEffect(() => {
const saveDraftWhenPageHidden = () => {