diff --git a/api/models/account.py b/api/models/account.py index 4c3b1f9e04..d63c5d7fb5 100644 --- a/api/models/account.py +++ b/api/models/account.py @@ -119,9 +119,7 @@ class Account(UserMixin, Base): @current_tenant.setter def current_tenant(self, tenant: "Tenant"): - ta = db.session.scalars( - select(TenantAccountJoin).filter_by(tenant_id=tenant.id, account_id=self.id).limit(1) - ).first() + ta = db.session.scalar(select(TenantAccountJoin).filter_by(tenant_id=tenant.id, account_id=self.id).limit(1)) if ta: self.role = TenantAccountRole(ta.role) self._current_tenant = tenant diff --git a/api/models/dataset.py b/api/models/dataset.py index 1f38f680c6..d877540213 100644 --- a/api/models/dataset.py +++ b/api/models/dataset.py @@ -189,11 +189,11 @@ class Dataset(Base): ) if not external_knowledge_binding: return None - external_knowledge_api = db.session.scalars( - select(ExternalKnowledgeApis) - .where(ExternalKnowledgeApis.id == external_knowledge_binding.external_knowledge_api_id) - .limit(1) - ).first() + external_knowledge_api = db.session.scalar( + select(ExternalKnowledgeApis).where( + ExternalKnowledgeApis.id == external_knowledge_binding.external_knowledge_api_id + ) + ) if not external_knowledge_api: return None return { @@ -687,27 +687,27 @@ class DocumentSegment(Base): @property def dataset(self): - return db.session.scalars(select(Dataset).where(Dataset.id == self.dataset_id).limit(1)).first() + return db.session.scalar(select(Dataset).where(Dataset.id == self.dataset_id)) @property def document(self): - return db.session.scalars(select(Document).where(Document.id == self.document_id).limit(1)).first() + return db.session.scalar(select(Document).where(Document.id == self.document_id)) @property def previous_segment(self): - return db.session.scalars( - select(DocumentSegment) - .where(DocumentSegment.document_id == self.document_id, DocumentSegment.position == self.position - 1) - .limit(1) - ).first() + return db.session.scalar( + select(DocumentSegment).where( + DocumentSegment.document_id == self.document_id, DocumentSegment.position == self.position - 1 + ) + ) @property def next_segment(self): - return db.session.scalars( - select(DocumentSegment) - .where(DocumentSegment.document_id == self.document_id, DocumentSegment.position == self.position + 1) - .limit(1) - ).first() + return db.session.scalar( + select(DocumentSegment).where( + DocumentSegment.document_id == self.document_id, DocumentSegment.position == self.position + 1 + ) + ) @property def child_chunks(self):