Skip to content

armgit / dify

Public Imported from GitHub
0

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.

fix(api): restore Service API file document writes (#44972)

FFXNe40200dcd2ae
diff --git a/api/controllers/service_api/dataset/document.py b/api/controllers/service_api/dataset/document.py
index af056d7e525..84a24796616 100644
--- a/api/controllers/service_api/dataset/document.py
+++ b/api/controllers/service_api/dataset/document.py
@@ -74,6 +74,7 @@ from libs.external_api import error_responses
from libs.helper import dump_response
from libs.login import current_user
from libs.pagination import clamp_pagination, paginate_query
+from models.account import Account
from models.dataset import Dataset, Document
from models.enums import DocumentCreatedFrom
from repositories.knowledge.dataset_read_repository import (
@@ -534,6 +535,19 @@ def _update_document_by_text(
return document, batch
+def _file_document_account(dataset: Dataset, *, session: Session) -> Account:
+ """Keep the dataset creator as the document author when they still belong to its tenant."""
+ creator = get_dataset_creator(dataset, session=session)
+ if creator is not None:
+ creator.set_tenant_id_with_session(dataset.tenant_id, session=session)
+ if creator.current_tenant_id == dataset.tenant_id:
+ return creator
+
+ # The dataset creator may have left the tenant. The authenticated Service API
+ # account is the tenant owner and already has the required tenant context.
+ return current_user
+
+
@service_api_ns.route("/datasets/<uuid:dataset_id>/document/create-by-text")
class DocumentAddByTextApi(DatasetApiResource):
"""Resource for the canonical text document creation route."""
@@ -851,7 +865,7 @@ class DocumentAddByFileApi(DatasetApiResource):
documents, batch = DocumentService.save_document_with_dataset_id(
dataset=dataset,
knowledge_config=knowledge_config,
- account=get_dataset_creator(dataset, session=session),
+ account=_file_document_account(dataset, session=session),
dataset_process_rule=dataset_process_rule,
created_from=DocumentCreatedFrom.API,
session=session,
@@ -930,7 +944,7 @@ def _update_document_by_file(
documents, _ = DocumentService.save_document_with_dataset_id(
dataset=dataset,
knowledge_config=knowledge_config,
- account=get_dataset_creator(dataset, session=session),
+ account=_file_document_account(dataset, session=session),
dataset_process_rule=get_latest_dataset_process_rule(dataset, session=session)
if "process_rule" not in args
else None,
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.py
index e59853690a3..7b9aaa423b9 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
@@ -50,7 +50,7 @@ from controllers.service_api.dataset.error import ArchivedDocumentImmutableError
from core.rag.index_processor.constant.index_type import IndexStructureType
from enums import DeploymentEdition
from libs.pagination import PaginatedResult, clamp_pagination
-from models.account import Account
+from models.account import Account, TenantAccountJoin, TenantAccountRole
from models.dataset import Dataset, Document, DocumentSegment
from models.enums import (
ApiTokenType,
@@ -1032,6 +1032,32 @@ class SQLiteControllerTest:
self.session.commit()
+class TestFileDocumentAccount(SQLiteControllerTest):
+ @pytest.mark.parametrize("creator_is_member", [True, False])
+ def test_creator_attribution_requires_tenant_membership(self, service_api_identity, creator_is_member: bool):
+ creator = make_account(
+ account_id=str(uuid.uuid4()),
+ email=f"dataset-creator-{uuid.uuid4()}@example.com",
+ )
+ self.session.add(creator)
+ if creator_is_member:
+ self.session.add(
+ TenantAccountJoin(
+ tenant_id=service_api_identity.tenant.id,
+ account_id=creator.id,
+ role=TenantAccountRole.NORMAL,
+ )
+ )
+ self.session.commit()
+ dataset = make_dataset(tenant_id=service_api_identity.tenant.id, created_by=creator.id)
+
+ with patch.object(document_module, "current_user", service_api_identity.account):
+ account = document_module._file_document_account(dataset, session=self.session)
+
+ assert account.id == (creator.id if creator_is_member else service_api_identity.account.id)
+ assert account.current_tenant_id == dataset.tenant_id
+
+
class TestDocumentApiDelete(SQLiteControllerTest):
"""Test suite for DocumentApi.delete() endpoint.
@@ -1923,6 +1949,9 @@ class TestDocumentAddByFileApiPost(SQLiteControllerTest):
{"document": _expected_document_response(mock_document), "batch": "batch-file"},
200,
)
+ account = mock_doc_svc.save_document_with_dataset_id.call_args.kwargs["account"]
+ assert isinstance(account, Account)
+ assert account.id == "user-1"
@patch(
"controllers.service_api.dataset.document.FeatureService.get_knowledge_file_size_limit",
@@ -2269,3 +2298,6 @@ class TestDocumentUpdateByFileApiPatch(SQLiteControllerTest):
{"document": _expected_document_response(mock_document), "batch": "batch-1"},
200,
)
+ account = mock_doc_svc.save_document_with_dataset_id.call_args.kwargs["account"]
+ assert isinstance(account, Account)
+ assert account.id == "user-1"