diff --git a/api/models/dataset.py b/api/models/dataset.py index 872abc3eee..5d18eaff49 100644 --- a/api/models/dataset.py +++ b/api/models/dataset.py @@ -69,6 +69,19 @@ class Dataset(Base): pipeline_id = db.Column(StringUUID, nullable=True) chunk_structure = db.Column(db.String(255), nullable=True) + @property + def total_documents(self): + return db.session.query(func.count(Document.id)).filter(Document.dataset_id == self.id).scalar() + + @property + def total_available_documents(self): + return db.session.query(func.count(Document.id)).filter( + Document.dataset_id == self.id, + Document.indexing_status == "completed", + Document.enabled == True, + Document.archived == False, + ).scalar() + @property def dataset_keyword_table(self): dataset_keyword_table = ( @@ -311,33 +324,6 @@ class DatasetProcessRule(Base): return json.loads(self.rules) if self.rules else None except JSONDecodeError: return None - - @property - def total_documents(self): - return db.session.query(func.count(Document.id)).filter(Document.dataset_id == self.dataset_id).scalar() - - @property - def total_available_documents(self): - return db.session.query(func.count(Document.id)).filter( - Document.dataset_id == self.dataset_id, - Document.indexing_status == "completed", - Document.enabled == True, - Document.archived == False, - ).scalar() - - @property - def total_documents(self): - return db.session.query(func.count(Document.id)).filter(Document.dataset_id == self.dataset_id).scalar() - - @property - def total_available_documents(self): - return db.session.query(func.count(Document.id)).filter( - Document.dataset_id == self.dataset_id, - Document.indexing_status == "completed", - Document.enabled == True, - Document.archived == False, - ).scalar() - class Document(Base): __tablename__ = "documents"