From 11a9627cbbc280aea9b643a1d1e8b2deb1e4aa60 Mon Sep 17 00:00:00 2001
From: Keith <148296621+keith991001@users.noreply.github.com>
Date: Mon, 7 Sep 2026 05:25:51 +0000
Subject: [PATCH] refactor(models): remove remaining legacy db.session property
 wrappers on Dataset (#41647)

---
 api/models/dataset.py                         | 25 ++---------------
 .../unit_tests/models/test_dataset_models.py  | 28 +++++++++++++++++++
 2 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/api/models/dataset.py b/api/models/dataset.py
index ad9d1d97817..db87aa71fa3 100644
--- a/api/models/dataset.py
+++ b/api/models/dataset.py
@@ -243,10 +243,6 @@ class Dataset(Base):
         }
         return self.retrieval_model or default_retrieval_model
 
-    @property
-    def created_by_account(self):
-        return self.get_created_by_account(session=db.session())
-
     def get_created_by_account(self, *, session: Session) -> Account | None:
         return session.get(Account, self.created_by)
 
@@ -264,10 +260,6 @@ class Dataset(Base):
             .limit(1)
         )
 
-    @property
-    def app_count(self) -> int:
-        return self.get_app_count(session=db.session())
-
     def get_app_count(self, *, session: Session) -> int:
         return (
             session.scalar(
@@ -278,17 +270,12 @@ class Dataset(Base):
             or 0
         )
 
-    @property
-    def document_count(self) -> int:
-        return self.get_document_count(session=db.session())
-
     def get_document_count(self, *, session: Session) -> int:
         return session.scalar(select(func.count(Document.id)).where(Document.dataset_id == self.id)) or 0
 
-    @property
-    def available_document_count(self):
+    def get_available_document_count(self, *, session: Session) -> int:
         return (
-            db.session.scalar(
+            session.scalar(
                 select(func.count(Document.id)).where(
                     Document.dataset_id == self.id,
                     Document.indexing_status == "completed",
@@ -401,10 +388,6 @@ class Dataset(Base):
             "external_knowledge_api_endpoint": json.loads(external_knowledge_api.settings).get("endpoint", ""),
         }
 
-    @property
-    def is_published(self) -> bool:
-        return self.get_is_published(session=db.session())
-
     def get_is_published(self, *, session: Session) -> bool:
         if self.pipeline_id:
             pipeline = session.scalar(select(Pipeline).where(Pipeline.id == self.pipeline_id))
@@ -412,10 +395,6 @@ class Dataset(Base):
                 return pipeline.is_published
         return False
 
-    @property
-    def doc_metadata(self) -> list[dict[str, str]]:
-        return self.get_doc_metadata(session=db.session())
-
     def get_doc_metadata(self, *, session: Session) -> list[dict[str, str]]:
         dataset_metadatas = session.scalars(select(DatasetMetadata).where(DatasetMetadata.dataset_id == self.id)).all()
 
diff --git a/api/tests/unit_tests/models/test_dataset_models.py b/api/tests/unit_tests/models/test_dataset_models.py
index 4d691214d2b..2ca01cf44f9 100644
--- a/api/tests/unit_tests/models/test_dataset_models.py
+++ b/api/tests/unit_tests/models/test_dataset_models.py
@@ -1662,6 +1662,34 @@ class TestChildChunkSessionAccessors:
         assert child_chunk.segment(session=sqlite_session) is None
 
 
+class TestDatasetAvailableDocumentCount:
+    """Regression coverage for ``Dataset.get_available_document_count``.
+
+    The accessor was a ``@property`` reaching for the global ``db.session``; it now takes a
+    caller-provided session, matching the other ``get_*`` accessors on ``Dataset``.
+    """
+
+    def test_counts_only_completed_enabled_documents(self, sqlite_session: Session):
+        dataset = _make_dataset(dataset_id=str(uuid4()), tenant_id=str(uuid4()))
+        completed = _make_document(
+            document_id=str(uuid4()),
+            dataset_id=dataset.id,
+            tenant_id=dataset.tenant_id,
+            indexing_status=IndexingStatus.COMPLETED,
+        )
+        waiting = _make_document(
+            document_id=str(uuid4()),
+            dataset_id=dataset.id,
+            tenant_id=dataset.tenant_id,
+            position=2,
+            indexing_status=IndexingStatus.WAITING,
+        )
+        sqlite_session.add_all([dataset, completed, waiting])
+        sqlite_session.flush()
+
+        assert dataset.get_available_document_count(session=sqlite_session) == 1
+
+
 class TestDocumentSegmentNeighborAccessors:
     """Regression coverage for ``DocumentSegment.previous_segment`` and ``next_segment`` refactored
     to take a caller-provided session.