Merge branch 'feat/rag-2' into fix/dataset-sidebar

api/core/app/apps/workflow/app_runner.py

@@ -105,6 +105,7 @@ class WorkflowAppRunner(WorkflowBasedAppRunner):
                 graph_runtime_state=graph_runtime_state,
                 workflow_id=self._workflow.id,
                 tenant_id=self._workflow.tenant_id,
+                user_id=self.application_generate_entity.user_id,
             )
 
         # RUN WORKFLOW

web/app/components/datasets/common/credential-icon.tsx

@@ -1,5 +1,5 @@
 import cn from '@/utils/classnames'
-import React, { useMemo } from 'react'
+import React, { useCallback, useMemo, useState } from 'react'
 
 type CredentialIconProps = {
   avatar_url?: string
@@ -21,10 +21,15 @@ export const CredentialIcon: React.FC<CredentialIconProps> = ({
   size = 20,
   className = '',
 }) => {
+  const [showAvatar, setShowAvatar] = useState(!!avatar_url && avatar_url !== 'default')
   const firstLetter = useMemo(() => name.charAt(0).toUpperCase(), [name])
   const bgColor = useMemo(() => ICON_BG_COLORS[firstLetter.charCodeAt(0) % ICON_BG_COLORS.length], [firstLetter])
 
-  if (avatar_url && avatar_url !== 'default') {
+  const onImgLoadError = useCallback(() => {
+    setShowAvatar(false)
+  }, [])
+
+  if (avatar_url && avatar_url !== 'default' && showAvatar) {
     return (
       <div
         className='flex shrink-0 items-center justify-center overflow-hidden rounded-md border border-divider-regular'
@@ -35,6 +40,7 @@ export const CredentialIcon: React.FC<CredentialIconProps> = ({
           width={size}
           height={size}
           className={cn('shrink-0 object-contain', className)}
+          onError={onImgLoadError}
         />
       </div>
     )

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

@@ -1,6 +1,6 @@
 'use client'
 
-import { useCallback } from 'react'
+import { useCallback, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useParams, useRouter } from 'next/navigation'
 import {
@@ -12,6 +12,7 @@ import Nav from '../nav'
 import type { NavItem } from '../nav/nav-selector'
 import { basePath } from '@/utils/var'
 import { useDatasetDetail, useDatasetList } from '@/service/knowledge/use-dataset'
+import type { DataSet } from '@/models/datasets'
 
 const DatasetNav = () => {
   const { t } = useTranslation()
@@ -28,6 +29,51 @@ const DatasetNav = () => {
   })
   const datasetItems = flatten(datasetList?.pages.map(datasetData => datasetData.data))
 
+  const curNav = useMemo(() => {
+    if (!currentDataset) return
+    return {
+      id: currentDataset.id,
+      name: currentDataset.name,
+      icon: currentDataset.icon_info.icon,
+      icon_type: currentDataset.icon_info.icon_type,
+      icon_background: currentDataset.icon_info.icon_background,
+      icon_url: currentDataset.icon_info.icon_url,
+    } as Omit<NavItem, 'link'>
+  }, [currentDataset?.id, currentDataset?.name, currentDataset?.icon_info])
+
+  const getDatasetLink = useCallback((dataset: DataSet) => {
+    const isPipelineUnpublished = dataset.runtime_mode === 'rag_pipeline' && !dataset.is_published
+    const link = isPipelineUnpublished
+      ? `/datasets/${dataset.id}/pipeline`
+      : `/datasets/${dataset.id}/documents`
+    return dataset.provider === 'external'
+      ? `/datasets/${dataset.id}/hitTesting`
+      : link
+  }, [])
+
+  const navigationItems = useMemo(() => {
+    return datasetItems.map((dataset) => {
+      const link = getDatasetLink(dataset)
+      return {
+        id: dataset.id,
+        name: dataset.name,
+        link,
+        icon: dataset.icon_info.icon,
+        icon_type: dataset.icon_info.icon_type,
+        icon_background: dataset.icon_info.icon_background,
+        icon_url: dataset.icon_info.icon_url,
+      }
+    }) as NavItem[]
+  }, [datasetItems, getDatasetLink])
+
+  const createRoute = useMemo(() => {
+    const runtimeMode = currentDataset?.runtime_mode
+    if (runtimeMode === 'rag_pipeline')
+      return `${basePath}/datasets/create-from-pipeline`
+    else
+      return `${basePath}/datasets/create`
+  }, [currentDataset?.runtime_mode])
+
   const handleLoadMore = useCallback(() => {
     if (hasNextPage)
       fetchNextPage()
@@ -41,25 +87,10 @@ const DatasetNav = () => {
       text={t('common.menus.datasets')}
       activeSegment='datasets'
       link='/datasets'
-      curNav={currentDataset && {
-        id: currentDataset.id,
-        name: currentDataset.name,
-        icon: currentDataset.icon_info.icon,
-        icon_type: currentDataset.icon_info.icon_type,
-        icon_background: currentDataset.icon_info.icon_background,
-        icon_url: currentDataset.icon_info.icon_url,
-      } as Omit<NavItem, 'link'>}
-      navigationItems={datasetItems.map(dataset => ({
-        id: dataset.id,
-        name: dataset.name,
-        link: dataset.provider === 'external' ? `/datasets/${dataset.id}/hitTesting` : `/datasets/${dataset.id}/documents`,
-        icon: dataset.icon_info.icon,
-        icon_type: dataset.icon_info.icon_type,
-        icon_background: dataset.icon_info.icon_background,
-        icon_url: dataset.icon_info.icon_url,
-      })) as NavItem[]}
+      curNav={curNav}
+      navigationItems={navigationItems}
       createText={t('common.menus.newDataset')}
-      onCreate={() => router.push(`${basePath}/datasets/create`)}
+      onCreate={() => router.push(createRoute)}
       onLoadMore={handleLoadMore}
     />
   )

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

@@ -42,7 +42,6 @@ const Nav = ({
   useEffect(() => {
     if (pathname === link)
       setLinkLastSearchParams(searchParams.toString())
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [pathname, searchParams])
 
   return (

web/models/datasets.ts

@@ -377,7 +377,7 @@ export type InitialDocumentDetail = {
   data_source_info: DataSourceInfo
   dataset_process_rule_id: string
   name: string
-  created_from: 'api' | 'web'
+  created_from: 'rag-pipeline' | 'api' | 'web'
   created_by: string
   created_at: number
   indexing_status: DocumentIndexingStatus
@@ -403,7 +403,6 @@ export type SimpleDocumentDetail = InitialDocumentDetail & {
     }
   }
   doc_metadata?: MetadataItemWithValue[]
-  created_from: string
 }
 
 export type DocumentListResponse = {