Merge remote-tracking branch 'origin/main' into feat/trigger

2026-05-04 17:38:04 +08:00 · 2025-10-17 19:21:15 +08:00
parent d0f357a690 fea2ffb3ba
commit 8a5174d078
56 changed files with 673 additions and 164 deletions
--- a/web/app/components/workflow/nodes/if-else/components/condition-list/condition-item.tsx
+++ b/web/app/components/workflow/nodes/if-else/components/condition-list/condition-item.tsx
@ -234,6 +234,9 @@ const ConditionItem = ({
      draft.varType = resolvedVarType
      draft.value = resolvedVarType === VarType.boolean ? false : ''
      draft.comparison_operator = getOperators(resolvedVarType)[0]
+      delete draft.key
+      delete draft.sub_variable_condition
+      delete draft.numberVarType
      setTimeout(() => setControlPromptEditorRerenderKey(Date.now()))
    })
    doUpdateCondition(newCondition)
--- a/web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/top-k-and-score-threshold.tsx
+++ b/web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/top-k-and-score-threshold.tsx
@ -1,8 +1,8 @@
-import { memo } from 'react'
+import { memo, useCallback } from 'react'
 import { useTranslation } from 'react-i18next'
 import Tooltip from '@/app/components/base/tooltip'
-import Input from '@/app/components/base/input'
 import Switch from '@/app/components/base/switch'
+import { InputNumber } from '@/app/components/base/input-number'

 export type TopKAndScoreThresholdProps = {
  topK: number
@ -14,6 +14,24 @@ export type TopKAndScoreThresholdProps = {
  readonly?: boolean
  hiddenScoreThreshold?: boolean
 }
+
+const maxTopK = (() => {
+  const configValue = Number.parseInt(globalThis.document?.body?.getAttribute('data-public-top-k-max-value') || '', 10)
+  if (configValue && !isNaN(configValue))
+    return configValue
+  return 10
+})()
+const TOP_K_VALUE_LIMIT = {
+  amount: 1,
+  min: 1,
+  max: maxTopK,
+}
+const SCORE_THRESHOLD_VALUE_LIMIT = {
+  step: 0.01,
+  min: 0,
+  max: 1,
+}
+
 const TopKAndScoreThreshold = ({
  topK,
  onTopKChange,
@ -25,18 +43,18 @@ const TopKAndScoreThreshold = ({
  hiddenScoreThreshold,
 }: TopKAndScoreThresholdProps) => {
  const { t } = useTranslation()
-  const handleTopKChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-    const value = Number(e.target.value)
-    if (Number.isNaN(value))
-      return
-    onTopKChange?.(value)
-  }
+  const handleTopKChange = useCallback((value: number) => {
+    let notOutRangeValue = Number.parseInt(value.toFixed(0))
+    notOutRangeValue = Math.max(TOP_K_VALUE_LIMIT.min, notOutRangeValue)
+    notOutRangeValue = Math.min(TOP_K_VALUE_LIMIT.max, notOutRangeValue)
+    onTopKChange?.(notOutRangeValue)
+  }, [onTopKChange])

-  const handleScoreThresholdChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-    const value = Number(e.target.value)
-    if (Number.isNaN(value))
-      return
-    onScoreThresholdChange?.(value)
+  const handleScoreThresholdChange = (value: number) => {
+    let notOutRangeValue = Number.parseFloat(value.toFixed(2))
+    notOutRangeValue = Math.max(SCORE_THRESHOLD_VALUE_LIMIT.min, notOutRangeValue)
+    notOutRangeValue = Math.min(SCORE_THRESHOLD_VALUE_LIMIT.max, notOutRangeValue)
+    onScoreThresholdChange?.(notOutRangeValue)
  }

  return (
@ -49,11 +67,13 @@ const TopKAndScoreThreshold = ({
            popupContent={t('appDebug.datasetConfig.top_kTip')}
          />
        </div>
-        <Input
+        <InputNumber
+          disabled={readonly}
          type='number'
+          {...TOP_K_VALUE_LIMIT}
+          size='regular'
          value={topK}
          onChange={handleTopKChange}
-          disabled={readonly}
        />
      </div>
      {
@ -74,11 +94,13 @@ const TopKAndScoreThreshold = ({
                popupContent={t('appDebug.datasetConfig.score_thresholdTip')}
              />
            </div>
-            <Input
+            <InputNumber
+              disabled={readonly || !isScoreThresholdEnabled}
              type='number'
+              {...SCORE_THRESHOLD_VALUE_LIMIT}
+              size='regular'
              value={scoreThreshold}
              onChange={handleScoreThresholdChange}
-              disabled={readonly || !isScoreThresholdEnabled}
            />
          </div>
        )
--- a/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-number.tsx
+++ b/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-number.tsx
@ -18,7 +18,7 @@ type ConditionNumberProps = {
  nodesOutputVars: NodeOutPutVar[]
  availableNodes: Node[]
  isCommonVariable?: boolean
-  commonVariables: { name: string, type: string }[]
+  commonVariables: { name: string; type: string; value: string }[]
 } & ConditionValueMethodProps
 const ConditionNumber = ({
  value,
--- a/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-string.tsx
+++ b/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-string.tsx
@ -18,7 +18,7 @@ type ConditionStringProps = {
  nodesOutputVars: NodeOutPutVar[]
  availableNodes: Node[]
  isCommonVariable?: boolean
-  commonVariables: { name: string, type: string }[]
+  commonVariables: { name: string; type: string; value: string }[]
 } & ConditionValueMethodProps
 const ConditionString = ({
  value,
--- a/web/app/components/workflow/nodes/knowledge-retrieval/types.ts
+++ b/web/app/components/workflow/nodes/knowledge-retrieval/types.ts
@ -128,6 +128,6 @@ export type MetadataShape = {
  availableNumberVars?: NodeOutPutVar[]
  availableNumberNodesWithParent?: Node[]
  isCommonVariable?: boolean
-  availableCommonStringVars?: { name: string; type: string; }[]
-  availableCommonNumberVars?: { name: string; type: string; }[]
+  availableCommonStringVars?: { name: string; type: string; value: string }[]
+  availableCommonNumberVars?: { name: string; type: string; value: string }[]
 }
--- a/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/json-importer.tsx
+++ b/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/json-importer.tsx
@ -24,7 +24,7 @@ const JsonImporter: FC<JsonImporterProps> = ({
  const [open, setOpen] = useState(false)
  const [json, setJson] = useState('')
  const [parseError, setParseError] = useState<any>(null)
-  const importBtnRef = useRef<HTMLButtonElement>(null)
+  const importBtnRef = useRef<HTMLElement>(null)
  const advancedEditing = useVisualEditorStore(state => state.advancedEditing)
  const isAddingNewField = useVisualEditorStore(state => state.isAddingNewField)
  const { emit } = useMittContext()
--- a/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/context.tsx
+++ b/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/context.tsx
@ -18,7 +18,7 @@ type VisualEditorProviderProps = {
 export const VisualEditorContext = createContext<VisualEditorContextType>(null)

 export const VisualEditorContextProvider = ({ children }: VisualEditorProviderProps) => {
-  const storeRef = useRef<VisualEditorStore>()
+  const storeRef = useRef<VisualEditorStore | null>(null)

  if (!storeRef.current)
    storeRef.current = createVisualEditorStore()
--- a/web/app/components/workflow/nodes/llm/use-config.ts
+++ b/web/app/components/workflow/nodes/llm/use-config.ts
@ -23,7 +23,7 @@ const useConfig = (id: string, payload: LLMNodeType) => {
  const { nodesReadOnly: readOnly } = useNodesReadOnly()
  const isChatMode = useIsChatMode()

-  const defaultConfig = useStore(s => s.nodesDefaultConfigs)[payload.type]
+  const defaultConfig = useStore(s => s.nodesDefaultConfigs)?.[payload.type]
  const [defaultRolePrefix, setDefaultRolePrefix] = useState<{ user: string; assistant: string }>({ user: '', assistant: '' })
  const { inputs, setInputs: doSetInputs } = useNodeCrud<LLMNodeType>(id, payload)
  const inputRef = useRef(inputs)
--- a/web/app/components/workflow/nodes/llm/utils.ts
+++ b/web/app/components/workflow/nodes/llm/utils.ts
@ -10,7 +10,7 @@ export const checkNodeValid = (_payload: LLMNodeType) => {

 export const getFieldType = (field: Field) => {
  const { type, items } = field
-  if(field.schemaType === 'file') return 'file'
+  if(field.schemaType === 'file') return Type.file
  if (type !== Type.array || !items)
    return type

--- a/web/app/components/workflow/nodes/loop/components/condition-list/condition-item.tsx
+++ b/web/app/components/workflow/nodes/loop/components/condition-list/condition-item.tsx
@ -196,6 +196,9 @@ const ConditionItem = ({
      draft.varType = varItem.type
      draft.value = ''
      draft.comparison_operator = getOperators(varItem.type)[0]
+      delete draft.key
+      delete draft.sub_variable_condition
+      delete draft.numberVarType
    })
    doUpdateCondition(newCondition)
    setOpen(false)
--- a/web/app/components/workflow/nodes/parameter-extractor/components/extract-parameter/import-from-tool.tsx
+++ b/web/app/components/workflow/nodes/parameter-extractor/components/extract-parameter/import-from-tool.tsx
@ -9,7 +9,10 @@ import BlockSelector from '../../../../block-selector'
 import type { Param, ParamType } from '../../types'
 import cn from '@/utils/classnames'
 import { useStore } from '@/app/components/workflow/store'
-import type { PluginDefaultValue } from '@/app/components/workflow/block-selector/types'
+import type {
+  PluginDefaultValue,
+  ToolDefaultValue,
+} from '@/app/components/workflow/block-selector/types'
 import type { ToolParameter } from '@/app/components/tools/types'
 import { CollectionType } from '@/app/components/tools/types'
 import type { BlockEnum } from '@/app/components/workflow/types'
@ -44,9 +47,10 @@ const ImportFromTool: FC<Props> = ({
  const workflowTools = useStore(s => s.workflowTools)

  const handleSelectTool = useCallback((_type: BlockEnum, toolInfo?: PluginDefaultValue) => {
-    if (!toolInfo || !('tool_name' in toolInfo))
+    if (!toolInfo || 'datasource_name' in toolInfo || !('tool_name' in toolInfo))
      return
-    const { provider_id, provider_type, tool_name: tool_name } = toolInfo!
+
+    const { provider_id, provider_type, tool_name } = toolInfo as ToolDefaultValue
    const currentTools = (() => {
      switch (provider_type) {
        case CollectionType.builtIn:
--- a/web/app/components/workflow/nodes/parameter-extractor/use-config.ts
+++ b/web/app/components/workflow/nodes/parameter-extractor/use-config.ts
@ -27,7 +27,7 @@ const useConfig = (id: string, payload: ParameterExtractorNodeType) => {
  const { handleOutVarRenameChange } = useWorkflow()
  const isChatMode = useIsChatMode()

-  const defaultConfig = useStore(s => s.nodesDefaultConfigs)[payload.type]
+  const defaultConfig = useStore(s => s.nodesDefaultConfigs)?.[payload.type]

  const [defaultRolePrefix, setDefaultRolePrefix] = useState<{ user: string; assistant: string }>({ user: '', assistant: '' })
  const { inputs, setInputs: doSetInputs } = useNodeCrud<ParameterExtractorNodeType>(id, payload)
--- a/web/app/components/workflow/nodes/question-classifier/use-config.ts
+++ b/web/app/components/workflow/nodes/question-classifier/use-config.ts
@ -20,7 +20,7 @@ const useConfig = (id: string, payload: QuestionClassifierNodeType) => {
  const updateNodeInternals = useUpdateNodeInternals()
  const { nodesReadOnly: readOnly } = useNodesReadOnly()
  const isChatMode = useIsChatMode()
-  const defaultConfig = useStore(s => s.nodesDefaultConfigs)[payload.type]
+  const defaultConfig = useStore(s => s.nodesDefaultConfigs)?.[payload.type]
  const { getBeforeNodesInSameBranch } = useWorkflow()
  const startNode = getBeforeNodesInSameBranch(id).find(node => node.data.type === BlockEnum.Start)
  const startNodeId = startNode?.id
--- a/web/app/components/workflow/nodes/template-transform/use-config.ts
+++ b/web/app/components/workflow/nodes/template-transform/use-config.ts
@ -13,7 +13,7 @@ import useAvailableVarList from '@/app/components/workflow/nodes/_base/hooks/use

 const useConfig = (id: string, payload: TemplateTransformNodeType) => {
  const { nodesReadOnly: readOnly } = useNodesReadOnly()
-  const defaultConfig = useStore(s => s.nodesDefaultConfigs)[payload.type]
+  const defaultConfig = useStore(s => s.nodesDefaultConfigs)?.[payload.type]

  const { inputs, setInputs: doSetInputs } = useNodeCrud<TemplateTransformNodeType>(id, payload)
  const inputsRef = useRef(inputs)
--- a/web/app/components/workflow/run/agent-log/agent-log-nav-more.tsx
+++ b/web/app/components/workflow/run/agent-log/agent-log-nav-more.tsx
@ -9,7 +9,7 @@ import Button from '@/app/components/base/button'
 import type { AgentLogItemWithChildren } from '@/types/workflow'

 type AgentLogNavMoreProps = {
-  options: { id: string; label: string }[]
+  options: AgentLogItemWithChildren[]
  onShowAgentOrToolLog: (detail?: AgentLogItemWithChildren) => void
 }
 const AgentLogNavMore = ({
@ -41,10 +41,10 @@ const AgentLogNavMore = ({
          {
            options.map(option => (
              <div
-                key={option.id}
+                key={option.message_id}
                className='system-md-regular flex h-8 cursor-pointer items-center rounded-lg px-2 text-text-secondary hover:bg-state-base-hover'
                onClick={() => {
-                  onShowAgentOrToolLog(option as AgentLogItemWithChildren)
+                  onShowAgentOrToolLog(option)
                  setOpen(false)
                }}
              >
--- a/web/app/components/workflow/workflow-preview/components/nodes/base.tsx
+++ b/web/app/components/workflow/workflow-preview/components/nodes/base.tsx
@ -23,8 +23,10 @@ import {
 } from '../node-handle'
 import ErrorHandleOnNode from '../error-handle-on-node'

+type NodeChildElement = ReactElement<Partial<NodeProps>>
+
 type NodeCardProps = NodeProps & {
-  children?: ReactElement
+  children?: NodeChildElement
 }

 const BaseCard = ({