Fix: Improved knowledge base configuration and related logic #9869 (#10315)

### What problem does this PR solve? Fix: Improved knowledge base configuration and related logic #9869 - Optimized the display logic of the Generate Log button to support displaying completion time and task ID - Implemented the ability to pause task generation and connect to the data flow cancellation interface - Fixed issues with type definitions and optional chaining calls in some components ### Type of change - [x] Bug Fix (non-breaking change which fixes an issue)
2026-01-04 03:25:30 +08:00 · 2025-09-26 19:09:11 +08:00
parent c7efaab30e
commit 886d38620e
19 changed files with 374 additions and 231 deletions
--- a/web/src/components/chunk-method-dialog/index.tsx
+++ b/web/src/components/chunk-method-dialog/index.tsx
@ -23,7 +23,6 @@ import {
  ParseTypeItem,
 } from '@/pages/dataset/dataset-setting/configuration/common-item';
 import { zodResolver } from '@hookform/resolvers/zod';
-import get from 'lodash/get';
 import omit from 'lodash/omit';
 import {} from 'module';
 import { useEffect, useMemo } from 'react';
@ -41,13 +40,6 @@ import { ExcelToHtmlFormField } from '../excel-to-html-form-field';
 import { FormContainer } from '../form-container';
 import { LayoutRecognizeFormField } from '../layout-recognize-form-field';
 import { MaxTokenNumberFormField } from '../max-token-number-from-field';
-import {
-  UseGraphRagFormField,
-  showGraphRagItems,
-} from '../parse-configuration/graph-rag-form-fields';
-import RaptorFormFields, {
-  showRaptorParseConfiguration,
-} from '../parse-configuration/raptor-form-fields';
 import { ButtonLoading } from '../ui/button';
 import { Input } from '../ui/input';
 import { DynamicPageRange } from './dynamic-page-range';
@ -121,19 +113,19 @@ export function ChunkMethodDialog({
        auto_keywords: z.coerce.number().optional(),
        auto_questions: z.coerce.number().optional(),
        html4excel: z.boolean().optional(),
-        raptor: z
-          .object({
-            use_raptor: z.boolean().optional(),
-            prompt: z.string().optional().optional(),
-            max_token: z.coerce.number().optional(),
-            threshold: z.coerce.number().optional(),
-            max_cluster: z.coerce.number().optional(),
-            random_seed: z.coerce.number().optional(),
-          })
-          .optional(),
-        graphrag: z.object({
-          use_graphrag: z.boolean().optional(),
-        }),
+        // raptor: z
+        //   .object({
+        //     use_raptor: z.boolean().optional(),
+        //     prompt: z.string().optional().optional(),
+        //     max_token: z.coerce.number().optional(),
+        //     threshold: z.coerce.number().optional(),
+        //     max_cluster: z.coerce.number().optional(),
+        //     random_seed: z.coerce.number().optional(),
+        //   })
+        //   .optional(),
+        // graphrag: z.object({
+        //   use_graphrag: z.boolean().optional(),
+        // }),
        entity_types: z.array(z.string()).optional(),
        pages: z
          .array(z.object({ from: z.coerce.number(), to: z.coerce.number() }))
@ -223,13 +215,13 @@ export function ChunkMethodDialog({
        parser_config: fillDefaultParserValue({
          pages: pages.length > 0 ? pages : [{ from: 1, to: 1024 }],
          ...omit(parserConfig, 'pages'),
-          graphrag: {
-            use_graphrag: get(
-              parserConfig,
-              'graphrag.use_graphrag',
-              useGraphRag,
-            ),
-          },
+          // graphrag: {
+          //   use_graphrag: get(
+          //     parserConfig,
+          //     'graphrag.use_graphrag',
+          //     useGraphRag,
+          //   ),
+          // },
        }),
      });
    }
@ -351,19 +343,19 @@ export function ChunkMethodDialog({
                    <ExcelToHtmlFormField></ExcelToHtmlFormField>
                  )}
                </FormContainer>
-                {showRaptorParseConfiguration(
+                {/* {showRaptorParseConfiguration(
                  selectedTag as DocumentParserType,
                ) && (
                  <FormContainer>
                    <RaptorFormFields></RaptorFormFields>
                  </FormContainer>
-                )}
-                {showGraphRagItems(selectedTag as DocumentParserType) &&
+                )} */}
+                {/* {showGraphRagItems(selectedTag as DocumentParserType) &&
                  useGraphRag && (
                    <FormContainer>
                      <UseGraphRagFormField></UseGraphRagFormField>
                    </FormContainer>
-                  )}
+                  )} */}
                {showEntityTypes && (
                  <EntityTypesFormField></EntityTypesFormField>
                )}
--- a/web/src/components/chunk-method-dialog/use-default-parser-values.ts
+++ b/web/src/components/chunk-method-dialog/use-default-parser-values.ts
@ -15,17 +15,17 @@ export function useDefaultParserValues() {
      auto_keywords: 0,
      auto_questions: 0,
      html4excel: false,
-      raptor: {
-        use_raptor: false,
-        prompt: t('knowledgeConfiguration.promptText'),
-        max_token: 256,
-        threshold: 0.1,
-        max_cluster: 64,
-        random_seed: 0,
-      },
-      graphrag: {
-        use_graphrag: false,
-      },
+      // raptor: {
+      //   use_raptor: false,
+      //   prompt: t('knowledgeConfiguration.promptText'),
+      //   max_token: 256,
+      //   threshold: 0.1,
+      //   max_cluster: 64,
+      //   random_seed: 0,
+      // },
+      // graphrag: {
+      //   use_graphrag: false,
+      // },
      entity_types: [],
      pages: [],
    };
--- a/web/src/components/data-pipeline-select/index.tsx
+++ b/web/src/components/data-pipeline-select/index.tsx
@ -2,7 +2,7 @@ import { useTranslate } from '@/hooks/common-hooks';
 import { useFetchAgentList } from '@/hooks/use-agent-request';
 import { buildSelectOptions } from '@/utils/component-util';
 import { ArrowUpRight } from 'lucide-react';
-import { useMemo } from 'react';
+import { useEffect, useMemo } from 'react';
 import { useFormContext } from 'react-hook-form';
 import { SelectWithSearch } from '../originui/select-with-search';
 import {
@ -13,15 +13,21 @@ import {
  FormMessage,
 } from '../ui/form';
 import { MultiSelect } from '../ui/multi-select';
+export interface IDataPipelineSelectNode {
+  id?: string;
+  name?: string;
+  avatar?: string;
+}

 interface IProps {
  toDataPipeline?: () => void;
  formFieldName: string;
  isMult?: boolean;
+  setDataList?: (data: IDataPipelineSelectNode[]) => void;
 }

 export function DataFlowSelect(props: IProps) {
-  const { toDataPipeline, formFieldName, isMult = true } = props;
+  const { toDataPipeline, formFieldName, isMult = false, setDataList } = props;
  const { t } = useTranslate('knowledgeConfiguration');
  const form = useFormContext();
  const toDataPipLine = () => {
@ -36,8 +42,26 @@ export function DataFlowSelect(props: IProps) {
      'id',
      'title',
    );
+
    return option || [];
  }, [dataPipelineOptions]);
+
+  const nodes = useMemo(() => {
+    return (
+      dataPipelineOptions?.canvas?.map((item) => {
+        return {
+          id: item?.id,
+          name: item?.title,
+          avatar: item?.avatar,
+        };
+      }) || []
+    );
+  }, [dataPipelineOptions]);
+
+  useEffect(() => {
+    setDataList?.(nodes);
+  }, [nodes, setDataList]);
+
  return (
    <FormField
      control={form.control}
--- a/web/src/components/parse-configuration/graph-rag-form-fields.tsx
+++ b/web/src/components/parse-configuration/graph-rag-form-fields.tsx
@ -4,6 +4,7 @@ import { cn } from '@/lib/utils';
 import {
  GenerateLogButton,
  GenerateType,
+  IGenerateLogButtonProps,
 } from '@/pages/dataset/dataset/generate-button/generate';
 import { upperFirst } from 'lodash';
 import { useCallback, useMemo } from 'react';
@ -51,10 +52,14 @@ export const showGraphRagItems = (parserId: DocumentParserType | undefined) => {
 type GraphRagItemsProps = {
  marginBottom?: boolean;
  className?: string;
-  showGenerateItem?: boolean;
+  data: IGenerateLogButtonProps;
 };

-export function UseGraphRagFormField() {
+export function UseGraphRagFormField({
+  data,
+}: {
+  data: IGenerateLogButtonProps;
+}) {
  const form = useFormContext();
  const { t } = useTranslate('knowledgeConfiguration');

@ -73,10 +78,16 @@ export function UseGraphRagFormField() {
            </FormLabel>
            <div className="w-3/4">
              <FormControl>
-                <Switch
+                {/* <Switch
                  checked={field.value}
                  onCheckedChange={field.onChange}
-                ></Switch>
+                ></Switch> */}
+                <GenerateLogButton
+                  {...data}
+                  className="w-full text-text-secondary"
+                  status={1}
+                  type={GenerateType.KnowledgeGraph}
+                />
              </FormControl>
            </div>
          </div>
@ -93,8 +104,8 @@ export function UseGraphRagFormField() {
 // The three types "table", "resume" and "one" do not display this configuration.
 const GraphRagItems = ({
  marginBottom = false,
-  showGenerateItem = false,
  className = 'p-10',
+  data,
 }: GraphRagItemsProps) => {
  const { t } = useTranslate('knowledgeConfiguration');
  const form = useFormContext();
@ -120,7 +131,7 @@ const GraphRagItems = ({

  return (
    <FormContainer className={cn({ 'mb-4': marginBottom }, className)}>
-      <UseGraphRagFormField></UseGraphRagFormField>
+      <UseGraphRagFormField data={data}></UseGraphRagFormField>
      {useRaptor && (
        <>
          <EntityTypesFormField name="parser_config.graphrag.entity_types"></EntityTypesFormField>
@ -216,7 +227,7 @@ const GraphRagItems = ({
              </FormItem>
            )}
          />
-          {showGenerateItem && (
+          {/* {showGenerateItem && (
            <div className="w-full flex items-center">
              <div className="text-sm whitespace-nowrap w-1/4">
                {t('extractKnowledgeGraph')}
@ -227,7 +238,7 @@ const GraphRagItems = ({
                type={GenerateType.KnowledgeGraph}
              />
            </div>
-          )}
+          )} */}
        </>
      )}
    </FormContainer>
--- a/web/src/components/parse-configuration/raptor-form-fields.tsx
+++ b/web/src/components/parse-configuration/raptor-form-fields.tsx
@ -4,6 +4,7 @@ import { useTranslate } from '@/hooks/common-hooks';
 import {
  GenerateLogButton,
  GenerateType,
+  IGenerateLogButtonProps,
 } from '@/pages/dataset/dataset/generate-button/generate';
 import random from 'lodash/random';
 import { Shuffle } from 'lucide-react';
@ -18,7 +19,6 @@ import {
  FormMessage,
 } from '../ui/form';
 import { ExpandedInput } from '../ui/input';
-import { Switch } from '../ui/switch';
 import { Textarea } from '../ui/textarea';

 export const excludedParseMethods = [
@ -56,11 +56,7 @@ const Prompt = 'parser_config.raptor.prompt';

 // The three types "table", "resume" and "one" do not display this configuration.

-const RaptorFormFields = ({
-  showGenerateItem = false,
-}: {
-  showGenerateItem?: boolean;
-}) => {
+const RaptorFormFields = ({ data }: { data: IGenerateLogButtonProps }) => {
  const form = useFormContext();
  const { t } = useTranslate('knowledgeConfiguration');
  const useRaptor = useWatch({ name: UseRaptorField });
@ -108,13 +104,12 @@ const RaptorFormFields = ({
                </FormLabel>
                <div className="w-3/4">
                  <FormControl>
-                    <Switch
-                      checked={field.value}
-                      onCheckedChange={(e) => {
-                        changeRaptor(e);
-                        field.onChange(e);
-                      }}
-                    ></Switch>
+                    <GenerateLogButton
+                      {...data}
+                      className="w-full text-text-secondary"
+                      status={1}
+                      type={GenerateType.Raptor}
+                    />
                  </FormControl>
                </div>
              </div>
@ -219,18 +214,6 @@ const RaptorFormFields = ({
              </FormItem>
            )}
          />
-          {showGenerateItem && (
-            <div className="w-full flex items-center">
-              <div className="text-sm whitespace-nowrap w-1/4">
-                {t('extractRaptor')}
-              </div>
-              <GenerateLogButton
-                className="w-3/4 text-text-secondary"
-                status={1}
-                type={GenerateType.Raptor}
-              />
-            </div>
-          )}
        </div>
      )}
    </>