From 7a0177cd06a881ba316dff475fa1706de99ceb17 Mon Sep 17 00:00:00 2001 From: sd0ric4 <1286518974@qq.com> Date: Thu, 27 Mar 2025 15:16:09 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=96=B0=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E8=AF=AD=E5=8F=A5=EF=BC=8C=E4=BD=BF=E7=94=A8=20type?= =?UTF-8?q?=20=E5=85=B3=E9=94=AE=E5=AD=97=E4=BC=98=E5=8C=96=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/service/core/workflow/dispatch/index.ts | 8 ++++---- .../core/workflow/dispatch/interactive/formInput.ts | 4 ++-- .../core/workflow/dispatch/interactive/userSelect.ts | 2 +- .../chat/components/Interactive/InteractiveComponents.tsx | 8 +++++++- .../WorkflowComponents/Flow/nodes/render/NodeCard.tsx | 2 +- projects/app/src/pages/api/core/chat/chatTest.ts | 8 ++++---- projects/app/src/pages/api/core/workflow/debug.ts | 2 +- 7 files changed, 20 insertions(+), 14 deletions(-) diff --git a/packages/service/core/workflow/dispatch/index.ts b/packages/service/core/workflow/dispatch/index.ts index 24b279f5c..b0ce0c440 100644 --- a/packages/service/core/workflow/dispatch/index.ts +++ b/packages/service/core/workflow/dispatch/index.ts @@ -44,14 +44,14 @@ import { textAdaptGptResponse, replaceEditorVariable } from '@fastgpt/global/core/workflow/runtime/utils'; -import { ChatNodeUsageType } from '@fastgpt/global/support/wallet/bill/type'; +import type { ChatNodeUsageType } from '@fastgpt/global/support/wallet/bill/type'; import { dispatchRunTools } from './agent/runTool/index'; import { ChatItemValueTypeEnum } from '@fastgpt/global/core/chat/constants'; -import { DispatchFlowResponse } from './type'; +import type { DispatchFlowResponse } from './type'; import { dispatchStopToolCall } from './agent/runTool/stopTool'; import { dispatchLafRequest } from './tools/runLaf'; import { dispatchIfElse } from './tools/runIfElse'; -import { RuntimeEdgeItemType } from '@fastgpt/global/core/workflow/type/edge'; +import type { RuntimeEdgeItemType } from '@fastgpt/global/core/workflow/type/edge'; import { getReferenceVariableValue } from '@fastgpt/global/core/workflow/runtime/utils'; import { dispatchSystemConfig } from './init/systemConfig'; import { dispatchUpdateVariable } from './tools/runUpdateVar'; @@ -62,7 +62,7 @@ import { dispatchTextEditor } from './tools/textEditor'; import { dispatchCustomFeedback } from './tools/customFeedback'; import { dispatchReadFiles } from './tools/readFiles'; import { dispatchUserSelect } from './interactive/userSelect'; -import { +import type { WorkflowInteractiveResponseType, InteractiveNodeResponseType } from '@fastgpt/global/core/workflow/template/system/interactive/type'; diff --git a/packages/service/core/workflow/dispatch/interactive/formInput.ts b/packages/service/core/workflow/dispatch/interactive/formInput.ts index 1290cdd06..1909651dd 100644 --- a/packages/service/core/workflow/dispatch/interactive/formInput.ts +++ b/packages/service/core/workflow/dispatch/interactive/formInput.ts @@ -1,11 +1,11 @@ import { chatValue2RuntimePrompt } from '@fastgpt/global/core/chat/adapt'; import { NodeInputKeyEnum, NodeOutputKeyEnum } from '@fastgpt/global/core/workflow/constants'; import { DispatchNodeResponseKeyEnum } from '@fastgpt/global/core/workflow/runtime/constants'; -import { +import type { DispatchNodeResultType, ModuleDispatchProps } from '@fastgpt/global/core/workflow/runtime/type'; -import { +import type { UserInputFormItemType, UserInputInteractive } from '@fastgpt/global/core/workflow/template/system/interactive/type'; diff --git a/packages/service/core/workflow/dispatch/interactive/userSelect.ts b/packages/service/core/workflow/dispatch/interactive/userSelect.ts index dd50d5060..6b04a21de 100644 --- a/packages/service/core/workflow/dispatch/interactive/userSelect.ts +++ b/packages/service/core/workflow/dispatch/interactive/userSelect.ts @@ -1,5 +1,5 @@ import { DispatchNodeResponseKeyEnum } from '@fastgpt/global/core/workflow/runtime/constants'; -import { +import type { DispatchNodeResultType, ModuleDispatchProps } from '@fastgpt/global/core/workflow/runtime/type'; diff --git a/projects/app/src/components/core/chat/components/Interactive/InteractiveComponents.tsx b/projects/app/src/components/core/chat/components/Interactive/InteractiveComponents.tsx index c149a662d..c8d309600 100644 --- a/projects/app/src/components/core/chat/components/Interactive/InteractiveComponents.tsx +++ b/projects/app/src/components/core/chat/components/Interactive/InteractiveComponents.tsx @@ -1,7 +1,13 @@ import React, { useCallback } from 'react'; import { Box, Button, Flex, Textarea } from '@chakra-ui/react'; import { useTranslation } from 'next-i18next'; -import { Controller, useForm, UseFormProps, UseFormReturn, FieldValues } from 'react-hook-form'; +import { + Controller, + useForm, + type UseFormProps, + type UseFormReturn, + type FieldValues +} from 'react-hook-form'; import Markdown from '@/components/Markdown'; import FormLabel from '@fastgpt/web/components/common/MyBox/FormLabel'; import QuestionTip from '@fastgpt/web/components/common/MyTooltip/QuestionTip'; diff --git a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/NodeCard.tsx b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/NodeCard.tsx index 2825c40de..e6ce76d1a 100644 --- a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/NodeCard.tsx +++ b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/NodeCard.tsx @@ -1,5 +1,5 @@ import React, { useCallback, useMemo } from 'react'; -import { Box, Button, Card, Flex, FlexProps } from '@chakra-ui/react'; +import { Box, Button, Card, Flex, type FlexProps } from '@chakra-ui/react'; import MyIcon from '@fastgpt/web/components/common/Icon'; import Avatar from '@fastgpt/web/components/common/Avatar'; import type { FlowNodeItemType } from '@fastgpt/global/core/workflow/type/node.d'; diff --git a/projects/app/src/pages/api/core/chat/chatTest.ts b/projects/app/src/pages/api/core/chat/chatTest.ts index dbbe6faad..38875aef2 100644 --- a/projects/app/src/pages/api/core/chat/chatTest.ts +++ b/projects/app/src/pages/api/core/chat/chatTest.ts @@ -11,7 +11,7 @@ import type { AIChatItemType, UserChatItemType } from '@fastgpt/global/core/chat import { authApp } from '@fastgpt/service/support/permission/app/auth'; import { dispatchWorkFlow } from '@fastgpt/service/core/workflow/dispatch'; import { getUserChatInfoAndAuthTeamPoints } from '@fastgpt/service/support/permission/auth/team'; -import { StoreEdgeItemType } from '@fastgpt/global/core/workflow/type/edge'; +import type { StoreEdgeItemType } from '@fastgpt/global/core/workflow/type/edge'; import { concatHistories, getChatTitleFromChatMessage, @@ -25,8 +25,8 @@ import { } from '@fastgpt/global/core/workflow/utils'; import { NextAPI } from '@/service/middleware/entry'; import { chatValue2RuntimePrompt, GPTMessages2Chats } from '@fastgpt/global/core/chat/adapt'; -import { ChatCompletionMessageParam } from '@fastgpt/global/core/ai/type'; -import { AppChatConfigType } from '@fastgpt/global/core/app/type'; +import type { ChatCompletionMessageParam } from '@fastgpt/global/core/ai/type'; +import type { AppChatConfigType } from '@fastgpt/global/core/app/type'; import { getLastInteractiveValue, getMaxHistoryLimitFromNodes, @@ -36,7 +36,7 @@ import { storeNodes2RuntimeNodes, textAdaptGptResponse } from '@fastgpt/global/core/workflow/runtime/utils'; -import { StoreNodeItemType } from '@fastgpt/global/core/workflow/type/node'; +import type { StoreNodeItemType } from '@fastgpt/global/core/workflow/type/node'; import { getWorkflowResponseWrite } from '@fastgpt/service/core/workflow/dispatch/utils'; import { WORKFLOW_MAX_RUN_TIMES } from '@fastgpt/service/core/workflow/constants'; import { getPluginInputsFromStoreNodes } from '@fastgpt/global/core/app/plugin/utils'; diff --git a/projects/app/src/pages/api/core/workflow/debug.ts b/projects/app/src/pages/api/core/workflow/debug.ts index 747e76a0e..b01bc0741 100644 --- a/projects/app/src/pages/api/core/workflow/debug.ts +++ b/projects/app/src/pages/api/core/workflow/debug.ts @@ -5,7 +5,7 @@ import { authApp } from '@fastgpt/service/support/permission/app/auth'; import { dispatchWorkFlow } from '@fastgpt/service/core/workflow/dispatch'; import { authCert } from '@fastgpt/service/support/permission/auth/common'; import { getUserChatInfoAndAuthTeamPoints } from '@fastgpt/service/support/permission/auth/team'; -import { PostWorkflowDebugProps, PostWorkflowDebugResponse } from '@/global/core/workflow/api'; +import type { PostWorkflowDebugProps, PostWorkflowDebugResponse } from '@/global/core/workflow/api'; import { NextAPI } from '@/service/middleware/entry'; import { ReadPermissionVal } from '@fastgpt/global/support/permission/constant'; import { defaultApp } from '@/web/core/app/constants';