refactor(models): Use `scalar` instead of `scalars`

Signed-off-by: -LAN- <laipz8200@outlook.com>
pull/22801/head
-LAN- 7 months ago
parent 1cc9fc4694
commit de0bd4ccc7
No known key found for this signature in database
GPG Key ID: 6BA0D108DED011FF

@ -119,9 +119,7 @@ class Account(UserMixin, Base):
@current_tenant.setter @current_tenant.setter
def current_tenant(self, tenant: "Tenant"): def current_tenant(self, tenant: "Tenant"):
ta = db.session.scalars( ta = db.session.scalar(select(TenantAccountJoin).filter_by(tenant_id=tenant.id, account_id=self.id).limit(1))
select(TenantAccountJoin).filter_by(tenant_id=tenant.id, account_id=self.id).limit(1)
).first()
if ta: if ta:
self.role = TenantAccountRole(ta.role) self.role = TenantAccountRole(ta.role)
self._current_tenant = tenant self._current_tenant = tenant

@ -189,11 +189,11 @@ class Dataset(Base):
) )
if not external_knowledge_binding: if not external_knowledge_binding:
return None return None
external_knowledge_api = db.session.scalars( external_knowledge_api = db.session.scalar(
select(ExternalKnowledgeApis) select(ExternalKnowledgeApis).where(
.where(ExternalKnowledgeApis.id == external_knowledge_binding.external_knowledge_api_id) ExternalKnowledgeApis.id == external_knowledge_binding.external_knowledge_api_id
.limit(1) )
).first() )
if not external_knowledge_api: if not external_knowledge_api:
return None return None
return { return {
@ -687,27 +687,27 @@ class DocumentSegment(Base):
@property @property
def dataset(self): 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 @property
def document(self): 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 @property
def previous_segment(self): def previous_segment(self):
return db.session.scalars( return db.session.scalar(
select(DocumentSegment) select(DocumentSegment).where(
.where(DocumentSegment.document_id == self.document_id, DocumentSegment.position == self.position - 1) DocumentSegment.document_id == self.document_id, DocumentSegment.position == self.position - 1
.limit(1) )
).first() )
@property @property
def next_segment(self): def next_segment(self):
return db.session.scalars( return db.session.scalar(
select(DocumentSegment) select(DocumentSegment).where(
.where(DocumentSegment.document_id == self.document_id, DocumentSegment.position == self.position + 1) DocumentSegment.document_id == self.document_id, DocumentSegment.position == self.position + 1
.limit(1) )
).first() )
@property @property
def child_chunks(self): def child_chunks(self):

Loading…
Cancel
Save