mirror of
https://github.com/infiniflow/ragflow.git
synced 2026-05-25 18:36:59 +08:00
### What problem does this PR solve?
## Summary
Refactor the dataset API layer into a clean service/REST separation
pattern, add a unified `/index` API for graph/raptor/mindmap operations,
and introduce several new dataset management endpoints with full test
coverage.
## Changes
### Service Layer (`dataset_api_service.py`)
- Added `trace_index(dataset_id, tenant_id, index_type)` — unified trace
function for all index types
- Added `run_index`, `delete_index` service functions
- Added `get_dataset`, `get_ingestion_summary`, `list_ingestion_logs`,
`get_ingestion_log`
- Added `run_embedding`, `list_tags`, `aggregate_tags`, `delete_tags`,
`rename_tag`
- Added `get_flattened_metadata`, `get_auto_metadata`,
`update_auto_metadata`
### REST API Layer (`dataset_api.py`)
**New unified routes:**
| Method | Route | Description |
|--------|-------|-------------|
| POST | `/datasets/<id>/index?type=graph\|raptor\|mindmap` | Run index
task |
| GET | `/datasets/<id>/index?type=graph\|raptor\|mindmap` | Trace index
task |
| DELETE | `/datasets/<id>/<index_type>` | Delete index |
| GET | `/datasets/<id>` | Get dataset details |
| GET | `/datasets/<id>/ingestions/summary` | Ingestion summary |
| GET | `/datasets/<id>/ingestions` | List ingestion logs |
| GET | `/datasets/<id>/ingestions/<log_id>` | Get single ingestion log
|
| POST | `/datasets/<id>/embedding` | Run embedding |
| GET | `/datasets/<id>/tags` | List tags |
| GET | `/datasets/tags/aggregation` | Aggregate tags across datasets |
| DELETE | `/datasets/<id>/tags` | Delete tags |
| PUT | `/datasets/<id>/tags` | Rename tag |
| GET | `/datasets/metadata/flattened` | Get flattened metadata |
| GET/PUT | `/datasets/<id>/metadata/config` | New metadata config path
|
**Removed routes (replaced by unified `/index`):**
- `POST /datasets/<id>/mindmap`
- `GET /datasets/<id>/mindmap`
**Preserved legacy routes (backward compatibility):**
- `/run_graphrag`, `/trace_graphrag`, `/run_raptor`, `/trace_raptor`
- `/auto_metadata` GET/PUT
### Test Suite
- Updated `common.py` helpers: added `trace_index`, removed
`run_mindmap`/`trace_mindmap`
- Added 7 new test files with 39 test cases total:
| Test File | Cases |
|-----------|-------|
| `test_get_dataset.py` | 4 |
| `test_ingestion_summary.py` | 2 |
| `test_ingestion_logs.py` | 5 |
| `test_index_api.py` | 14 |
| `test_embedding.py` | 2 |
| `test_tags.py` | 8 |
| `test_flattened_metadata.py` | 4 |
- Deleted `test_mindmap_tasks.py` (covered by unified index tests)
## Design Decisions
1. **Unified `/index?type=...`** — single endpoint replaces 3 separate
route pairs for graph/raptor/mindmap
2. **Backward compatibility** — old routes (`/run_graphrag`,
`/run_raptor`, `/auto_metadata`) preserved alongside new paths
3. **`_VALID_INDEX_TYPES = {"graph", "raptor", "mindmap"}`** — input
validation via constant set
4. **`_INDEX_TYPE_TO_TASK_ID_FIELD`** — maps index type to KB model task
ID field for clean dispatch
## Files Changed
- `api/apps/restful_apis/dataset_api.py`
- `api/apps/services/dataset_api_service.py`
- `sdk/python/ragflow_sdk/modules/dataset.py`
- `test/testcases/test_http_api/common.py`
- `test/testcases/test_http_api/test_dataset_management/` (7 new files)
### Type of change
- [x] New Feature (non-breaking change which adds functionality)
- [x] Refactoring
---------
Signed-off-by: noob <yixiao121314@outlook.com>
165 lines
4.9 KiB
Python
165 lines
4.9 KiB
Python
#
|
|
# Copyright 2025 The InfiniFlow Authors. All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
#
|
|
from time import sleep
|
|
|
|
import pytest
|
|
from common import (
|
|
batch_add_chunks,
|
|
batch_create_chat_assistants,
|
|
batch_create_datasets,
|
|
bulk_upload_documents,
|
|
delete_all_chat_assistants,
|
|
delete_all_datasets,
|
|
delete_all_sessions_with_chat_assistant,
|
|
list_documents,
|
|
parse_documents,
|
|
)
|
|
from libs.auth import RAGFlowHttpApiAuth
|
|
from utils import wait_for
|
|
from utils.file_utils import (
|
|
create_docx_file,
|
|
create_eml_file,
|
|
create_excel_file,
|
|
create_html_file,
|
|
create_image_file,
|
|
create_json_file,
|
|
create_md_file,
|
|
create_pdf_file,
|
|
create_ppt_file,
|
|
create_txt_file,
|
|
)
|
|
|
|
|
|
@wait_for(200, 1, "Document parsing timeout")
|
|
def condition(_auth, _dataset_id):
|
|
res = list_documents(_auth, _dataset_id)
|
|
for doc in res["data"]["docs"]:
|
|
if doc["run"] != "DONE":
|
|
return False
|
|
return True
|
|
|
|
|
|
@pytest.fixture
|
|
def generate_test_files(request, tmp_path):
|
|
file_creators = {
|
|
"docx": (tmp_path / "ragflow_test.docx", create_docx_file),
|
|
"excel": (tmp_path / "ragflow_test.xlsx", create_excel_file),
|
|
"ppt": (tmp_path / "ragflow_test.pptx", create_ppt_file),
|
|
"image": (tmp_path / "ragflow_test.png", create_image_file),
|
|
"pdf": (tmp_path / "ragflow_test.pdf", create_pdf_file),
|
|
"txt": (tmp_path / "ragflow_test.txt", create_txt_file),
|
|
"md": (tmp_path / "ragflow_test.md", create_md_file),
|
|
"json": (tmp_path / "ragflow_test.json", create_json_file),
|
|
"eml": (tmp_path / "ragflow_test.eml", create_eml_file),
|
|
"html": (tmp_path / "ragflow_test.html", create_html_file),
|
|
}
|
|
|
|
files = {}
|
|
for file_type, (file_path, creator_func) in file_creators.items():
|
|
if request.param in ["", file_type]:
|
|
creator_func(file_path)
|
|
files[file_type] = file_path
|
|
return files
|
|
|
|
|
|
@pytest.fixture(scope="class")
|
|
def ragflow_tmp_dir(request, tmp_path_factory):
|
|
class_name = request.cls.__name__
|
|
return tmp_path_factory.mktemp(class_name)
|
|
|
|
|
|
@pytest.fixture(scope="session")
|
|
def HttpApiAuth(token):
|
|
return RAGFlowHttpApiAuth(token)
|
|
|
|
|
|
@pytest.fixture(scope="function")
|
|
def clear_datasets(request, HttpApiAuth):
|
|
def cleanup():
|
|
delete_all_datasets(HttpApiAuth)
|
|
|
|
request.addfinalizer(cleanup)
|
|
|
|
|
|
@pytest.fixture(scope="function")
|
|
def clear_chat_assistants(request, HttpApiAuth):
|
|
def cleanup():
|
|
delete_all_chat_assistants(HttpApiAuth)
|
|
|
|
request.addfinalizer(cleanup)
|
|
|
|
|
|
@pytest.fixture(scope="function")
|
|
def clear_session_with_chat_assistants(request, HttpApiAuth, add_chat_assistants):
|
|
def cleanup():
|
|
for chat_assistant_id in chat_assistant_ids:
|
|
delete_all_sessions_with_chat_assistant(HttpApiAuth, chat_assistant_id)
|
|
|
|
request.addfinalizer(cleanup)
|
|
|
|
_, _, chat_assistant_ids = add_chat_assistants
|
|
|
|
|
|
@pytest.fixture(scope="class")
|
|
def add_dataset(request, HttpApiAuth):
|
|
def cleanup():
|
|
delete_all_datasets(HttpApiAuth)
|
|
|
|
request.addfinalizer(cleanup)
|
|
|
|
dataset_ids = batch_create_datasets(HttpApiAuth, 1)
|
|
return dataset_ids[0]
|
|
|
|
|
|
@pytest.fixture(scope="function")
|
|
def add_dataset_func(request, HttpApiAuth):
|
|
def cleanup():
|
|
delete_all_datasets(HttpApiAuth)
|
|
|
|
request.addfinalizer(cleanup)
|
|
|
|
return batch_create_datasets(HttpApiAuth, 1)[0]
|
|
|
|
|
|
@pytest.fixture(scope="class")
|
|
def add_document(HttpApiAuth, add_dataset, ragflow_tmp_dir):
|
|
dataset_id = add_dataset
|
|
document_ids = bulk_upload_documents(HttpApiAuth, dataset_id, 1, ragflow_tmp_dir)
|
|
return dataset_id, document_ids[0]
|
|
|
|
|
|
@pytest.fixture(scope="class")
|
|
def add_chunks(HttpApiAuth, add_document):
|
|
dataset_id, document_id = add_document
|
|
parse_documents(HttpApiAuth, dataset_id, {"document_ids": [document_id]})
|
|
condition(HttpApiAuth, dataset_id)
|
|
chunk_ids = batch_add_chunks(HttpApiAuth, dataset_id, document_id, 4)
|
|
sleep(1) # issues/6487
|
|
return dataset_id, document_id, chunk_ids
|
|
|
|
|
|
@pytest.fixture(scope="class")
|
|
def add_chat_assistants(request, HttpApiAuth, add_document):
|
|
def cleanup():
|
|
delete_all_chat_assistants(HttpApiAuth)
|
|
|
|
request.addfinalizer(cleanup)
|
|
|
|
dataset_id, document_id = add_document
|
|
parse_documents(HttpApiAuth, dataset_id, {"document_ids": [document_id]})
|
|
condition(HttpApiAuth, dataset_id)
|
|
return dataset_id, document_id, batch_create_chat_assistants(HttpApiAuth, 5)
|