Build Agentic workflows, RAG pipelines, with rich AI model and tool support on one collaborative workspace. Deploy on cloud, VPC, or self-hosted, so teams move from prototype to production without rebuilding the stack.
Python agentagentic-aiagentic-frameworkagentic-workflowaiautomationclaudedeepseekgenaigptllmlow-codemcpnextjsno-codeopenaipythonskillsworkflow
fix(api): use the dataset doc_form when document requests omit it (#45581)
Tianyu Caice7ccc375415
diff --git a/api/controllers/service_api/dataset/document.py b/api/controllers/service_api/dataset/document.pyindex 84a24796616..68eb7feaed9 100644--- a/api/controllers/service_api/dataset/document.py+++ b/api/controllers/service_api/dataset/document.py@@ -79,6 +79,7 @@ from models.dataset import Dataset, Documentfrom models.enums import DocumentCreatedFromfrom repositories.knowledge.dataset_read_repository import (get_dataset_creator,+ get_dataset_doc_form,get_document_hit_count,get_document_process_rule,get_document_segment_count,@@ -415,6 +416,9 @@ def _create_document_by_text(session: Session, tenant_id: str, dataset_id: UUID)if not dataset:raise ValueError("Dataset does not exist.")+ if "doc_form" not in payload.model_fields_set:+ args["doc_form"] = get_dataset_doc_form(dataset, session=session) or "text_model"+if not dataset.indexing_technique and not args.get("indexing_technique"):raise ValueError("indexing_technique is required.")@@ -483,6 +487,8 @@ def _update_document_by_text(if not dataset:raise ValueError("Dataset does not exist.")+ if "doc_form" not in payload.model_fields_set:+ args["doc_form"] = get_dataset_doc_form(dataset, session=session) or "text_model"retrieval_model = payload.retrieval_modelif (retrieval_model@@ -794,7 +800,7 @@ class DocumentAddByFileApi(DatasetApiResource):if "data" in request.form:args = json.loads(request.form["data"])if "doc_form" not in args:- args["doc_form"] = dataset.chunk_structure or "text_model"+ args["doc_form"] = get_dataset_doc_form(dataset, session=session) or "text_model"if "doc_language" not in args:args["doc_language"] = "English"@@ -895,7 +901,7 @@ def _update_document_by_file(if "data" in request.form:args = json.loads(request.form["data"])if "doc_form" not in args:- args["doc_form"] = dataset.chunk_structure or "text_model"+ args["doc_form"] = get_dataset_doc_form(dataset, session=session) or "text_model"if "doc_language" not in args:args["doc_language"] = "English"diff --git a/api/tests/unit_tests/controllers/service_api/dataset/test_document.py b/api/tests/unit_tests/controllers/service_api/dataset/test_document.pyindex 7b9aaa423b9..d63394637f6 100644--- a/api/tests/unit_tests/controllers/service_api/dataset/test_document.py+++ b/api/tests/unit_tests/controllers/service_api/dataset/test_document.py@@ -20,6 +20,7 @@ import jsonimport uuidfrom collections.abc import Iteratorfrom datetime import UTC, datetime+from io import BytesIOfrom typing import castfrom unittest.mock import Mock, PropertyMock, patch@@ -2301,3 +2302,100 @@ class TestDocumentUpdateByFileApiPatch(SQLiteControllerTest):account = mock_doc_svc.save_document_with_dataset_id.call_args.kwargs["account"]assert isinstance(account, Account)assert account.id == "user-1"+++class TestDocumentTextDefaultDocForm(SQLiteControllerTest):+ @pytest.mark.parametrize("entry", ["create", "update"])+ @pytest.mark.parametrize(+ ("existing_doc_form", "sent_doc_form", "expected"),+ [+ ("hierarchical_model", None, "hierarchical_model"),+ (None, None, "text_model"),+ ("hierarchical_model", "text_model", "text_model"),+ ],+ )+ def test_omitted_doc_form_defaults_to_dataset_doc_form(+ self,+ app: Flask,+ entry: str,+ existing_doc_form: str | None,+ sent_doc_form: str | None,+ expected: str,+ ) -> None:+ dataset = make_dataset()+ self._persist_dataset(dataset)++ if existing_doc_form is not None:+ document = make_serializable_document(+ tenant_id=dataset.tenant_id,+ dataset_id=dataset.id,+ doc_form=existing_doc_form,+ )+ self.session.add(document)+ self.session.commit()++ body = {"name": "a.txt", "text": "hello", "indexing_technique": "economy"}+ if sent_doc_form is not None:+ body["doc_form"] = sent_doc_form++ with (+ patch.object(document_module.FileService, "upload_text", autospec=True, return_value=_upload_file()),+ patch.object(+ DocumentService,+ "save_document_with_dataset_id",+ autospec=True,+ return_value=([make_serializable_document()], "batch-1"),+ ) as save,+ app.test_request_context("/", method="POST", json=body),+ ):+ if entry == "create":+ document_module._create_document_by_text(self.session, dataset.tenant_id, uuid.UUID(dataset.id))+ else:+ document_module._update_document_by_text(+ self.session, dataset.tenant_id, uuid.UUID(dataset.id), uuid.uuid4()+ )++ assert save.call_args.kwargs["knowledge_config"].doc_form == expected+++class TestDocumentFileDefaultDocForm(SQLiteControllerTest):+ @pytest.mark.parametrize("entry", ["create", "update"])+ def test_omitted_doc_form_defaults_to_dataset_doc_form(self, app: Flask, entry: str) -> None:+ dataset = make_dataset()+ self._persist_dataset(dataset)++ document = make_serializable_document(+ tenant_id=dataset.tenant_id,+ dataset_id=dataset.id,+ doc_form="hierarchical_model",+ )+ self.session.add(document)+ self.session.commit()+ data = {+ "file": (BytesIO(b"content"), "a.txt", "text/plain"),+ "data": json.dumps({"process_rule": {"mode": "automatic", "rules": None}}),+ }+ with (+ patch.object(+ document_module.FeatureService, "get_knowledge_file_size_limit", autospec=True, return_value=15+ ),+ patch.object(document_module.FileService, "upload_file", autospec=True, return_value=_upload_file()),+ patch.object(+ DocumentService,+ "save_document_with_dataset_id",+ autospec=True,+ return_value=([make_serializable_document()], "batch-1"),+ ) as save,+ app.test_request_context("/", method="POST", content_type="multipart/form-data", data=data),+ ):+ if entry == "create":+ api = DocumentAddByFileApi()+ _unwrap_non_wrapped_controller(type(api).post)(+ api, self.session, tenant_id=dataset.tenant_id, dataset_id=dataset.id+ )+ else:+ document_module._update_document_by_file(+ self.session, dataset.tenant_id, uuid.UUID(dataset.id), uuid.uuid4()+ )++ assert save.call_args.kwargs["knowledge_config"].doc_form == "hierarchical_model"