squashme: address comments

SwissDataScienceCenter · Oct 29, 2024 · ffb3570 · ffb3570
1 parent 93899c7
commit ffb3570
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 14 deletions.
diff --git a/components/renku_data_services/data_connectors/db.py b/components/renku_data_services/data_connectors/db.py
@@ -6,6 +6,7 @@
 from cryptography.hazmat.primitives.asymmetric import rsa
 from sqlalchemy import Select, delete, func, or_, select
 from sqlalchemy.ext.asyncio import AsyncSession
+from sqlalchemy.orm import selectinload
 from ulid import ULID
 
 from renku_data_services import base_models, errors
@@ -501,19 +502,21 @@ async def get_data_connectors_with_secrets(
             )
 
         async with self.session_maker() as session:
-            stmt = select(schemas.DataConnectorORM).where(
-                schemas.DataConnectorORM.project_links.any(
-                    schemas.DataConnectorToProjectLinkORM.project_id == project_id
-                ),
-                or_(
-                    # Data connectors with secrets for the specific user
-                    schemas.DataConnectorORM.secrets.any(
-                        schemas.DataConnectorSecretORM.user_id == user.id,
-                    ),
-                    # Data connectors without any secrets
-                    # See: https://docs.sqlalchemy.org/en/20/orm/queryguide/select.html#exists-forms-has-any
-                    ~schemas.DataConnectorORM.secrets.any(),
-                ),
+            stmt = (
+                select(schemas.DataConnectorORM)
+                .where(
+                    schemas.DataConnectorORM.project_links.any(
+                        schemas.DataConnectorToProjectLinkORM.project_id == project_id
+                    )
+                )
+                # Use the DB to filter the secrets returned by the relationship
+                # See: https://docs.sqlalchemy.org/en/20/orm/queryguide/relationships.html#adding-criteria-to-loader-options
+                .options(
+                    selectinload(
+                        schemas.DataConnectorSecretORM.secrets.and_(schemas.DataConnectorSecretORM.user_id == user.id)
+                    )
+                )
+                .execution_options(populate_existing=True)
             )
             results = await session.stream_scalars(stmt)
             async for dc in results:

diff --git a/components/renku_data_services/data_connectors/orm.py b/components/renku_data_services/data_connectors/orm.py
@@ -85,7 +85,7 @@ class DataConnectorORM(BaseORM):
         onupdate=func.now(),
         nullable=False,
     )
-    secrets: Mapped[list["DataConnectorSecretORM"]] = relationship(init=False, viewonly=True, lazy="selectin")
+    secrets: Mapped[list["DataConnectorSecretORM"]] = relationship(init=False, viewonly=True)
     project_links: Mapped[list["DataConnectorToProjectLinkORM"]] = relationship(init=False, viewonly=True)
 
     def dump(self) -> models.DataConnector: