Skip to content

Commit 5e48594

Browse files
authored
feat: remove n+1 query knowledge (#3238)
# Description closes #3237
1 parent ad87641 commit 5e48594

File tree

4 files changed

+19
-8
lines changed

4 files changed

+19
-8
lines changed

backend/api/quivr_api/modules/knowledge/entity/knowledge.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,9 @@ class KnowledgeDB(AsyncAttrs, SQLModel, table=True):
115115
)
116116

117117
# TODO: nested folder search
118-
async def to_dto(self, get_children: bool = True) -> Knowledge:
118+
async def to_dto(
119+
self, get_children: bool = True, get_parent: bool = True
120+
) -> Knowledge:
119121
assert (
120122
self.updated_at
121123
), "knowledge should be inserted before transforming to dto"
@@ -126,7 +128,7 @@ async def to_dto(self, get_children: bool = True) -> Knowledge:
126128
children: list[KnowledgeDB] = (
127129
await self.awaitable_attrs.children if get_children else []
128130
)
129-
parent = await self.awaitable_attrs.parent
131+
parent = await self.awaitable_attrs.parent if get_parent else None
130132
parent = await parent.to_dto(get_children=False) if parent else None
131133

132134
return Knowledge(

backend/api/quivr_api/modules/knowledge/repository/knowledges.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,8 +245,15 @@ async def get_knowledge_by_id(
245245
raise KnowledgeNotFoundException("Knowledge not found")
246246
return knowledge
247247

248-
async def get_brain_by_id(self, brain_id: UUID) -> Brain:
248+
async def get_brain_by_id(
249+
self, brain_id: UUID, get_knowledge: bool = False
250+
) -> Brain:
249251
query = select(Brain).where(Brain.brain_id == brain_id)
252+
if get_knowledge:
253+
query = query.options(
254+
joinedload(Brain.knowledges).joinedload(KnowledgeDB.brains)
255+
)
256+
250257
result = await self.session.exec(query)
251258
brain = result.first()
252259
if not brain:

backend/api/quivr_api/modules/knowledge/service/knowledge_service.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -208,10 +208,12 @@ async def insert_knowledge_brain(
208208
return inserted_knowledge
209209

210210
async def get_all_knowledge_in_brain(self, brain_id: UUID) -> List[Knowledge]:
211-
brain = await self.repository.get_brain_by_id(brain_id)
212-
213-
all_knowledges = await brain.awaitable_attrs.knowledges
214-
knowledges = [await knowledge.to_dto() for knowledge in all_knowledges]
211+
brain = await self.repository.get_brain_by_id(brain_id, get_knowledge=True)
212+
all_knowledges: List[KnowledgeDB] = await brain.awaitable_attrs.knowledges
213+
knowledges = [
214+
await knowledge.to_dto(get_children=False, get_parent=False)
215+
for knowledge in all_knowledges
216+
]
215217

216218
return knowledges
217219

backend/api/quivr_api/modules/knowledge/tests/test_knowledge_entity.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ async def test_knowledge_remove_folder_cascade(
170170
await session.commit()
171171

172172
statement = select(KnowledgeDB)
173-
results = (await session.exec(statement)).all()
173+
results = (await session.exec(statement)).unique().all()
174174
assert results == []
175175

176176

0 commit comments

Comments
 (0)