balibabu
commited on
Commit
·
431cdbc
1
Parent(s):
b085dec
feat: when Layout recognize is false, hide pages (#144)
Browse files* feat: when Layout recognize is false, hide pages
* feat: fix the name column to the leftmost part of the KnowledgeFile table
web/src/pages/add-knowledge/components/knowledge-file/chunk-method-modal.tsx
CHANGED
@@ -1,4 +1,8 @@
|
|
|
|
1 |
import { IModalManagerChildrenProps } from '@/components/modal-manager';
|
|
|
|
|
|
|
2 |
import {
|
3 |
Button,
|
4 |
Divider,
|
@@ -9,14 +13,8 @@ import {
|
|
9 |
Switch,
|
10 |
Tag,
|
11 |
} from 'antd';
|
12 |
-
import React, { useEffect, useMemo } from 'react';
|
13 |
-
|
14 |
-
import MaxTokenNumber from '@/components/max-token-number';
|
15 |
-
import { IKnowledgeFileParserConfig } from '@/interfaces/database/knowledge';
|
16 |
-
import { IChangeParserConfigRequestBody } from '@/interfaces/request/document';
|
17 |
-
import { MinusCircleOutlined, PlusOutlined } from '@ant-design/icons';
|
18 |
import omit from 'lodash/omit';
|
19 |
-
import {} from '
|
20 |
import { useFetchParserListOnMount } from './hooks';
|
21 |
|
22 |
import styles from './index.less';
|
@@ -51,12 +49,10 @@ const ChunkMethodModal: React.FC<IProps> = ({
|
|
51 |
|
52 |
const handleOk = async () => {
|
53 |
const values = await form.validateFields();
|
54 |
-
console.info(values);
|
55 |
const parser_config = {
|
56 |
...values.parser_config,
|
57 |
pages: values.pages?.map((x: any) => [x.from, x.to]) ?? [],
|
58 |
};
|
59 |
-
console.info(parser_config);
|
60 |
onOk(selectedTag, parser_config);
|
61 |
};
|
62 |
|
@@ -110,134 +106,156 @@ const ChunkMethodModal: React.FC<IProps> = ({
|
|
110 |
</div>
|
111 |
</Space>
|
112 |
<Divider></Divider>
|
|
|
113 |
{
|
114 |
<Form name="dynamic_form_nest_item" autoComplete="off" form={form}>
|
115 |
-
{showPages && (
|
116 |
-
<>
|
117 |
-
<Form.List name="pages">
|
118 |
-
{(fields, { add, remove }) => (
|
119 |
-
<>
|
120 |
-
{fields.map(({ key, name, ...restField }) => (
|
121 |
-
<Space
|
122 |
-
key={key}
|
123 |
-
style={{
|
124 |
-
display: 'flex',
|
125 |
-
}}
|
126 |
-
align="baseline"
|
127 |
-
>
|
128 |
-
<Form.Item
|
129 |
-
{...restField}
|
130 |
-
name={[name, 'from']}
|
131 |
-
dependencies={name > 0 ? [name - 1, 'to'] : []}
|
132 |
-
rules={[
|
133 |
-
{
|
134 |
-
required: true,
|
135 |
-
message: 'Missing start page number',
|
136 |
-
},
|
137 |
-
({ getFieldValue }) => ({
|
138 |
-
validator(_, value) {
|
139 |
-
if (
|
140 |
-
name === 0 ||
|
141 |
-
!value ||
|
142 |
-
getFieldValue(['pages', name - 1, 'to']) <
|
143 |
-
value
|
144 |
-
) {
|
145 |
-
return Promise.resolve();
|
146 |
-
}
|
147 |
-
return Promise.reject(
|
148 |
-
new Error(
|
149 |
-
'The current value must be greater than the previous to!',
|
150 |
-
),
|
151 |
-
);
|
152 |
-
},
|
153 |
-
}),
|
154 |
-
]}
|
155 |
-
>
|
156 |
-
<InputNumber
|
157 |
-
placeholder="from"
|
158 |
-
min={0}
|
159 |
-
precision={0}
|
160 |
-
className={styles.pageInputNumber}
|
161 |
-
/>
|
162 |
-
</Form.Item>
|
163 |
-
<Form.Item
|
164 |
-
{...restField}
|
165 |
-
name={[name, 'to']}
|
166 |
-
dependencies={[name, 'from']}
|
167 |
-
rules={[
|
168 |
-
{
|
169 |
-
required: true,
|
170 |
-
message: 'Missing end page number(excluding)',
|
171 |
-
},
|
172 |
-
({ getFieldValue }) => ({
|
173 |
-
validator(_, value) {
|
174 |
-
if (
|
175 |
-
!value ||
|
176 |
-
getFieldValue(['pages', name, 'from']) < value
|
177 |
-
) {
|
178 |
-
return Promise.resolve();
|
179 |
-
}
|
180 |
-
return Promise.reject(
|
181 |
-
new Error(
|
182 |
-
'The current value must be greater than to!',
|
183 |
-
),
|
184 |
-
);
|
185 |
-
},
|
186 |
-
}),
|
187 |
-
]}
|
188 |
-
>
|
189 |
-
<InputNumber
|
190 |
-
placeholder="to"
|
191 |
-
min={0}
|
192 |
-
precision={0}
|
193 |
-
className={styles.pageInputNumber}
|
194 |
-
/>
|
195 |
-
</Form.Item>
|
196 |
-
{name > 0 && (
|
197 |
-
<MinusCircleOutlined onClick={() => remove(name)} />
|
198 |
-
)}
|
199 |
-
</Space>
|
200 |
-
))}
|
201 |
-
<Form.Item>
|
202 |
-
<Button
|
203 |
-
type="dashed"
|
204 |
-
onClick={() => add()}
|
205 |
-
block
|
206 |
-
icon={<PlusOutlined />}
|
207 |
-
>
|
208 |
-
Add page
|
209 |
-
</Button>
|
210 |
-
</Form.Item>
|
211 |
-
</>
|
212 |
-
)}
|
213 |
-
</Form.List>
|
214 |
-
<Form.Item
|
215 |
-
name={['parser_config', 'task_page_size']}
|
216 |
-
label="Task page size"
|
217 |
-
tooltip={'coming soon'}
|
218 |
-
initialValue={2}
|
219 |
-
rules={[
|
220 |
-
{
|
221 |
-
required: true,
|
222 |
-
message: 'Please input your task page size!',
|
223 |
-
},
|
224 |
-
]}
|
225 |
-
>
|
226 |
-
<InputNumber min={1} max={128} />
|
227 |
-
</Form.Item>
|
228 |
-
</>
|
229 |
-
)}
|
230 |
{showOne && (
|
231 |
<Form.Item
|
232 |
name={['parser_config', 'layout_recognize']}
|
233 |
label="Layout recognize"
|
234 |
initialValue={true}
|
235 |
valuePropName="checked"
|
236 |
-
tooltip={
|
|
|
|
|
237 |
>
|
238 |
<Switch />
|
239 |
</Form.Item>
|
240 |
)}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
241 |
{selectedTag === 'naive' && <MaxTokenNumber></MaxTokenNumber>}
|
242 |
</Form>
|
243 |
}
|
|
|
1 |
+
import MaxTokenNumber from '@/components/max-token-number';
|
2 |
import { IModalManagerChildrenProps } from '@/components/modal-manager';
|
3 |
+
import { IKnowledgeFileParserConfig } from '@/interfaces/database/knowledge';
|
4 |
+
import { IChangeParserConfigRequestBody } from '@/interfaces/request/document';
|
5 |
+
import { MinusCircleOutlined, PlusOutlined } from '@ant-design/icons';
|
6 |
import {
|
7 |
Button,
|
8 |
Divider,
|
|
|
13 |
Switch,
|
14 |
Tag,
|
15 |
} from 'antd';
|
|
|
|
|
|
|
|
|
|
|
|
|
16 |
import omit from 'lodash/omit';
|
17 |
+
import React, { useEffect, useMemo } from 'react';
|
18 |
import { useFetchParserListOnMount } from './hooks';
|
19 |
|
20 |
import styles from './index.less';
|
|
|
49 |
|
50 |
const handleOk = async () => {
|
51 |
const values = await form.validateFields();
|
|
|
52 |
const parser_config = {
|
53 |
...values.parser_config,
|
54 |
pages: values.pages?.map((x: any) => [x.from, x.to]) ?? [],
|
55 |
};
|
|
|
56 |
onOk(selectedTag, parser_config);
|
57 |
};
|
58 |
|
|
|
106 |
</div>
|
107 |
</Space>
|
108 |
<Divider></Divider>
|
109 |
+
|
110 |
{
|
111 |
<Form name="dynamic_form_nest_item" autoComplete="off" form={form}>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
112 |
{showOne && (
|
113 |
<Form.Item
|
114 |
name={['parser_config', 'layout_recognize']}
|
115 |
label="Layout recognize"
|
116 |
initialValue={true}
|
117 |
valuePropName="checked"
|
118 |
+
tooltip={
|
119 |
+
'Use visual models for layout analysis to better identify document structure, find where the titles, text blocks, images, and tables are. Without this feature, only the plain text of the PDF can be obtained.'
|
120 |
+
}
|
121 |
>
|
122 |
<Switch />
|
123 |
</Form.Item>
|
124 |
)}
|
125 |
+
{showPages && (
|
126 |
+
<Form.Item
|
127 |
+
noStyle
|
128 |
+
dependencies={[['parser_config', 'layout_recognize']]}
|
129 |
+
>
|
130 |
+
{({ getFieldValue }) =>
|
131 |
+
getFieldValue(['parser_config', 'layout_recognize']) && (
|
132 |
+
<>
|
133 |
+
<Form.List name="pages">
|
134 |
+
{(fields, { add, remove }) => (
|
135 |
+
<>
|
136 |
+
{fields.map(({ key, name, ...restField }) => (
|
137 |
+
<Space
|
138 |
+
key={key}
|
139 |
+
style={{
|
140 |
+
display: 'flex',
|
141 |
+
}}
|
142 |
+
align="baseline"
|
143 |
+
>
|
144 |
+
<Form.Item
|
145 |
+
{...restField}
|
146 |
+
name={[name, 'from']}
|
147 |
+
dependencies={name > 0 ? [name - 1, 'to'] : []}
|
148 |
+
rules={[
|
149 |
+
{
|
150 |
+
required: true,
|
151 |
+
message: 'Missing start page number',
|
152 |
+
},
|
153 |
+
({ getFieldValue }) => ({
|
154 |
+
validator(_, value) {
|
155 |
+
if (
|
156 |
+
name === 0 ||
|
157 |
+
!value ||
|
158 |
+
getFieldValue([
|
159 |
+
'pages',
|
160 |
+
name - 1,
|
161 |
+
'to',
|
162 |
+
]) < value
|
163 |
+
) {
|
164 |
+
return Promise.resolve();
|
165 |
+
}
|
166 |
+
return Promise.reject(
|
167 |
+
new Error(
|
168 |
+
'The current value must be greater than the previous to!',
|
169 |
+
),
|
170 |
+
);
|
171 |
+
},
|
172 |
+
}),
|
173 |
+
]}
|
174 |
+
>
|
175 |
+
<InputNumber
|
176 |
+
placeholder="from"
|
177 |
+
min={0}
|
178 |
+
precision={0}
|
179 |
+
className={styles.pageInputNumber}
|
180 |
+
/>
|
181 |
+
</Form.Item>
|
182 |
+
<Form.Item
|
183 |
+
{...restField}
|
184 |
+
name={[name, 'to']}
|
185 |
+
dependencies={[name, 'from']}
|
186 |
+
rules={[
|
187 |
+
{
|
188 |
+
required: true,
|
189 |
+
message:
|
190 |
+
'Missing end page number(excluding)',
|
191 |
+
},
|
192 |
+
({ getFieldValue }) => ({
|
193 |
+
validator(_, value) {
|
194 |
+
if (
|
195 |
+
!value ||
|
196 |
+
getFieldValue(['pages', name, 'from']) <
|
197 |
+
value
|
198 |
+
) {
|
199 |
+
return Promise.resolve();
|
200 |
+
}
|
201 |
+
return Promise.reject(
|
202 |
+
new Error(
|
203 |
+
'The current value must be greater than to!',
|
204 |
+
),
|
205 |
+
);
|
206 |
+
},
|
207 |
+
}),
|
208 |
+
]}
|
209 |
+
>
|
210 |
+
<InputNumber
|
211 |
+
placeholder="to"
|
212 |
+
min={0}
|
213 |
+
precision={0}
|
214 |
+
className={styles.pageInputNumber}
|
215 |
+
/>
|
216 |
+
</Form.Item>
|
217 |
+
{name > 0 && (
|
218 |
+
<MinusCircleOutlined
|
219 |
+
onClick={() => remove(name)}
|
220 |
+
/>
|
221 |
+
)}
|
222 |
+
</Space>
|
223 |
+
))}
|
224 |
+
<Form.Item>
|
225 |
+
<Button
|
226 |
+
type="dashed"
|
227 |
+
onClick={() => add()}
|
228 |
+
block
|
229 |
+
icon={<PlusOutlined />}
|
230 |
+
>
|
231 |
+
Add page
|
232 |
+
</Button>
|
233 |
+
</Form.Item>
|
234 |
+
</>
|
235 |
+
)}
|
236 |
+
</Form.List>
|
237 |
+
|
238 |
+
<Form.Item
|
239 |
+
name={['parser_config', 'task_page_size']}
|
240 |
+
label="Task page size"
|
241 |
+
tooltip={`If using layout recognize, the PDF file will be split into groups of successive. Layout analysis will be performed parallelly between groups to increase the processing speed.
|
242 |
+
The 'Task page size' determines the size of groups. The larger the page size is, the lower the chance of splitting continuous text between pages into different chunks.`}
|
243 |
+
initialValue={2}
|
244 |
+
rules={[
|
245 |
+
{
|
246 |
+
required: true,
|
247 |
+
message: 'Please input your task page size!',
|
248 |
+
},
|
249 |
+
]}
|
250 |
+
>
|
251 |
+
<InputNumber min={1} max={128} />
|
252 |
+
</Form.Item>
|
253 |
+
</>
|
254 |
+
)
|
255 |
+
}
|
256 |
+
</Form.Item>
|
257 |
+
)}
|
258 |
+
|
259 |
{selectedTag === 'naive' && <MaxTokenNumber></MaxTokenNumber>}
|
260 |
</Form>
|
261 |
}
|
web/src/pages/add-knowledge/components/knowledge-file/index.tsx
CHANGED
@@ -112,6 +112,7 @@ const KnowledgeFile = () => {
|
|
112 |
title: 'Name',
|
113 |
dataIndex: 'name',
|
114 |
key: 'name',
|
|
|
115 |
render: (text: any, { id, thumbnail }) => (
|
116 |
<div className={styles.tochunks} onClick={() => toChunk(id)}>
|
117 |
<img className={styles.img} src={thumbnail} alt="" />
|
|
|
112 |
title: 'Name',
|
113 |
dataIndex: 'name',
|
114 |
key: 'name',
|
115 |
+
fixed: 'left',
|
116 |
render: (text: any, { id, thumbnail }) => (
|
117 |
<div className={styles.tochunks} onClick={() => toChunk(id)}>
|
118 |
<img className={styles.img} src={thumbnail} alt="" />
|