ngskcloud
/
gcgj-dify-1.7.0
17
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Solve circular dependency issue between `workflow/constants.ts` file and `default.ts` file (#13165)

Browse Source
pull/13170/head
Obada Khalili 1 year ago committed by GitHub
parent 1b6fd9dfe8
commit 8fbc9c9342
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
20 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File

5
web/app/components/workflow/blocks.tsx
Unescape Escape View File

@ -0,0 +1,5 @@
import { BlockEnum } from './types'
export const ALL_AVAILABLE_BLOCKS = Object.values(BlockEnum)
export const ALL_CHAT_AVAILABLE_BLOCKS = ALL_AVAILABLE_BLOCKS.filter(key => key !== BlockEnum.End && key !== BlockEnum.Start) as BlockEnum[]
export const ALL_COMPLETION_AVAILABLE_BLOCKS = ALL_AVAILABLE_BLOCKS.filter(key => key !== BlockEnum.Answer && key !== BlockEnum.Start) as BlockEnum[]

3
web/app/components/workflow/constants.ts
Unescape Escape View File

@ -203,9 +203,6 @@ export const NODES_EXTRA_DATA: Record<BlockEnum, NodesExtraData> = {
} }
export const ALL_CHAT_AVAILABLE_BLOCKS = Object.keys(NODES_EXTRA_DATA).filter(key => key !== BlockEnum.End && key !== BlockEnum.Start) as BlockEnum[]
export const ALL_COMPLETION_AVAILABLE_BLOCKS = Object.keys(NODES_EXTRA_DATA).filter(key => key !== BlockEnum.Answer && key !== BlockEnum.Start) as BlockEnum[]
export const NODES_INITIAL_DATA = { export const NODES_INITIAL_DATA = {
[BlockEnum.Start]: { [BlockEnum.Start]: {
type: BlockEnum.Start, type: BlockEnum.Start,

2
web/app/components/workflow/nodes/answer/default.ts
Unescape Escape View File

@ -1,7 +1,7 @@
import { BlockEnum } from '../../types' import { BlockEnum } from '../../types'
import type { NodeDefault } from '../../types' import type { NodeDefault } from '../../types'
import type { AnswerNodeType } from './types' import type { AnswerNodeType } from './types'
import { ALL_CHAT_AVAILABLE_BLOCKS, ALL_COMPLETION_AVAILABLE_BLOCKS } from '@/app/components/workflow/constants' import { ALL_CHAT_AVAILABLE_BLOCKS, ALL_COMPLETION_AVAILABLE_BLOCKS } from '@/app/components/workflow/blocks'
const nodeDefault: NodeDefault<AnswerNodeType> = { const nodeDefault: NodeDefault<AnswerNodeType> = {
defaultValue: { defaultValue: {

2
web/app/components/workflow/nodes/assigner/default.ts
Unescape Escape View File

@ -1,7 +1,7 @@
import { BlockEnum } from '../../types' import { BlockEnum } from '../../types'
import type { NodeDefault } from '../../types' import type { NodeDefault } from '../../types'
import { type AssignerNodeType, WriteMode } from './types' import { type AssignerNodeType, WriteMode } from './types'
import { ALL_CHAT_AVAILABLE_BLOCKS, ALL_COMPLETION_AVAILABLE_BLOCKS } from '@/app/components/workflow/constants' import { ALL_CHAT_AVAILABLE_BLOCKS, ALL_COMPLETION_AVAILABLE_BLOCKS } from '@/app/components/workflow/blocks'
const i18nPrefix = 'workflow.errorMsg' const i18nPrefix = 'workflow.errorMsg'
const nodeDefault: NodeDefault<AssignerNodeType> = { const nodeDefault: NodeDefault<AssignerNodeType> = {

2
web/app/components/workflow/nodes/code/default.ts
Unescape Escape View File

@ -1,7 +1,7 @@
import { BlockEnum } from '../../types' import { BlockEnum } from '../../types'
import type { NodeDefault } from '../../types' import type { NodeDefault } from '../../types'
import { CodeLanguage, type CodeNodeType } from './types' import { CodeLanguage, type CodeNodeType } from './types'
import { ALL_CHAT_AVAILABLE_BLOCKS, ALL_COMPLETION_AVAILABLE_BLOCKS } from '@/app/components/workflow/constants' import { ALL_CHAT_AVAILABLE_BLOCKS, ALL_COMPLETION_AVAILABLE_BLOCKS } from '@/app/components/workflow/blocks'
const i18nPrefix = 'workflow.errorMsg' const i18nPrefix = 'workflow.errorMsg'

2
web/app/components/workflow/nodes/document-extractor/default.ts
Unescape Escape View File

@ -1,7 +1,7 @@
import { BlockEnum } from '../../types' import { BlockEnum } from '../../types'
import type { NodeDefault } from '../../types' import type { NodeDefault } from '../../types'
import { type DocExtractorNodeType } from './types' import { type DocExtractorNodeType } from './types'
import { ALL_CHAT_AVAILABLE_BLOCKS, ALL_COMPLETION_AVAILABLE_BLOCKS } from '@/app/components/workflow/constants' import { ALL_CHAT_AVAILABLE_BLOCKS, ALL_COMPLETION_AVAILABLE_BLOCKS } from '@/app/components/workflow/blocks'
const i18nPrefix = 'workflow.errorMsg' const i18nPrefix = 'workflow.errorMsg'
const nodeDefault: NodeDefault<DocExtractorNodeType> = { const nodeDefault: NodeDefault<DocExtractorNodeType> = {

2
web/app/components/workflow/nodes/end/default.ts
Unescape Escape View File

@ -1,7 +1,7 @@
import { BlockEnum } from '../../types' import { BlockEnum } from '../../types'
import type { NodeDefault } from '../../types' import type { NodeDefault } from '../../types'
import { type EndNodeType } from './types' import { type EndNodeType } from './types'
import { ALL_CHAT_AVAILABLE_BLOCKS, ALL_COMPLETION_AVAILABLE_BLOCKS } from '@/app/components/workflow/constants' import { ALL_CHAT_AVAILABLE_BLOCKS, ALL_COMPLETION_AVAILABLE_BLOCKS } from '@/app/components/workflow/blocks'
const nodeDefault: NodeDefault<EndNodeType> = { const nodeDefault: NodeDefault<EndNodeType> = {
defaultValue: { defaultValue: {

2
web/app/components/workflow/nodes/http/default.ts
Unescape Escape View File

@ -5,7 +5,7 @@ import type { BodyPayload, HttpNodeType } from './types'
import { import {
ALL_CHAT_AVAILABLE_BLOCKS, ALL_CHAT_AVAILABLE_BLOCKS,
ALL_COMPLETION_AVAILABLE_BLOCKS, ALL_COMPLETION_AVAILABLE_BLOCKS,
} from '@/app/components/workflow/constants' } from '@/app/components/workflow/blocks'
const nodeDefault: NodeDefault<HttpNodeType> = { const nodeDefault: NodeDefault<HttpNodeType> = {
defaultValue: { defaultValue: {

2
web/app/components/workflow/nodes/if-else/default.ts
Unescape Escape View File

@ -2,7 +2,7 @@ import { BlockEnum, type NodeDefault } from '../../types'
import { type IfElseNodeType, LogicalOperator } from './types' import { type IfElseNodeType, LogicalOperator } from './types'
import { isEmptyRelatedOperator } from './utils' import { isEmptyRelatedOperator } from './utils'
import { TransferMethod } from '@/types/app' import { TransferMethod } from '@/types/app'
import { ALL_CHAT_AVAILABLE_BLOCKS, ALL_COMPLETION_AVAILABLE_BLOCKS } from '@/app/components/workflow/constants' import { ALL_CHAT_AVAILABLE_BLOCKS, ALL_COMPLETION_AVAILABLE_BLOCKS } from '@/app/components/workflow/blocks'
const i18nPrefix = 'workflow.errorMsg' const i18nPrefix = 'workflow.errorMsg'
const nodeDefault: NodeDefault<IfElseNodeType> = { const nodeDefault: NodeDefault<IfElseNodeType> = {

2
web/app/components/workflow/nodes/iteration-start/default.ts
Unescape Escape View File

@ -1,6 +1,6 @@
import type { NodeDefault } from '../../types' import type { NodeDefault } from '../../types'
import type { IterationStartNodeType } from './types' import type { IterationStartNodeType } from './types'
import { ALL_CHAT_AVAILABLE_BLOCKS, ALL_COMPLETION_AVAILABLE_BLOCKS } from '@/app/components/workflow/constants' import { ALL_CHAT_AVAILABLE_BLOCKS, ALL_COMPLETION_AVAILABLE_BLOCKS } from '@/app/components/workflow/blocks'
const nodeDefault: NodeDefault<IterationStartNodeType> = { const nodeDefault: NodeDefault<IterationStartNodeType> = {
defaultValue: {}, defaultValue: {},

2
web/app/components/workflow/nodes/iteration/default.ts
Unescape Escape View File

@ -4,7 +4,7 @@ import type { IterationNodeType } from './types'
import { import {
ALL_CHAT_AVAILABLE_BLOCKS, ALL_CHAT_AVAILABLE_BLOCKS,
ALL_COMPLETION_AVAILABLE_BLOCKS, ALL_COMPLETION_AVAILABLE_BLOCKS,
} from '@/app/components/workflow/constants' } from '@/app/components/workflow/blocks'
const i18nPrefix = 'workflow' const i18nPrefix = 'workflow'
const nodeDefault: NodeDefault<IterationNodeType> = { const nodeDefault: NodeDefault<IterationNodeType> = {

2
web/app/components/workflow/nodes/knowledge-retrieval/default.ts
Unescape Escape View File

@ -2,7 +2,7 @@ import { BlockEnum } from '../../types'
import type { NodeDefault } from '../../types' import type { NodeDefault } from '../../types'
import type { KnowledgeRetrievalNodeType } from './types' import type { KnowledgeRetrievalNodeType } from './types'
import { checkoutRerankModelConfigedInRetrievalSettings } from './utils' import { checkoutRerankModelConfigedInRetrievalSettings } from './utils'
import { ALL_CHAT_AVAILABLE_BLOCKS, ALL_COMPLETION_AVAILABLE_BLOCKS } from '@/app/components/workflow/constants' import { ALL_CHAT_AVAILABLE_BLOCKS, ALL_COMPLETION_AVAILABLE_BLOCKS } from '@/app/components/workflow/blocks'
import { DATASET_DEFAULT } from '@/config' import { DATASET_DEFAULT } from '@/config'
import { RETRIEVE_TYPE } from '@/types/app' import { RETRIEVE_TYPE } from '@/types/app'
const i18nPrefix = 'workflow' const i18nPrefix = 'workflow'

2
web/app/components/workflow/nodes/list-operator/default.ts
Unescape Escape View File

@ -2,7 +2,7 @@ import { BlockEnum, VarType } from '../../types'
import type { NodeDefault } from '../../types' import type { NodeDefault } from '../../types'
import { comparisonOperatorNotRequireValue } from '../if-else/utils' import { comparisonOperatorNotRequireValue } from '../if-else/utils'
import { type ListFilterNodeType, OrderBy } from './types' import { type ListFilterNodeType, OrderBy } from './types'
import { ALL_CHAT_AVAILABLE_BLOCKS, ALL_COMPLETION_AVAILABLE_BLOCKS } from '@/app/components/workflow/constants' import { ALL_CHAT_AVAILABLE_BLOCKS, ALL_COMPLETION_AVAILABLE_BLOCKS } from '@/app/components/workflow/blocks'
const i18nPrefix = 'workflow.errorMsg' const i18nPrefix = 'workflow.errorMsg'
const nodeDefault: NodeDefault<ListFilterNodeType> = { const nodeDefault: NodeDefault<ListFilterNodeType> = {

2
web/app/components/workflow/nodes/llm/default.ts
Unescape Escape View File

@ -1,7 +1,7 @@
import { BlockEnum, EditionType } from '../../types' import { BlockEnum, EditionType } from '../../types'
import { type NodeDefault, type PromptItem, PromptRole } from '../../types' import { type NodeDefault, type PromptItem, PromptRole } from '../../types'
import type { LLMNodeType } from './types' import type { LLMNodeType } from './types'
import { ALL_CHAT_AVAILABLE_BLOCKS, ALL_COMPLETION_AVAILABLE_BLOCKS } from '@/app/components/workflow/constants' import { ALL_CHAT_AVAILABLE_BLOCKS, ALL_COMPLETION_AVAILABLE_BLOCKS } from '@/app/components/workflow/blocks'
const i18nPrefix = 'workflow.errorMsg' const i18nPrefix = 'workflow.errorMsg'

2
web/app/components/workflow/nodes/parameter-extractor/default.ts
Unescape Escape View File

@ -1,7 +1,7 @@
import { BlockEnum } from '../../types' import { BlockEnum } from '../../types'
import type { NodeDefault } from '../../types' import type { NodeDefault } from '../../types'
import { type ParameterExtractorNodeType, ReasoningModeType } from './types' import { type ParameterExtractorNodeType, ReasoningModeType } from './types'
import { ALL_CHAT_AVAILABLE_BLOCKS, ALL_COMPLETION_AVAILABLE_BLOCKS } from '@/app/components/workflow/constants' import { ALL_CHAT_AVAILABLE_BLOCKS, ALL_COMPLETION_AVAILABLE_BLOCKS } from '@/app/components/workflow/blocks'
const i18nPrefix = 'workflow' const i18nPrefix = 'workflow'
const nodeDefault: NodeDefault<ParameterExtractorNodeType> = { const nodeDefault: NodeDefault<ParameterExtractorNodeType> = {

2
web/app/components/workflow/nodes/question-classifier/default.ts
Unescape Escape View File

@ -1,7 +1,7 @@
import type { NodeDefault } from '../../types' import type { NodeDefault } from '../../types'
import { BlockEnum } from '../../types' import { BlockEnum } from '../../types'
import type { QuestionClassifierNodeType } from './types' import type { QuestionClassifierNodeType } from './types'
import { ALL_CHAT_AVAILABLE_BLOCKS, ALL_COMPLETION_AVAILABLE_BLOCKS } from '@/app/components/workflow/constants' import { ALL_CHAT_AVAILABLE_BLOCKS, ALL_COMPLETION_AVAILABLE_BLOCKS } from '@/app/components/workflow/blocks'
const i18nPrefix = 'workflow' const i18nPrefix = 'workflow'

2
web/app/components/workflow/nodes/start/default.ts
Unescape Escape View File

@ -1,6 +1,6 @@
import type { NodeDefault } from '../../types' import type { NodeDefault } from '../../types'
import type { StartNodeType } from './types' import type { StartNodeType } from './types'
import { ALL_CHAT_AVAILABLE_BLOCKS, ALL_COMPLETION_AVAILABLE_BLOCKS } from '@/app/components/workflow/constants' import { ALL_CHAT_AVAILABLE_BLOCKS, ALL_COMPLETION_AVAILABLE_BLOCKS } from '@/app/components/workflow/blocks'
const nodeDefault: NodeDefault<StartNodeType> = { const nodeDefault: NodeDefault<StartNodeType> = {
defaultValue: { defaultValue: {

2
web/app/components/workflow/nodes/template-transform/default.ts
Unescape Escape View File

@ -1,7 +1,7 @@
import { BlockEnum } from '../../types' import { BlockEnum } from '../../types'
import type { NodeDefault } from '../../types' import type { NodeDefault } from '../../types'
import type { TemplateTransformNodeType } from './types' import type { TemplateTransformNodeType } from './types'
import { ALL_CHAT_AVAILABLE_BLOCKS, ALL_COMPLETION_AVAILABLE_BLOCKS } from '@/app/components/workflow/constants' import { ALL_CHAT_AVAILABLE_BLOCKS, ALL_COMPLETION_AVAILABLE_BLOCKS } from '@/app/components/workflow/blocks'
const i18nPrefix = 'workflow.errorMsg' const i18nPrefix = 'workflow.errorMsg'
const nodeDefault: NodeDefault<TemplateTransformNodeType> = { const nodeDefault: NodeDefault<TemplateTransformNodeType> = {

2
web/app/components/workflow/nodes/tool/default.ts
Unescape Escape View File

@ -2,7 +2,7 @@ import { BlockEnum } from '../../types'
import type { NodeDefault } from '../../types' import type { NodeDefault } from '../../types'
import type { ToolNodeType } from './types' import type { ToolNodeType } from './types'
import { VarType as VarKindType } from '@/app/components/workflow/nodes/tool/types' import { VarType as VarKindType } from '@/app/components/workflow/nodes/tool/types'
import { ALL_CHAT_AVAILABLE_BLOCKS, ALL_COMPLETION_AVAILABLE_BLOCKS } from '@/app/components/workflow/constants' import { ALL_CHAT_AVAILABLE_BLOCKS, ALL_COMPLETION_AVAILABLE_BLOCKS } from '@/app/components/workflow/blocks'
const i18nPrefix = 'workflow.errorMsg' const i18nPrefix = 'workflow.errorMsg'

2
web/app/components/workflow/nodes/variable-assigner/default.ts
Unescape Escape View File

@ -1,7 +1,7 @@
import { type NodeDefault, VarType } from '../../types' import { type NodeDefault, VarType } from '../../types'
import { BlockEnum } from '../../types' import { BlockEnum } from '../../types'
import type { VariableAssignerNodeType } from './types' import type { VariableAssignerNodeType } from './types'
import { ALL_CHAT_AVAILABLE_BLOCKS, ALL_COMPLETION_AVAILABLE_BLOCKS } from '@/app/components/workflow/constants' import { ALL_CHAT_AVAILABLE_BLOCKS, ALL_COMPLETION_AVAILABLE_BLOCKS } from '@/app/components/workflow/blocks'
const i18nPrefix = 'workflow' const i18nPrefix = 'workflow'

Write Preview
Loading…
Cancel
Save