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(web): skip parameter rules for unavailable models (#42660)

林玮 (Jade Lin)a625c62a1d5b
diff --git a/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/index.tsx b/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/index.tsx
index cdb1b03c9d9..2936bbbca56 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/index.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/index.tsx
@@ -92,10 +92,16 @@ const ModelParameterModal: FC<ModelParameterModalProps> = ({
}) => {
const { t } = useTranslation()
const [open, setOpen] = useState(false)
- const { data: parameterRulesData, isLoading } = useModelParameterRules(provider, modelId)
- const isRulesLoading = !!provider && !!modelId && isLoading
const { currentProvider, currentModel, activeTextGenerationModelList } =
useTextGenerationCurrentProviderAndModelAndModelList({ provider, model: modelId })
+ const canFetchParameterRules =
+ !!currentProvider && currentModel?.status === ModelStatusEnum.active
+ const { data: parameterRulesData, isLoading } = useModelParameterRules(
+ provider,
+ modelId,
+ canFetchParameterRules,
+ )
+ const isRulesLoading = canFetchParameterRules && !!provider && !!modelId && isLoading
const selectableModelList = modelList ?? activeTextGenerationModelList
const parameterRules: ModelParameterRule[] = useMemo(() => {
diff --git a/web/features/skills/__tests__/detail-page.fixture.tsx b/web/features/skills/__tests__/detail-page.fixture.tsx
index 7a5532173d8..e7df4a3fa6b 100644
--- a/web/features/skills/__tests__/detail-page.fixture.tsx
+++ b/web/features/skills/__tests__/detail-page.fixture.tsx
@@ -7,6 +7,7 @@ import type {
import type { OperationKey } from '@orpc/tanstack-query'
import type userEvent from '@testing-library/user-event'
import type { ReactNode } from 'react'
+import type { DefaultModel } from '@/app/components/header/account-setting/model-provider-page/declarations'
import { detectPlatform } from '@tanstack/react-hotkeys'
import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
import { fireEvent, render, screen, within } from '@testing-library/react'
@@ -120,11 +121,18 @@ vi.mock('@/app/components/header/account-setting/model-provider-page/hooks', ()
useDefaultModel: () => ({
data: mocks.defaultTextGenerationModel,
}),
- useTextGenerationCurrentProviderAndModelAndModelList: () => ({
- currentProvider: mocks.textGenerationModelList[0],
- currentModel: mocks.textGenerationModelList[0]?.models[0],
- activeTextGenerationModelList: mocks.textGenerationModelList,
- }),
+ useTextGenerationCurrentProviderAndModelAndModelList: (selectedModel?: DefaultModel) => {
+ const currentProvider = mocks.textGenerationModelList.find(
+ (provider) => provider.provider === selectedModel?.provider,
+ )
+ return {
+ currentProvider,
+ currentModel: currentProvider?.models.find((model) => model.model === selectedModel?.model),
+ activeTextGenerationModelList: mocks.textGenerationModelList.filter(
+ (provider) => provider.status === 'active',
+ ),
+ }
+ },
}))
vi.mock('@/app/components/header/account-setting/model-provider-page/model-selector', () => ({