Merge pull request #3379 from QuivrHQ/fix/sort-brain-list-km-only

fix: sort brain name and knowledge list local

Author: AmineDiro

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

@@ -112,6 +112,7 @@ async def to_dto(
             await self.awaitable_attrs.created_at
         ), "knowledge should be inserted before transforming to dto"
         brains = await self.awaitable_attrs.brains
+        brains = sorted(brains, key=lambda b: (b is None, b.name))
         children: list[KnowledgeDB] = (
             await self.awaitable_attrs.children if get_children else []
         )

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

@@ -20,6 +20,7 @@
 )
 from quivr_api.modules.knowledge.entity.knowledge import (
     KnowledgeDB,
+    KnowledgeSource,
 )
 from quivr_api.modules.knowledge.service.knowledge_exceptions import (
     KnowledgeCreationError,
@@ -328,6 +329,7 @@ async def get_root_knowledge_user(self, user_id: UUID) -> list[KnowledgeDB]:
             select(KnowledgeDB)
             .where(KnowledgeDB.parent_id.is_(None))  # type: ignore
             .where(KnowledgeDB.user_id == user_id)
+            .where(KnowledgeDB.source == KnowledgeSource.LOCAL)
             .options(joinedload(KnowledgeDB.children))  # type: ignore
         )
         result = await self.session.exec(query)

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

@@ -134,7 +134,19 @@ async def sync(session: AsyncSession, user: User) -> Sync:
 @pytest_asyncio.fixture(scope="function")
 async def brain(session):
     brain_1 = Brain(
-        name="test_brain",
+        name="brain_1",
+        description="this is a test brain",
+        brain_type=BrainType.integration,
+    )
+    session.add(brain_1)
+    await session.commit()
+    return brain_1
+
+
+@pytest_asyncio.fixture(scope="function")
+async def brain2(session):
+    brain_1 = Brain(
+        name="brain_2",
         description="this is a test brain",
         brain_type=BrainType.integration,
     )

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

@@ -141,7 +141,7 @@ async def test_knowledge_remove_folder_cascade(
 
 
 @pytest.mark.asyncio(loop_scope="session")
-async def test_knowledge_dto(session, user, brain, sync):
+async def test_knowledge_dto(session, user, brain, brain2, sync):
     # add folder in brain
     folder = KnowledgeDB(
         file_name="folder_1",
@@ -165,7 +165,7 @@ async def test_knowledge_dto(session, user, brain, sync):
         file_size=100,
         file_sha1="test_sha1",
         user_id=user.id,
-        brains=[brain],
+        brains=[brain2, brain],
         parent=folder,
         sync_file_id="file1",
         sync=sync,
@@ -194,7 +194,11 @@ async def test_knowledge_dto(session, user, brain, sync):
     # Syncs fields
     assert km_dto.sync_id == km.sync_id
     assert km_dto.sync_file_id == km.sync_file_id
+    # Check brain_name order
+    assert len(km_dto.brains) == 2
+    assert km_dto.brains[1]["name"] > km_dto.brains[0]["name"]
 
+    # Check folder to dto
     folder_dto = await folder.to_dto()
     assert folder_dto.brains[0] == brain.model_dump()
     assert folder_dto.children == [await km.to_dto()]