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.

refactor(models): remove legacy db.session property wrappers on Document (#41721)

Keithe6a38fd793be
diff --git a/api/models/dataset.py b/api/models/dataset.py
index ddcc8020ed8..5e45d4b9a68 100644
--- a/api/models/dataset.py
+++ b/api/models/dataset.py
@@ -622,10 +622,6 @@ class Document(Base):
return data_source_info_dict
return {}
- @property
- def data_source_detail_dict(self) -> dict[str, Any]:
- return self.get_data_source_detail_dict(session=db.session())
-
def get_data_source_detail_dict(self, *, session: Session) -> dict[str, Any]:
if self.data_source_info:
if self.data_source_type == "upload_file":
@@ -665,10 +661,6 @@ class Document(Base):
return session.get(DatasetProcessRule, self.dataset_process_rule_id)
return None
- @property
- def dataset(self) -> Dataset | None:
- return self.get_dataset(session=db.session())
-
def get_dataset(self, *, session: Session) -> Dataset | None:
"""Load the owning dataset with the caller-owned database session."""
return session.get(Dataset, self.dataset_id)
@@ -694,10 +686,6 @@ class Document(Base):
or 0
)
- @property
- def uploader(self):
- return self.get_uploader(session=db.session())
-
def get_uploader(self, *, session: Session) -> str | None:
user = session.scalar(select(Account).where(Account.id == self.created_by))
return user.name if user else None
@@ -710,10 +698,6 @@ class Document(Base):
def last_update_date(self):
return self.updated_at
- @property
- def doc_metadata_details(self) -> list[DocMetadataDetailItem] | None:
- return self.get_doc_metadata_details(session=db.session())
-
def get_doc_metadata_details(self, *, session: Session) -> list[DocMetadataDetailItem] | None:
if self.doc_metadata:
document_metadatas = session.scalars(
diff --git a/api/tests/unit_tests/controllers/console/test_document_detail_api_data_source_info.py b/api/tests/unit_tests/controllers/console/test_document_detail_api_data_source_info.py
index 9507fb4a75c..fac5aa79ae7 100644
--- a/api/tests/unit_tests/controllers/console/test_document_detail_api_data_source_info.py
+++ b/api/tests/unit_tests/controllers/console/test_document_detail_api_data_source_info.py
@@ -7,6 +7,7 @@ and data_source_detail_dict for all data_source_type values, including "local_fi
import json
from typing import Literal, NotRequired, TypedDict
+from unittest.mock import MagicMock
from models.dataset import Document
@@ -116,7 +117,7 @@ class TestDocumentDetailDataSourceInfo:
)
# data_source_detail_dict should return raw data for notion_import
- detail_result = document.data_source_detail_dict
+ detail_result = document.get_data_source_detail_dict(session=MagicMock())
assert detail_result == notion_data
# Test website_crawl
@@ -127,7 +128,7 @@ class TestDocumentDetailDataSourceInfo:
)
# data_source_detail_dict should return raw data for website_crawl
- detail_result = document.data_source_detail_dict
+ detail_result = document.get_data_source_detail_dict(session=MagicMock())
assert detail_result == website_data
def test_local_file_data_source_detail_dict_without_db(self):
@@ -139,5 +140,5 @@ class TestDocumentDetailDataSourceInfo:
)
# Should return empty dict for local_file type (handled in the model)
- detail_result = document.data_source_detail_dict
+ detail_result = document.get_data_source_detail_dict(session=MagicMock())
assert detail_result == {}