+ 
-#
-
-
-
+ 
@@ -111,7 +112,7 @@ Dify 是一个开源的 LLM 应用开发平台。其直观的界面结合了 AI
+
#
@@ -111,7 +112,7 @@ es basados en LLM Function Calling o ReAct, y agregar herramientas preconstruida
+
#
@@ -111,7 +112,7 @@ ités d'agent**:
Dify Cloud · - 自己ホスティング · + セルフホスト · ドキュメント · デモのスケジュール
@@ -35,6 +35,7 @@
+
#
@@ -54,7 +55,7 @@ DifyはオープンソースのLLMアプリケーション開発プラットフ
-**2. 網羅的なモデルサポート**:
+**2. 包括的なモデルサポート**:
数百のプロプライエタリ/オープンソースのLLMと、数十の推論プロバイダーおよびセルフホスティングソリューションとのシームレスな統合を提供します。GPT、Mistral、Llama3、およびOpenAI API互換のモデルをカバーします。サポートされているモデルプロバイダーの完全なリストは[こちら](https://docs.dify.ai/getting-started/readme/model-providers)をご覧ください。
@@ -94,9 +95,9 @@ DifyはオープンソースのLLMアプリケーション開発プラットフ
| ミーティング | -無料の30分間のミーティングをスケジュールしてください。 | +無料の30分間のミーティングをスケジュール | ||||||||||||||||||||||||||||||||||||||||||||||||
| 技術サポート | @@ -242,4 +243,4 @@ docker compose up -d ## ライセンス -このリポジトリは、Dify Open Source License にいくつかの追加制限を加えた[Difyオープンソースライセンス](LICENSE)の下で利用可能です。 \ No newline at end of file +このリポジトリは、Dify Open Source License にいくつかの追加制限を加えた[Difyオープンソースライセンス](LICENSE)の下で利用可能です。 diff --git a/README_KL.md b/README_KL.md index 600649c459..b1eb5073f6 100644 --- a/README_KL.md +++ b/README_KL.md @@ -35,6 +35,7 @@Agent | ✅ | ✅ | -✅ | +❌ | ✅ | ||||||||||||||||||||||||||||||||||||||||||||
| 기능 | +Dify.AI | +LangChain | +Flowise | +OpenAI Assistants API | +
|---|---|---|---|---|
| 프로그래밍 접근 방식 | +API + 앱 중심 | +Python 코드 | +앱 중심 | +API 중심 | +
| 지원되는 LLMs | +다양한 종류 | +다양한 종류 | +다양한 종류 | +OpenAI 전용 | +
| RAG 엔진 | +✅ | +✅ | +✅ | +✅ | +
| 에이전트 | +✅ | +✅ | +❌ | +✅ | +
| 워크플로우 | +✅ | +❌ | +✅ | +❌ | +
| 가시성 | +✅ | +✅ | +❌ | +❌ | +
| 기업용 기능 (SSO/접근 제어) | +✅ | +❌ | +❌ | +❌ | +
| 로컬 배포 | +✅ | +✅ | +✅ | +❌ | +
| 연락처 | +목적 | +
|---|---|
| 비즈니스 문의 및 제품 피드백 | +|
| 기여, 이슈 및 기능 요청 | +
+
= () => {
+ const [isSSOEnforced, setIsSSOEnforced] = React.useState(true)
+ const [loading, setLoading] = React.useState(true)
+
+ useEffect(() => {
+ fetchSystemFeatures().then((res) => {
+ setIsSSOEnforced(res.sso_enforced_for_web)
+ setLoading(false)
+ })
+ }, [])
+
return (
-
+ <>
+ {
+ loading
+ ? (
+ = ({
s.actionIconWrapper,
)
}
- className={'!w-[154px] h-fit !z-20'}
+ className={'!w-[155px] h-fit !z-20'}
popupClassName='!w-full !overflow-visible'
manualClose
/>
diff --git a/web/app/components/app/app-publisher/index.tsx b/web/app/components/app/app-publisher/index.tsx
index fa7b9ed344..7e4c584257 100644
--- a/web/app/components/app/app-publisher/index.tsx
+++ b/web/app/components/app/app-publisher/index.tsx
@@ -23,6 +23,8 @@ import { PlayCircle } from '@/app/components/base/icons/src/vender/line/mediaAnd
import { CodeBrowser } from '@/app/components/base/icons/src/vender/line/development'
import { LeftIndent02 } from '@/app/components/base/icons/src/vender/line/editor'
import { FileText } from '@/app/components/base/icons/src/vender/line/files'
+import WorkflowToolConfigureButton from '@/app/components/tools/workflow-tool/configure-button'
+import type { InputVar } from '@/app/components/workflow/types'
export type AppPublisherProps = {
disabled?: boolean
@@ -37,6 +39,9 @@ export type AppPublisherProps = {
onRestore?: () => Promise | any
onToggle?: (state: boolean) => void
crossAxisOffset?: number
+ toolPublished?: boolean
+ inputs?: InputVar[]
+ onRefreshData?: () => void
}
const AppPublisher = ({
@@ -50,6 +55,9 @@ const AppPublisher = ({
onRestore,
onToggle,
crossAxisOffset = 0,
+ toolPublished,
+ inputs,
+ onRefreshData,
}: AppPublisherProps) => {
const { t } = useTranslation()
const [published, setPublished] = useState(false)
@@ -122,7 +130,7 @@ const AppPublisher = ({
-
@@ -27,6 +31,9 @@ const Thought: FC = ({
allToolIcons,
isFinished,
}) => {
+ const { locale } = useContext(I18n)
+ const language = getLanguage(locale)
+
const [toolNames, isValueArray]: [string[], boolean] = (() => {
try {
if (Array.isArray(JSON.parse(thought.tool)))
@@ -40,6 +47,7 @@ const Thought: FC = ({
const toolThoughtList = toolNames.map((toolName, index) => {
return {
name: toolName,
+ label: thought.tool_labels?.[toolName][language] ?? toolName,
input: getValue(thought.tool_input, isValueArray, index),
output: getValue(thought.observation, isValueArray, index),
isFinished,
diff --git a/web/app/components/app/chat/thought/tool.tsx b/web/app/components/app/chat/thought/tool.tsx
index 324fcde7bc..9142357828 100644
--- a/web/app/components/app/chat/thought/tool.tsx
+++ b/web/app/components/app/chat/thought/tool.tsx
@@ -49,8 +49,9 @@ const Tool: FC = ({
allToolIcons = {},
}) => {
const { t } = useTranslation()
- const { name, input, isFinished, output } = payload
+ const { name, label, input, isFinished, output } = payload
const toolName = name.startsWith('dataset_') ? t('dataset.knowledge') : name
+ const toolLabel = name.startsWith('dataset_') ? t('dataset.knowledge') : label
const [isShowDetail, setIsShowDetail] = useState(false)
const icon = getIcon(name, allToolIcons) as any
return (
@@ -74,9 +75,9 @@ const Tool: FC = ({
- {toolName}
+ {toolLabel}
= ({
)}
= ({
- show,
- onHide,
- selectedProviderId,
-}) => {
- const { t } = useTranslation()
- const { locale } = useContext(I18n)
- const {
- modelConfig,
- setModelConfig,
- } = useContext(ConfigContext)
- if (!show)
- return null
-
- return (
- {
- const parameters: Record = {}
- if (tool.parameters) {
- tool.parameters.forEach((item) => {
- parameters[item.name] = ''
- })
- }
-
- const nexModelConfig = produce(modelConfig, (draft: ModelConfig) => {
- draft.agentConfig.tools.push({
- provider_id: collection.id || collection.name,
- provider_type: collection.type,
- provider_name: collection.name,
- tool_name: tool.name,
- tool_label: tool.label[locale] || tool.label[locale.replaceAll('-', '_')],
- tool_parameters: parameters,
- enabled: true,
- })
- })
- setModelConfig(nexModelConfig)
- }}
- addedTools={(modelConfig?.agentConfig?.tools as any) || []}
- />
- }
- isShowMask={true}
- clickOutsideNotOpen={false}
- />
- )
-}
-export default React.memo(ChooseTool)
diff --git a/web/app/components/app/configuration/config/agent/agent-tools/index.tsx b/web/app/components/app/configuration/config/agent/agent-tools/index.tsx
index b92ff94983..c59145aa9d 100644
--- a/web/app/components/app/configuration/config/agent/agent-tools/index.tsx
+++ b/web/app/components/app/configuration/config/agent/agent-tools/index.tsx
@@ -6,7 +6,6 @@ import cn from 'classnames'
import { useContext } from 'use-context-selector'
import produce from 'immer'
import { useFormattingChangedDispatcher } from '../../../debug/hooks'
-import ChooseTool from './choose-tool'
import SettingBuiltInTool from './setting-built-in-tool'
import Panel from '@/app/components/app/configuration/base/feature-panel'
import Tooltip from '@/app/components/base/tooltip'
@@ -22,6 +21,7 @@ import { MAX_TOOLS_NUM } from '@/config'
import { AlertTriangle } from '@/app/components/base/icons/src/vender/solid/alertsAndFeedback'
import TooltipPlus from '@/app/components/base/tooltip-plus'
import { DefaultToolIcon } from '@/app/components/base/icons/src/public/other'
+import AddToolModal from '@/app/components/tools/add-tool-modal'
type AgentToolWithMoreInfo = AgentTool & { icon: any; collection?: Collection } | null
const AgentTools: FC = () => {
@@ -31,7 +31,6 @@ const AgentTools: FC = () => {
const formattingChangedDispatcher = useFormattingChangedDispatcher()
const [currentTool, setCurrentTool] = useState(null)
- const [selectedProviderId, setSelectedProviderId] = useState(undefined)
const [isShowSettingTool, setIsShowSettingTool] = useState(false)
const tools = (modelConfig?.agentConfig?.tools as AgentTool[] || []).map((item) => {
const collection = collectionList.find(collection => collection.id === item.provider_id && collection.type === item.provider_type)
@@ -78,10 +77,7 @@ const AgentTools: FC = () => {
{tools.length < MAX_TOOLS_NUM && (
<>
- {
- setSelectedProviderId(undefined)
- setIsShowChooseTool(true)
- }} />
+ setIsShowChooseTool(true)} />
)}
@@ -116,10 +112,14 @@ const AgentTools: FC = () => {
/>
))}
- Custom
-
- )
-}
-export default Custom
diff --git a/web/app/(commonLayout)/tools/page.tsx b/web/app/(commonLayout)/tools/page.tsx
index 36a76d60d0..066550b3a2 100644
--- a/web/app/(commonLayout)/tools/page.tsx
+++ b/web/app/(commonLayout)/tools/page.tsx
@@ -2,8 +2,7 @@
import type { FC } from 'react'
import { useTranslation } from 'react-i18next'
import React, { useEffect } from 'react'
-import Tools from '@/app/components/tools'
-import { LOC } from '@/app/components/tools/types'
+import ToolProviderList from '@/app/components/tools/provider-list'
const Layout: FC = () => {
const { t } = useTranslation()
@@ -12,12 +11,6 @@ const Layout: FC = () => {
document.title = `${t('tools.title')} - Dify`
}, [])
- return (
-
-
- )
+ return
- Third part
-
- )
-}
-export default ThirdPart
diff --git a/web/app/(shareLayout)/chat/[token]/page.tsx b/web/app/(shareLayout)/chat/[token]/page.tsx
index 6c3fe2b4a4..56b2e0da7d 100644
--- a/web/app/(shareLayout)/chat/[token]/page.tsx
+++ b/web/app/(shareLayout)/chat/[token]/page.tsx
@@ -1,5 +1,4 @@
'use client'
-
import type { FC } from 'react'
import React from 'react'
diff --git a/web/app/(shareLayout)/chatbot/[token]/page.tsx b/web/app/(shareLayout)/chatbot/[token]/page.tsx
index 8aa182893a..0dc7b07169 100644
--- a/web/app/(shareLayout)/chatbot/[token]/page.tsx
+++ b/web/app/(shareLayout)/chatbot/[token]/page.tsx
@@ -1,12 +1,87 @@
+'use client'
import type { FC } from 'react'
-import React from 'react'
-
+import React, { useEffect } from 'react'
+import cn from 'classnames'
import type { IMainProps } from '@/app/components/share/chat'
import Main from '@/app/components/share/chatbot'
+import Loading from '@/app/components/base/loading'
+import { fetchSystemFeatures } from '@/service/share'
+import LogoSite from '@/app/components/base/logo/logo-site'
const Chatbot: FC
+
+ )
+ : (
+ <>
+ {isSSOEnforced
+ ? (
+
+
+
+
+ )
+ :
+ }
+
+ )}
+
)
}
diff --git a/web/app/(shareLayout)/webapp-signin/page.tsx b/web/app/(shareLayout)/webapp-signin/page.tsx
new file mode 100644
index 0000000000..5306854638
--- /dev/null
+++ b/web/app/(shareLayout)/webapp-signin/page.tsx
@@ -0,0 +1,154 @@
+'use client'
+import cn from 'classnames'
+import { useRouter, useSearchParams } from 'next/navigation'
+import type { FC } from 'react'
+import React, { useEffect, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import Toast from '@/app/components/base/toast'
+import Button from '@/app/components/base/button'
+import { fetchSystemFeatures, fetchWebOAuth2SSOUrl, fetchWebOIDCSSOUrl, fetchWebSAMLSSOUrl } from '@/service/share'
+import LogoSite from '@/app/components/base/logo/logo-site'
+import { setAccessToken } from '@/app/components/share/utils'
+
+const WebSSOForm: FC = () => {
+ const searchParams = useSearchParams()
+
+ const redirectUrl = searchParams.get('redirect_url')
+ const tokenFromUrl = searchParams.get('web_sso_token')
+ const message = searchParams.get('message')
+
+ const router = useRouter()
+ const { t } = useTranslation()
+
+ const [isLoading, setIsLoading] = useState(false)
+ const [protocol, setProtocol] = useState('')
+
+ useEffect(() => {
+ const fetchFeaturesAndSetToken = async () => {
+ await fetchSystemFeatures().then((res) => {
+ setProtocol(res.sso_enforced_for_web_protocol)
+ })
+
+ // Callback from SSO, process token and redirect
+ if (tokenFromUrl && redirectUrl) {
+ const appCode = redirectUrl.split('/').pop()
+ if (!appCode) {
+ Toast.notify({
+ type: 'error',
+ message: 'redirect url is invalid. App code is not found.',
+ })
+ return
+ }
+
+ await setAccessToken(appCode, tokenFromUrl)
+ router.push(redirectUrl)
+ }
+ }
+
+ fetchFeaturesAndSetToken()
+
+ if (message) {
+ Toast.notify({
+ type: 'error',
+ message,
+ })
+ }
+ }, [])
+
+ const handleSSOLogin = () => {
+ setIsLoading(true)
+
+ if (!redirectUrl) {
+ Toast.notify({
+ type: 'error',
+ message: 'redirect url is not found.',
+ })
+ setIsLoading(false)
+ return
+ }
+
+ const appCode = redirectUrl.split('/').pop()
+ if (!appCode) {
+ Toast.notify({
+ type: 'error',
+ message: 'redirect url is invalid. App code is not found.',
+ })
+ return
+ }
+
+ if (protocol === 'saml') {
+ fetchWebSAMLSSOUrl(appCode, redirectUrl).then((res) => {
+ router.push(res.url)
+ }).finally(() => {
+ setIsLoading(false)
+ })
+ }
+ else if (protocol === 'oidc') {
+ fetchWebOIDCSSOUrl(appCode, redirectUrl).then((res) => {
+ router.push(res.url)
+ }).finally(() => {
+ setIsLoading(false)
+ })
+ }
+ else if (protocol === 'oauth2') {
+ fetchWebOAuth2SSOUrl(appCode, redirectUrl).then((res) => {
+ router.push(res.url)
+ }).finally(() => {
+ setIsLoading(false)
+ })
+ }
+ else {
+ Toast.notify({
+ type: 'error',
+ message: 'sso protocol is not supported.',
+ })
+ setIsLoading(false)
+ }
+ }
+
+ return (
+
+
+
+
+
+
+
+
+
+
+
+ + Warning: Chatbot is not available +
++ Because SSO is enforced. Please contact your administrator. +
+
+
+ )
+}
+
+export default React.memo(WebSSOForm)
diff --git a/web/app/components/app/annotation/header-opts/index.tsx b/web/app/components/app/annotation/header-opts/index.tsx
index aba3b6324c..18cc0a0f9c 100644
--- a/web/app/components/app/annotation/header-opts/index.tsx
+++ b/web/app/components/app/annotation/header-opts/index.tsx
@@ -150,7 +150,7 @@ const HeaderOptions: FC
+
+
+
+
+
+
+
+
+
+
+ {t('login.pageTitle')}
+
+
+
+
+
diff --git a/web/app/components/app/chat/answer/index.tsx b/web/app/components/app/chat/answer/index.tsx
index 49dd817255..1ba033911a 100644
--- a/web/app/components/app/chat/answer/index.tsx
+++ b/web/app/components/app/chat/answer/index.tsx
@@ -362,7 +362,7 @@ const Answer: FC = ({
{!item.isOpeningStatement && (
= ({
+ customDisclaimer?: string
}
const Chat: FC = ({
@@ -102,6 +103,7 @@ const Chat: FC = ({
supportAnnotation,
onChatListChange,
allToolIcons,
+ customDisclaimer,
}) => {
const { t } = useTranslation()
const { notify } = useContext(ToastContext)
@@ -260,11 +262,7 @@ const Chat: FC = ({
return {
...item,
content: item.content,
- annotation: {
- ...(item.annotation || {}),
- id: '',
- logAnnotation: undefined, // remove log
- } as Annotation,
+ annotation: undefined,
}
}
return item
@@ -362,44 +360,46 @@ const Chat: FC = ({
)}
-
{publishedAt ? t('workflow.common.latestPublished') : t('workflow.common.currentDraftUnpublished')}
@@ -202,6 +210,23 @@ const AppPublisher = ({
)}
- {visionConfig?.enabled && (
- <>
-
diff --git a/web/app/components/app/chat/thought/index.tsx b/web/app/components/app/chat/thought/index.tsx
index 78551424da..462cf87fbc 100644
--- a/web/app/components/app/chat/thought/index.tsx
+++ b/web/app/components/app/chat/thought/index.tsx
@@ -1,10 +1,14 @@
'use client'
import type { FC } from 'react'
import React from 'react'
+import { useContext } from 'use-context-selector'
import type { ThoughtItem, ToolInfoInThought } from '../type'
import Tool from '@/app/components/app/chat/thought/tool'
import type { Emoji } from '@/app/components/tools/types'
+import I18n from '@/context/i18n'
+import { getLanguage } from '@/i18n/language'
+
export type IThoughtProps = {
thought: ThoughtItem
allToolIcons: Record
- = visionConfig.number_limits}
- />
-
-
-
-
-
- )}
-
+
+
= ({
/>
)}
+ {customDisclaimer &&
)}
+ {visionConfig?.enabled && (
+ <>
+
+ = visionConfig.number_limits}
+ />
+
+
+
+
+
+ )}
+
+ {query.trim().length}
{
@@ -444,6 +444,9 @@ const Chat: FC
+ {customDisclaimer}
+
}
- {!isAgent && (
+ {!isAgent && !readonly && (
diff --git a/web/app/components/app/configuration/config/agent/agent-tools/choose-tool/index.tsx b/web/app/components/app/configuration/config/agent/agent-tools/choose-tool/index.tsx
deleted file mode 100644
index d47406e95b..0000000000
--- a/web/app/components/app/configuration/config/agent/agent-tools/choose-tool/index.tsx
+++ /dev/null
@@ -1,77 +0,0 @@
-'use client'
-import type { FC } from 'react'
-import React from 'react'
-import { useContext } from 'use-context-selector'
-import { useTranslation } from 'react-i18next'
-import produce from 'immer'
-import Tools from '@/app/components/tools'
-import { LOC } from '@/app/components/tools/types'
-import Drawer from '@/app/components/base/drawer-plus'
-import ConfigContext from '@/context/debug-configuration'
-import type { ModelConfig } from '@/models/debug'
-import I18n from '@/context/i18n'
-
-type Props = {
- show: boolean
- onHide: () => void
- selectedProviderId?: string
-}
-
-const ChooseTool: FC
- {item.tool_label || item.tool_name}
+ {item.provider_type === CollectionType.builtIn ? item.provider_name : item.tool_label}
+
+ {item.tool_name}
+
@@ -130,10 +130,8 @@ const AgentTools: FC = () => {
popupContent={t(`tools.${item.isDeleted ? 'toolRemoved' : 'notAuthorized'}`)}
>
setIsShowChooseTool(false)}
- selectedProviderId={selectedProviderId}
- />
+ setIsShowChooseTool(false)} />
)}
{
isShowSettingTool && (
diff --git a/web/app/components/app/configuration/config/agent/agent-tools/setting-built-in-tool.tsx b/web/app/components/app/configuration/config/agent/agent-tools/setting-built-in-tool.tsx
index 9eb2657fcf..b35217732f 100644
--- a/web/app/components/app/configuration/config/agent/agent-tools/setting-built-in-tool.tsx
+++ b/web/app/components/app/configuration/config/agent/agent-tools/setting-built-in-tool.tsx
@@ -8,7 +8,8 @@ import Drawer from '@/app/components/base/drawer-plus'
import Form from '@/app/components/header/account-setting/model-provider-page/model-modal/Form'
import { addDefaultValue, toolParametersToFormSchemas } from '@/app/components/tools/utils/to-form-schema'
import type { Collection, Tool } from '@/app/components/tools/types'
-import { fetchBuiltInToolList, fetchCustomToolList, fetchModelToolList } from '@/service/tools'
+import { CollectionType } from '@/app/components/tools/types'
+import { fetchBuiltInToolList, fetchCustomToolList, fetchModelToolList, fetchWorkflowToolList } from '@/service/tools'
import I18n from '@/context/i18n'
import Button from '@/app/components/base/button'
import Loading from '@/app/components/base/loading'
@@ -64,6 +65,8 @@ const SettingBuiltInTool: FC = ({
resolve(await fetchModelToolList(collection.name))
else if (isBuiltIn)
resolve(await fetchBuiltInToolList(collection.name))
+ else if (collection.type === CollectionType.workflow)
+ resolve(await fetchWorkflowToolList(collection.id))
else
resolve(await fetchCustomToolList(collection.name))
}())
@@ -78,7 +81,7 @@ const SettingBuiltInTool: FC = ({
catch (e) { }
setIsLoading(false)
})()
- }, [collection?.name])
+ }, [collection?.name, collection?.id, collection?.type])
useEffect(() => {
setCurrType((!readonly && hasSetting) ? 'setting' : 'info')
@@ -150,7 +153,7 @@ const SettingBuiltInTool: FC = ({
onHide={onHide}
title={(
}
- isShowMask={true}
+ isShowMask={false}
clickOutsideNotOpen={false}
/>
)
diff --git a/web/app/components/app/configuration/config/assistant-type-picker/index.tsx b/web/app/components/app/configuration/config/assistant-type-picker/index.tsx
index e19e7fffa3..3bdf0cbcf7 100644
--- a/web/app/components/app/configuration/config/assistant-type-picker/index.tsx
+++ b/web/app/components/app/configuration/config/assistant-type-picker/index.tsx
@@ -123,7 +123,7 @@ const AssistantTypePicker: FC {
- if (item.notAuthor) {
- setSelectedProviderId(item.provider_id)
+ if (item.notAuthor)
setIsShowChooseTool(true)
- }
}}>
@@ -153,7 +151,6 @@ const AgentTools: FC = () => {
)
: (
- {/* {item.provider_type === CollectionType.builtIn && ( */}
@@ -164,7 +161,6 @@ const AgentTools: FC = () => {
- {/* )} */}
{
const newModelConfig = produce(modelConfig, (draft) => {
@@ -197,11 +193,7 @@ const AgentTools: FC = () => {
{isShowChooseTool && (
-
- {collection.icon === 'string'
+ {typeof collection.icon === 'string'
? (
= ({
)}
= ({
)}
)}
- panelClassName='mt-[65px] !w-[480px]'
- maxWidthClassName='!max-w-[480px]'
+ panelClassName='mt-[65px] !w-[405px]'
+ maxWidthClassName='!max-w-[405px]'
height='calc(100vh - 65px)'
headerClassName='!border-b-black/5'
body={
@@ -212,7 +215,7 @@ const SettingBuiltInTool: FC
+
= ({
permission,
indexing_technique: indexMethod,
retrieval_model: postRetrievalConfig,
+ embedding_model: localeCurrentDataset.embedding_model,
+ embedding_model_provider: localeCurrentDataset.embedding_model_provider,
},
})
notify({ type: 'success', message: t('common.actionMsg.modifiedSuccessfully') })
diff --git a/web/app/components/app/configuration/debug/index.tsx b/web/app/components/app/configuration/debug/index.tsx
index dba0b6d05f..3717bab88e 100644
--- a/web/app/components/app/configuration/debug/index.tsx
+++ b/web/app/components/app/configuration/debug/index.tsx
@@ -41,7 +41,7 @@ import PromptLogModal from '@/app/components/base/prompt-log-modal'
import { useStore as useAppStore } from '@/app/components/app/store'
type IDebug = {
- hasSetAPIKEY: boolean
+ isAPIKeySet: boolean
onSetting: () => void
inputs: Inputs
modelParameterParams: Pick
@@ -51,7 +51,7 @@ type IDebug = {
}
const Debug: FC = ({
- hasSetAPIKEY = true,
+ isAPIKeySet = true,
onSetting,
inputs,
modelParameterParams,
@@ -503,7 +503,7 @@ const Debug: FC = ({
onCancel={handleCancel}
/>
)}
- {!hasSetAPIKEY && (
}
noBodySpacing
- isShowTextToSpeech={true}
+ isShowTextToSpeech
/>
)
}
diff --git a/web/app/components/app/configuration/index.tsx b/web/app/components/app/configuration/index.tsx
index 259f6b2deb..3b61a0b7fe 100644
--- a/web/app/components/app/configuration/index.tsx
+++ b/web/app/components/app/configuration/index.tsx
@@ -255,7 +255,7 @@ const Configuration: FC = () => {
})
}
- const { hasSettedApiKey } = useProviderContext()
+ const { isAPIKeySet } = useProviderContext()
const {
currentModel: currModel,
textGenerationModelList,
@@ -678,7 +678,7 @@ const Configuration: FC = () => {
return (
{
{!isMobile &&
setShowAccountSettingModal({ payload: 'provider' })}
inputs={inputs}
modelParameterParams={{
@@ -881,7 +881,7 @@ const Configuration: FC = () => {
{isMobile && (
setShowAccountSettingModal({ payload: 'provider' })}
inputs={inputs}
modelParameterParams={{
diff --git a/web/app/components/app/log/list.tsx b/web/app/components/app/log/list.tsx
index 026db4da2c..c2ce0b5633 100644
--- a/web/app/components/app/log/list.tsx
+++ b/web/app/components/app/log/list.tsx
@@ -137,8 +137,8 @@ const getFormattedChatList = (messages: ChatMessage[], conversationId: string, t
if (item.annotation) {
return {
- id: '',
- authorName: '',
+ id: item.annotation.id,
+ authorName: item.annotation.account.name,
logAnnotation: item.annotation,
created_at: 0,
}
@@ -164,7 +164,7 @@ function DetailPanel ({
+ const { currentLogItem, setCurrentLogItem, showPromptLogModal, setShowPromptLogModal, showAgentLogModal, setShowAgentLogModal, showMessageLogModal, setShowMessageLogModal, currentLogModalActiveTab } = useAppStore(useShallow(state => ({
currentLogItem: state.currentLogItem,
setCurrentLogItem: state.setCurrentLogItem,
showPromptLogModal: state.showPromptLogModal,
@@ -173,6 +173,7 @@ function DetailPanel([])
@@ -444,6 +445,7 @@ function DetailPanel
diff --git a/web/app/components/app/log/var-panel.tsx b/web/app/components/app/log/var-panel.tsx
index 8a0e076401..65248b6c24 100644
--- a/web/app/components/app/log/var-panel.tsx
+++ b/web/app/components/app/log/var-panel.tsx
@@ -41,7 +41,7 @@ const VarPanel: FC = ({
{label}
{'}}'}
-
))}
diff --git a/web/app/components/app/overview/apikey-info-panel/index.tsx b/web/app/components/app/overview/apikey-info-panel/index.tsx
index 555be997a1..b91bfd5aaf 100644
--- a/web/app/components/app/overview/apikey-info-panel/index.tsx
+++ b/web/app/components/app/overview/apikey-info-panel/index.tsx
@@ -12,14 +12,14 @@ import { useModalContext } from '@/context/modal-context'
const APIKeyInfoPanel: FC = () => {
const isCloud = !IS_CE_EDITION
- const { hasSettedApiKey } = useProviderContext()
+ const { isAPIKeySet } = useProviderContext()
const { setShowAccountSettingModal } = useModalContext()
const { t } = useTranslation()
const [isShow, setIsShow] = useState(true)
- if (hasSettedApiKey)
+ if (isAPIKeySet)
return null
if (!(isShow))
diff --git a/web/app/components/app/overview/appCard.tsx b/web/app/components/app/overview/appCard.tsx
index 2243f251e4..2426bab942 100644
--- a/web/app/components/app/overview/appCard.tsx
+++ b/web/app/components/app/overview/appCard.tsx
@@ -22,6 +22,7 @@ import Tag from '@/app/components/base/tag'
import Switch from '@/app/components/base/switch'
import Divider from '@/app/components/base/divider'
import CopyFeedback from '@/app/components/base/copy-feedback'
+import Confirm from '@/app/components/base/confirm'
import ShareQRCode from '@/app/components/base/qrcode'
import SecretKeyButton from '@/app/components/develop/secret-key/secret-key-button'
import type { AppDetailResponse } from '@/models/app'
@@ -57,6 +58,8 @@ function AppCard({
const [showEmbedded, setShowEmbedded] = useState(false)
const [showCustomizeModal, setShowCustomizeModal] = useState(false)
const [genLoading, setGenLoading] = useState(false)
+ const [showConfirmDelete, setShowConfirmDelete] = useState(false)
+
const { t } = useTranslation()
const OPERATIONS_MAP = useMemo(() => {
@@ -129,8 +132,7 @@ function AppCard({
return (
{t('appDebug.assistantType.name')}
{value}
+ {value}
@@ -162,7 +164,7 @@ function AppCard({
? t('appOverview.overview.appInfo.accessibleAddress')
: t('appOverview.overview.apiInfo.accessibleAddress')}
-
+
{isApp ? appUrl : apiUrl}
@@ -176,6 +178,20 @@ function AppCard({
className={'hover:bg-gray-200'}
/>
{/* button copy link/ button regenerate */}
+ {showConfirmDelete && (
+ setShowConfirmDelete(false)}
+ onConfirm={() => {
+ onGenCode()
+ setShowConfirmDelete(false)
+ }}
+ onCancel={() => setShowConfirmDelete(false)}
+ />
+ )}
{isApp && isCurrentWorkspaceManager && (
= ({
const { notify } = useToastContext()
const [isShowMore, setIsShowMore] = useState(false)
const { icon, icon_background } = appInfo
- const { title, description, copyright, privacy_policy, default_language } = appInfo.site
- const [inputInfo, setInputInfo] = useState({ title, desc: description, copyright, privacyPolicy: privacy_policy })
+ const { title, description, copyright, privacy_policy, custom_disclaimer, default_language } = appInfo.site
+ const [inputInfo, setInputInfo] = useState({ title, desc: description, copyright, privacyPolicy: privacy_policy, customDisclaimer: custom_disclaimer })
const [language, setLanguage] = useState(default_language)
const [saveLoading, setSaveLoading] = useState(false)
const { t } = useTranslation()
@@ -56,7 +57,7 @@ const SettingsModal: FC = ({
const [emoji, setEmoji] = useState({ icon, icon_background })
useEffect(() => {
- setInputInfo({ title, desc: description, copyright, privacyPolicy: privacy_policy })
+ setInputInfo({ title, desc: description, copyright, privacyPolicy: privacy_policy, customDisclaimer: custom_disclaimer })
setLanguage(default_language)
setEmoji({ icon, icon_background })
}, [appInfo])
@@ -81,6 +82,7 @@ const SettingsModal: FC = ({
prompt_public: false,
copyright: inputInfo.copyright,
privacy_policy: inputInfo.privacyPolicy,
+ custom_disclaimer: inputInfo.customDisclaimer,
icon: emoji.icon,
icon_background: emoji.icon_background,
}
@@ -161,6 +163,13 @@ const SettingsModal: FC = ({
onChange={onChange('privacyPolicy')}
placeholder={t(`${prefixSettings}.more.privacyPolicyPlaceholder`) as string}
/>
+
setShowConfirmDelete(true)}
>
diff --git a/web/app/components/app/overview/settings/index.tsx b/web/app/components/app/overview/settings/index.tsx
index df0f3a0062..8c4eb3c4a1 100644
--- a/web/app/components/app/overview/settings/index.tsx
+++ b/web/app/components/app/overview/settings/index.tsx
@@ -31,6 +31,7 @@ export type ConfigParams = {
prompt_public: boolean
copyright: string
privacy_policy: string
+ custom_disclaimer: string
icon: string
icon_background: string
}
@@ -46,8 +47,8 @@ const SettingsModal: FC{t(`${prefixSettings}.more.customDisclaimer`)}
+ {t(`${prefixSettings}.more.customDisclaimerTip`)}
+ }
diff --git a/web/app/components/app/store.ts b/web/app/components/app/store.ts
index aaa42d7110..eb7ad62f77 100644
--- a/web/app/components/app/store.ts
+++ b/web/app/components/app/store.ts
@@ -6,6 +6,7 @@ type State = {
appDetail?: App
appSidebarExpand: string
currentLogItem?: IChatItem
+ currentLogModalActiveTab: string
showPromptLogModal: boolean
showAgentLogModal: boolean
showMessageLogModal: boolean
@@ -15,6 +16,7 @@ type Action = {
setAppDetail: (appDetail?: App) => void
setAppSiderbarExpand: (state: string) => void
setCurrentLogItem: (item?: IChatItem) => void
+ setCurrentLogModalActiveTab: (tab: string) => void
setShowPromptLogModal: (showPromptLogModal: boolean) => void
setShowAgentLogModal: (showAgentLogModal: boolean) => void
setShowMessageLogModal: (showMessageLogModal: boolean) => void
@@ -26,11 +28,23 @@ export const useStore = create(set => ({
appSidebarExpand: '',
setAppSiderbarExpand: appSidebarExpand => set(() => ({ appSidebarExpand })),
currentLogItem: undefined,
+ currentLogModalActiveTab: 'DETAIL',
setCurrentLogItem: currentLogItem => set(() => ({ currentLogItem })),
+ setCurrentLogModalActiveTab: currentLogModalActiveTab => set(() => ({ currentLogModalActiveTab })),
showPromptLogModal: false,
setShowPromptLogModal: showPromptLogModal => set(() => ({ showPromptLogModal })),
showAgentLogModal: false,
setShowAgentLogModal: showAgentLogModal => set(() => ({ showAgentLogModal })),
showMessageLogModal: false,
- setShowMessageLogModal: showMessageLogModal => set(() => ({ showMessageLogModal })),
+ setShowMessageLogModal: showMessageLogModal => set(() => {
+ if (showMessageLogModal) {
+ return { showMessageLogModal }
+ }
+ else {
+ return {
+ showMessageLogModal,
+ currentLogModalActiveTab: 'DETAIL',
+ }
+ }
+ }),
}))
diff --git a/web/app/components/app/text-generate/item/index.tsx b/web/app/components/app/text-generate/item/index.tsx
index d65587fe75..be7328d448 100644
--- a/web/app/components/app/text-generate/item/index.tsx
+++ b/web/app/components/app/text-generate/item/index.tsx
@@ -58,6 +58,7 @@ export type IGenerationItemProps = {
innerClassName?: string
contentClassName?: string
footerClassName?: string
+ hideProcessDetail?: boolean
}
export const SimpleBtn = ({ className, isDisabled, onClick, children }: {
@@ -108,6 +109,7 @@ const GenerationItem: FC = ({
varList,
innerClassName,
contentClassName,
+ hideProcessDetail,
}) => {
const { t } = useTranslation()
const params = useParams()
@@ -265,6 +267,8 @@ const GenerationItem: FC = ({
)
+ const [currentTab, setCurrentTab] = useState('DETAIL')
+
return (
= ({
{workflowProcessData && (
- = ({
)
}
- {
- if (typeof content === 'string')
- copy(content)
- else
- copy(JSON.stringify(content))
- Toast.notify({ type: 'success', message: t('common.actionMsg.copySuccessfully') })
- }}>
-
+ {(currentTab === 'RESULT' || !isWorkflow) && (
+ {
+ const copyContent = isWorkflow ? workflowProcessData?.resultText : content
+ if (typeof copyContent === 'string')
+ copy(copyContent)
+ else
+ copy(JSON.stringify(copyContent))
+ Toast.notify({ type: 'success', message: t('common.actionMsg.copySuccessfully') })
+ }}>
+
+ )}
+
{isInWebApp && (
<>
{!isWorkflow && (
@@ -414,6 +422,7 @@ const GenerationItem: FC = ({
('DETAIL')
const switchTab = async (tab: string) => {
- setCurrentTab(tab)
+ onCurrentTabChange(tab)
}
useEffect(() => {
if (data?.resultText)
diff --git a/web/app/components/app/text-generate/saved-items/index.tsx b/web/app/components/app/text-generate/saved-items/index.tsx
index f63ebdfbc0..8cd16d5aae 100644
--- a/web/app/components/app/text-generate/saved-items/index.tsx
+++ b/web/app/components/app/text-generate/saved-items/index.tsx
@@ -78,6 +78,7 @@ const SavedItems: FC = ({
(null)
const [audioState, setAudioState] = useState('initial')
@@ -38,12 +40,12 @@ const AudioBtn = ({
const loadAudio = async () => {
const formData = new FormData()
+ formData.append('text', removeCodeBlocks(value))
+ formData.append('voice', removeCodeBlocks(voice))
+
if (value !== '') {
setAudioState('loading')
- formData.append('text', removeCodeBlocks(value))
- formData.append('voice', removeCodeBlocks(voice))
-
let url = ''
let isPublic = false
@@ -72,15 +74,16 @@ const AudioBtn = ({
}
}
- const handleToggle = () => {
- if (audioState === 'initial')
- loadAudio()
- if (audioRef.current) {
+ const handleToggle = async () => {
+ if (audioState === 'initial' || noCache) {
+ await loadAudio()
+ }
+ else if (audioRef.current) {
if (audioState === 'playing') {
audioRef.current.pause()
setAudioState('paused')
}
- else if (audioState === 'paused' || audioState === 'ended') {
+ else {
audioRef.current.play()
setAudioState('playing')
}
@@ -89,27 +92,31 @@ const AudioBtn = ({
useEffect(() => {
const currentAudio = audioRef.current
+
const handleLoading = () => {
setAudioState('loading')
}
+
const handlePlay = () => {
currentAudio?.play()
setAudioState('playing')
}
+
const handleEnded = () => {
setAudioState('ended')
}
+
currentAudio?.addEventListener('progress', handleLoading)
currentAudio?.addEventListener('canplaythrough', handlePlay)
currentAudio?.addEventListener('ended', handleEnded)
+
return () => {
- if (currentAudio) {
- currentAudio.removeEventListener('progress', handleLoading)
- currentAudio.removeEventListener('canplaythrough', handlePlay)
- currentAudio.removeEventListener('ended', handleEnded)
- URL.revokeObjectURL(currentAudio.src)
- currentAudio.src = ''
- }
+ currentAudio?.removeEventListener('progress', handleLoading)
+ currentAudio?.removeEventListener('canplaythrough', handlePlay)
+ currentAudio?.removeEventListener('ended', handleEnded)
+ URL.revokeObjectURL(currentAudio?.src || '')
+ currentAudio?.pause()
+ currentAudio?.setAttribute('src', '')
}
}, [])
@@ -131,9 +138,17 @@ const AudioBtn = ({
diff --git a/web/app/components/base/button/index.css b/web/app/components/base/button/index.css
index bffb19be94..94cd71817e 100644
--- a/web/app/components/base/button/index.css
+++ b/web/app/components/base/button/index.css
@@ -2,11 +2,11 @@
@layer components {
.btn {
- @apply inline-flex justify-center items-center content-center h-9 leading-5 rounded-lg px-4 py-2 text-base cursor-pointer;
- }
+ @apply inline-flex justify-center items-center content-center h-9 leading-5 rounded-lg px-4 py-2 text-base cursor-pointer whitespace-nowrap;
+ };
.btn-default {
- @apply border-solid border border-gray-200 cursor-pointer text-gray-500 hover:bg-white hover:shadow-sm hover:border-gray-300;
+ @apply border-solid border border-gray-200 cursor-pointer text-gray-700 hover:bg-white hover:shadow-sm hover:border-gray-300;
}
.btn-default-disabled {
@@ -28,4 +28,4 @@
.btn-warning-disabled {
@apply bg-red-600/75 cursor-not-allowed text-white;
}
-}
\ No newline at end of file
+}
diff --git a/web/app/components/base/button/index.tsx b/web/app/components/base/button/index.tsx
index e617a5d12d..34f16ad556 100644
--- a/web/app/components/base/button/index.tsx
+++ b/web/app/components/base/button/index.tsx
@@ -1,16 +1,16 @@
-import type { FC, MouseEventHandler } from 'react'
-import React from 'react'
+import type { FC, MouseEventHandler, PropsWithChildren } from 'react'
+import React, { memo } from 'react'
+import classNames from 'classnames'
import Spinner from '../spinner'
-export type IButtonProps = {
+export type IButtonProps = PropsWithChildren<{
type?: string
className?: string
disabled?: boolean
loading?: boolean
tabIndex?: number
- children: React.ReactNode
onClick?: MouseEventHandler
-}
+}>
const Button: FC = ({
type,
@@ -21,22 +21,22 @@ const Button: FC = ({
loading = false,
tabIndex,
}) => {
- let style = 'cursor-pointer'
+ let typeClassNames = 'cursor-pointer'
switch (type) {
case 'primary':
- style = (disabled || loading) ? 'btn-primary-disabled' : 'btn-primary'
+ typeClassNames = (disabled || loading) ? 'btn-primary-disabled' : 'btn-primary'
break
case 'warning':
- style = (disabled || loading) ? 'btn-warning-disabled' : 'btn-warning'
+ typeClassNames = (disabled || loading) ? 'btn-warning-disabled' : 'btn-warning'
break
default:
- style = disabled ? 'btn-default-disabled' : 'btn-default'
+ typeClassNames = disabled ? 'btn-default-disabled' : 'btn-default'
break
}
return (
{t('share.generation.batchFailed.outputPlaceholder')}
@@ -318,19 +322,23 @@ const GenerationItem: FC{t('common.operation.copy')}
}
- {t('common.operation.copy')}
}
+
@@ -47,4 +47,4 @@ const Button: FC = ({
)
}
-export default React.memo(Button)
+export default memo(Button)
diff --git a/web/app/components/base/chat/chat-with-history/chat-wrapper.tsx b/web/app/components/base/chat/chat-with-history/chat-wrapper.tsx
index 9e20bddada..99c106293d 100644
--- a/web/app/components/base/chat/chat-with-history/chat-wrapper.tsx
+++ b/web/app/components/base/chat/chat-with-history/chat-wrapper.tsx
@@ -140,6 +140,7 @@ const ChatWrapper = () => {
allToolIcons={appMeta?.tool_icons || {}}
onFeedback={handleFeedback}
suggestedQuestions={suggestedQuestions}
+ hideProcessDetail
/>
)
}
diff --git a/web/app/components/base/chat/chat-with-history/config-panel/form.tsx b/web/app/components/base/chat/chat-with-history/config-panel/form.tsx
index d34b1cc30f..39b2426a5f 100644
--- a/web/app/components/base/chat/chat-with-history/config-panel/form.tsx
+++ b/web/app/components/base/chat/chat-with-history/config-panel/form.tsx
@@ -37,6 +37,17 @@ const Form = () => {
/>
)
}
+ if (form.type === 'number') {
+ return (
+ handleFormChange(variable, e.target.value)}
+ placeholder={`${label}${!required ? `(${t('appDebug.variableTable.optional')})` : ''}`}
+ />
+ )
+ }
return (
{
{site?.privacy_policy
?
{t('share.chat.privacyPolicyLeft')}
{t('share.chat.privacyPolicyMiddle')}
{t('share.chat.privacyPolicyRight')}
@@ -146,14 +146,14 @@ const ConfigPanel = () => {
? null
: (
)
}
diff --git a/web/app/components/base/chat/chat-with-history/hooks.tsx b/web/app/components/base/chat/chat-with-history/hooks.tsx
index eec55f9e28..af2a607b67 100644
--- a/web/app/components/base/chat/chat-with-history/hooks.tsx
+++ b/web/app/components/base/chat/chat-with-history/hooks.tsx
@@ -129,19 +129,26 @@ export const useChatWithHistory = (installedAppInfo?: InstalledApp) => {
setNewConversationInputs(newInputs)
}, [])
const inputsForms = useMemo(() => {
- return (appParams?.user_input_form || []).filter((item: any) => item.paragraph || item.select || item['text-input']).map((item: any) => {
+ return (appParams?.user_input_form || []).filter((item: any) => item.paragraph || item.select || item['text-input'] || item.number).map((item: any) => {
if (item.paragraph) {
return {
...item.paragraph,
type: 'paragraph',
}
}
+ if (item.number) {
+ return {
+ ...item.number,
+ type: 'number',
+ }
+ }
if (item.select) {
return {
...item.select,
type: 'select',
}
}
+
return {
...item['text-input'],
type: 'text-input',
@@ -226,7 +233,7 @@ export const useChatWithHistory = (installedAppInfo?: InstalledApp) => {
setShowNewConversationItemInList(true)
}
}, [setShowConfigPanelBeforeChat, setShowNewConversationItemInList, checkInputsRequired])
- const currentChatInstanceRef = useRef<{ handleStop: () => void }>({ handleStop: () => {} })
+ const currentChatInstanceRef = useRef<{ handleStop: () => void }>({ handleStop: () => { } })
const handleChangeConversation = useCallback((conversationId: string) => {
currentChatInstanceRef.current.handleStop()
setNewConversationId('')
diff --git a/web/app/components/base/chat/chat/answer/index.tsx b/web/app/components/base/chat/chat/answer/index.tsx
index d338efc7e5..4e88283663 100644
--- a/web/app/components/base/chat/chat/answer/index.tsx
+++ b/web/app/components/base/chat/chat/answer/index.tsx
@@ -31,6 +31,7 @@ type AnswerProps = {
allToolIcons?: Record
showPromptLog?: boolean
chatAnswerContainerInner?: string
+ hideProcessDetail?: boolean
}
const Answer: FC = ({
item,
@@ -42,6 +43,7 @@ const Answer: FC = ({
allToolIcons,
showPromptLog,
chatAnswerContainerInner,
+ hideProcessDetail,
}) => {
const { t } = useTranslation()
const {
@@ -95,7 +97,7 @@ const Answer: FC = ({
)
}
-
+
= ({
speechToTextConfig,
onSend,
}) => {
+ const { appData } = useChatWithHistoryContext()
const { t } = useTranslation()
const { notify } = useContext(ToastContext)
const [voiceInputShow, setVoiceInputShow] = useState(false)
@@ -127,101 +129,106 @@ const ChatInput: FC = ({
)
return (
-
= ({
}
{
workflowProcess && (
- = ({
))
diff --git a/web/app/components/base/chat/chat/chat-input.tsx b/web/app/components/base/chat/chat/chat-input.tsx
index ac958b0d2c..17e316062d 100644
--- a/web/app/components/base/chat/chat/chat-input.tsx
+++ b/web/app/components/base/chat/chat/chat-input.tsx
@@ -14,6 +14,7 @@ import type {
VisionConfig,
} from '../types'
import { TransferMethod } from '../types'
+import { useChatWithHistoryContext } from '../chat-with-history/context'
import TooltipPlus from '@/app/components/base/tooltip-plus'
import { ToastContext } from '@/app/components/base/toast'
import useBreakpoints, { MediaType } from '@/hooks/use-breakpoints'
@@ -40,6 +41,7 @@ const ChatInput: FC
-
- {
- visionConfig?.enabled && (
- <>
-
- = visionConfig.number_limits}
- />
-
-
-
-
-
- )
- }
-