yujunjun/dify
1
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2025-11-01 03:13:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feat/r2' into deploy/rag-dev

Browse Source 
# Conflicts:
#	api/models/dataset.py
This commit is contained in:
jyong 2025-06-11 17:30:30 +08:00
commit 4e8184bc56
1 changed files with 13 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
api/models/dataset.py
View File

@ -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"