Merge branch 'langgenius:main' into fix/Upload-folders-to-knowledgebase

api/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "dify-api"
-version = "1.2.0"
+version = "1.3.0"
 requires-python = ">=3.11,<3.13"
 
 dependencies = [

api/uv.lock

@@ -1148,7 +1148,7 @@ wheels = [
 
 [[package]]
 name = "dify-api"
-version = "1.2.0"
+version = "1.3.0"
 source = { virtual = "." }
 dependencies = [
     { name = "authlib" },

web/app/components/app/configuration/dataset-config/select-dataset/index.tsx

@@ -14,6 +14,7 @@ import Loading from '@/app/components/base/loading'
 import Badge from '@/app/components/base/badge'
 import { useKnowledge } from '@/hooks/use-knowledge'
 import cn from '@/utils/classnames'
+import { basePath } from '@/utils/var'
 
 export type ISelectDataSetProps = {
   isShow: boolean
@@ -111,7 +112,7 @@ const SelectDataSet: FC<ISelectDataSetProps> = ({
           }}
         >
           <span className='text-text-tertiary'>{t('appDebug.feature.dataSet.noDataSet')}</span>
-          <Link href="/datasets/create" className='font-normal text-text-accent'>{t('appDebug.feature.dataSet.toCreate')}</Link>
+          <Link href={`${basePath}/datasets/create`} className='font-normal text-text-accent'>{t('appDebug.feature.dataSet.toCreate')}</Link>
         </div>
       )}
 

web/app/components/base/logo/logo-embedded-chat-avatar.tsx

@@ -1,4 +1,5 @@
 import type { FC } from 'react'
+import { basePath } from '@/utils/var'
 
 type LogoEmbeddedChatAvatarProps = {
   className?: string
@@ -8,7 +9,7 @@ const LogoEmbeddedChatAvatar: FC<LogoEmbeddedChatAvatarProps> = ({
 }) => {
   return (
     <img
-      src='/logo/logo-embedded-chat-avatar.png'
+      src={`${basePath}/logo/logo-embedded-chat-avatar.png`}
       className={`block h-10 w-10 ${className}`}
       alt='logo'
     />

web/app/components/header/account-setting/model-provider-page/model-icon/index.tsx

@@ -3,7 +3,6 @@ import type {
   Model,
   ModelProvider,
 } from '../declarations'
-import { basePath } from '@/utils/var'
 import { useLanguage } from '../hooks'
 import { Group } from '@/app/components/base/icons/src/vender/other'
 import { OpenaiBlue, OpenaiViolet } from '@/app/components/base/icons/src/public/llm'
@@ -31,7 +30,7 @@ const ModelIcon: FC<ModelIconProps> = ({
   if (provider?.icon_small) {
     return (
       <div className={cn('flex h-5 w-5 items-center justify-center', isDeprecated && 'opacity-50', className)}>
-        <img alt='model-icon' src={basePath + renderI18nObject(provider.icon_small, language)}/>
+        <img alt='model-icon' src={renderI18nObject(provider.icon_small, language)}/>
       </div>
     )
   }

web/app/components/header/dataset-nav/index.tsx

@@ -14,6 +14,7 @@ import Nav from '../nav'
 import type { NavItem } from '../nav/nav-selector'
 import { fetchDatasetDetail, fetchDatasets } from '@/service/datasets'
 import type { DataSetListResponse } from '@/models/datasets'
+import { basePath } from '@/utils/var'
 
 const getKey = (pageIndex: number, previousPageData: DataSetListResponse) => {
   if (!pageIndex || previousPageData.has_more)
@@ -56,7 +57,7 @@ const DatasetNav = () => {
         icon_background: dataset.icon_background,
       })) as NavItem[]}
       createText={t('common.menus.newDataset')}
-      onCreate={() => router.push('/datasets/create')}
+      onCreate={() => router.push(`${basePath}/datasets/create`)}
       onLoadmore={handleLoadmore}
     />
   )

web/app/components/workflow-app/components/workflow-header/chat-variable-trigger.tsx

@@ -3,9 +3,15 @@ import ChatVariableButton from '@/app/components/workflow/header/chat-variable-b
 import {
   useNodesReadOnly,
 } from '@/app/components/workflow/hooks'
+import { useIsChatMode } from '../../hooks'
 
 const ChatVariableTrigger = () => {
   const { nodesReadOnly } = useNodesReadOnly()
+  const isChatMode = useIsChatMode()
+
+  if (!isChatMode)
+    return null
+
   return <ChatVariableButton disabled={nodesReadOnly} />
 }
 export default memo(ChatVariableTrigger)

web/app/components/workflow-app/components/workflow-panel.tsx

@@ -74,7 +74,7 @@ const WorkflowPanelOnRight = () => {
         )
       }
       {
-        showChatVariablePanel && (
+        showChatVariablePanel && isChatMode && (
           <ChatVariablePanel />
         )
       }

web/app/install/installForm.tsx

@@ -16,6 +16,7 @@ import Button from '@/app/components/base/button'
 
 import { fetchInitValidateStatus, fetchSetupStatus, setup } from '@/service/common'
 import type { InitValidateStatusResponse, SetupStatusResponse } from '@/models/common'
+import { basePath } from '@/utils/var'
 
 const validPassword = /^(?=.*[a-zA-Z])(?=.*\d).{8,}$/
 
@@ -80,12 +81,12 @@ const InstallForm = () => {
     fetchSetupStatus().then((res: SetupStatusResponse) => {
       if (res.step === 'finished') {
         localStorage.setItem('setup_status', 'finished')
-        router.push('/signin')
+        router.push(`${basePath}/signin`)
       }
       else {
         fetchInitValidateStatus().then((res: InitValidateStatusResponse) => {
           if (res.status === 'not_started')
-            router.push('/init')
+            router.push(`${basePath}/init`)
         })
       }
       setLoading(false)

web/next.config.js

@@ -1,4 +1,4 @@
-const { basePath } = require('./utils/var-basePath')
+const { basePath, assetPrefix } = require('./utils/var-basePath')
 const { codeInspectorPlugin } = require('code-inspector-plugin')
 const withMDX = require('@next/mdx')({
   extension: /\.mdx?$/,
@@ -16,6 +16,7 @@ const withMDX = require('@next/mdx')({
 /** @type {import('next').NextConfig} */
 const nextConfig = {
   basePath,
+  assetPrefix,
   webpack: (config, { dev, isServer }) => {
     config.plugins.push(codeInspectorPlugin({ bundler: 'webpack' }))
     return config

web/utils/var-basePath.js

@@ -2,4 +2,5 @@
 // same as the one exported from var.ts
 module.exports = {
   basePath: '',
+  assetPrefix: '',
 }