high_quality High quality: embedding using embedding model, built as vector database index
- - economy Economy: Build using inverted index of Keyword Table Index
+ - economy Economy: Build using inverted index of keyword table index
remove_extra_spaces Replace consecutive spaces, newlines, tabs
- remove_urls_emails Delete URL, email address
- enabled (bool) Whether to select this rule or not. If no document ID is passed in, it represents the default value.
- - segmentation (object) segmentation rules
+ - segmentation (object) Segmentation rules
- separator Custom segment identifier, currently only allows one delimiter to be set. Default is \n
- max_tokens Maximum length (token) defaults to 1000
original_document_id Source document ID (optional)
- Used to re-upload the document or modify the document cleaning and segmentation configuration. The missing information is copied from the source document
- The source document cannot be an archived document
- When original_document_id is passed in, the update operation is performed on behalf of the document. process_rule is a fillable item. If not filled in, the segmentation method of the source document will be used by default
- When original_document_id is not passed in, the new operation is performed on behalf of the document, and process_rule is required
- - indexing_technique Index mode
+ - indexing_technique Index mode
- high_quality High quality: embedding using embedding model, built as vector database index
- - economy Economy: Build using inverted index of Keyword Table Index
+ - economy Economy: Build using inverted index of keyword table index
- - process_rule Processing rules
+ - process_rule Processing rules
- mode (string) Cleaning, segmentation mode, automatic / custom
- rules (object) Custom rules (in automatic mode, this field is empty)
- pre_processing_rules (array[object]) Preprocessing rules
@@ -164,7 +164,7 @@ import { Row, Col, Properties, Property, Heading, SubProperty, Paragraph } from
- remove_extra_spaces Replace consecutive spaces, newlines, tabs
- remove_urls_emails Delete URL, email address
- enabled (bool) Whether to select this rule or not. If no document ID is passed in, it represents the default value.
- - segmentation (object) segmentation rules
+ - segmentation (object) Segmentation rules
- separator Custom segment identifier, currently only allows one delimiter to be set. Default is \n
- max_tokens Maximum length (token) defaults to 1000
high_quality high_quality
- - economy economy
+ Index technique (optional)
+ - high_quality High quality
+ - economy Economy
vendor vendor
- - external external knowledge
+ - vendor Vendor
+ - external External knowledge
remove_extra_spaces Replace consecutive spaces, newlines, tabs
- remove_urls_emails Delete URL, email address
- enabled (bool) Whether to select this rule or not. If no document ID is passed in, it represents the default value.
- - segmentation (object) segmentation rules
+ - segmentation (object) Segmentation rules
- separator Custom segment identifier, currently only allows one delimiter to be set. Default is \n
- max_tokens Maximum length (token) defaults to 1000
@@ -456,11 +456,11 @@ import { Row, Col, Properties, Property, Heading, SubProperty, Paragraph } from
remove_extra_spaces Replace consecutive spaces, newlines, tabs
- remove_urls_emails Delete URL, email address
- enabled (bool) Whether to select this rule or not. If no document ID is passed in, it represents the default value.
- - segmentation (object) segmentation rules
+ - segmentation (object) Segmentation rules
- separator Custom segment identifier, currently only allows one delimiter to be set. Default is \n
- max_tokens Maximum length (token) defaults to 1000
@@ -553,11 +553,11 @@ import { Row, Col, Properties, Property, Heading, SubProperty, Paragraph } from
content (text) Text content/question content, required
- - answer (text) Answer content, if the mode of the Knowledge is qa mode, pass the value(optional)
- - keywords (list) Keywords(optional)
+ - content (text) Text content / question content, required
+ - answer (text) Answer content, if the mode of the knowledge is Q&A mode, pass the value (optional)
+ - keywords (list) Keywords (optional)
content (text) text content/question content，required
- - answer (text) Answer content, not required, passed if the Knowledge is in qa mode
- - keywords (list) keyword, not required
- - enabled (bool) false/true, not required
+ - content (text) Text content / question content, required
+ - answer (text) Answer content, passed if the knowledge is in Q&A mode (optional)
+ - keywords (list) Keyword (optional)
+ - enabled (bool) False / true (optional)
search_method (text) Search method: One of the following four keywords is required
- keyword_search Keyword search
- semantic_search Semantic search
- full_text_search Full-text search
- hybrid_search Hybrid search
- - reranking_enable (bool) Whether to enable reranking, optional, required if the search mode is semantic_search or hybrid_search
- - reranking_mode (object) Rerank model configuration, optional, required if reranking is enabled
+ - reranking_enable (bool) Whether to enable reranking, required if the search mode is semantic_search or hybrid_search (optional)
+ - reranking_mode (object) Rerank model configuration, required if reranking is enabled
- reranking_provider_name (string) Rerank model provider
- reranking_model_name (string) Rerank model name
- weights (double) Semantic search weight setting in hybrid search mode
- - top_k (integer) Number of results to return, optional
+ - top_k (integer) Number of results to return (optional)
- score_threshold_enabled (bool) Whether to enable score threshold
- score_threshold (double) Score threshold
high_quality 高质量：使用 embedding 模型进行嵌入，构建为向量数据库索引
- - economy 经济：使用 Keyword Table Index 的倒排索引进行构建
+ - economy 经济：使用 keyword table index 的倒排索引进行构建
enabled (bool) 是否选中该规则，不传入文档 ID 时代表默认值
- segmentation (object) 分段规则
- separator 自定义分段标识符，目前仅允许设置一个分隔符。默认为 \n
- - max_tokens 最大长度 (token) 默认为 1000
+ - max_tokens 最大长度（token）默认为 1000
original_document_id 源文档 ID（选填）
- 用于重新上传文档或修改文档清洗、分段配置，缺失的信息从源文档复制
- 源文档不可为归档的文档
- 当传入 original_document_id 时，代表文档进行更新操作，process_rule 为可填项目，不填默认使用源文档的分段方式
- 未传入 original_document_id 时，代表文档进行新增操作，process_rule 为必填
- - indexing_technique 索引方式
+ - indexing_technique 索引方式
- high_quality 高质量：使用 embedding 模型进行嵌入，构建为向量数据库索引
- - economy 经济：使用 Keyword Table Index 的倒排索引进行构建
+ - economy 经济：使用 keyword table index 的倒排索引进行构建
- - process_rule 处理规则
+ - process_rule 处理规则
- mode (string) 清洗、分段模式 ，automatic 自动 / custom 自定义
- rules (object) 自定义规则（自动模式下，该字段为空）
- pre_processing_rules (array[object]) 预处理规则
@@ -166,7 +166,7 @@ import { Row, Col, Properties, Property, Heading, SubProperty, Paragraph } from
- enabled (bool) 是否选中该规则，不传入文档 ID 时代表默认值
- segmentation (object) 分段规则
- separator 自定义分段标识符，目前仅允许设置一个分隔符。默认为 \n
- - max_tokens 最大长度 (token) 默认为 1000
+ - max_tokens 最大长度（token）默认为 1000
only_me 仅自己
- all_team_members 所有团队成员
- partial_members 部分团队成员
vendor 上传文件
- external 外部知识库
enabled (bool) 是否选中该规则，不传入文档 ID 时代表默认值
- segmentation (object) 分段规则
- separator 自定义分段标识符，目前仅允许设置一个分隔符。默认为 \n
- - max_tokens 最大长度 (token) 默认为 1000
+ - max_tokens 最大长度（token）默认为 1000
enabled (bool) 是否选中该规则，不传入文档 ID 时代表默认值
- segmentation (object) 分段规则
- separator 自定义分段标识符，目前仅允许设置一个分隔符。默认为 \n
- - max_tokens 最大长度 (token) 默认为 1000
+ - max_tokens 最大长度（token）默认为 1000
content (text) 文本内容/问题内容，必填
- - answer (text) 答案内容，非必填，如果知识库的模式为qa模式则传值
+ - answer (text) 答案内容，非必填，如果知识库的模式为 Q&A 模式则传值
- keywords (list) 关键字，非必填
content (text) 文本内容/问题内容，必填
- - answer (text) 答案内容，非必填，如果知识库的模式为qa模式则传值
+ - answer (text) 答案内容，非必填，如果知识库的模式为 Q&A 模式则传值
- keywords (list) 关键字，非必填
- enabled (bool) false/true，非必填
search_method (text) 检索方法：以下三个关键字之一，必填
- keyword_search 关键字检索
- semantic_search 语义检索
- full_text_search 全文检索
- hybrid_search 混合检索
- - reranking_enable (bool) 是否启用 Reranking，非必填，如果检索模式为semantic_search模式或者hybrid_search则传值
+ - reranking_enable (bool) 是否启用 Reranking，非必填，如果检索模式为 semantic_search 模式或者 hybrid_search 则传值
- reranking_mode (object) Rerank模型配置，非必填，如果启用了 reranking 则传值
- reranking_provider_name (string) Rerank 模型提供商
- reranking_model_name (string) Rerank 模型名称
- weights (double) 混合检索模式下语意检索的权重设置
- top_k (integer) 返回结果数量，非必填
- - score_threshold_enabled (bool) 是否开启Score阈值
- - score_threshold (double) Score阈值
+ - score_threshold_enabled (bool) 是否开启 score 阈值
+ - score_threshold (double) Score 阈值
{t('appDebug.generate.title')}
{t('appDebug.generate.description')}
+
+
{t('appDebug.generate.tryIt')}
diff --git a/web/app/components/app/configuration/config/code-generator/get-code-generator-res.tsx b/web/app/components/app/configuration/config/code-generator/get-code-generator-res.tsx
index b63e3e2693..85c522ca0f 100644
--- a/web/app/components/app/configuration/config/code-generator/get-code-generator-res.tsx
+++ b/web/app/components/app/configuration/config/code-generator/get-code-generator-res.tsx
@@ -105,6 +105,15 @@ export const GetCodeGeneratorResModal: FC{t('appDebug.codegen.loading')}
+
+ )
return (
+
+ {t('appDebug.codegen.noDataLine1')}
+ {t('appDebug.codegen.noDataLine2')}
+ {t('appDebug.codegen.resTitle')}
diff --git a/web/app/components/app/configuration/dataset-config/index.tsx b/web/app/components/app/configuration/dataset-config/index.tsx
index 2c082d8815..0d9d575c1e 100644
--- a/web/app/components/app/configuration/dataset-config/index.tsx
+++ b/web/app/components/app/configuration/dataset-config/index.tsx
@@ -15,6 +15,7 @@ import { AppType } from '@/types/app'
import type { DataSet } from '@/models/datasets'
import {
getMultipleRetrievalConfig,
+ getSelectedDatasetsMode,
} from '@/app/components/workflow/nodes/knowledge-retrieval/utils'
import { useModelListAndDefaultModelAndCurrentProviderAndModel } from '@/app/components/header/account-setting/model-provider-page/hooks'
import { ModelTypeEnum } from '@/app/components/header/account-setting/model-provider-page/declarations'
@@ -38,6 +39,7 @@ const DatasetConfig: FC = () => {
isAgent,
datasetConfigs,
setDatasetConfigs,
+ setRerankSettingModalOpen,
} = useContext(ConfigContext)
const formattingChangedDispatcher = useFormattingChangedDispatcher()
@@ -55,6 +57,20 @@ const DatasetConfig: FC = () => {
...(datasetConfigs as any),
...retrievalConfig,
})
+ const {
+ allExternal,
+ allInternal,
+ mixtureInternalAndExternal,
+ mixtureHighQualityAndEconomic,
+ inconsistentEmbeddingModel,
+ } = getSelectedDatasetsMode(filteredDataSets)
+
+ if (
+ (allInternal && (mixtureHighQualityAndEconomic || inconsistentEmbeddingModel))
+ || mixtureInternalAndExternal
+ || allExternal
+ )
+ setRerankSettingModalOpen(true)
formattingChangedDispatcher()
}
diff --git a/web/app/components/app/configuration/dataset-config/params-config/config-content.tsx b/web/app/components/app/configuration/dataset-config/params-config/config-content.tsx
index 6b1983f5e2..75f0c33349 100644
--- a/web/app/components/app/configuration/dataset-config/params-config/config-content.tsx
+++ b/web/app/components/app/configuration/dataset-config/params-config/config-content.tsx
@@ -266,7 +266,7 @@ const ConfigContent: FC
{
- selectedDatasetsMode.allEconomic && (
+ selectedDatasetsMode.allEconomic && !selectedDatasetsMode.mixtureInternalAndExternal && (
= ({
className,
onImageCropped,
+ onUpload,
}) => {
const [inputImage, setInputImage] = useState<{ file: File; url: string }>()
+ const [isAnimatedImage, setIsAnimatedImage] = useState(false)
useEffect(() => {
return () => {
if (inputImage)
@@ -34,12 +38,19 @@ const Uploader: FC = ({
if (!inputImage)
return
onImageCropped?.(inputImage.url, croppedAreaPixels, inputImage.file.name)
+ onUpload?.(undefined)
}
const handleLocalFileInput = (e: ChangeEvent) => {
const file = e.target.files?.[0]
- if (file)
+ if (file) {
setInputImage({ file, url: URL.createObjectURL(file) })
+ checkIsAnimatedImage(file).then((isAnimatedImage) => {
+ setIsAnimatedImage(!!isAnimatedImage)
+ if (isAnimatedImage)
+ onUpload?.(file)
+ })
+ }
}
const {
@@ -52,6 +63,26 @@ const Uploader: FC = ({
const inputRef = createRef()
+ const handleShowImage = () => {
+ if (isAnimatedImage) {
+ return (
+ 
+ )
+ }
+
+ return (
+
diff --git a/web/app/components/base/app-icon-picker/index.tsx b/web/app/components/base/app-icon-picker/index.tsx
index ba375abdd9..8a10d28653 100644
--- a/web/app/components/base/app-icon-picker/index.tsx
+++ b/web/app/components/base/app-icon-picker/index.tsx
@@ -74,6 +74,11 @@ const AppIconPicker: FC {
let errMsg = ''
if (tempDataSetConfigs.retrieval_model === RETRIEVE_TYPE.multiWay) {
- if (!tempDataSetConfigs.reranking_model?.reranking_model_name && (rerankDefaultModel && !isRerankDefaultModelValid))
+ if (tempDataSetConfigs.reranking_enable
+ && tempDataSetConfigs.reranking_mode === RerankingModeEnum.RerankingModel
+ && !isRerankDefaultModelValid
+ )
errMsg = t('appDebug.datasetConfig.rerankModelRequired')
}
if (errMsg) {
@@ -62,7 +66,9 @@ const ParamsConfig = ({
if (!isValid())
return
const config = { ...tempDataSetConfigs }
- if (config.retrieval_model === RETRIEVE_TYPE.multiWay && !config.reranking_model) {
+ if (config.retrieval_model === RETRIEVE_TYPE.multiWay
+ && config.reranking_mode === RerankingModeEnum.RerankingModel
+ && !config.reranking_model) {
config.reranking_model = {
reranking_provider_name: rerankDefaultModel?.provider?.provider,
reranking_model_name: rerankDefaultModel?.model,
diff --git a/web/app/components/app/configuration/index.tsx b/web/app/components/app/configuration/index.tsx
index af50fc65c3..bf6c5e79c8 100644
--- a/web/app/components/app/configuration/index.tsx
+++ b/web/app/components/app/configuration/index.tsx
@@ -252,12 +252,18 @@ const Configuration: FC = () => {
}
hideSelectDataSet()
const {
- allEconomic,
+ allExternal,
+ allInternal,
+ mixtureInternalAndExternal,
mixtureHighQualityAndEconomic,
inconsistentEmbeddingModel,
} = getSelectedDatasetsMode(newDatasets)
- if (allEconomic || mixtureHighQualityAndEconomic || inconsistentEmbeddingModel)
+ if (
+ (allInternal && (mixtureHighQualityAndEconomic || inconsistentEmbeddingModel))
+ || mixtureInternalAndExternal
+ || allExternal
+ )
setRerankSettingModalOpen(true)
const { datasets, retrieval_model, score_threshold_enabled, ...restConfigs } = datasetConfigs
diff --git a/web/app/components/app/log/list.tsx b/web/app/components/app/log/list.tsx
index f289c5a401..b78aaffef2 100644
--- a/web/app/components/app/log/list.tsx
+++ b/web/app/components/app/log/list.tsx
@@ -36,6 +36,7 @@ import useBreakpoints, { MediaType } from '@/hooks/use-breakpoints'
import TextGeneration from '@/app/components/app/text-generate/item'
import { addFileInfos, sortAgentSorts } from '@/app/components/tools/utils'
import MessageLogModal from '@/app/components/base/message-log-modal'
+import PromptLogModal from '@/app/components/base/prompt-log-modal'
import { useStore as useAppStore } from '@/app/components/app/store'
import { useAppContext } from '@/context/app-context'
import useTimestamp from '@/hooks/use-timestamp'
@@ -168,11 +169,13 @@ function DetailPanel({ detail, onFeedback }: IDetailPanel) {
const { userProfile: { timezone } } = useAppContext()
const { formatTime } = useTimestamp()
const { onClose, appDetail } = useContext(DrawerContext)
- const { currentLogItem, setCurrentLogItem, showMessageLogModal, setShowMessageLogModal, currentLogModalActiveTab } = useAppStore(useShallow(state => ({
+ const { currentLogItem, setCurrentLogItem, showMessageLogModal, setShowMessageLogModal, showPromptLogModal, setShowPromptLogModal, currentLogModalActiveTab } = useAppStore(useShallow(state => ({
currentLogItem: state.currentLogItem,
setCurrentLogItem: state.setCurrentLogItem,
showMessageLogModal: state.showMessageLogModal,
setShowMessageLogModal: state.setShowMessageLogModal,
+ showPromptLogModal: state.showPromptLogModal,
+ setShowPromptLogModal: state.setShowPromptLogModal,
currentLogModalActiveTab: state.currentLogModalActiveTab,
})))
const { t } = useTranslation()
@@ -192,8 +195,8 @@ function DetailPanel({ detail, onFeedback }: IDetailPanel) {
conversation_id: detail.id,
limit: 10,
}
- if (allChatItems.at(-1)?.id)
- params.first_id = allChatItems.at(-1)?.id.replace('question-', '')
+ if (allChatItems[0]?.id)
+ params.first_id = allChatItems[0]?.id.replace('question-', '')
const messageRes = await fetchChatMessages({
url: `/apps/${appDetail?.id}/chat-messages`,
params,
@@ -557,6 +560,16 @@ function DetailPanel({ detail, onFeedback }: IDetailPanel) {
defaultTab={currentLogModalActiveTab}
/>
)}
+ {showPromptLogModal && (
+ {
+ setCurrentLogItem()
+ setShowPromptLogModal(false)
+ }}
+ />
+ )}
)
}
diff --git a/web/app/components/base/app-icon-picker/Uploader.tsx b/web/app/components/base/app-icon-picker/Uploader.tsx
index 4ddaa40447..ba0ef6b2b2 100644
--- a/web/app/components/base/app-icon-picker/Uploader.tsx
+++ b/web/app/components/base/app-icon-picker/Uploader.tsx
@@ -8,18 +8,22 @@ import classNames from 'classnames'
import { ImagePlus } from '../icons/src/vender/line/images'
import { useDraggableUploader } from './hooks'
+import { checkIsAnimatedImage } from './utils'
import { ALLOW_FILE_EXTENSIONS } from '@/types/app'
type UploaderProps = {
className?: string
onImageCropped?: (tempUrl: string, croppedAreaPixels: Area, fileName: string) => void
+ onUpload?: (file?: File) => void
}
const Uploader: FC = ({
Supports PNG, JPG, JPEG, WEBP and GIF
- :
diff --git a/web/app/components/base/app-icon-picker/utils.ts b/web/app/components/base/app-icon-picker/utils.ts
index 14c9ae3f28..99154d56da 100644
--- a/web/app/components/base/app-icon-picker/utils.ts
+++ b/web/app/components/base/app-icon-picker/utils.ts
@@ -115,3 +115,52 @@ export default async function getCroppedImg(
}, mimeType)
})
}
+
+export function checkIsAnimatedImage(file) {
+ return new Promise((resolve, reject) => {
+ const fileReader = new FileReader()
+
+ fileReader.onload = function (e) {
+ const arr = new Uint8Array(e.target.result)
+
+ // Check file extension
+ const fileName = file.name.toLowerCase()
+ if (fileName.endsWith('.gif')) {
+ // If file is a GIF, assume it's animated
+ resolve(true)
+ }
+ // Check for WebP signature (RIFF and WEBP)
+ else if (isWebP(arr)) {
+ resolve(checkWebPAnimation(arr)) // Check if it's animated
+ }
+ else {
+ resolve(false) // Not a GIF or WebP
+ }
+ }
+
+ fileReader.onerror = function (err) {
+ reject(err) // Reject the promise on error
+ }
+
+ // Read the file as an array buffer
+ fileReader.readAsArrayBuffer(file)
+ })
+}
+
+// Function to check for WebP signature
+function isWebP(arr) {
+ return (
+ arr[0] === 0x52 && arr[1] === 0x49 && arr[2] === 0x46 && arr[3] === 0x46
+ && arr[8] === 0x57 && arr[9] === 0x45 && arr[10] === 0x42 && arr[11] === 0x50
+ ) // "WEBP"
+}
+
+// Function to check if the WebP is animated (contains ANIM chunk)
+function checkWebPAnimation(arr) {
+ // Search for the ANIM chunk in WebP to determine if it's animated
+ for (let i = 12; i < arr.length - 4; i++) {
+ if (arr[i] === 0x41 && arr[i + 1] === 0x4E && arr[i + 2] === 0x49 && arr[i + 3] === 0x4D)
+ return true // Found animation
+ }
+ return false // No animation chunk found
+}
diff --git a/web/app/components/base/chat/__tests__/__snapshots__/utils.spec.ts.snap b/web/app/components/base/chat/__tests__/__snapshots__/utils.spec.ts.snap
index 070975bfa7..7da09c4529 100644
--- a/web/app/components/base/chat/__tests__/__snapshots__/utils.spec.ts.snap
+++ b/web/app/components/base/chat/__tests__/__snapshots__/utils.spec.ts.snap
@@ -1804,6 +1804,280 @@ exports[`build chat item tree and get thread messages should get thread messages
]
`;
+exports[`build chat item tree and get thread messages should work with partial messages 1`] = `
+[
+ {
+ "children": [
+ {
+ "agent_thoughts": [
+ {
+ "chain_id": null,
+ "created_at": 1726105809,
+ "files": [],
+ "id": "1019cd79-d141-4f9f-880a-fc1441cfd802",
+ "message_id": "cd5affb0-7bc2-4a6f-be7e-25e74595c9dd",
+ "observation": "",
+ "position": 1,
+ "thought": "Sure! My number is 54. Your turn!",
+ "tool": "",
+ "tool_input": "",
+ "tool_labels": {},
+ },
+ ],
+ "children": [
+ {
+ "children": [
+ {
+ "agent_thoughts": [
+ {
+ "chain_id": null,
+ "created_at": 1726105822,
+ "files": [],
+ "id": "0773bec7-b992-4a53-92b2-20ebaeae8798",
+ "message_id": "324bce32-c98c-435d-a66b-bac974ebb5ed",
+ "observation": "",
+ "position": 1,
+ "thought": "My number is 4729. Your turn!",
+ "tool": "",
+ "tool_input": "",
+ "tool_labels": {},
+ },
+ ],
+ "children": [],
+ "content": "My number is 4729. Your turn!",
+ "conversationId": "dd6c9cfd-2656-48ec-bd51-2139c1790d80",
+ "feedbackDisabled": false,
+ "id": "324bce32-c98c-435d-a66b-bac974ebb5ed",
+ "input": {
+ "inputs": {},
+ "query": "3306",
+ },
+ "isAnswer": true,
+ "log": [
+ {
+ "files": [],
+ "role": "user",
+ "text": "Let's play a game, I say a number , and you response me with another bigger, yet randomly number. I'll start first, 38",
+ },
+ {
+ "files": [],
+ "role": "assistant",
+ "text": "Sure! My number is 54. Your turn!",
+ },
+ {
+ "files": [],
+ "role": "user",
+ "text": "3306",
+ },
+ {
+ "files": [],
+ "role": "assistant",
+ "text": "My number is 4729. Your turn!",
+ },
+ ],
+ "message_files": [],
+ "more": {
+ "latency": "1.30",
+ "time": "09/11/2024 09:50 PM",
+ "tokens": 66,
+ },
+ "parentMessageId": "question-324bce32-c98c-435d-a66b-bac974ebb5ed",
+ "siblingIndex": 0,
+ "workflow_run_id": null,
+ },
+ ],
+ "content": "3306",
+ "id": "question-324bce32-c98c-435d-a66b-bac974ebb5ed",
+ "isAnswer": false,
+ "message_files": [],
+ "parentMessageId": "cd5affb0-7bc2-4a6f-be7e-25e74595c9dd",
+ },
+ {
+ "children": [
+ {
+ "agent_thoughts": [
+ {
+ "chain_id": null,
+ "created_at": 1726107812,
+ "files": [],
+ "id": "5ca650f3-982c-4399-8b95-9ea241c76707",
+ "message_id": "684b5396-4e91-4043-88e9-aabe48b21acc",
+ "observation": "",
+ "position": 1,
+ "thought": "My number is 4821. Your turn!",
+ "tool": "",
+ "tool_input": "",
+ "tool_labels": {},
+ },
+ ],
+ "children": [
+ {
+ "children": [
+ {
+ "agent_thoughts": [
+ {
+ "chain_id": null,
+ "created_at": 1726111024,
+ "files": [],
+ "id": "095cacab-afad-4387-a41d-1662578b8b13",
+ "message_id": "19904a7b-7494-4ed8-b72c-1d18668cea8c",
+ "observation": "",
+ "position": 1,
+ "thought": "My number is 1456. Your turn!",
+ "tool": "",
+ "tool_input": "",
+ "tool_labels": {},
+ },
+ ],
+ "children": [],
+ "content": "My number is 1456. Your turn!",
+ "conversationId": "dd6c9cfd-2656-48ec-bd51-2139c1790d80",
+ "feedbackDisabled": false,
+ "id": "19904a7b-7494-4ed8-b72c-1d18668cea8c",
+ "input": {
+ "inputs": {},
+ "query": "1003",
+ },
+ "isAnswer": true,
+ "log": [
+ {
+ "files": [],
+ "role": "user",
+ "text": "Let's play a game, I say a number , and you response me with another bigger, yet randomly number. I'll start first, 38",
+ },
+ {
+ "files": [],
+ "role": "assistant",
+ "text": "Sure! My number is 54. Your turn!",
+ },
+ {
+ "files": [],
+ "role": "user",
+ "text": "3306",
+ },
+ {
+ "files": [],
+ "role": "assistant",
+ "text": "My number is 4821. Your turn!",
+ },
+ {
+ "files": [],
+ "role": "user",
+ "text": "1003",
+ },
+ {
+ "files": [],
+ "role": "assistant",
+ "text": "My number is 1456. Your turn!",
+ },
+ ],
+ "message_files": [],
+ "more": {
+ "latency": "1.38",
+ "time": "09/11/2024 11:17 PM",
+ "tokens": 86,
+ },
+ "parentMessageId": "question-19904a7b-7494-4ed8-b72c-1d18668cea8c",
+ "siblingIndex": 0,
+ "workflow_run_id": null,
+ },
+ ],
+ "content": "1003",
+ "id": "question-19904a7b-7494-4ed8-b72c-1d18668cea8c",
+ "isAnswer": false,
+ "message_files": [],
+ "parentMessageId": "684b5396-4e91-4043-88e9-aabe48b21acc",
+ },
+ ],
+ "content": "My number is 4821. Your turn!",
+ "conversationId": "dd6c9cfd-2656-48ec-bd51-2139c1790d80",
+ "feedbackDisabled": false,
+ "id": "684b5396-4e91-4043-88e9-aabe48b21acc",
+ "input": {
+ "inputs": {},
+ "query": "3306",
+ },
+ "isAnswer": true,
+ "log": [
+ {
+ "files": [],
+ "role": "user",
+ "text": "Let's play a game, I say a number , and you response me with another bigger, yet randomly number. I'll start first, 38",
+ },
+ {
+ "files": [],
+ "role": "assistant",
+ "text": "Sure! My number is 54. Your turn!",
+ },
+ {
+ "files": [],
+ "role": "user",
+ "text": "3306",
+ },
+ {
+ "files": [],
+ "role": "assistant",
+ "text": "My number is 4821. Your turn!",
+ },
+ ],
+ "message_files": [],
+ "more": {
+ "latency": "1.48",
+ "time": "09/11/2024 10:23 PM",
+ "tokens": 66,
+ },
+ "parentMessageId": "question-684b5396-4e91-4043-88e9-aabe48b21acc",
+ "siblingIndex": 1,
+ "workflow_run_id": null,
+ },
+ ],
+ "content": "3306",
+ "id": "question-684b5396-4e91-4043-88e9-aabe48b21acc",
+ "isAnswer": false,
+ "message_files": [],
+ "parentMessageId": "cd5affb0-7bc2-4a6f-be7e-25e74595c9dd",
+ },
+ ],
+ "content": "Sure! My number is 54. Your turn!",
+ "conversationId": "dd6c9cfd-2656-48ec-bd51-2139c1790d80",
+ "feedbackDisabled": false,
+ "id": "cd5affb0-7bc2-4a6f-be7e-25e74595c9dd",
+ "input": {
+ "inputs": {},
+ "query": "Let's play a game, I say a number , and you response me with another bigger, yet randomly number. I'll start first, 38",
+ },
+ "isAnswer": true,
+ "log": [
+ {
+ "files": [],
+ "role": "user",
+ "text": "Let's play a game, I say a number , and you response me with another bigger, yet randomly number. I'll start first, 38",
+ },
+ {
+ "files": [],
+ "role": "assistant",
+ "text": "Sure! My number is 54. Your turn!",
+ },
+ ],
+ "message_files": [],
+ "more": {
+ "latency": "1.52",
+ "time": "09/11/2024 09:50 PM",
+ "tokens": 46,
+ },
+ "parentMessageId": "question-cd5affb0-7bc2-4a6f-be7e-25e74595c9dd",
+ "siblingIndex": 0,
+ "workflow_run_id": null,
+ },
+ ],
+ "content": "Let's play a game, I say a number , and you response me with another bigger, yet randomly number. I'll start first, 38",
+ "id": "question-cd5affb0-7bc2-4a6f-be7e-25e74595c9dd",
+ "isAnswer": false,
+ "message_files": [],
+ },
+]
+`;
+
exports[`build chat item tree and get thread messages should work with real world messages 1`] = `
[
{
diff --git a/web/app/components/base/chat/__tests__/utils.spec.ts b/web/app/components/base/chat/__tests__/utils.spec.ts
index c602ac8a99..1dead1c949 100644
--- a/web/app/components/base/chat/__tests__/utils.spec.ts
+++ b/web/app/components/base/chat/__tests__/utils.spec.ts
@@ -255,4 +255,10 @@ describe('build chat item tree and get thread messages', () => {
const threadMessages6_2 = getThreadMessages(tree6, 'ff4c2b43-48a5-47ad-9dc5-08b34ddba61b')
expect(threadMessages6_2).toMatchSnapshot()
})
+
+ const partialMessages = (realWorldMessages as ChatItemInTree[]).slice(-10)
+ const tree7 = buildChatItemTree(partialMessages)
+ it('should work with partial messages', () => {
+ expect(tree7).toMatchSnapshot()
+ })
})
diff --git a/web/app/components/base/chat/utils.ts b/web/app/components/base/chat/utils.ts
index 16357361cf..61dfaecffc 100644
--- a/web/app/components/base/chat/utils.ts
+++ b/web/app/components/base/chat/utils.ts
@@ -134,6 +134,12 @@ function buildChatItemTree(allMessages: IChatItem[]): ChatItemInTree[] {
}
}
+ // If no messages have parentMessageId=null (indicating a root node),
+ // then we likely have a partial chat history. In this case,
+ // use the first available message as the root node.
+ if (rootNodes.length === 0 && allMessages.length > 0)
+ rootNodes.push(map[allMessages[0]!.id]!)
+
return rootNodes
}
diff --git a/web/app/components/base/file-uploader/constants.ts b/web/app/components/base/file-uploader/constants.ts
index 629fe2566b..a749d73c74 100644
--- a/web/app/components/base/file-uploader/constants.ts
+++ b/web/app/components/base/file-uploader/constants.ts
@@ -3,5 +3,6 @@ export const IMG_SIZE_LIMIT = 10 * 1024 * 1024
export const FILE_SIZE_LIMIT = 15 * 1024 * 1024
export const AUDIO_SIZE_LIMIT = 50 * 1024 * 1024
export const VIDEO_SIZE_LIMIT = 100 * 1024 * 1024
+export const MAX_FILE_UPLOAD_LIMIT = 10
export const FILE_URL_REGEX = /^(https?|ftp):\/\//
diff --git a/web/app/components/base/file-uploader/file-uploader-in-attachment/file-item.tsx b/web/app/components/base/file-uploader/file-uploader-in-attachment/file-item.tsx
index d22d6ff4ec..2a042bab40 100644
--- a/web/app/components/base/file-uploader/file-uploader-in-attachment/file-item.tsx
+++ b/web/app/components/base/file-uploader/file-uploader-in-attachment/file-item.tsx
@@ -1,6 +1,5 @@
import {
memo,
- useMemo,
} from 'react'
import {
RiDeleteBinLine,
@@ -35,17 +34,9 @@ const FileInAttachmentItem = ({
onRemove,
onReUpload,
}: FileInAttachmentItemProps) => {
- const { id, name, type, progress, supportFileType, base64Url, url } = file
- const ext = getFileExtension(name, type)
+ const { id, name, type, progress, supportFileType, base64Url, url, isRemote } = file
+ const ext = getFileExtension(name, type, isRemote)
const isImageFile = supportFileType === SupportUploadFileTypes.image
- const nameArr = useMemo(() => {
- const nameMatch = name.match(/(.+)\.([^.]+)$/)
-
- if (nameMatch)
- return [nameMatch[1], nameMatch[2]]
-
- return [name, '']
- }, [name])
return (
-
{nameArr[0]}
- {
- nameArr[1] && (
- .{nameArr[1]}
- )
- }
+ {name}
{
@@ -93,7 +79,11 @@ const FileInAttachmentItem = ({
•
)
}
- {formatFileSize(file.size || 0)}
+ {
+ !!file.size && (
+ {formatFileSize(file.size)}
+ )
+ }
diff --git a/web/app/components/base/file-uploader/file-uploader-in-chat-input/file-item.tsx b/web/app/components/base/file-uploader/file-uploader-in-chat-input/file-item.tsx
index 6597373020..a051b89ec1 100644
--- a/web/app/components/base/file-uploader/file-uploader-in-chat-input/file-item.tsx
+++ b/web/app/components/base/file-uploader/file-uploader-in-chat-input/file-item.tsx
@@ -31,8 +31,8 @@ const FileItem = ({
onRemove,
onReUpload,
}: FileItemProps) => {
- const { id, name, type, progress, url } = file
- const ext = getFileExtension(name, type)
+ const { id, name, type, progress, url, isRemote } = file
+ const ext = getFileExtension(name, type, isRemote)
const uploadError = progress === -1
return (
@@ -75,7 +75,9 @@ const FileItem = ({
)
}
- {formatFileSize(file.size || 0)}
+ {
+ !!file.size && formatFileSize(file.size)
+ }
{
showDownloadAction && (
diff --git a/web/app/components/base/file-uploader/hooks.ts b/web/app/components/base/file-uploader/hooks.ts
index 942e5d612a..c735754ffe 100644
--- a/web/app/components/base/file-uploader/hooks.ts
+++ b/web/app/components/base/file-uploader/hooks.ts
@@ -18,6 +18,7 @@ import {
AUDIO_SIZE_LIMIT,
FILE_SIZE_LIMIT,
IMG_SIZE_LIMIT,
+ MAX_FILE_UPLOAD_LIMIT,
VIDEO_SIZE_LIMIT,
} from '@/app/components/base/file-uploader/constants'
import { useToastContext } from '@/app/components/base/toast'
@@ -25,7 +26,7 @@ import { TransferMethod } from '@/types/app'
import { SupportUploadFileTypes } from '@/app/components/workflow/types'
import type { FileUpload } from '@/app/components/base/features/types'
import { formatFileSize } from '@/utils/format'
-import { fetchRemoteFileInfo } from '@/service/common'
+import { uploadRemoteFileInfo } from '@/service/common'
import type { FileUploadConfigResponse } from '@/models/common'
export const useFileSizeLimit = (fileUploadConfig?: FileUploadConfigResponse) => {
@@ -33,12 +34,14 @@ export const useFileSizeLimit = (fileUploadConfig?: FileUploadConfigResponse) =>
const docSizeLimit = Number(fileUploadConfig?.file_size_limit) * 1024 * 1024 || FILE_SIZE_LIMIT
const audioSizeLimit = Number(fileUploadConfig?.audio_file_size_limit) * 1024 * 1024 || AUDIO_SIZE_LIMIT
const videoSizeLimit = Number(fileUploadConfig?.video_file_size_limit) * 1024 * 1024 || VIDEO_SIZE_LIMIT
+ const maxFileUploadLimit = Number(fileUploadConfig?.workflow_file_upload_limit) || MAX_FILE_UPLOAD_LIMIT
return {
imgSizeLimit,
docSizeLimit,
audioSizeLimit,
videoSizeLimit,
+ maxFileUploadLimit,
}
}
@@ -49,7 +52,7 @@ export const useFile = (fileConfig: FileUpload) => {
const params = useParams()
const { imgSizeLimit, docSizeLimit, audioSizeLimit, videoSizeLimit } = useFileSizeLimit(fileConfig.fileUploadConfig)
- const checkSizeLimit = (fileType: string, fileSize: number) => {
+ const checkSizeLimit = useCallback((fileType: string, fileSize: number) => {
switch (fileType) {
case SupportUploadFileTypes.image: {
if (fileSize > imgSizeLimit) {
@@ -120,7 +123,7 @@ export const useFile = (fileConfig: FileUpload) => {
return true
}
}
- }
+ }, [audioSizeLimit, docSizeLimit, imgSizeLimit, notify, t, videoSizeLimit])
const handleAddFile = useCallback((newFile: FileEntity) => {
const {
@@ -188,6 +191,17 @@ export const useFile = (fileConfig: FileUpload) => {
}
}, [fileStore, notify, t, handleUpdateFile, params])
+ const startProgressTimer = useCallback((fileId: string) => {
+ const timer = setInterval(() => {
+ const files = fileStore.getState().files
+ const file = files.find(file => file.id === fileId)
+
+ if (file && file.progress < 80 && file.progress >= 0)
+ handleUpdateFile({ ...file, progress: file.progress + 20 })
+ else
+ clearTimeout(timer)
+ }, 200)
+ }, [fileStore, handleUpdateFile])
const handleLoadFileFromLink = useCallback((url: string) => {
const allowedFileTypes = fileConfig.allowed_file_types
@@ -197,19 +211,27 @@ export const useFile = (fileConfig: FileUpload) => {
type: '',
size: 0,
progress: 0,
- transferMethod: TransferMethod.remote_url,
+ transferMethod: TransferMethod.local_file,
supportFileType: '',
url,
+ isRemote: true,
}
handleAddFile(uploadingFile)
+ startProgressTimer(uploadingFile.id)
- fetchRemoteFileInfo(url).then((res) => {
+ uploadRemoteFileInfo(url, !!params.token).then((res) => {
const newFile = {
...uploadingFile,
- type: res.file_type,
- size: res.file_length,
+ type: res.mime_type,
+ size: res.size,
progress: 100,
- supportFileType: getSupportFileType(url, res.file_type, allowedFileTypes?.includes(SupportUploadFileTypes.custom)),
+ supportFileType: getSupportFileType(res.name, res.mime_type, allowedFileTypes?.includes(SupportUploadFileTypes.custom)),
+ uploadedId: res.id,
+ url: res.url,
+ }
+ if (!isAllowedFileExtension(res.name, res.mime_type, fileConfig.allowed_file_types || [], fileConfig.allowed_file_extensions || [])) {
+ notify({ type: 'error', message: t('common.fileUploader.fileExtensionNotSupport') })
+ handleRemoveFile(uploadingFile.id)
}
if (!checkSizeLimit(newFile.supportFileType, newFile.size))
handleRemoveFile(uploadingFile.id)
@@ -219,7 +241,7 @@ export const useFile = (fileConfig: FileUpload) => {
notify({ type: 'error', message: t('common.fileUploader.pasteFileLinkInvalid') })
handleRemoveFile(uploadingFile.id)
})
- }, [checkSizeLimit, handleAddFile, handleUpdateFile, notify, t, handleRemoveFile, fileConfig?.allowed_file_types])
+ }, [checkSizeLimit, handleAddFile, handleUpdateFile, notify, t, handleRemoveFile, fileConfig?.allowed_file_types, fileConfig.allowed_file_extensions, startProgressTimer])
const handleLoadFileFromLinkSuccess = useCallback(() => { }, [])
diff --git a/web/app/components/base/file-uploader/types.ts b/web/app/components/base/file-uploader/types.ts
index ac4584bb4c..285023f0af 100644
--- a/web/app/components/base/file-uploader/types.ts
+++ b/web/app/components/base/file-uploader/types.ts
@@ -29,4 +29,5 @@ export type FileEntity = {
uploadedId?: string
base64Url?: string
url?: string
+ isRemote?: boolean
}
diff --git a/web/app/components/base/file-uploader/utils.ts b/web/app/components/base/file-uploader/utils.ts
index 4c7ef0d89b..eb9199d74b 100644
--- a/web/app/components/base/file-uploader/utils.ts
+++ b/web/app/components/base/file-uploader/utils.ts
@@ -43,10 +43,13 @@ export const fileUpload: FileUpload = ({
})
}
-export const getFileExtension = (fileName: string, fileMimetype: string) => {
+export const getFileExtension = (fileName: string, fileMimetype: string, isRemote?: boolean) => {
if (fileMimetype)
return mime.getExtension(fileMimetype) || ''
+ if (isRemote)
+ return ''
+
if (fileName) {
const fileNamePair = fileName.split('.')
const fileNamePairLength = fileNamePair.length
diff --git a/web/app/components/base/image-uploader/image-list.tsx b/web/app/components/base/image-uploader/image-list.tsx
index 8d5d1a1af5..35f6149b13 100644
--- a/web/app/components/base/image-uploader/image-list.tsx
+++ b/web/app/components/base/image-uploader/image-list.tsx
@@ -133,6 +133,7 @@ const ImageList: FC = ({
placeholder={placeholder || t('common.operation.search')!}
value={value}
onChange={(e) => {
- onChange(e.target.value)
+ if (!isComposing.current)
+ onChange(e.target.value)
+ }}
+ onCompositionStart={() => {
+ isComposing.current = true
+ }}
+ onCompositionEnd={() => {
+ isComposing.current = false
}}
onFocus={() => setFocus(true)}
onBlur={() => setFocus(false)}
diff --git a/web/app/components/base/select/index.tsx b/web/app/components/base/select/index.tsx
index 02a642b94c..ba667955ce 100644
--- a/web/app/components/base/select/index.tsx
+++ b/web/app/components/base/select/index.tsx
@@ -126,7 +126,7 @@ const Select: FC = ({
- {filteredItems.length > 0 && (
+ {(filteredItems.length > 0 && open) && (
{t(`billing.upgradeBtn.${isShort ? 'encourageShort' : 'encourage'}`)}
+ {t(`billing.upgradeBtn.${isShort ? 'encourageShort' : 'encourage'}`)}
{method}
{/* */}
diff --git a/web/app/components/develop/template/template_advanced_chat.en.mdx b/web/app/components/develop/template/template_advanced_chat.en.mdx
index 7d80367ce4..6642c5cedc 100644
--- a/web/app/components/develop/template/template_advanced_chat.en.mdx
+++ b/web/app/components/develop/template/template_advanced_chat.en.mdx
@@ -656,6 +656,11 @@ Chat applications support session persistence, allowing previous chat history to
Return only pinned conversations as `true`, only non-pinned as `false`
+
+ Sorting Field (Optional), Default: -updated_at (sorted in descending order by update time)
+ - Available Values: created_at, -created_at, updated_at, -updated_at
+ - The symbol before the field represents the order or reverse, "-" represents reverse order.
+
### Response
diff --git a/web/app/components/develop/template/template_advanced_chat.zh.mdx b/web/app/components/develop/template/template_advanced_chat.zh.mdx
index 690d700f05..8e64d63ac5 100755
--- a/web/app/components/develop/template/template_advanced_chat.zh.mdx
+++ b/web/app/components/develop/template/template_advanced_chat.zh.mdx
@@ -691,6 +691,11 @@ import { Row, Col, Properties, Property, Heading, SubProperty } from '../md.tsx'
只返回置顶 true，只返回非置顶 false
+
+ 排序字段（选题），默认 -updated_at(按更新时间倒序排列)
+ - 可选值：created_at, -created_at, updated_at, -updated_at
+ - 字段前面的符号代表顺序或倒序，-代表倒序
+
### Response
diff --git a/web/app/components/develop/template/template_chat.en.mdx b/web/app/components/develop/template/template_chat.en.mdx
index 907a1ab0b4..a94016ca3a 100644
--- a/web/app/components/develop/template/template_chat.en.mdx
+++ b/web/app/components/develop/template/template_chat.en.mdx
@@ -690,6 +690,11 @@ Chat applications support session persistence, allowing previous chat history to
Return only pinned conversations as `true`, only non-pinned as `false`
+
+ Sorting Field (Optional), Default: -updated_at (sorted in descending order by update time)
+ - Available Values: created_at, -created_at, updated_at, -updated_at
+ - The symbol before the field represents the order or reverse, "-" represents reverse order.
+
### Response
diff --git a/web/app/components/develop/template/template_chat.zh.mdx b/web/app/components/develop/template/template_chat.zh.mdx
index f6dc7daa1e..92b13b2c7d 100644
--- a/web/app/components/develop/template/template_chat.zh.mdx
+++ b/web/app/components/develop/template/template_chat.zh.mdx
@@ -705,6 +705,11 @@ import { Row, Col, Properties, Property, Heading, SubProperty } from '../md.tsx'
只返回置顶 true，只返回非置顶 false
+
+ 排序字段（选题），默认 -updated_at(按更新时间倒序排列)
+ - 可选值：created_at, -created_at, updated_at, -updated_at
+ - 字段前面的符号代表顺序或倒序，-代表倒序
+
### Response
diff --git a/web/app/components/explore/category.tsx b/web/app/components/explore/category.tsx
index cbf6cd26fe..8f67f0fd49 100644
--- a/web/app/components/explore/category.tsx
+++ b/web/app/components/explore/category.tsx
@@ -28,7 +28,7 @@ const Category: FC = ({
allCategoriesEn,
}) => {
const { t } = useTranslation()
- const isAllCategories = !list.includes(value as AppCategory)
+ const isAllCategories = !list.includes(value as AppCategory) || value === allCategoriesEn
const itemClassName = (isSelected: boolean) => cn(
'flex items-center px-3 py-[7px] h-[32px] rounded-lg border-[0.5px] border-transparent text-gray-700 font-medium leading-[18px] cursor-pointer hover:bg-gray-200',
@@ -44,7 +44,7 @@ const Category: FC = ({
- {list.map(name => (
+ {list.filter(name => name !== allCategoriesEn).map(name => (
= ({ updatePayload, on
: '',
selectedVersion: '',
selectedPackage: '',
- releases: [],
+ releases: updatePayload ? updatePayload.originalPackageInfo.releases : [],
})
const [uniqueIdentifier, setUniqueIdentifier] = useState(null)
const [manifest, setManifest] = useState(null)
@@ -133,11 +133,6 @@ const InstallFromGitHub: React.FC = ({ updatePayload, on
})
}
- useEffect(() => {
- if (state.step === InstallStepFromGitHub.selectPackage)
- handleUrlSubmit()
- }, [])
-
return (
= ({
repo: meta!.repo,
version: meta!.version,
package: meta!.package,
+ releases: fetchedReleases,
},
},
},
diff --git a/web/app/components/plugins/types.ts b/web/app/components/plugins/types.ts
index f0f80a3e57..304ebcab69 100644
--- a/web/app/components/plugins/types.ts
+++ b/web/app/components/plugins/types.ts
@@ -155,6 +155,7 @@ export type UpdateFromGitHubPayload = {
repo: string
version: string
package: string
+ releases: GitHubRepoReleaseResponse[]
}
}
diff --git a/web/app/components/swr-initor.tsx b/web/app/components/swr-initor.tsx
index 8c5d9725d8..a2ae003139 100644
--- a/web/app/components/swr-initor.tsx
+++ b/web/app/components/swr-initor.tsx
@@ -4,7 +4,6 @@ import { SWRConfig } from 'swr'
import { useCallback, useEffect, useState } from 'react'
import type { ReactNode } from 'react'
import { usePathname, useRouter, useSearchParams } from 'next/navigation'
-import useRefreshToken from '@/hooks/use-refresh-token'
import { fetchSetupStatus } from '@/service/common'
interface SwrInitorProps {
@@ -15,12 +14,11 @@ const SwrInitor = ({
}: SwrInitorProps) => {
const router = useRouter()
const searchParams = useSearchParams()
- const pathname = usePathname()
- const { getNewAccessToken } = useRefreshToken()
- const consoleToken = searchParams.get('access_token')
- const refreshToken = searchParams.get('refresh_token')
+ const consoleToken = decodeURIComponent(searchParams.get('access_token') || '')
+ const refreshToken = decodeURIComponent(searchParams.get('refresh_token') || '')
const consoleTokenFromLocalStorage = localStorage?.getItem('console_token')
const refreshTokenFromLocalStorage = localStorage?.getItem('refresh_token')
+ const pathname = usePathname()
const [init, setInit] = useState(false)
const isSetupFinished = useCallback(async () => {
@@ -41,25 +39,6 @@ const SwrInitor = ({
}
}, [])
- const setRefreshToken = useCallback(async () => {
- try {
- if (!(consoleToken || refreshToken || consoleTokenFromLocalStorage || refreshTokenFromLocalStorage))
- return Promise.reject(new Error('No token found'))
-
- if (consoleTokenFromLocalStorage && refreshTokenFromLocalStorage)
- await getNewAccessToken()
-
- if (consoleToken && refreshToken) {
- localStorage.setItem('console_token', consoleToken)
- localStorage.setItem('refresh_token', refreshToken)
- await getNewAccessToken()
- }
- }
- catch (error) {
- return Promise.reject(error)
- }
- }, [consoleToken, refreshToken, consoleTokenFromLocalStorage, refreshTokenFromLocalStorage, getNewAccessToken])
-
useEffect(() => {
(async () => {
try {
@@ -68,9 +47,15 @@ const SwrInitor = ({
router.replace('/install')
return
}
- await setRefreshToken()
- if (searchParams.has('access_token') || searchParams.has('refresh_token'))
+ if (!((consoleToken && refreshToken) || (consoleTokenFromLocalStorage && refreshTokenFromLocalStorage))) {
+ router.replace('/signin')
+ return
+ }
+ if (searchParams.has('access_token') || searchParams.has('refresh_token')) {
+ consoleToken && localStorage.setItem('console_token', consoleToken)
+ refreshToken && localStorage.setItem('refresh_token', refreshToken)
router.replace(pathname)
+ }
setInit(true)
}
@@ -78,7 +63,7 @@ const SwrInitor = ({
router.replace('/signin')
}
})()
- }, [isSetupFinished, setRefreshToken, router, pathname, searchParams])
+ }, [isSetupFinished, router, pathname, searchParams, consoleToken, refreshToken, consoleTokenFromLocalStorage, refreshTokenFromLocalStorage])
return init
? (
diff --git a/web/app/components/workflow/constants.ts b/web/app/components/workflow/constants.ts
index 9d533c1ee9..09ac2ed8ea 100644
--- a/web/app/components/workflow/constants.ts
+++ b/web/app/components/workflow/constants.ts
@@ -340,7 +340,9 @@ export const NODES_INITIAL_DATA = {
...ListFilterDefault.defaultValue,
},
}
-
+export const MAX_ITERATION_PARALLEL_NUM = 10
+export const MIN_ITERATION_PARALLEL_NUM = 1
+export const DEFAULT_ITER_TIMES = 1
export const NODE_WIDTH = 240
export const X_OFFSET = 60
export const NODE_WIDTH_X_OFFSET = NODE_WIDTH + X_OFFSET
diff --git a/web/app/components/workflow/hooks/use-nodes-interactions.ts b/web/app/components/workflow/hooks/use-nodes-interactions.ts
index af2a1500ba..375a269377 100644
--- a/web/app/components/workflow/hooks/use-nodes-interactions.ts
+++ b/web/app/components/workflow/hooks/use-nodes-interactions.ts
@@ -644,6 +644,11 @@ export const useNodesInteractions = () => {
newNode.data.isInIteration = true
newNode.data.iteration_id = prevNode.parentId
newNode.zIndex = ITERATION_CHILDREN_Z_INDEX
+ if (newNode.data.type === BlockEnum.Answer || newNode.data.type === BlockEnum.Tool || newNode.data.type === BlockEnum.Assigner) {
+ const parentIterNodeIndex = nodes.findIndex(node => node.id === prevNode.parentId)
+ const iterNodeData: IterationNodeType = nodes[parentIterNodeIndex].data
+ iterNodeData._isShowTips = true
+ }
}
const newEdge: Edge = {
diff --git a/web/app/components/workflow/hooks/use-workflow-run.ts b/web/app/components/workflow/hooks/use-workflow-run.ts
index 0bbb1adab8..26654ef71e 100644
--- a/web/app/components/workflow/hooks/use-workflow-run.ts
+++ b/web/app/components/workflow/hooks/use-workflow-run.ts
@@ -14,6 +14,7 @@ import {
NodeRunningStatus,
WorkflowRunningStatus,
} from '../types'
+import { DEFAULT_ITER_TIMES } from '../constants'
import { useWorkflowUpdate } from './use-workflow-interactions'
import { useStore as useAppStore } from '@/app/components/app/store'
import type { IOtherOptions } from '@/service/base'
@@ -170,11 +171,13 @@ export const useWorkflowRun = () => {
const {
workflowRunningData,
setWorkflowRunningData,
+ setIterParallelLogMap,
} = workflowStore.getState()
const {
edges,
setEdges,
} = store.getState()
+ setIterParallelLogMap(new Map())
setWorkflowRunningData(produce(workflowRunningData!, (draft) => {
draft.task_id = task_id
draft.result = {
@@ -244,6 +247,8 @@ export const useWorkflowRun = () => {
const {
workflowRunningData,
setWorkflowRunningData,
+ iterParallelLogMap,
+ setIterParallelLogMap,
} = workflowStore.getState()
const {
getNodes,
@@ -259,10 +264,21 @@ export const useWorkflowRun = () => {
const tracing = draft.tracing!
const iterations = tracing.find(trace => trace.node_id === node?.parentId)
const currIteration = iterations?.details![node.data.iteration_index] || iterations?.details![iterations.details!.length - 1]
- currIteration?.push({
- ...data,
- status: NodeRunningStatus.Running,
- } as any)
+ if (!data.parallel_run_id) {
+ currIteration?.push({
+ ...data,
+ status: NodeRunningStatus.Running,
+ } as any)
+ }
+ else {
+ if (!iterParallelLogMap.has(data.parallel_run_id))
+ iterParallelLogMap.set(data.parallel_run_id, [{ ...data, status: NodeRunningStatus.Running } as any])
+ else
+ iterParallelLogMap.get(data.parallel_run_id)!.push({ ...data, status: NodeRunningStatus.Running } as any)
+ setIterParallelLogMap(iterParallelLogMap)
+ if (iterations)
+ iterations.details = Array.from(iterParallelLogMap.values())
+ }
}))
}
else {
@@ -309,6 +325,8 @@ export const useWorkflowRun = () => {
const {
workflowRunningData,
setWorkflowRunningData,
+ iterParallelLogMap,
+ setIterParallelLogMap,
} = workflowStore.getState()
const {
getNodes,
@@ -317,21 +335,21 @@ export const useWorkflowRun = () => {
const nodes = getNodes()
const nodeParentId = nodes.find(node => node.id === data.node_id)!.parentId
if (nodeParentId) {
- setWorkflowRunningData(produce(workflowRunningData!, (draft) => {
- const tracing = draft.tracing!
- const iterations = tracing.find(trace => trace.node_id === nodeParentId) // the iteration node
+ if (!data.execution_metadata.parallel_mode_run_id) {
+ setWorkflowRunningData(produce(workflowRunningData!, (draft) => {
+ const tracing = draft.tracing!
+ const iterations = tracing.find(trace => trace.node_id === nodeParentId) // the iteration node
- if (iterations && iterations.details) {
- const iterationIndex = data.execution_metadata?.iteration_index || 0
- if (!iterations.details[iterationIndex])
- iterations.details[iterationIndex] = []
+ if (iterations && iterations.details) {
+ const iterationIndex = data.execution_metadata?.iteration_index || 0
+ if (!iterations.details[iterationIndex])
+ iterations.details[iterationIndex] = []
- const currIteration = iterations.details[iterationIndex]
- const nodeIndex = currIteration.findIndex(node =>
- node.node_id === data.node_id && (
- node.execution_metadata?.parallel_id === data.execution_metadata?.parallel_id || node.parallel_id === data.execution_metadata?.parallel_id),
- )
- if (data.status === NodeRunningStatus.Succeeded) {
+ const currIteration = iterations.details[iterationIndex]
+ const nodeIndex = currIteration.findIndex(node =>
+ node.node_id === data.node_id && (
+ node.execution_metadata?.parallel_id === data.execution_metadata?.parallel_id || node.parallel_id === data.execution_metadata?.parallel_id),
+ )
if (nodeIndex !== -1) {
currIteration[nodeIndex] = {
...currIteration[nodeIndex],
@@ -344,8 +362,40 @@ export const useWorkflowRun = () => {
} as any)
}
}
- }
- }))
+ }))
+ }
+ else {
+ // open parallel mode
+ setWorkflowRunningData(produce(workflowRunningData!, (draft) => {
+ const tracing = draft.tracing!
+ const iterations = tracing.find(trace => trace.node_id === nodeParentId) // the iteration node
+
+ if (iterations && iterations.details) {
+ const iterRunID = data.execution_metadata?.parallel_mode_run_id
+
+ const currIteration = iterParallelLogMap.get(iterRunID)
+ const nodeIndex = currIteration?.findIndex(node =>
+ node.node_id === data.node_id && (
+ node?.parallel_run_id === data.execution_metadata?.parallel_mode_run_id),
+ )
+ if (currIteration) {
+ if (nodeIndex !== undefined && nodeIndex !== -1) {
+ currIteration[nodeIndex] = {
+ ...currIteration[nodeIndex],
+ ...data,
+ } as any
+ }
+ else {
+ currIteration.push({
+ ...data,
+ } as any)
+ }
+ }
+ setIterParallelLogMap(iterParallelLogMap)
+ iterations.details = Array.from(iterParallelLogMap.values())
+ }
+ }))
+ }
}
else {
setWorkflowRunningData(produce(workflowRunningData!, (draft) => {
@@ -379,6 +429,7 @@ export const useWorkflowRun = () => {
const {
workflowRunningData,
setWorkflowRunningData,
+ setIterTimes,
} = workflowStore.getState()
const {
getNodes,
@@ -388,6 +439,7 @@ export const useWorkflowRun = () => {
transform,
} = store.getState()
const nodes = getNodes()
+ setIterTimes(DEFAULT_ITER_TIMES)
setWorkflowRunningData(produce(workflowRunningData!, (draft) => {
draft.tracing!.push({
...data,
@@ -431,6 +483,8 @@ export const useWorkflowRun = () => {
const {
workflowRunningData,
setWorkflowRunningData,
+ iterTimes,
+ setIterTimes,
} = workflowStore.getState()
const { data } = params
@@ -445,13 +499,14 @@ export const useWorkflowRun = () => {
if (iteration.details!.length >= iteration.metadata.iterator_length!)
return
}
- iteration?.details!.push([])
+ if (!data.parallel_mode_run_id)
+ iteration?.details!.push([])
}))
const nodes = getNodes()
const newNodes = produce(nodes, (draft) => {
const currentNode = draft.find(node => node.id === data.node_id)!
-
- currentNode.data._iterationIndex = data.index > 0 ? data.index : 1
+ currentNode.data._iterationIndex = iterTimes
+ setIterTimes(iterTimes + 1)
})
setNodes(newNodes)
@@ -464,6 +519,7 @@ export const useWorkflowRun = () => {
const {
workflowRunningData,
setWorkflowRunningData,
+ setIterTimes,
} = workflowStore.getState()
const {
getNodes,
@@ -480,7 +536,7 @@ export const useWorkflowRun = () => {
})
}
}))
-
+ setIterTimes(DEFAULT_ITER_TIMES)
const newNodes = produce(nodes, (draft) => {
const currentNode = draft.find(node => node.id === data.node_id)!
diff --git a/web/app/components/workflow/nodes/_base/components/editor/base.tsx b/web/app/components/workflow/nodes/_base/components/editor/base.tsx
index 55b8e7dd3b..fa4389efdc 100644
--- a/web/app/components/workflow/nodes/_base/components/editor/base.tsx
+++ b/web/app/components/workflow/nodes/_base/components/editor/base.tsx
@@ -26,7 +26,7 @@ interface Props {
isFocus: boolean
isInNode?: boolean
onGenerated?: (prompt: string) => void
- codeLanguages: CodeLanguage
+ codeLanguages?: CodeLanguage
fileList?: FileEntity[]
showFileList?: boolean
showCodeGenerator?: boolean
@@ -78,7 +78,7 @@ const Base: FC = ({
e.stopPropagation()
}}>
{headerRight}
- {showCodeGenerator && (
+ {showCodeGenerator && codeLanguages && (
diff --git a/web/app/components/workflow/nodes/_base/components/editor/code-editor/index.tsx b/web/app/components/workflow/nodes/_base/components/editor/code-editor/index.tsx
index b5ca968185..1656d5e43d 100644
--- a/web/app/components/workflow/nodes/_base/components/editor/code-editor/index.tsx
+++ b/web/app/components/workflow/nodes/_base/components/editor/code-editor/index.tsx
@@ -31,6 +31,7 @@ export interface Props {
noWrapper?: boolean
isExpand?: boolean
showFileList?: boolean
+ onGenerated?: (value: string) => void
showCodeGenerator?: boolean
}
@@ -64,6 +65,7 @@ const CodeEditor: FC = ({
noWrapper,
isExpand,
showFileList,
+ onGenerated,
showCodeGenerator = false,
}) => {
const [isFocus, setIsFocus] = React.useState(false)
@@ -151,9 +153,6 @@ const CodeEditor: FC = ({
return isFocus ? 'focus-theme' : 'blur-theme'
})()
- const handleGenerated = (code: string) => {
- handleEditorChange(code)
- }
const main = (
<>
@@ -205,7 +204,7 @@ const CodeEditor: FC = ({
isFocus={isFocus && !readOnly}
minHeight={minHeight}
isInNode={isInNode}
- onGenerated={handleGenerated}
+ onGenerated={onGenerated}
codeLanguages={language}
fileList={fileList}
showFileList={showFileList}
diff --git a/web/app/components/workflow/nodes/_base/components/field.tsx b/web/app/components/workflow/nodes/_base/components/field.tsx
index a36dadbbef..8e83a0508a 100644
--- a/web/app/components/workflow/nodes/_base/components/field.tsx
+++ b/web/app/components/workflow/nodes/_base/components/field.tsx
@@ -12,15 +12,15 @@ import Tooltip from '@/app/components/base/tooltip'
interface Props {
className?: string
title: JSX.Element | string | DefaultTFuncReturn
+ tooltip?: React.ReactNode
isSubTitle?: boolean
- tooltip?: string
supportFold?: boolean
children?: JSX.Element | string | null
operations?: JSX.Element
inline?: boolean
}
-const Filed: FC = ({
+const Field: FC = ({
className,
title,
isSubTitle,
@@ -60,4 +60,4 @@ const Filed: FC = ({
)
}
-export default React.memo(Filed)
+export default React.memo(Field)
diff --git a/web/app/components/workflow/nodes/_base/components/file-upload-setting.tsx b/web/app/components/workflow/nodes/_base/components/file-upload-setting.tsx
index 82a3a906cf..42a7213f80 100644
--- a/web/app/components/workflow/nodes/_base/components/file-upload-setting.tsx
+++ b/web/app/components/workflow/nodes/_base/components/file-upload-setting.tsx
@@ -39,7 +39,13 @@ const FileUploadSetting: FC
- {data.title}
+
+
}
+ >
+
+ {data.title}
+
+ {
+ data.type === BlockEnum.Iteration && (data as IterationNodeType).is_parallel && (
+
+ {t('workflow.nodes.iteration.parallelModeEnableTitle')}
+
+ {t('workflow.nodes.iteration.parallelModeEnableDesc')}
+
+ {t('workflow.nodes.iteration.parallelModeUpper')}
+
+
+ )
+ }
{
data._iterationLength && data._iterationIndex && data._runningStatus === NodeRunningStatus.Running && (
diff --git a/web/app/components/workflow/nodes/code/code-parser.spec.ts b/web/app/components/workflow/nodes/code/code-parser.spec.ts
new file mode 100644
index 0000000000..b5d28dd136
--- /dev/null
+++ b/web/app/components/workflow/nodes/code/code-parser.spec.ts
@@ -0,0 +1,326 @@
+import { VarType } from '../../types'
+import { extractFunctionParams, extractReturnType } from './code-parser'
+import { CodeLanguage } from './types'
+
+const SAMPLE_CODES = {
+ python3: {
+ noParams: 'def main():',
+ singleParam: 'def main(param1):',
+ multipleParams: `def main(param1, param2, param3):
+ return {"result": param1}`,
+ withTypes: `def main(param1: str, param2: int, param3: List[str]):
+ result = process_data(param1, param2)
+ return {"output": result}`,
+ withDefaults: `def main(param1: str = "default", param2: int = 0):
+ return {"data": param1}`,
+ },
+ javascript: {
+ noParams: 'function main() {',
+ singleParam: 'function main(param1) {',
+ multipleParams: `function main(param1, param2, param3) {
+ return { result: param1 }
+ }`,
+ withComments: `// Main function
+ function main(param1, param2) {
+ // Process data
+ return { output: process(param1, param2) }
+ }`,
+ withSpaces: 'function main( param1 , param2 ) {',
+ },
+}
+
+describe('extractFunctionParams', () => {
+ describe('Python3', () => {
+ test('handles no parameters', () => {
+ const result = extractFunctionParams(SAMPLE_CODES.python3.noParams, CodeLanguage.python3)
+ expect(result).toEqual([])
+ })
+
+ test('extracts single parameter', () => {
+ const result = extractFunctionParams(SAMPLE_CODES.python3.singleParam, CodeLanguage.python3)
+ expect(result).toEqual(['param1'])
+ })
+
+ test('extracts multiple parameters', () => {
+ const result = extractFunctionParams(SAMPLE_CODES.python3.multipleParams, CodeLanguage.python3)
+ expect(result).toEqual(['param1', 'param2', 'param3'])
+ })
+
+ test('handles type hints', () => {
+ const result = extractFunctionParams(SAMPLE_CODES.python3.withTypes, CodeLanguage.python3)
+ expect(result).toEqual(['param1', 'param2', 'param3'])
+ })
+
+ test('handles default values', () => {
+ const result = extractFunctionParams(SAMPLE_CODES.python3.withDefaults, CodeLanguage.python3)
+ expect(result).toEqual(['param1', 'param2'])
+ })
+ })
+
+ // JavaScriptのテストケース
+ describe('JavaScript', () => {
+ test('handles no parameters', () => {
+ const result = extractFunctionParams(SAMPLE_CODES.javascript.noParams, CodeLanguage.javascript)
+ expect(result).toEqual([])
+ })
+
+ test('extracts single parameter', () => {
+ const result = extractFunctionParams(SAMPLE_CODES.javascript.singleParam, CodeLanguage.javascript)
+ expect(result).toEqual(['param1'])
+ })
+
+ test('extracts multiple parameters', () => {
+ const result = extractFunctionParams(SAMPLE_CODES.javascript.multipleParams, CodeLanguage.javascript)
+ expect(result).toEqual(['param1', 'param2', 'param3'])
+ })
+
+ test('handles comments in code', () => {
+ const result = extractFunctionParams(SAMPLE_CODES.javascript.withComments, CodeLanguage.javascript)
+ expect(result).toEqual(['param1', 'param2'])
+ })
+
+ test('handles whitespace', () => {
+ const result = extractFunctionParams(SAMPLE_CODES.javascript.withSpaces, CodeLanguage.javascript)
+ expect(result).toEqual(['param1', 'param2'])
+ })
+ })
+})
+
+const RETURN_TYPE_SAMPLES = {
+ python3: {
+ singleReturn: `
+def main(param1):
+ return {"result": "value"}`,
+
+ multipleReturns: `
+def main(param1, param2):
+ return {"result": "value", "status": "success"}`,
+
+ noReturn: `
+def main():
+ print("Hello")`,
+
+ complexReturn: `
+def main():
+ data = process()
+ return {"result": data, "count": 42, "messages": ["hello"]}`,
+ nestedObject: `
+ def main(name, age, city):
+ return {
+ 'personal_info': {
+ 'name': name,
+ 'age': age,
+ 'city': city
+ },
+ 'timestamp': int(time.time()),
+ 'status': 'active'
+ }`,
+ },
+
+ javascript: {
+ singleReturn: `
+function main(param1) {
+ return { result: "value" }
+}`,
+
+ multipleReturns: `
+function main(param1) {
+ return { result: "value", status: "success" }
+}`,
+
+ withParentheses: `
+function main() {
+ return ({ result: "value", status: "success" })
+}`,
+
+ noReturn: `
+function main() {
+ console.log("Hello")
+}`,
+
+ withQuotes: `
+function main() {
+ return { "result": 'value', 'status': "success" }
+}`,
+ nestedObject: `
+function main(name, age, city) {
+ return {
+ personal_info: {
+ name: name,
+ age: age,
+ city: city
+ },
+ timestamp: Date.now(),
+ status: 'active'
+ }
+}`,
+ withJSDoc: `
+/**
+ * Creates a user profile with personal information and metadata
+ * @param {string} name - The user's name
+ * @param {number} age - The user's age
+ * @param {string} city - The user's city of residence
+ * @returns {Object} An object containing the user profile
+ */
+function main(name, age, city) {
+ return {
+ result: {
+ personal_info: {
+ name: name,
+ age: age,
+ city: city
+ },
+ timestamp: Date.now(),
+ status: 'active'
+ }
+ };
+}`,
+
+ },
+}
+
+describe('extractReturnType', () => {
+ // Python3のテスト
+ describe('Python3', () => {
+ test('extracts single return value', () => {
+ const result = extractReturnType(RETURN_TYPE_SAMPLES.python3.singleReturn, CodeLanguage.python3)
+ expect(result).toEqual({
+ result: {
+ type: VarType.string,
+ children: null,
+ },
+ })
+ })
+
+ test('extracts multiple return values', () => {
+ const result = extractReturnType(RETURN_TYPE_SAMPLES.python3.multipleReturns, CodeLanguage.python3)
+ expect(result).toEqual({
+ result: {
+ type: VarType.string,
+ children: null,
+ },
+ status: {
+ type: VarType.string,
+ children: null,
+ },
+ })
+ })
+
+ test('returns empty object when no return statement', () => {
+ const result = extractReturnType(RETURN_TYPE_SAMPLES.python3.noReturn, CodeLanguage.python3)
+ expect(result).toEqual({})
+ })
+
+ test('handles complex return statement', () => {
+ const result = extractReturnType(RETURN_TYPE_SAMPLES.python3.complexReturn, CodeLanguage.python3)
+ expect(result).toEqual({
+ result: {
+ type: VarType.string,
+ children: null,
+ },
+ count: {
+ type: VarType.string,
+ children: null,
+ },
+ messages: {
+ type: VarType.string,
+ children: null,
+ },
+ })
+ })
+ test('handles nested object structure', () => {
+ const result = extractReturnType(RETURN_TYPE_SAMPLES.python3.nestedObject, CodeLanguage.python3)
+ expect(result).toEqual({
+ personal_info: {
+ type: VarType.string,
+ children: null,
+ },
+ timestamp: {
+ type: VarType.string,
+ children: null,
+ },
+ status: {
+ type: VarType.string,
+ children: null,
+ },
+ })
+ })
+ })
+
+ // JavaScriptのテスト
+ describe('JavaScript', () => {
+ test('extracts single return value', () => {
+ const result = extractReturnType(RETURN_TYPE_SAMPLES.javascript.singleReturn, CodeLanguage.javascript)
+ expect(result).toEqual({
+ result: {
+ type: VarType.string,
+ children: null,
+ },
+ })
+ })
+
+ test('extracts multiple return values', () => {
+ const result = extractReturnType(RETURN_TYPE_SAMPLES.javascript.multipleReturns, CodeLanguage.javascript)
+ expect(result).toEqual({
+ result: {
+ type: VarType.string,
+ children: null,
+ },
+ status: {
+ type: VarType.string,
+ children: null,
+ },
+ })
+ })
+
+ test('handles return with parentheses', () => {
+ const result = extractReturnType(RETURN_TYPE_SAMPLES.javascript.withParentheses, CodeLanguage.javascript)
+ expect(result).toEqual({
+ result: {
+ type: VarType.string,
+ children: null,
+ },
+ status: {
+ type: VarType.string,
+ children: null,
+ },
+ })
+ })
+
+ test('returns empty object when no return statement', () => {
+ const result = extractReturnType(RETURN_TYPE_SAMPLES.javascript.noReturn, CodeLanguage.javascript)
+ expect(result).toEqual({})
+ })
+
+ test('handles quoted keys', () => {
+ const result = extractReturnType(RETURN_TYPE_SAMPLES.javascript.withQuotes, CodeLanguage.javascript)
+ expect(result).toEqual({
+ result: {
+ type: VarType.string,
+ children: null,
+ },
+ status: {
+ type: VarType.string,
+ children: null,
+ },
+ })
+ })
+ test('handles nested object structure', () => {
+ const result = extractReturnType(RETURN_TYPE_SAMPLES.javascript.nestedObject, CodeLanguage.javascript)
+ expect(result).toEqual({
+ personal_info: {
+ type: VarType.string,
+ children: null,
+ },
+ timestamp: {
+ type: VarType.string,
+ children: null,
+ },
+ status: {
+ type: VarType.string,
+ children: null,
+ },
+ })
+ })
+ })
+})
diff --git a/web/app/components/workflow/nodes/code/code-parser.ts b/web/app/components/workflow/nodes/code/code-parser.ts
new file mode 100644
index 0000000000..e1b0928f14
--- /dev/null
+++ b/web/app/components/workflow/nodes/code/code-parser.ts
@@ -0,0 +1,86 @@
+import { VarType } from '../../types'
+import type { OutputVar } from './types'
+import { CodeLanguage } from './types'
+
+export const extractFunctionParams = (code: string, language: CodeLanguage) => {
+ if (language === CodeLanguage.json)
+ return []
+
+ const patterns: Record
@@ -92,6 +105,7 @@ const Panel: FC> = ({
language={inputs.code_language}
value={inputs.code}
onChange={handleCodeChange}
+ onGenerated={handleGeneratedCode}
showCodeGenerator={true}
/>
diff --git a/web/app/components/workflow/nodes/code/use-config.ts b/web/app/components/workflow/nodes/code/use-config.ts
index 07fe85aa0f..c53c07a28e 100644
--- a/web/app/components/workflow/nodes/code/use-config.ts
+++ b/web/app/components/workflow/nodes/code/use-config.ts
@@ -3,7 +3,7 @@ import produce from 'immer'
import useVarList from '../_base/hooks/use-var-list'
import useOutputVarList from '../_base/hooks/use-output-var-list'
import { BlockEnum, VarType } from '../../types'
-import type { Var } from '../../types'
+import type { Var, Variable } from '../../types'
import { useStore } from '../../store'
import type { CodeNodeType, OutputVar } from './types'
import { CodeLanguage } from './types'
@@ -136,7 +136,15 @@ const useConfig = (id: string, payload: CodeNodeType) => {
const setInputVarValues = useCallback((newPayload: Record> = ({
data,
}) => {
const { t } = useTranslation()
-
+ const responseMethod = [
+ {
+ value: ErrorHandleMode.Terminated,
+ name: t(`${i18nPrefix}.ErrorMethod.operationTerminated`),
+ },
+ {
+ value: ErrorHandleMode.ContinueOnError,
+ name: t(`${i18nPrefix}.ErrorMethod.continueOnError`),
+ },
+ {
+ value: ErrorHandleMode.RemoveAbnormalOutput,
+ name: t(`${i18nPrefix}.ErrorMethod.removeAbnormalOutput`),
+ },
+ ]
const {
readOnly,
inputs,
@@ -47,6 +66,9 @@ const Panel: FC> = ({
setIterator,
iteratorInputKey,
iterationRunResult,
+ changeParallel,
+ changeErrorResponseMode,
+ changeParallelNums,
} = useConfig(id, data)
return (
@@ -87,6 +109,39 @@ const Panel: FC> = ({
/>
+
+ {t(`${i18nPrefix}.parallelPanelDesc`)}
} inline>
+
+ {t(`${i18nPrefix}.MaxParallelismDesc`)}
}>
+
+ { changeParallelNums(Number(e.target.value)) }} />
+
+
+
+ )
+ }
+
+
+
+
+
+
+
+
+
{isShowSingleRun && (
= ({
return iteration_length
}
+ const getErrorCount = (details: NodeTracing[][] | undefined) => {
+ if (!details || details.length === 0)
+ return 0
+ return details.reduce((acc, iteration) => {
+ if (iteration.some(item => item.status === 'failed'))
+ acc++
+ return acc
+ }, 0)
+ }
useEffect(() => {
setCollapseState(!nodeInfo.expand)
}, [nodeInfo.expand, setCollapseState])
@@ -136,7 +145,12 @@ const NodePanel: FC = ({
onClick={handleOnShowIterationDetail}
>
+ setIterParallelLogMap: (iterParallelLogMap: Map) => void
}
export const createWorkflowStore = () => {
@@ -281,6 +286,11 @@ export const createWorkflowStore = () => {
setShowImportDSLModal: showImportDSLModal => set(() => ({ showImportDSLModal })),
showTips: '',
setShowTips: showTips => set(() => ({ showTips })),
+ iterTimes: 1,
+ setIterTimes: iterTimes => set(() => ({ iterTimes })),
+ iterParallelLogMap: new Map(),
+ setIterParallelLogMap: iterParallelLogMap => set(() => ({ iterParallelLogMap })),
+
}))
}
diff --git a/web/app/components/workflow/types.ts b/web/app/components/workflow/types.ts
index 811ec0d70c..1a57308d28 100644
--- a/web/app/components/workflow/types.ts
+++ b/web/app/components/workflow/types.ts
@@ -37,7 +37,12 @@ export enum ControlMode {
Hand = 'hand',
}
-export interface Branch {
+export enum ErrorHandleMode {
+ Terminated = 'terminated',
+ ContinueOnError = 'continue-on-error',
+ RemoveAbnormalOutput = 'remove-abnormal-output',
+}
+export type Branch = {
id: string
name: string
}
diff --git a/web/app/components/workflow/utils.ts b/web/app/components/workflow/utils.ts
index 91656e3bbc..aaf333f4d7 100644
--- a/web/app/components/workflow/utils.ts
+++ b/web/app/components/workflow/utils.ts
@@ -19,7 +19,7 @@ import type {
ToolWithProvider,
ValueSelector,
} from './types'
-import { BlockEnum } from './types'
+import { BlockEnum, ErrorHandleMode } from './types'
import {
CUSTOM_NODE,
ITERATION_CHILDREN_Z_INDEX,
@@ -267,8 +267,13 @@ export const initialNodes = (originNodes: Node[], originEdges: Edge[]) => {
})
}
- if (node.data.type === BlockEnum.Iteration)
- node.data._children = iterationNodeMap[node.id] || []
+ if (node.data.type === BlockEnum.Iteration) {
+ const iterationNodeData = node.data as IterationNodeType
+ iterationNodeData._children = iterationNodeMap[node.id] || []
+ iterationNodeData.is_parallel = iterationNodeData.is_parallel || false
+ iterationNodeData.parallel_nums = iterationNodeData.parallel_nums || 10
+ iterationNodeData.error_handle_mode = iterationNodeData.error_handle_mode || ErrorHandleMode.Terminated
+ }
return node
})
diff --git a/web/app/signin/normalForm.tsx b/web/app/signin/normalForm.tsx
index c0f2d89b37..f4f46c68ba 100644
--- a/web/app/signin/normalForm.tsx
+++ b/web/app/signin/normalForm.tsx
@@ -12,11 +12,9 @@ import cn from '@/utils/classnames'
import { getSystemFeatures, invitationCheck } from '@/service/common'
import { defaultSystemFeatures } from '@/types/feature'
import Toast from '@/app/components/base/toast'
-import useRefreshToken from '@/hooks/use-refresh-token'
import { IS_CE_EDITION } from '@/config'
const NormalForm = () => {
- const { getNewAccessToken } = useRefreshToken()
const { t } = useTranslation()
const router = useRouter()
const searchParams = useSearchParams()
@@ -38,7 +36,6 @@ const NormalForm = () => {
if (consoleToken && refreshToken) {
localStorage.setItem('console_token', consoleToken)
localStorage.setItem('refresh_token', refreshToken)
- getNewAccessToken()
router.replace('/apps')
return
}
@@ -71,7 +68,7 @@ const NormalForm = () => {
setSystemFeatures(defaultSystemFeatures)
}
finally { setIsLoading(false) }
- }, [consoleToken, refreshToken, message, router, invite_token, isInviteLink, getNewAccessToken])
+ }, [consoleToken, refreshToken, message, router, invite_token, isInviteLink])
useEffect(() => {
init()
}, [init])
diff --git a/web/hooks/use-refresh-token.ts b/web/hooks/use-refresh-token.ts
deleted file mode 100644
index 53dc4faf00..0000000000
--- a/web/hooks/use-refresh-token.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-'use client'
-import { useCallback, useEffect, useRef } from 'react'
-import { jwtDecode } from 'jwt-decode'
-import dayjs from 'dayjs'
-import utc from 'dayjs/plugin/utc'
-import { useRouter } from 'next/navigation'
-import type { CommonResponse } from '@/models/common'
-import { fetchNewToken } from '@/service/common'
-import { fetchWithRetry } from '@/utils'
-
-dayjs.extend(utc)
-
-const useRefreshToken = () => {
- const router = useRouter()
- const timer = useRef()
- const advanceTime = useRef(5 * 60 * 1000)
-
- const getExpireTime = useCallback((token: string) => {
- if (!token)
- return 0
- const decoded = jwtDecode(token)
- return (decoded.exp || 0) * 1000
- }, [])
-
- const getCurrentTimeStamp = useCallback(() => {
- return dayjs.utc().valueOf()
- }, [])
-
- const handleError = useCallback(() => {
- localStorage?.removeItem('is_refreshing')
- localStorage?.removeItem('console_token')
- localStorage?.removeItem('refresh_token')
- router.replace('/signin')
- }, [])
-
- const getNewAccessToken = useCallback(async () => {
- const currentAccessToken = localStorage?.getItem('console_token')
- const currentRefreshToken = localStorage?.getItem('refresh_token')
- if (!currentAccessToken || !currentRefreshToken) {
- handleError()
- return new Error('No access token or refresh token found')
- }
- if (localStorage?.getItem('is_refreshing') === '1') {
- clearTimeout(timer.current)
- timer.current = setTimeout(() => {
- getNewAccessToken()
- }, 1000)
- return null
- }
- const currentTokenExpireTime = getExpireTime(currentAccessToken)
- if (getCurrentTimeStamp() + advanceTime.current > currentTokenExpireTime) {
- localStorage?.setItem('is_refreshing', '1')
- const [e, res] = await fetchWithRetry(fetchNewToken({
- body: { refresh_token: currentRefreshToken },
- }) as Promise)
- if (e) {
- handleError()
- return e
- }
- const { access_token, refresh_token } = res.data
- localStorage?.setItem('is_refreshing', '0')
- localStorage?.setItem('console_token', access_token)
- localStorage?.setItem('refresh_token', refresh_token)
- const newTokenExpireTime = getExpireTime(access_token)
- clearTimeout(timer.current)
- timer.current = setTimeout(() => {
- getNewAccessToken()
- }, newTokenExpireTime - advanceTime.current - getCurrentTimeStamp())
- }
- else {
- const newTokenExpireTime = getExpireTime(currentAccessToken)
- clearTimeout(timer.current)
- timer.current = setTimeout(() => {
- getNewAccessToken()
- }, newTokenExpireTime - advanceTime.current - getCurrentTimeStamp())
- }
- return null
- }, [getExpireTime, getCurrentTimeStamp, handleError])
-
- const handleVisibilityChange = useCallback(() => {
- if (document.visibilityState === 'visible')
- getNewAccessToken()
- }, [])
-
- useEffect(() => {
- window.addEventListener('visibilitychange', handleVisibilityChange)
- return () => {
- window.removeEventListener('visibilitychange', handleVisibilityChange)
- clearTimeout(timer.current)
- localStorage?.removeItem('is_refreshing')
- }
- }, [])
-
- return {
- getNewAccessToken,
- }
-}
-
-export default useRefreshToken
diff --git a/web/i18n/de-DE/workflow.ts b/web/i18n/de-DE/workflow.ts
index bde0250fcc..d05070c308 100644
--- a/web/i18n/de-DE/workflow.ts
+++ b/web/i18n/de-DE/workflow.ts
@@ -557,6 +557,23 @@ const translation = {
iteration_one: '{{count}} Iteration',
iteration_other: '{{count}} Iterationen',
currentIteration: 'Aktuelle Iteration',
+ ErrorMethod: {
+ operationTerminated: 'beendet',
+ removeAbnormalOutput: 'remove-abnormale_ausgabe',
+ continueOnError: 'Fehler "Fortfahren bei"',
+ },
+ MaxParallelismTitle: 'Maximale Parallelität',
+ parallelMode: 'Paralleler Modus',
+ errorResponseMethod: 'Methode der Fehlerantwort',
+ error_one: '{{Anzahl}} Fehler',
+ error_other: '{{Anzahl}} Irrtümer',
+ MaxParallelismDesc: 'Die maximale Parallelität wird verwendet, um die Anzahl der Aufgaben zu steuern, die gleichzeitig in einer einzigen Iteration ausgeführt werden.',
+ parallelPanelDesc: 'Im parallelen Modus unterstützen Aufgaben in der Iteration die parallele Ausführung.',
+ parallelModeEnableDesc: 'Im parallelen Modus unterstützen Aufgaben innerhalb von Iterationen die parallele Ausführung. Sie können dies im Eigenschaftenbereich auf der rechten Seite konfigurieren.',
+ answerNodeWarningDesc: 'Warnung im parallelen Modus: Antwortknoten, Zuweisungen von Konversationsvariablen und persistente Lese-/Schreibvorgänge innerhalb von Iterationen können Ausnahmen verursachen.',
+ parallelModeEnableTitle: 'Paralleler Modus aktiviert',
+ parallelModeUpper: 'PARALLELER MODUS',
+ comma: ',',
},
note: {
editor: {
diff --git a/web/i18n/en-US/app-debug.ts b/web/i18n/en-US/app-debug.ts
index b2144262f6..e17afc38bf 100644
--- a/web/i18n/en-US/app-debug.ts
+++ b/web/i18n/en-US/app-debug.ts
@@ -224,6 +224,8 @@ const translation = {
description: 'The Code Generator uses configured models to generate high-quality code based on your instructions. Please provide clear and detailed instructions.',
instruction: 'Instructions',
instructionPlaceholder: 'Enter detailed description of the code you want to generate.',
+ noDataLine1: 'Describe your use case on the left,',
+ noDataLine2: 'the code preview will show here.',
generate: 'Generate',
generatedCodeTitle: 'Generated Code',
loading: 'Generating code...',
diff --git a/web/i18n/en-US/workflow.ts b/web/i18n/en-US/workflow.ts
index 8b5f96453c..7f237b1a49 100644
--- a/web/i18n/en-US/workflow.ts
+++ b/web/i18n/en-US/workflow.ts
@@ -556,6 +556,23 @@ const translation = {
iteration_one: '{{count}} Iteration',
iteration_other: '{{count}} Iterations',
currentIteration: 'Current Iteration',
+ comma: ', ',
+ error_one: '{{count}} Error',
+ error_other: '{{count}} Errors',
+ parallelMode: 'Parallel Mode',
+ parallelModeUpper: 'PARALLEL MODE',
+ parallelModeEnableTitle: 'Parallel Mode Enabled',
+ parallelModeEnableDesc: 'In parallel mode, tasks within iterations support parallel execution. You can configure this in the properties panel on the right.',
+ parallelPanelDesc: 'In parallel mode, tasks in the iteration support parallel execution.',
+ MaxParallelismTitle: 'Maximum parallelism',
+ MaxParallelismDesc: 'The maximum parallelism is used to control the number of tasks executed simultaneously in a single iteration.',
+ errorResponseMethod: 'Error response method',
+ ErrorMethod: {
+ operationTerminated: 'terminated',
+ continueOnError: 'continue-on-error',
+ removeAbnormalOutput: 'remove-abnormal-output',
+ },
+ answerNodeWarningDesc: 'Parallel mode warning: Answer nodes, conversation variable assignments, and persistent read/write operations within iterations may cause exceptions.',
},
note: {
addNote: 'Add Note',
diff --git a/web/i18n/es-ES/workflow.ts b/web/i18n/es-ES/workflow.ts
index 59a330e7f4..6c9af49c4d 100644
--- a/web/i18n/es-ES/workflow.ts
+++ b/web/i18n/es-ES/workflow.ts
@@ -557,6 +557,23 @@ const translation = {
iteration_one: '{{count}} Iteración',
iteration_other: '{{count}} Iteraciones',
currentIteration: 'Iteración actual',
+ ErrorMethod: {
+ operationTerminated: 'Terminado',
+ continueOnError: 'Continuar en el error',
+ removeAbnormalOutput: 'eliminar-salida-anormal',
+ },
+ comma: ',',
+ errorResponseMethod: 'Método de respuesta a errores',
+ error_one: '{{conteo}} Error',
+ parallelPanelDesc: 'En el modo paralelo, las tareas de la iteración admiten la ejecución en paralelo.',
+ MaxParallelismTitle: 'Máximo paralelismo',
+ error_other: '{{conteo}} Errores',
+ parallelMode: 'Modo paralelo',
+ parallelModeEnableDesc: 'En el modo paralelo, las tareas dentro de las iteraciones admiten la ejecución en paralelo. Puede configurar esto en el panel de propiedades a la derecha.',
+ parallelModeUpper: 'MODO PARALELO',
+ MaxParallelismDesc: 'El paralelismo máximo se utiliza para controlar el número de tareas ejecutadas simultáneamente en una sola iteración.',
+ answerNodeWarningDesc: 'Advertencia de modo paralelo: Los nodos de respuesta, las asignaciones de variables de conversación y las operaciones de lectura/escritura persistentes dentro de las iteraciones pueden provocar excepciones.',
+ parallelModeEnableTitle: 'Modo paralelo habilitado',
},
note: {
addNote: 'Agregar nota',
diff --git a/web/i18n/fa-IR/workflow.ts b/web/i18n/fa-IR/workflow.ts
index b1f9384159..4b00390663 100644
--- a/web/i18n/fa-IR/workflow.ts
+++ b/web/i18n/fa-IR/workflow.ts
@@ -557,6 +557,23 @@ const translation = {
iteration_one: '{{count}} تکرار',
iteration_other: '{{count}} تکرارها',
currentIteration: 'تکرار فعلی',
+ ErrorMethod: {
+ continueOnError: 'ادامه در خطا',
+ operationTerminated: 'فسخ',
+ removeAbnormalOutput: 'حذف خروجی غیرطبیعی',
+ },
+ error_one: '{{تعداد}} خطا',
+ error_other: '{{تعداد}} خطاهای',
+ parallelMode: 'حالت موازی',
+ errorResponseMethod: 'روش پاسخ به خطا',
+ parallelModeEnableTitle: 'حالت موازی فعال است',
+ parallelModeUpper: 'حالت موازی',
+ comma: ',',
+ parallelModeEnableDesc: 'در حالت موازی، وظایف درون تکرارها از اجرای موازی پشتیبانی می کنند. می توانید این را در پانل ویژگی ها در سمت راست پیکربندی کنید.',
+ MaxParallelismTitle: 'حداکثر موازی سازی',
+ parallelPanelDesc: 'در حالت موازی، وظایف در تکرار از اجرای موازی پشتیبانی می کنند.',
+ MaxParallelismDesc: 'حداکثر موازی سازی برای کنترل تعداد وظایف اجرا شده به طور همزمان در یک تکرار واحد استفاده می شود.',
+ answerNodeWarningDesc: 'هشدار حالت موازی: گره های پاسخ، تکالیف متغیر مکالمه و عملیات خواندن/نوشتن مداوم در تکرارها ممکن است باعث استثنائات شود.',
},
note: {
addNote: 'افزودن یادداشت',
diff --git a/web/i18n/fr-FR/workflow.ts b/web/i18n/fr-FR/workflow.ts
index e56932455f..e736e2cb07 100644
--- a/web/i18n/fr-FR/workflow.ts
+++ b/web/i18n/fr-FR/workflow.ts
@@ -557,6 +557,23 @@ const translation = {
iteration_one: '{{count}} Itération',
iteration_other: '{{count}} Itérations',
currentIteration: 'Itération actuelle',
+ ErrorMethod: {
+ operationTerminated: 'Terminé',
+ removeAbnormalOutput: 'remove-abnormal-output',
+ continueOnError: 'continuer sur l’erreur',
+ },
+ comma: ',',
+ error_one: '{{compte}} Erreur',
+ error_other: '{{compte}} Erreurs',
+ parallelModeEnableDesc: 'En mode parallèle, les tâches au sein des itérations prennent en charge l’exécution parallèle. Vous pouvez le configurer dans le panneau des propriétés à droite.',
+ parallelModeUpper: 'MODE PARALLÈLE',
+ parallelPanelDesc: 'En mode parallèle, les tâches de l’itération prennent en charge l’exécution parallèle.',
+ MaxParallelismDesc: 'Le parallélisme maximal est utilisé pour contrôler le nombre de tâches exécutées simultanément en une seule itération.',
+ errorResponseMethod: 'Méthode de réponse aux erreurs',
+ MaxParallelismTitle: 'Parallélisme maximal',
+ answerNodeWarningDesc: 'Avertissement en mode parallèle : les nœuds de réponse, les affectations de variables de conversation et les opérations de lecture/écriture persistantes au sein des itérations peuvent provoquer des exceptions.',
+ parallelModeEnableTitle: 'Mode parallèle activé',
+ parallelMode: 'Mode parallèle',
},
note: {
addNote: 'Ajouter note',
diff --git a/web/i18n/hi-IN/workflow.ts b/web/i18n/hi-IN/workflow.ts
index 1473f78ccd..4112643488 100644
--- a/web/i18n/hi-IN/workflow.ts
+++ b/web/i18n/hi-IN/workflow.ts
@@ -577,6 +577,23 @@ const translation = {
iteration_one: '{{count}} इटरेशन',
iteration_other: '{{count}} इटरेशन्स',
currentIteration: 'वर्तमान इटरेशन',
+ ErrorMethod: {
+ operationTerminated: 'समाप्त',
+ continueOnError: 'जारी रखें-पर-त्रुटि',
+ removeAbnormalOutput: 'निकालें-असामान्य-आउटपुट',
+ },
+ comma: ',',
+ error_other: '{{गिनती}} त्रुटियों',
+ error_one: '{{गिनती}} चूक',
+ parallelMode: 'समानांतर मोड',
+ parallelModeUpper: 'समानांतर मोड',
+ errorResponseMethod: 'त्रुटि प्रतिक्रिया विधि',
+ MaxParallelismTitle: 'अधिकतम समांतरता',
+ parallelModeEnableTitle: 'समानांतर मोड सक्षम किया गया',
+ parallelModeEnableDesc: 'समानांतर मोड में, पुनरावृत्तियों के भीतर कार्य समानांतर निष्पादन का समर्थन करते हैं। आप इसे दाईं ओर गुण पैनल में कॉन्फ़िगर कर सकते हैं।',
+ parallelPanelDesc: 'समानांतर मोड में, पुनरावृत्ति में कार्य समानांतर निष्पादन का समर्थन करते हैं।',
+ MaxParallelismDesc: 'अधिकतम समांतरता का उपयोग एकल पुनरावृत्ति में एक साथ निष्पादित कार्यों की संख्या को नियंत्रित करने के लिए किया जाता है।',
+ answerNodeWarningDesc: 'समानांतर मोड चेतावनी: उत्तर नोड्स, वार्तालाप चर असाइनमेंट, और पुनरावृत्तियों के भीतर लगातार पढ़ने/लिखने की कार्रवाई अपवाद पैदा कर सकती है।',
},
note: {
addNote: 'नोट जोड़ें',
diff --git a/web/i18n/it-IT/workflow.ts b/web/i18n/it-IT/workflow.ts
index 19fa7bfbb5..756fb665af 100644
--- a/web/i18n/it-IT/workflow.ts
+++ b/web/i18n/it-IT/workflow.ts
@@ -584,6 +584,23 @@ const translation = {
iteration_one: '{{count}} Iterazione',
iteration_other: '{{count}} Iterazioni',
currentIteration: 'Iterazione Corrente',
+ ErrorMethod: {
+ operationTerminated: 'Terminato',
+ continueOnError: 'continua sull\'errore',
+ removeAbnormalOutput: 'rimuovi-output-anomalo',
+ },
+ error_one: '{{conteggio}} Errore',
+ parallelMode: 'Modalità parallela',
+ MaxParallelismTitle: 'Parallelismo massimo',
+ error_other: '{{conteggio}} Errori',
+ parallelModeEnableDesc: 'In modalità parallela, le attività all\'interno delle iterazioni supportano l\'esecuzione parallela. È possibile configurare questa opzione nel pannello delle proprietà a destra.',
+ MaxParallelismDesc: 'Il parallelismo massimo viene utilizzato per controllare il numero di attività eseguite contemporaneamente in una singola iterazione.',
+ errorResponseMethod: 'Metodo di risposta all\'errore',
+ parallelModeEnableTitle: 'Modalità parallela abilitata',
+ parallelModeUpper: 'MODALITÀ PARALLELA',
+ comma: ',',
+ parallelPanelDesc: 'In modalità parallela, le attività nell\'iterazione supportano l\'esecuzione parallela.',
+ answerNodeWarningDesc: 'Avviso in modalità parallela: i nodi di risposta, le assegnazioni di variabili di conversazione e le operazioni di lettura/scrittura persistenti all\'interno delle iterazioni possono causare eccezioni.',
},
note: {
addNote: 'Aggiungi Nota',
diff --git a/web/i18n/ja-JP/app-debug.ts b/web/i18n/ja-JP/app-debug.ts
index 620d9b2f55..05e81a2ae2 100644
--- a/web/i18n/ja-JP/app-debug.ts
+++ b/web/i18n/ja-JP/app-debug.ts
@@ -224,6 +224,8 @@ const translation = {
description: 'コードジェネレーターは、設定されたモデルを使用して指示に基づいて高品質なコードを生成します。明確で詳細な指示を提供してください。',
instruction: '指示',
instructionPlaceholder: '生成したいコードの詳細な説明を入力してください。',
+ noDataLine1: '左側に使用例を記入してください,',
+ noDataLine2: 'コードのプレビューがこちらに表示されます。',
generate: '生成',
generatedCodeTitle: '生成されたコード',
loading: 'コードを生成中...',
diff --git a/web/i18n/ja-JP/app.ts b/web/i18n/ja-JP/app.ts
index 76c7d1c4f4..48a35c61af 100644
--- a/web/i18n/ja-JP/app.ts
+++ b/web/i18n/ja-JP/app.ts
@@ -39,10 +39,10 @@ const translation = {
workflowWarning: '現在ベータ版です',
chatbotType: 'チャットボットのオーケストレーション方法',
basic: '基本',
- basicTip: '初心者向け。後で Chatflow に切り替えることができます',
+ basicTip: '初心者向け。後で「チャットフロー」に切り替えることができます',
basicFor: '初心者向け',
basicDescription: '基本オーケストレートは、組み込みのプロンプトを変更する機能がなく、簡単な設定を使用してチャットボット アプリをオーケストレートします。初心者向けです。',
- advanced: 'Chatflow',
+ advanced: 'チャットフロー',
advancedFor: '上級ユーザー向け',
advancedDescription: 'ワークフロー オーケストレートは、ワークフロー形式でチャットボットをオーケストレートし、組み込みのプロンプトを編集する機能を含む高度なカスタマイズを提供します。経験豊富なユーザー向けです。',
captionName: 'アプリのアイコンと名前',
diff --git a/web/i18n/ja-JP/workflow.ts b/web/i18n/ja-JP/workflow.ts
index b6c7786081..a82ba71e48 100644
--- a/web/i18n/ja-JP/workflow.ts
+++ b/web/i18n/ja-JP/workflow.ts
@@ -558,6 +558,23 @@ const translation = {
iteration_one: '{{count}} イテレーション',
iteration_other: '{{count}} イテレーション',
currentIteration: '現在のイテレーション',
+ ErrorMethod: {
+ operationTerminated: '終了',
+ continueOnError: 'エラー時に続行',
+ removeAbnormalOutput: 'アブノーマルアウトプットの削除',
+ },
+ comma: ',',
+ error_other: '{{カウント}}エラー',
+ error_one: '{{カウント}}エラー',
+ parallelModeUpper: 'パラレルモード',
+ parallelMode: 'パラレルモード',
+ MaxParallelismTitle: '最大並列処理',
+ errorResponseMethod: 'エラー応答方式',
+ parallelPanelDesc: '並列モードでは、イテレーションのタスクは並列実行をサポートします。',
+ parallelModeEnableDesc: '並列モードでは、イテレーション内のタスクは並列実行をサポートします。これは、右側のプロパティパネルで構成できます。',
+ parallelModeEnableTitle: 'パラレルモード有効',
+ MaxParallelismDesc: '最大並列処理は、1 回の反復で同時に実行されるタスクの数を制御するために使用されます。',
+ answerNodeWarningDesc: '並列モードの警告: 応答ノード、会話変数の割り当て、およびイテレーション内の永続的な読み取り/書き込み操作により、例外が発生する可能性があります。',
},
note: {
addNote: 'コメントを追加',
diff --git a/web/i18n/ko-KR/common.ts b/web/i18n/ko-KR/common.ts
index d2035e7c71..43e7402bd4 100644
--- a/web/i18n/ko-KR/common.ts
+++ b/web/i18n/ko-KR/common.ts
@@ -169,7 +169,7 @@ const translation = {
deleteConfirmTip: '확인하려면 등록된 이메일에서 다음 내용을 로 보내주세요 ',
myAccount: '내 계정',
studio: '디파이 스튜디오',
- account: '계좌',
+ account: '계정',
},
members: {
team: '팀',
diff --git a/web/i18n/ko-KR/workflow.ts b/web/i18n/ko-KR/workflow.ts
index b62aff2068..589831401c 100644
--- a/web/i18n/ko-KR/workflow.ts
+++ b/web/i18n/ko-KR/workflow.ts
@@ -557,6 +557,23 @@ const translation = {
iteration_one: '{{count}} 반복',
iteration_other: '{{count}} 반복',
currentIteration: '현재 반복',
+ ErrorMethod: {
+ operationTerminated: '종료',
+ continueOnError: '오류 발생 시 계속',
+ removeAbnormalOutput: '비정상 출력 제거',
+ },
+ comma: ',',
+ error_one: '{{개수}} 오류',
+ parallelMode: '병렬 모드',
+ errorResponseMethod: '오류 응답 방법',
+ parallelModeUpper: '병렬 모드',
+ MaxParallelismTitle: '최대 병렬 처리',
+ error_other: '{{개수}} 오류',
+ parallelModeEnableTitle: 'Parallel Mode Enabled(병렬 모드 사용)',
+ parallelPanelDesc: '병렬 모드에서 반복의 작업은 병렬 실행을 지원합니다.',
+ parallelModeEnableDesc: '병렬 모드에서는 반복 내의 작업이 병렬 실행을 지원합니다. 오른쪽의 속성 패널에서 이를 구성할 수 있습니다.',
+ MaxParallelismDesc: '최대 병렬 처리는 단일 반복에서 동시에 실행되는 작업 수를 제어하는 데 사용됩니다.',
+ answerNodeWarningDesc: '병렬 모드 경고: 응답 노드, 대화 변수 할당 및 반복 내의 지속적인 읽기/쓰기 작업으로 인해 예외가 발생할 수 있습니다.',
},
note: {
editor: {
diff --git a/web/i18n/pl-PL/app-debug.ts b/web/i18n/pl-PL/app-debug.ts
index 7cf6c77cb4..cf7232e563 100644
--- a/web/i18n/pl-PL/app-debug.ts
+++ b/web/i18n/pl-PL/app-debug.ts
@@ -355,7 +355,7 @@ const translation = {
openingStatement: {
title: 'Wstęp do rozmowy',
add: 'Dodaj',
- writeOpner: 'Napisz wstęp',
+ writeOpener: 'Napisz wstęp',
placeholder:
'Tutaj napisz swoją wiadomość wprowadzającą, możesz użyć zmiennych, spróbuj wpisać {{variable}}.',
openingQuestion: 'Pytania otwierające',
diff --git a/web/i18n/pl-PL/workflow.ts b/web/i18n/pl-PL/workflow.ts
index aace1b2642..f118f7945c 100644
--- a/web/i18n/pl-PL/workflow.ts
+++ b/web/i18n/pl-PL/workflow.ts
@@ -557,6 +557,23 @@ const translation = {
iteration_one: '{{count}} Iteracja',
iteration_other: '{{count}} Iteracje',
currentIteration: 'Bieżąca iteracja',
+ ErrorMethod: {
+ continueOnError: 'kontynuacja w przypadku błędu',
+ operationTerminated: 'Zakończone',
+ removeAbnormalOutput: 'usuń-nieprawidłowe-wyjście',
+ },
+ comma: ',',
+ parallelModeUpper: 'TRYB RÓWNOLEGŁY',
+ parallelModeEnableTitle: 'Włączony tryb równoległy',
+ MaxParallelismTitle: 'Maksymalna równoległość',
+ error_one: '{{liczba}} Błąd',
+ error_other: '{{liczba}} Błędy',
+ parallelPanelDesc: 'W trybie równoległym zadania w iteracji obsługują wykonywanie równoległe.',
+ parallelMode: 'Tryb równoległy',
+ MaxParallelismDesc: 'Maksymalna równoległość służy do kontrolowania liczby zadań wykonywanych jednocześnie w jednej iteracji.',
+ parallelModeEnableDesc: 'W trybie równoległym zadania w iteracjach obsługują wykonywanie równoległe. Możesz to skonfigurować w panelu właściwości po prawej stronie.',
+ answerNodeWarningDesc: 'Ostrzeżenie w trybie równoległym: węzły odpowiedzi, przypisania zmiennych konwersacji i trwałe operacje odczytu/zapisu w iteracjach mogą powodować wyjątki.',
+ errorResponseMethod: 'Metoda odpowiedzi na błąd',
},
note: {
editor: {
diff --git a/web/i18n/pt-BR/workflow.ts b/web/i18n/pt-BR/workflow.ts
index f0f2fec0e2..44afda5cd4 100644
--- a/web/i18n/pt-BR/workflow.ts
+++ b/web/i18n/pt-BR/workflow.ts
@@ -557,6 +557,23 @@ const translation = {
iteration_one: '{{count}} Iteração',
iteration_other: '{{count}} Iterações',
currentIteration: 'Iteração atual',
+ ErrorMethod: {
+ continueOnError: 'continuar em erro',
+ removeAbnormalOutput: 'saída anormal de remoção',
+ operationTerminated: 'Terminada',
+ },
+ MaxParallelismTitle: 'Paralelismo máximo',
+ parallelModeEnableTitle: 'Modo paralelo ativado',
+ errorResponseMethod: 'Método de resposta de erro',
+ error_other: '{{contagem}} Erros',
+ parallelMode: 'Modo paralelo',
+ parallelModeUpper: 'MODO PARALELO',
+ error_one: '{{contagem}} Erro',
+ parallelModeEnableDesc: 'No modo paralelo, as tarefas dentro das iterações dão suporte à execução paralela. Você pode configurar isso no painel de propriedades à direita.',
+ comma: ',',
+ MaxParallelismDesc: 'O paralelismo máximo é usado para controlar o número de tarefas executadas simultaneamente em uma única iteração.',
+ answerNodeWarningDesc: 'Aviso de modo paralelo: nós de resposta, atribuições de variáveis de conversação e operações persistentes de leitura/gravação em iterações podem causar exceções.',
+ parallelPanelDesc: 'No modo paralelo, as tarefas na iteração dão suporte à execução paralela.',
},
note: {
editor: {
diff --git a/web/i18n/ro-RO/workflow.ts b/web/i18n/ro-RO/workflow.ts
index ab0100d347..d8cd84f730 100644
--- a/web/i18n/ro-RO/workflow.ts
+++ b/web/i18n/ro-RO/workflow.ts
@@ -557,6 +557,23 @@ const translation = {
iteration_one: '{{count}} Iterație',
iteration_other: '{{count}} Iterații',
currentIteration: 'Iterație curentă',
+ ErrorMethod: {
+ operationTerminated: 'Încheiată',
+ continueOnError: 'continuare-la-eroare',
+ removeAbnormalOutput: 'elimină-ieșire-anormală',
+ },
+ parallelModeEnableTitle: 'Modul paralel activat',
+ errorResponseMethod: 'Metoda de răspuns la eroare',
+ comma: ',',
+ parallelModeEnableDesc: 'În modul paralel, sarcinile din iterații acceptă execuția paralelă. Puteți configura acest lucru în panoul de proprietăți din dreapta.',
+ parallelModeUpper: 'MOD PARALEL',
+ MaxParallelismTitle: 'Paralelism maxim',
+ parallelMode: 'Mod paralel',
+ error_other: '{{număr}} Erori',
+ error_one: '{{număr}} Eroare',
+ parallelPanelDesc: 'În modul paralel, activitățile din iterație acceptă execuția paralelă.',
+ MaxParallelismDesc: 'Paralelismul maxim este utilizat pentru a controla numărul de sarcini executate simultan într-o singură iterație.',
+ answerNodeWarningDesc: 'Avertisment modul paralel: Nodurile de răspuns, atribuirea variabilelor de conversație și operațiunile persistente de citire/scriere în iterații pot cauza excepții.',
},
note: {
editor: {
diff --git a/web/i18n/ru-RU/workflow.ts b/web/i18n/ru-RU/workflow.ts
index 27735fbb7d..c822f8c3e5 100644
--- a/web/i18n/ru-RU/workflow.ts
+++ b/web/i18n/ru-RU/workflow.ts
@@ -557,6 +557,23 @@ const translation = {
iteration_one: '{{count}} Итерация',
iteration_other: '{{count}} Итераций',
currentIteration: 'Текущая итерация',
+ ErrorMethod: {
+ operationTerminated: 'Прекращено',
+ continueOnError: 'продолжить по ошибке',
+ removeAbnormalOutput: 'удалить аномальный вывод',
+ },
+ comma: ',',
+ error_other: '{{Количество}} Ошибки',
+ errorResponseMethod: 'Метод реагирования на ошибку',
+ MaxParallelismTitle: 'Максимальный параллелизм',
+ parallelModeUpper: 'ПАРАЛЛЕЛЬНЫЙ РЕЖИМ',
+ error_one: '{{Количество}} Ошибка',
+ parallelModeEnableTitle: 'Параллельный режим включен',
+ parallelMode: 'Параллельный режим',
+ parallelPanelDesc: 'В параллельном режиме задачи в итерации поддерживают параллельное выполнение.',
+ parallelModeEnableDesc: 'В параллельном режиме задачи в итерациях поддерживают параллельное выполнение. Вы можете настроить это на панели свойств справа.',
+ MaxParallelismDesc: 'Максимальный параллелизм используется для управления количеством задач, выполняемых одновременно в одной итерации.',
+ answerNodeWarningDesc: 'Предупреждение о параллельном режиме: узлы ответов, присвоение переменных диалога и постоянные операции чтения и записи в итерациях могут вызывать исключения.',
},
note: {
addNote: 'Добавить заметку',
diff --git a/web/i18n/tr-TR/workflow.ts b/web/i18n/tr-TR/workflow.ts
index 82718ebc03..e6e25f6d0e 100644
--- a/web/i18n/tr-TR/workflow.ts
+++ b/web/i18n/tr-TR/workflow.ts
@@ -558,6 +558,23 @@ const translation = {
iteration_one: '{{count}} Yineleme',
iteration_other: '{{count}} Yineleme',
currentIteration: 'Mevcut Yineleme',
+ ErrorMethod: {
+ operationTerminated: 'Sonlandırıldı',
+ continueOnError: 'Hata Üzerine Devam Et',
+ removeAbnormalOutput: 'anormal çıktıyı kaldır',
+ },
+ parallelModeUpper: 'PARALEL MOD',
+ parallelMode: 'Paralel Mod',
+ MaxParallelismTitle: 'Maksimum paralellik',
+ error_one: '{{sayı}} Hata',
+ errorResponseMethod: 'Hata yanıtı yöntemi',
+ comma: ',',
+ parallelModeEnableTitle: 'Paralel Mod Etkin',
+ error_other: '{{sayı}} Hata',
+ parallelPanelDesc: 'Paralel modda, yinelemedeki görevler paralel yürütmeyi destekler.',
+ answerNodeWarningDesc: 'Paralel mod uyarısı: Yinelemeler içindeki yanıt düğümleri, konuşma değişkeni atamaları ve kalıcı okuma/yazma işlemleri özel durumlara neden olabilir.',
+ parallelModeEnableDesc: 'Paralel modda, yinelemeler içindeki görevler paralel yürütmeyi destekler. Bunu sağdaki özellikler panelinde yapılandırabilirsiniz.',
+ MaxParallelismDesc: 'Maksimum paralellik, tek bir yinelemede aynı anda yürütülen görevlerin sayısını kontrol etmek için kullanılır.',
},
note: {
addNote: 'Not Ekle',
diff --git a/web/i18n/uk-UA/workflow.ts b/web/i18n/uk-UA/workflow.ts
index 1828b6499f..663b5e4c13 100644
--- a/web/i18n/uk-UA/workflow.ts
+++ b/web/i18n/uk-UA/workflow.ts
@@ -557,6 +557,23 @@ const translation = {
iteration_one: '{{count}} Ітерація',
iteration_other: '{{count}} Ітерацій',
currentIteration: 'Поточна ітерація',
+ ErrorMethod: {
+ operationTerminated: 'Припинено',
+ continueOnError: 'Продовжити після помилки',
+ removeAbnormalOutput: 'видалити-ненормальний-вивід',
+ },
+ error_one: '{{count}} Помилка',
+ comma: ',',
+ MaxParallelismTitle: 'Максимальна паралельність',
+ parallelModeUpper: 'ПАРАЛЕЛЬНИЙ РЕЖИМ',
+ error_other: '{{count}} Помилки',
+ parallelMode: 'Паралельний режим',
+ parallelModeEnableTitle: 'Увімкнено паралельний режим',
+ errorResponseMethod: 'Метод реагування на помилку',
+ parallelPanelDesc: 'У паралельному режимі завдання в ітерації підтримують паралельне виконання.',
+ parallelModeEnableDesc: 'У паралельному режимі завдання всередині ітерацій підтримують паралельне виконання. Ви можете налаштувати це на панелі властивостей праворуч.',
+ MaxParallelismDesc: 'Максимальний паралелізм використовується для контролю числа завдань, що виконуються одночасно за одну ітерацію.',
+ answerNodeWarningDesc: 'Попередження в паралельному режимі: вузли відповідей, призначення змінних розмови та постійні операції читання/запису в межах ітерацій можуть спричинити винятки.',
},
note: {
editor: {
diff --git a/web/i18n/vi-VN/workflow.ts b/web/i18n/vi-VN/workflow.ts
index 2866af8a2a..1176fdd2b5 100644
--- a/web/i18n/vi-VN/workflow.ts
+++ b/web/i18n/vi-VN/workflow.ts
@@ -557,6 +557,23 @@ const translation = {
iteration_one: '{{count}} Lặp',
iteration_other: '{{count}} Lặp',
currentIteration: 'Lặp hiện tại',
+ ErrorMethod: {
+ operationTerminated: 'Chấm dứt',
+ removeAbnormalOutput: 'loại bỏ-bất thường-đầu ra',
+ continueOnError: 'Tiếp tục lỗi',
+ },
+ comma: ',',
+ error_other: '{{đếm}} Lỗi',
+ error_one: '{{đếm}} Lỗi',
+ MaxParallelismTitle: 'Song song tối đa',
+ parallelPanelDesc: 'Ở chế độ song song, các tác vụ trong quá trình lặp hỗ trợ thực thi song song.',
+ parallelMode: 'Chế độ song song',
+ parallelModeEnableTitle: 'Đã bật Chế độ song song',
+ errorResponseMethod: 'Phương pháp phản hồi lỗi',
+ MaxParallelismDesc: 'Tính song song tối đa được sử dụng để kiểm soát số lượng tác vụ được thực hiện đồng thời trong một lần lặp.',
+ answerNodeWarningDesc: 'Cảnh báo chế độ song song: Các nút trả lời, bài tập biến hội thoại và các thao tác đọc/ghi liên tục trong các lần lặp có thể gây ra ngoại lệ.',
+ parallelModeEnableDesc: 'Trong chế độ song song, các tác vụ trong các lần lặp hỗ trợ thực thi song song. Bạn có thể định cấu hình điều này trong bảng thuộc tính ở bên phải.',
+ parallelModeUpper: 'CHẾ ĐỘ SONG SONG',
},
note: {
editor: {
diff --git a/web/i18n/zh-Hans/app-debug.ts b/web/i18n/zh-Hans/app-debug.ts
index 3e801bcf62..9e21945755 100644
--- a/web/i18n/zh-Hans/app-debug.ts
+++ b/web/i18n/zh-Hans/app-debug.ts
@@ -224,6 +224,8 @@ const translation = {
description: '代码生成器使用配置的模型根据您的指令生成高质量的代码。请提供清晰详细的说明。',
instruction: '指令',
instructionPlaceholder: '请输入您想要生成的代码的详细描述。',
+ noDataLine1: '在左侧描述您的用例，',
+ noDataLine2: '代码预览将在此处显示。',
generate: '生成',
generatedCodeTitle: '生成的代码',
loading: '正在生成代码...',
diff --git a/web/i18n/zh-Hans/workflow.ts b/web/i18n/zh-Hans/workflow.ts
index 519f25d34e..6d574bc6f5 100644
--- a/web/i18n/zh-Hans/workflow.ts
+++ b/web/i18n/zh-Hans/workflow.ts
@@ -556,6 +556,23 @@ const translation = {
iteration_one: '{{count}}个迭代',
iteration_other: '{{count}}个迭代',
currentIteration: '当前迭代',
+ comma: '，',
+ error_one: '{{count}}个失败',
+ error_other: '{{count}}个失败',
+ parallelMode: '并行模式',
+ parallelModeUpper: '并行模式',
+ parallelModeEnableTitle: '并行模式启用',
+ parallelModeEnableDesc: '启用并行模式时迭代内的任务支持并行执行。你可以在右侧的属性面板中进行配置。',
+ parallelPanelDesc: '在并行模式下，迭代中的任务支持并行执行。',
+ MaxParallelismTitle: '最大并行度',
+ MaxParallelismDesc: '最大并行度用于控制单次迭代中同时执行的任务数量。',
+ errorResponseMethod: '错误响应方法',
+ ErrorMethod: {
+ operationTerminated: '错误时终止',
+ continueOnError: '忽略错误并继续',
+ removeAbnormalOutput: '移除错误输出',
+ },
+ answerNodeWarningDesc: '并行模式警告：在迭代中，回答节点、会话变量赋值和工具持久读/写操作可能会导致异常。',
},
note: {
addNote: '添加注释',
diff --git a/web/i18n/zh-Hant/workflow.ts b/web/i18n/zh-Hant/workflow.ts
index d65b3999d2..f3fbfdedc2 100644
--- a/web/i18n/zh-Hant/workflow.ts
+++ b/web/i18n/zh-Hant/workflow.ts
@@ -557,6 +557,23 @@ const translation = {
iteration_one: '{{count}}個迭代',
iteration_other: '{{count}}個迭代',
currentIteration: '當前迭代',
+ ErrorMethod: {
+ operationTerminated: '終止',
+ removeAbnormalOutput: 'remove-abnormal-output',
+ continueOnError: '出錯時繼續',
+ },
+ comma: ',',
+ parallelMode: '並行模式',
+ parallelModeEnableTitle: 'Parallel Mode 已啟用',
+ MaxParallelismTitle: '最大並行度',
+ parallelModeUpper: '並行模式',
+ parallelPanelDesc: '在並行模式下，反覆運算中的任務支援並行執行。',
+ error_one: '{{count}}錯誤',
+ errorResponseMethod: '錯誤回應方法',
+ parallelModeEnableDesc: '在並行模式下，反覆運算中的任務支援並行執行。您可以在右側的 properties 面板中進行配置。',
+ answerNodeWarningDesc: '並行模式警告：反覆運算中的應答節點、對話變數賦值和持久讀/寫操作可能會導致異常。',
+ error_other: '{{count}}錯誤',
+ MaxParallelismDesc: '最大並行度用於控制在單個反覆運算中同時執行的任務數。',
},
note: {
editor: {
diff --git a/web/models/common.ts b/web/models/common.ts
index bb694385ef..48bdc8ae44 100644
--- a/web/models/common.ts
+++ b/web/models/common.ts
@@ -216,7 +216,7 @@ export interface FileUploadConfigResponse {
file_size_limit: number // default is 15MB
audio_file_size_limit?: number // default is 50MB
video_file_size_limit?: number // default is 100MB
-
+ workflow_file_upload_limit?: number // default is 10
}
export type InvitationResult = {
diff --git a/web/package.json b/web/package.json
index 471a720fba..8d69bbc209 100644
--- a/web/package.json
+++ b/web/package.json
@@ -1,6 +1,6 @@
{
"name": "dify-web",
- "version": "0.10.2",
+ "version": "0.11.0",
"private": true,
"engines": {
"node": ">=18.17.0"
diff --git a/web/service/base.ts b/web/service/base.ts
index 8efb97cff3..e1a04217c7 100644
--- a/web/service/base.ts
+++ b/web/service/base.ts
@@ -1,4 +1,5 @@
import { API_PREFIX, IS_CE_EDITION, MARKETPLACE_API_PREFIX, PUBLIC_API_PREFIX } from '@/config'
+import { refreshAccessTokenOrRelogin } from './refresh-token'
import Toast from '@/app/components/base/toast'
import type { AnnotationReply, MessageEnd, MessageReplace, ThoughtItem } from '@/app/components/base/chat/chat/type'
import type { VisionFile } from '@/types/app'
@@ -368,42 +369,8 @@ const baseFetch = (
if (!/^(2|3)\d{2}$/.test(String(res.status))) {
const bodyJson = res.json()
switch (res.status) {
- case 401: {
- if (isMarketplaceAPI)
- return
-
- if (isPublicAPI) {
- return bodyJson.then((data: ResponseError) => {
- if (data.code === 'web_sso_auth_required')
- requiredWebSSOLogin()
-
- if (data.code === 'unauthorized') {
- removeAccessToken()
- globalThis.location.reload()
- }
-
- return Promise.reject(data)
- })
- }
- const loginUrl = `${globalThis.location.origin}/signin`
- bodyJson.then((data: ResponseError) => {
- if (data.code === 'init_validate_failed' && IS_CE_EDITION && !silent)
- Toast.notify({ type: 'error', message: data.message, duration: 4000 })
- else if (data.code === 'not_init_validated' && IS_CE_EDITION)
- globalThis.location.href = `${globalThis.location.origin}/init`
- else if (data.code === 'not_setup' && IS_CE_EDITION)
- globalThis.location.href = `${globalThis.location.origin}/install`
- else if (location.pathname !== '/signin' || !IS_CE_EDITION)
- globalThis.location.href = loginUrl
- else if (!silent)
- Toast.notify({ type: 'error', message: data.message })
- }).catch(() => {
- // Handle any other errors
- globalThis.location.href = loginUrl
- })
-
- break
- }
+ case 401:
+ return Promise.reject(resClone)
case 403:
bodyJson.then((data: ResponseError) => {
if (!silent)
@@ -499,7 +466,9 @@ export const upload = (options: any, isPublicAPI?: boolean, url?: string, search
export const ssePost = (
url: string,
fetchOptions: FetchOptionType,
- {
+ otherOptions: IOtherOptions,
+) => {
+ const {
isPublicAPI = false,
onData,
onCompleted,
@@ -522,8 +491,7 @@ export const ssePost = (
onTextReplace,
onError,
getAbortController,
- }: IOtherOptions,
-) => {
+ } = otherOptions
const abortController = new AbortController()
const options = Object.assign({}, baseOptions, {
@@ -547,21 +515,29 @@ export const ssePost = (
globalThis.fetch(urlWithPrefix, options as RequestInit)
.then((res) => {
if (!/^(2|3)\d{2}$/.test(String(res.status))) {
- res.json().then((data: any) => {
- if (isPublicAPI) {
- if (data.code === 'web_sso_auth_required')
- requiredWebSSOLogin()
+ if (res.status === 401) {
+ refreshAccessTokenOrRelogin(TIME_OUT).then(() => {
+ ssePost(url, fetchOptions, otherOptions)
+ }).catch(() => {
+ res.json().then((data: any) => {
+ if (isPublicAPI) {
+ if (data.code === 'web_sso_auth_required')
+ requiredWebSSOLogin()
- if (data.code === 'unauthorized') {
- removeAccessToken()
- globalThis.location.reload()
- }
- if (res.status === 401)
- return
- }
- Toast.notify({ type: 'error', message: data.message || 'Server Error' })
- })
- onError?.('Server Error')
+ if (data.code === 'unauthorized') {
+ removeAccessToken()
+ globalThis.location.reload()
+ }
+ }
+ })
+ })
+ }
+ else {
+ res.json().then((data) => {
+ Toast.notify({ type: 'error', message: data.message || 'Server Error' })
+ })
+ onError?.('Server Error')
+ }
return
}
return handleStream(res, (str: string, isFirstMessage: boolean, moreInfo: IOnDataMoreInfo) => {
@@ -584,7 +560,54 @@ export const ssePost = (
// base request
export const request = (url: string, options = {}, otherOptions?: IOtherOptions) => {
- return baseFetch(url, options, otherOptions || {})
+ return new Promise((resolve, reject) => {
+ const otherOptionsForBaseFetch = otherOptions || {}
+ baseFetch(url, options, otherOptionsForBaseFetch).then(resolve).catch((errResp) => {
+ if (errResp?.status === 401) {
+ return refreshAccessTokenOrRelogin(TIME_OUT).then(() => {
+ baseFetch(url, options, otherOptionsForBaseFetch).then(resolve).catch(reject)
+ }).catch(() => {
+ const {
+ isPublicAPI = false,
+ silent,
+ } = otherOptionsForBaseFetch
+ const bodyJson = errResp.json()
+ if (isPublicAPI) {
+ return bodyJson.then((data: ResponseError) => {
+ if (data.code === 'web_sso_auth_required')
+ requiredWebSSOLogin()
+
+ if (data.code === 'unauthorized') {
+ removeAccessToken()
+ globalThis.location.reload()
+ }
+
+ return Promise.reject(data)
+ })
+ }
+ const loginUrl = `${globalThis.location.origin}/signin`
+ bodyJson.then((data: ResponseError) => {
+ if (data.code === 'init_validate_failed' && IS_CE_EDITION && !silent)
+ Toast.notify({ type: 'error', message: data.message, duration: 4000 })
+ else if (data.code === 'not_init_validated' && IS_CE_EDITION)
+ globalThis.location.href = `${globalThis.location.origin}/init`
+ else if (data.code === 'not_setup' && IS_CE_EDITION)
+ globalThis.location.href = `${globalThis.location.origin}/install`
+ else if (location.pathname !== '/signin' || !IS_CE_EDITION)
+ globalThis.location.href = loginUrl
+ else if (!silent)
+ Toast.notify({ type: 'error', message: data.message })
+ }).catch(() => {
+ // Handle any other errors
+ globalThis.location.href = loginUrl
+ })
+ })
+ }
+ else {
+ reject(errResp)
+ }
+ })
+ })
}
// request methods
diff --git a/web/service/common.ts b/web/service/common.ts
index 70586b6ff6..01b3a60991 100644
--- a/web/service/common.ts
+++ b/web/service/common.ts
@@ -320,9 +320,10 @@ export const verifyForgotPasswordToken: Fetcher = ({ url, body }) =>
post(url, { body })
-export const fetchRemoteFileInfo = (url: string) => {
- return get<{ file_type: string; file_length: number }>(`/remote-files/${url}`)
+export const uploadRemoteFileInfo = (url: string, isPublic?: boolean) => {
+ return post<{ id: string; name: string; size: number; mime_type: string; url: string }>('/remote-files/upload', { body: { url } }, { isPublicAPI: isPublic })
}
+
export const sendEMailLoginCode = (email: string, language = 'en-US') =>
post('/email-code-login', { body: { email, language } })
diff --git a/web/service/refresh-token.ts b/web/service/refresh-token.ts
new file mode 100644
index 0000000000..8bd2215041
--- /dev/null
+++ b/web/service/refresh-token.ts
@@ -0,0 +1,75 @@
+import { apiPrefix } from '@/config'
+import { fetchWithRetry } from '@/utils'
+
+let isRefreshing = false
+function waitUntilTokenRefreshed() {
+ return new Promise((resolve, reject) => {
+ function _check() {
+ const isRefreshingSign = localStorage.getItem('is_refreshing')
+ if ((isRefreshingSign && isRefreshingSign === '1') || isRefreshing) {
+ setTimeout(() => {
+ _check()
+ }, 1000)
+ }
+ else {
+ resolve()
+ }
+ }
+ _check()
+ })
+}
+
+// only one request can send
+async function getNewAccessToken(): Promise {
+ try {
+ const isRefreshingSign = localStorage.getItem('is_refreshing')
+ if ((isRefreshingSign && isRefreshingSign === '1') || isRefreshing) {
+ await waitUntilTokenRefreshed()
+ }
+ else {
+ globalThis.localStorage.setItem('is_refreshing', '1')
+ isRefreshing = true
+ const refresh_token = globalThis.localStorage.getItem('refresh_token')
+
+ // Do not use baseFetch to refresh tokens.
+ // If a 401 response occurs and baseFetch itself attempts to refresh the token,
+ // it can lead to an infinite loop if the refresh attempt also returns 401.
+ // To avoid this, handle token refresh separately in a dedicated function
+ // that does not call baseFetch and uses a single retry mechanism.
+ const [error, ret] = await fetchWithRetry(globalThis.fetch(`${apiPrefix}/refresh-token`, {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json;utf-8',
+ },
+ body: JSON.stringify({ refresh_token }),
+ }))
+ if (error) {
+ return Promise.reject(error)
+ }
+ else {
+ if (ret.status === 401)
+ return Promise.reject(ret)
+
+ const { data } = await ret.json()
+ globalThis.localStorage.setItem('console_token', data.access_token)
+ globalThis.localStorage.setItem('refresh_token', data.refresh_token)
+ }
+ }
+ }
+ catch (error) {
+ console.error(error)
+ return Promise.reject(error)
+ }
+ finally {
+ isRefreshing = false
+ globalThis.localStorage.removeItem('is_refreshing')
+ }
+}
+
+export async function refreshAccessTokenOrRelogin(timeout: number) {
+ return Promise.race([new Promise((resolve, reject) => setTimeout(() => {
+ isRefreshing = false
+ globalThis.localStorage.removeItem('is_refreshing')
+ reject(new Error('request timeout'))
+ }, timeout)), getNewAccessToken()])
+}
diff --git a/web/themes/dark.css b/web/themes/dark.css
index 3440a1a7a8..fad5c02559 100644
--- a/web/themes/dark.css
+++ b/web/themes/dark.css
@@ -244,6 +244,8 @@ html[data-theme="dark"] {
--color-components-Avatar-default-avatar-bg: #222225;
+ --color-components-label-gray: #C8CEDA24;
+
--color-text-primary: #FBFBFC;
--color-text-secondary: #D9D9DE;
--color-text-tertiary: #C8CEDA99;
diff --git a/web/themes/light.css b/web/themes/light.css
index 717226e462..ecc1930360 100644
--- a/web/themes/light.css
+++ b/web/themes/light.css
@@ -244,6 +244,8 @@ html[data-theme="light"] {
--color-components-Avatar-default-avatar-bg: #D0D5DC;
+ --color-components-label-gray: #F2F4F7;
+
--color-text-primary: #101828;
--color-text-secondary: #354052;
--color-text-tertiary: #676F83;
diff --git a/web/themes/tailwind-theme-var-define.ts b/web/themes/tailwind-theme-var-define.ts
index 643c96d1a1..9d17c361f8 100644
--- a/web/themes/tailwind-theme-var-define.ts
+++ b/web/themes/tailwind-theme-var-define.ts
@@ -244,6 +244,8 @@ const vars = {
'components-Avatar-default-avatar-bg': 'var(--color-components-Avatar-default-avatar-bg)',
+ 'components-label-gray': 'var(--color-components-label-gray)',
+
'text-primary': 'var(--color-text-primary)',
'text-secondary': 'var(--color-text-secondary)',
'text-tertiary': 'var(--color-text-tertiary)',
diff --git a/web/types/workflow.ts b/web/types/workflow.ts
index 28a8bd627e..8c0d81639d 100644
--- a/web/types/workflow.ts
+++ b/web/types/workflow.ts
@@ -19,6 +19,7 @@ export interface NodeTracing {
process_data: any
outputs?: any
status: string
+ parallel_run_id?: string
error?: string
elapsed_time: number
execution_metadata: {
@@ -31,6 +32,7 @@ export interface NodeTracing {
parallel_start_node_id?: string
parent_parallel_id?: string
parent_parallel_start_node_id?: string
+ parallel_mode_run_id?: string
}
metadata: {
iterator_length: number
@@ -121,6 +123,7 @@ export interface NodeStartedResponse {
id: string
node_id: string
iteration_id?: string
+ parallel_run_id?: string
node_type: string
index: number
predecessor_node_id?: string
@@ -166,6 +169,7 @@ export interface NodeFinishedResponse {
parallel_start_node_id?: string
iteration_index?: number
iteration_id?: string
+ parallel_mode_run_id: string
}
created_at: number
files?: FileResponse[]
@@ -200,6 +204,7 @@ export interface IterationNextResponse {
output: any
extras?: any
created_at: number
+ parallel_mode_run_id: string
execution_metadata: {
parallel_id?: string
}
{t('workflow.nodes.iteration.iteration', { count: getCount(nodeInfo.details?.length, nodeInfo.metadata?.iterator_length) })}
+ {t('workflow.nodes.iteration.iteration', { count: getCount(nodeInfo.details?.length, nodeInfo.metadata?.iterator_length) })}{getErrorCount(nodeInfo.details) > 0 && (
+ <>
+ {t('workflow.nodes.iteration.comma')}
+ {t('workflow.nodes.iteration.error', { count: getErrorCount(nodeInfo.details) })}
+
+ )}
{justShowIterationNavArrow
? (