Merge branch 'main' into feat/dify-builder

api/models/dataset.py

@@ -212,17 +212,9 @@ class Dataset(Base):
     enable_api = mapped_column(sa.Boolean, nullable=False, server_default=sa.text("true"))
     is_multimodal = mapped_column(sa.Boolean, default=False, nullable=False, server_default=sa.text("false"))
 
-    @property
-    def total_documents(self) -> int:
-        return self.get_total_documents(session=db.session())
-
     def get_total_documents(self, *, session: Session) -> int:
         return self.get_document_count(session=session)
 
-    @property
-    def total_available_documents(self) -> int:
-        return self.get_total_available_documents(session=db.session())
-
     def get_total_available_documents(self, *, session: Session) -> int:
         return (
             session.scalar(
@@ -258,20 +250,12 @@ class Dataset(Base):
     def get_created_by_account(self, *, session: Session) -> Account | None:
         return session.get(Account, self.created_by)
 
-    @property
-    def author_name(self) -> str | None:
-        return self.get_author_name(session=db.session())
-
     def get_author_name(self, *, session: Session) -> str | None:
         account = self.get_created_by_account(session=session)
         if account:
             return account.name
         return None
 
-    @property
-    def latest_process_rule(self):
-        return self.get_latest_process_rule(session=db.session())
-
     def get_latest_process_rule(self, *, session: Session) -> "DatasetProcessRule | None":
         return session.scalar(
             select(DatasetProcessRule)
@@ -391,10 +375,6 @@ class Dataset(Base):
 
         return tags or []
 
-    @property
-    def external_knowledge_info(self) -> dict[str, Any] | None:
-        return self.get_external_knowledge_info(session=db.session())
-
     def get_external_knowledge_info(self, *, session: Session) -> dict[str, Any] | None:
         if self.provider != "external":
             return None
@@ -974,17 +954,15 @@ class DocumentSegment(TypeBase):
         """Load the owning document with the caller-owned database session."""
         return session.get(Document, self.document_id)
 
-    @property
-    def previous_segment(self):
-        return db.session.scalar(
+    def previous_segment(self, session: Session) -> "DocumentSegment | None":
+        return session.scalar(
             select(DocumentSegment).where(
                 DocumentSegment.document_id == self.document_id, DocumentSegment.position == self.position - 1
             )
         )
 
-    @property
-    def next_segment(self):
-        return db.session.scalar(
+    def next_segment(self, session: Session) -> "DocumentSegment | None":
+        return session.scalar(
             select(DocumentSegment).where(
                 DocumentSegment.document_id == self.document_id, DocumentSegment.position == self.position + 1
             )
@@ -1204,9 +1182,8 @@ class AppDatasetJoin(TypeBase):
         DateTime, nullable=False, server_default=sa.func.current_timestamp(), init=False
     )
 
-    @property
-    def app(self):
-        return db.session.get(App, self.app_id)
+    def app(self, session: Session) -> App | None:
+        return session.get(App, self.app_id)
 
 
 class DatasetQuery(TypeBase):