Merge branch 'main' of github.com:infiniflow/ragflow into structured-output

docs/references/http_api_reference.md

@@ -512,13 +512,16 @@ curl --request POST \
       - Maximum: `2048`
     - `"delimiter"`: `string`
       - Defaults to `"\n"`.
-    - `"html4excel"`: `bool` Indicates whether to convert Excel documents into HTML format.
+    - `"html4excel"`: `bool`
+      - Whether to convert Excel documents into HTML format.
       - Defaults to `false`
     - `"layout_recognize"`: `string`
       - Defaults to `DeepDOC`
-    - `"tag_kb_ids"`: `array<string>` refer to [Use tag set](https://ragflow.io/docs/dev/use_tag_sets)
+    - `"tag_kb_ids"`: `array<string>`
-      - Must include a list of dataset IDs, where each dataset is parsed using the ​​Tag Chunking Method
+      - IDs of datasets to be parsed using the ​​Tag chunk method.
-    - `"task_page_size"`: `int` For PDF only.
+      - Before setting this, ensure a tag set is created and properly configured. For details, see [Use tag set](https://ragflow.io/docs/dev/use_tag_sets).
+    - `"task_page_size"`: `int`
+      - For PDFs only.
       - Defaults to `12`
       - Minimum: `1`
     - `"raptor"`: `object` RAPTOR-specific settings.

rag/svr/sync_data_source.py

@@ -157,11 +157,16 @@ class Confluence(SyncBase):
         from common.data_source.config import DocumentSource
         from common.data_source.interfaces import StaticCredentialsProvider
 
+        space = (self.conf.get("space") or "").strip()
+        page_id = (self.conf.get("page_id") or "").strip()
+        index_recursively = bool(self.conf.get("index_recursively", False))
+
         self.connector = ConfluenceConnector(
             wiki_base=self.conf["wiki_base"],
-            space=self.conf.get("space", ""),
             is_cloud=self.conf.get("is_cloud", True),
-            # page_id=self.conf.get("page_id", ""),
+            space=space,
+            page_id=page_id,
+            index_recursively=index_recursively,
         )
 
         credentials_provider = StaticCredentialsProvider(tenant_id=task["tenant_id"], connector_name=DocumentSource.CONFLUENCE, credential_json=self.conf["credentials"])

web/src/pages/user-setting/data-source/contant.tsx

@@ -235,7 +235,18 @@ export const DataSourceFormFields = {
       name: 'config.space',
       type: FormFieldType.Text,
       required: false,
-      tooltip: t('setting.confluenceSpaceKeyTip'),
+    },
+    {
+      label: 'Page ID',
+      name: 'config.page_id',
+      type: FormFieldType.Text,
+      required: false,
+    },
+    {
+      label: 'Index Recursively',
+      name: 'config.index_recursively',
+      type: FormFieldType.Checkbox,
+      required: false,
     },
   ],
   [DataSourceKey.GOOGLE_DRIVE]: [